Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'upstream/master' into develop

Browse source
This commit is contained in:
Nick Brassel 2022-02-09 16:00:09 +11:00
commit a2ffdb4abd
28 changed files with 1022 additions and 593 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/config_options.md
View file

@ -61,6 +61,8 @@ This is a C header file that is one of the first things included, and will persi
* pins unused by the keyboard for reference * pins unused by the keyboard for reference
* `#define MATRIX_HAS_GHOST` * `#define MATRIX_HAS_GHOST`
* define is matrix has ghost (unlikely) * define is matrix has ghost (unlikely)
* `#define MATRIX_UNSELECT_DRIVE_HIGH`
* On un-select of matrix pins, rather than setting pins to input-high, sets them to output-high.
* `#define DIODE_DIRECTION COL2ROW` * `#define DIODE_DIRECTION COL2ROW`
* COL2ROW or ROW2COL - how your matrix is configured. COL2ROW means the black mark on your diode is facing to the rows, and between the switch and the rows. * COL2ROW or ROW2COL - how your matrix is configured. COL2ROW means the black mark on your diode is facing to the rows, and between the switch and the rows.
* `#define DIRECT_PINS { { F1, F0, B0, C7 }, { F4, F5, F6, F7 } }` * `#define DIRECT_PINS { { F1, F0, B0, C7 }, { F4, F5, F6, F7 } }`

586
keyboards/boardsource/the_mark/info.json
View file

@ -1,229 +1,393 @@
{ {
"keyboard_name": "The Mark: 65", "keyboard_name": "The Mark: 65",
"url": "", "url": "",
"maintainer": "Boardsource", "maintainer": "daysgobye, Boardsource",
"layouts": { "layouts": {
"LAYOUT_all": { "LAYOUT_all": {
"layout": [ "layout": [
{ "x": 0, "y": 0, "w": 1 }, {"label":"Esc", "x":0, "y":0},
{ "x": 1, "y": 0, "w": 1 }, {"label":"1!", "x":1, "y":0},
{ "x": 2, "y": 0, "w": 1 }, {"label":"2@", "x":2, "y":0},
{ "x": 3, "y": 0, "w": 1 }, {"label":"3#", "x":3, "y":0},
{ "x": 4, "y": 0, "w": 1 }, {"label":"4$", "x":4, "y":0},
{ "x": 5, "y": 0, "w": 1 }, {"label":"5%", "x":5, "y":0},
{ "x": 6, "y": 0, "w": 1 }, {"label":"6^", "x":6, "y":0},
{ "x": 7, "y": 0, "w": 1 }, {"label":"7&", "x":7, "y":0},
{ "x": 8, "y": 0, "w": 1 }, {"label":"8*", "x":8, "y":0},
{ "x": 9, "y": 0, "w": 1 }, {"label":"9(", "x":9, "y":0},
{ "x": 10, "y": 0, "w": 1 }, {"label":"0)", "x":10, "y":0},
{ "x": 11, "y": 0, "w": 1 }, {"label":"-_", "x":11, "y":0},
{ "x": 12, "y": 0, "w": 1 }, {"label":"=+", "x":12, "y":0},
{ "x": 13, "y": 0, "w": 1 }, {"label":"Backspace", "x":13, "y":0},
{ "x": 14, "y": 0, "w": 1 }, {"label":"Backspace", "x":14, "y":0},
{ "x": 15.25, "y": 0, "w": 1 }, {"label":"Toggle RGB", "x":15.25, "y":0},
{ "x": 0, "y": 1, "w": 1.5 },
{ "x": 1.5, "y": 1, "w": 1 }, {"label":"Tab", "x":0, "y":1, "w":1.5},
{ "x": 2.5, "y": 1, "w": 1 }, {"label":"Q", "x":1.5, "y":1},
{ "x": 3.5, "y": 1, "w": 1 }, {"label":"W", "x":2.5, "y":1},
{ "x": 4.5, "y": 1, "w": 1 }, {"label":"E", "x":3.5, "y":1},
{ "x": 5.5, "y": 1, "w": 1 }, {"label":"R", "x":4.5, "y":1},
{ "x": 6.5, "y": 1, "w": 1 }, {"label":"T", "x":5.5, "y":1},
{ "x": 7.5, "y": 1, "w": 1 }, {"label":"Y", "x":6.5, "y":1},
{ "x": 8.5, "y": 1, "w": 1 }, {"label":"U", "x":7.5, "y":1},
{ "x": 9.5, "y": 1, "w": 1 }, {"label":"I", "x":8.5, "y":1},
{ "x": 10.5, "y": 1, "w": 1 }, {"label":"O", "x":9.5, "y":1},
{ "x": 11.5, "y": 1, "w": 1 }, {"label":"P", "x":10.5, "y":1},
{ "x": 12.5, "y": 1, "w": 1 }, {"label":"[{", "x":11.5, "y":1},
{ "x": 13.5, "y": 1, "w": 1.5 }, {"label":"]}", "x":12.5, "y":1},
{ "x": 15.25, "y": 1, "w": 1 }, {"label":"\\|", "x":13.5, "y":1, "w":1.5},
{ "x": 0, "y": 2, "w": 1.75 }, {"label":"RGB Mode +", "x":15.25, "y":1},
{ "x": 1.75, "y": 2, "w": 1 },
{ "x": 2.75, "y": 2, "w": 1 }, {"label":"Ctrl", "x":0, "y":2, "w":1.75},
{ "x": 3.75, "y": 2, "w": 1 }, {"label":"A", "x":1.75, "y":2},
{ "x": 4.75, "y": 2, "w": 1 }, {"label":"S", "x":2.75, "y":2},
{ "x": 5.75, "y": 2, "w": 1 }, {"label":"D", "x":3.75, "y":2},
{ "x": 6.75, "y": 2, "w": 1 }, {"label":"F", "x":4.75, "y":2},
{ "x": 7.75, "y": 2, "w": 1 }, {"label":"G", "x":5.75, "y":2},
{ "x": 8.75, "y": 2, "w": 1 }, {"label":"H", "x":6.75, "y":2},
{ "x": 9.75, "y": 2, "w": 1 }, {"label":"J", "x":7.75, "y":2},
{ "x": 10.75, "y": 2, "w": 1 }, {"label":"K", "x":8.75, "y":2},
{ "x": 11.75, "y": 2, "w": 1 }, {"label":"L", "x":9.75, "y":2},
{ "x": 12.75, "y": 2, "w": 2.25 }, {"label":";:", "x":10.75, "y":2},
{ "x": 15.25, "y": 2, "w": 1 }, {"label":"'\"", "x":11.75, "y":2},
{ "x": 0, "y": 3, "w": 1.25 }, {"label":"Enter", "x":12.75, "y":2, "w":2.25},
{ "x": 1.25, "y": 3, "w": 1 }, {"label":"Fn", "x":15.25, "y":2},
{ "x": 2.25, "y": 3, "w": 1 },
{ "x": 3.25, "y": 3, "w": 1 }, {"label":"Shift", "x":0, "y":3, "w":1.25},
{ "x": 4.25, "y": 3, "w": 1 }, {"label":"\\|", "x":1.25, "y":3},
{ "x": 5.25, "y": 3, "w": 1 }, {"label":"Z", "x":2.25, "y":3},
{ "x": 6.25, "y": 3, "w": 1 }, {"label":"X", "x":3.25, "y":3},
{ "x": 7.25, "y": 3, "w": 1 }, {"label":"C", "x":4.25, "y":3},
{ "x": 8.25, "y": 3, "w": 1 }, {"label":"V", "x":5.25, "y":3},
{ "x": 9.25, "y": 3, "w": 1 }, {"label":"B", "x":6.25, "y":3},
{ "x": 10.25, "y": 3, "w": 1 }, {"label":"N", "x":7.25, "y":3},
{ "x": 11.25, "y": 3, "w": 1 }, {"label":"M", "x":8.25, "y":3},
{ "x": 12.25, "y": 3, "w": 1.75 }, {"label":",<", "x":9.25, "y":3},
{ "x": 14.25, "y": 3.25, "w": 1 }, {"label":".>", "x":10.25, "y":3},
{ "x": 0, "y": 4, "w": 1.25 }, {"label":"/?", "x":11.25, "y":3},
{ "x": 1.25, "y": 4, "w": 1.25 }, {"label":"Shift", "x":12.25, "y":3, "w":1.75},
{ "x": 2.5, "y": 4, "w": 1.25 }, {"label":"\u2191", "x":14.25, "y":3.25},
{ "x": 3.75, "y": 4, "w": 2.25 },
{ "x": 6, "y": 4, "w": 1.25 }, {"label":"Ctrl", "x":0, "y":4, "w":1.25},
{ "x": 7.25, "y": 4, "w": 2.75 }, {"label":"GUI", "x":1.25, "y":4, "w":1.25},
{ "x": 10, "y": 4, "w": 1 }, {"label":"Alt", "x":2.5, "y":4, "w":1.25},
{ "x": 11, "y": 4, "w": 1 }, {"label":"Space", "x":3.75, "y":4, "w":2.25},
{ "x": 12, "y": 4, "w": 1 }, {"label":"Space", "x":6, "y":4, "w":1.25},
{ "x": 13.25, "y": 4.25, "w": 1 }, {"label":"Space", "x":7.25, "y":4, "w":2.75},
{ "x": 14.25, "y": 4.25, "w": 1 }, {"label":"Alt", "x":10, "y":4},
{ "x": 15.25, "y": 4.25, "w": 1 } {"label":"Ctrl", "x":11, "y":4},
{"label":"`~", "x":12, "y":4},
{"label":"\u2190", "x":13.25, "y":4.25},
{"label":"\u2193", "x":14.25, "y":4.25},
{"label":"\u2192", "x":15.25, "y":4.25}
] ]
}, },
"LAYOUT_ansi": { "LAYOUT_ansi": {
"layout": [ "layout": [
{ "x": 0, "y": 0, "w": 1 }, {"label":"Esc", "x":0, "y":0},
{ "x": 1, "y": 0, "w": 1 }, {"label":"1!", "x":1, "y":0},
{ "x": 2, "y": 0, "w": 1 }, {"label":"2@", "x":2, "y":0},
{ "x": 3, "y": 0, "w": 1 }, {"label":"3#", "x":3, "y":0},
{ "x": 4, "y": 0, "w": 1 }, {"label":"4$", "x":4, "y":0},
{ "x": 5, "y": 0, "w": 1 }, {"label":"5%", "x":5, "y":0},
{ "x": 6, "y": 0, "w": 1 }, {"label":"6^", "x":6, "y":0},
{ "x": 7, "y": 0, "w": 1 }, {"label":"7&", "x":7, "y":0},
{ "x": 8, "y": 0, "w": 1 }, {"label":"8*", "x":8, "y":0},
{ "x": 9, "y": 0, "w": 1 }, {"label":"9(", "x":9, "y":0},
{ "x": 10, "y": 0, "w": 1 }, {"label":"0)", "x":10, "y":0},
{ "x": 11, "y": 0, "w": 1 }, {"label":"-_", "x":11, "y":0},
{ "x": 12, "y": 0, "w": 1 }, {"label":"=+", "x":12, "y":0},
{ "x": 13, "y": 0, "w": 2 }, {"label":"Backspace", "x":13, "y":0, "w":2},
{ "x": 15.25, "y": 0, "w": 1 }, {"label":"Toggle RGB", "x":15.25, "y":0},
{ "x": 0, "y": 1, "w": 1.5 },
{ "x": 1.5, "y": 1, "w": 1 }, {"label":"Tab", "x":0, "y":1, "w":1.5},
{ "x": 2.5, "y": 1, "w": 1 }, {"label":"Q", "x":1.5, "y":1},
{ "x": 3.5, "y": 1, "w": 1 }, {"label":"W", "x":2.5, "y":1},
{ "x": 4.5, "y": 1, "w": 1 }, {"label":"E", "x":3.5, "y":1},
{ "x": 5.5, "y": 1, "w": 1 }, {"label":"R", "x":4.5, "y":1},
{ "x": 6.5, "y": 1, "w": 1 }, {"label":"T", "x":5.5, "y":1},
{ "x": 7.5, "y": 1, "w": 1 }, {"label":"Y", "x":6.5, "y":1},
{ "x": 8.5, "y": 1, "w": 1 }, {"label":"U", "x":7.5, "y":1},
{ "x": 9.5, "y": 1, "w": 1 }, {"label":"I", "x":8.5, "y":1},
{ "x": 10.5, "y": 1, "w": 1 }, {"label":"O", "x":9.5, "y":1},
{ "x": 11.5, "y": 1, "w": 1 }, {"label":"P", "x":10.5, "y":1},
{ "x": 12.5, "y": 1, "w": 1 }, {"label":"[{", "x":11.5, "y":1},
{ "x": 13.5, "y": 1, "w": 1.5 }, {"label":"]}", "x":12.5, "y":1},
{ "x": 15.25, "y": 1, "w": 1 }, {"label":"\\|", "x":13.5, "y":1, "w":1.5},
{ "x": 0, "y": 2, "w": 1.75 }, {"label":"RGB Mode +", "x":15.25, "y":1},
{ "x": 1.75, "y": 2, "w": 1 },
{ "x": 2.75, "y": 2, "w": 1 }, {"label":"Ctrl", "x":0, "y":2, "w":1.75},
{ "x": 3.75, "y": 2, "w": 1 }, {"label":"A", "x":1.75, "y":2},
{ "x": 4.75, "y": 2, "w": 1 }, {"label":"S", "x":2.75, "y":2},
{ "x": 5.75, "y": 2, "w": 1 }, {"label":"D", "x":3.75, "y":2},
{ "x": 6.75, "y": 2, "w": 1 }, {"label":"F", "x":4.75, "y":2},
{ "x": 7.75, "y": 2, "w": 1 }, {"label":"G", "x":5.75, "y":2},
{ "x": 8.75, "y": 2, "w": 1 }, {"label":"H", "x":6.75, "y":2},
{ "x": 9.75, "y": 2, "w": 1 }, {"label":"J", "x":7.75, "y":2},
{ "x": 10.75, "y": 2, "w": 1 }, {"label":"K", "x":8.75, "y":2},
{ "x": 11.75, "y": 2, "w": 1 }, {"label":"L", "x":9.75, "y":2},
{ "x": 12.75, "y": 2, "w": 2.25 }, {"label":";:", "x":10.75, "y":2},
{ "x": 15.25, "y": 2, "w": 1 }, {"label":"'\"", "x":11.75, "y":2},
{ "x": 0, "y": 3, "w": 2.25 }, {"label":"Enter", "x":12.75, "y":2, "w":2.25},
{ "x": 2.25, "y": 3, "w": 1 }, {"label":"Fn", "x":15.25, "y":2},
{ "x": 3.25, "y": 3, "w": 1 },
{ "x": 4.25, "y": 3, "w": 1 }, {"label":"Shift", "x":0, "y":3, "w":2.25},
{ "x": 5.25, "y": 3, "w": 1 }, {"label":"Z", "x":2.25, "y":3},
{ "x": 6.25, "y": 3, "w": 1 }, {"label":"X", "x":3.25, "y":3},
{ "x": 7.25, "y": 3, "w": 1 }, {"label":"C", "x":4.25, "y":3},
{ "x": 8.25, "y": 3, "w": 1 }, {"label":"V", "x":5.25, "y":3},
{ "x": 9.25, "y": 3, "w": 1 }, {"label":"B", "x":6.25, "y":3},
{ "x": 10.25, "y": 3, "w": 1 }, {"label":"N", "x":7.25, "y":3},
{ "x": 11.25, "y": 3, "w": 1 }, {"label":"M", "x":8.25, "y":3},
{ "x": 12.25, "y": 3, "w": 1.75 }, {"label":",<", "x":9.25, "y":3},
{ "x": 14.25, "y": 3.25, "w": 1 }, {"label":".>", "x":10.25, "y":3},
{ "x": 0, "y": 4, "w": 1.25 }, {"label":"/?", "x":11.25, "y":3},
{ "x": 1.25, "y": 4, "w": 1.25 }, {"label":"Shift", "x":12.25, "y":3, "w":1.75},
{ "x": 2.5, "y": 4, "w": 1.25 }, {"label":"\u2191", "x":14.25, "y":3.25},
{ "x": 3.75, "y": 4, "w": 6.25 },
{ "x": 10, "y": 4, "w": 1 }, {"label":"Ctrl", "x":0, "y":4, "w":1.25},
{ "x": 11, "y": 4, "w": 1 }, {"label":"GUI", "x":1.25, "y":4, "w":1.25},
{ "x": 12, "y": 4, "w": 1 }, {"label":"Alt", "x":2.5, "y":4, "w":1.25},
{ "x": 13.25, "y": 4.25, "w": 1 }, {"label":"Space", "x":3.75, "y":4, "w":6.25},
{ "x": 14.25, "y": 4.25, "w": 1 }, {"label":"Alt", "x":10, "y":4},
{ "x": 15.25, "y": 4.25, "w": 1 } {"label":"Ctrl", "x":11, "y":4},
{"label":"`~", "x":12, "y":4},
{"label":"\u2190", "x":13.25, "y":4.25},
{"label":"\u2193", "x":14.25, "y":4.25},
{"label":"\u2192", "x":15.25, "y":4.25}
]
},
"LAYOUT_ansi_split_bs_space": {
"layout": [
{"label":"Esc", "x":0, "y":0},
{"label":"1!", "x":1, "y":0},
{"label":"2@", "x":2, "y":0},
{"label":"3#", "x":3, "y":0},
{"label":"4$", "x":4, "y":0},
{"label":"5%", "x":5, "y":0},
{"label":"6^", "x":6, "y":0},
{"label":"7&", "x":7, "y":0},
{"label":"8*", "x":8, "y":0},
{"label":"9(", "x":9, "y":0},
{"label":"0)", "x":10, "y":0},
{"label":"-_", "x":11, "y":0},
{"label":"=+", "x":12, "y":0},
{"label":"Backspace", "x":13, "y":0},
{"label":"Backspace", "x":14, "y":0},
{"label":"Toggle RGB", "x":15.25, "y":0},
{"label":"Tab", "x":0, "y":1, "w":1.5},
{"label":"Q", "x":1.5, "y":1},
{"label":"W", "x":2.5, "y":1},
{"label":"E", "x":3.5, "y":1},
{"label":"R", "x":4.5, "y":1},
{"label":"T", "x":5.5, "y":1},
{"label":"Y", "x":6.5, "y":1},
{"label":"U", "x":7.5, "y":1},
{"label":"I", "x":8.5, "y":1},
{"label":"O", "x":9.5, "y":1},
{"label":"P", "x":10.5, "y":1},
{"label":"[{", "x":11.5, "y":1},
{"label":"]}", "x":12.5, "y":1},
{"label":"\\|", "x":13.5, "y":1, "w":1.5},
{"label":"RGB Mode +", "x":15.25, "y":1},
{"label":"Ctrl", "x":0, "y":2, "w":1.75},
{"label":"A", "x":1.75, "y":2},
{"label":"S", "x":2.75, "y":2},
{"label":"D", "x":3.75, "y":2},
{"label":"F", "x":4.75, "y":2},
{"label":"G", "x":5.75, "y":2},
{"label":"H", "x":6.75, "y":2},
{"label":"J", "x":7.75, "y":2},
{"label":"K", "x":8.75, "y":2},
{"label":"L", "x":9.75, "y":2},
{"label":";:", "x":10.75, "y":2},
{"label":"'\"", "x":11.75, "y":2},
{"label":"Enter", "x":12.75, "y":2, "w":2.25},
{"label":"Fn", "x":15.25, "y":2},
{"label":"Shift", "x":0, "y":3, "w":2.25},
{"label":"Z", "x":2.25, "y":3},
{"label":"X", "x":3.25, "y":3},
{"label":"C", "x":4.25, "y":3},
{"label":"V", "x":5.25, "y":3},
{"label":"B", "x":6.25, "y":3},
{"label":"N", "x":7.25, "y":3},
{"label":"M", "x":8.25, "y":3},
{"label":",<", "x":9.25, "y":3},
{"label":".>", "x":10.25, "y":3},
{"label":"/?", "x":11.25, "y":3},
{"label":"Shift", "x":12.25, "y":3, "w":1.75},
{"label":"\u2191", "x":14.25, "y":3.25},
{"label":"Ctrl", "x":0, "y":4, "w":1.25},
{"label":"GUI", "x":1.25, "y":4, "w":1.25},
{"label":"Alt", "x":2.5, "y":4, "w":1.25},
{"label":"Space", "x":3.75, "y":4, "w":2.25},
{"label":"Space", "x":6, "y":4, "w":1.25},
{"label":"Space", "x":7.25, "y":4, "w":2.75},
{"label":"Alt", "x":10, "y":4},
{"label":"Ctrl", "x":11, "y":4},
{"label":"`~", "x":12, "y":4},
{"label":"\u2190", "x":13.25, "y":4.25},
{"label":"\u2193", "x":14.25, "y":4.25},
{"label":"\u2192", "x":15.25, "y":4.25}
] ]
}, },
"LAYOUT_iso": { "LAYOUT_iso": {
"layout": [ "layout": [
{ "x": 0, "y": 0, "w": 1 }, {"label":"Esc", "x":0, "y":0},
{ "x": 1, "y": 0, "w": 1 }, {"label":"1!", "x":1, "y":0},
{ "x": 2, "y": 0, "w": 1 }, {"label":"2\"", "x":2, "y":0},
{ "x": 3, "y": 0, "w": 1 }, {"label":"3\u00a3", "x":3, "y":0},
{ "x": 4, "y": 0, "w": 1 }, {"label":"4$", "x":4, "y":0},
{ "x": 5, "y": 0, "w": 1 }, {"label":"5%", "x":5, "y":0},
{ "x": 6, "y": 0, "w": 1 }, {"label":"6^", "x":6, "y":0},
{ "x": 7, "y": 0, "w": 1 }, {"label":"7&", "x":7, "y":0},
{ "x": 8, "y": 0, "w": 1 }, {"label":"8*", "x":8, "y":0},
{ "x": 9, "y": 0, "w": 1 }, {"label":"9(", "x":9, "y":0},
{ "x": 10, "y": 0, "w": 1 }, {"label":"0)", "x":10, "y":0},
{ "x": 11, "y": 0, "w": 1 }, {"label":"-_", "x":11, "y":0},
{ "x": 12, "y": 0, "w": 1 }, {"label":"=+", "x":12, "y":0},
{ "x": 13, "y": 0, "w": 2 }, {"label":"Backspace", "x":13, "y":0, "w":2},
{ "x": 15.25, "y": 0, "w": 1 }, {"label":"Toggle RGB", "x":15.25, "y":0},
{ "x": 0, "y": 1, "w": 1.5 },
{ "x": 1.5, "y": 1, "w": 1 }, {"label":"Tab", "x":0, "y":1, "w":1.5},
{ "x": 2.5, "y": 1, "w": 1 }, {"label":"Q", "x":1.5, "y":1},
{ "x": 3.5, "y": 1, "w": 1 }, {"label":"W", "x":2.5, "y":1},
{ "x": 4.5, "y": 1, "w": 1 }, {"label":"E", "x":3.5, "y":1},
{ "x": 5.5, "y": 1, "w": 1 }, {"label":"R", "x":4.5, "y":1},
{ "x": 6.5, "y": 1, "w": 1 }, {"label":"T", "x":5.5, "y":1},
{ "x": 7.5, "y": 1, "w": 1 }, {"label":"Y", "x":6.5, "y":1},
{ "x": 8.5, "y": 1, "w": 1 }, {"label":"U", "x":7.5, "y":1},
{ "x": 9.5, "y": 1, "w": 1 }, {"label":"I", "x":8.5, "y":1},
{ "x": 10.5, "y": 1, "w": 1 }, {"label":"O", "x":9.5, "y":1},
{ "x": 11.5, "y": 1, "w": 1 }, {"label":"P", "x":10.5, "y":1},
{ "x": 12.5, "y": 1, "w": 1 }, {"label":"[{", "x":11.5, "y":1},
{ "x": 15.25, "y": 1, "w": 1 }, {"label":"]}", "x":12.5, "y":1},
{ "x": 0, "y": 2, "w": 1.75 }, {"label":"RGB Mode +", "x":15.25, "y":1},
{ "x": 1.75, "y": 2, "w": 1 },
{ "x": 2.75, "y": 2, "w": 1 }, {"label":"Ctrl", "x":0, "y":2, "w":1.75},
{ "x": 3.75, "y": 2, "w": 1 }, {"label":"A", "x":1.75, "y":2},
{ "x": 4.75, "y": 2, "w": 1 }, {"label":"S", "x":2.75, "y":2},
{ "x": 5.75, "y": 2, "w": 1 }, {"label":"D", "x":3.75, "y":2},
{ "x": 6.75, "y": 2, "w": 1 }, {"label":"F", "x":4.75, "y":2},
{ "x": 7.75, "y": 2, "w": 1 }, {"label":"G", "x":5.75, "y":2},
{ "x": 8.75, "y": 2, "w": 1 }, {"label":"H", "x":6.75, "y":2},
{ "x": 9.75, "y": 2, "w": 1 }, {"label":"J", "x":7.75, "y":2},
{ "x": 10.75, "y": 2, "w": 1 }, {"label":"K", "x":8.75, "y":2},
{ "x": 11.75, "y": 2, "w": 1 }, {"label":"L", "x":9.75, "y":2},
{ "x": 12.75, "y": 2, "w": 1 }, {"label":";:", "x":10.75, "y":2},
{ {"label":"'\"", "x":11.75, "y":2},
"x": 13.75, {"label":"#~", "x":12.75, "y":2},
"y": 1, {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
"w": 1.25, {"label":"Fn", "x":15.25, "y":2},
"h": 2
{"label":"Shift", "x":0, "y":3, "w":1.25},
{"label":"\\|", "x":1.25, "y":3},
{"label":"Z", "x":2.25, "y":3},
{"label":"X", "x":3.25, "y":3},
{"label":"C", "x":4.25, "y":3},
{"label":"V", "x":5.25, "y":3},
{"label":"B", "x":6.25, "y":3},
{"label":"N", "x":7.25, "y":3},
{"label":"M", "x":8.25, "y":3},
{"label":",<", "x":9.25, "y":3},
{"label":".>", "x":10.25, "y":3},
{"label":"/?", "x":11.25, "y":3},
{"label":"Shift", "x":12.25, "y":3, "w":1.75},
{"label":"\u2191", "x":14.25, "y":3.25},
{"label":"Ctrl", "x":0, "y":4, "w":1.25},
{"label":"GUI", "x":1.25, "y":4, "w":1.25},
{"label":"Alt", "x":2.5, "y":4, "w":1.25},
{"label":"Space", "x":3.75, "y":4, "w":6.25},
{"label":"Alt", "x":10, "y":4},
{"label":"Ctrl", "x":11, "y":4},
{"label":"`\u00ac", "x":12, "y":4},
{"label":"\u2190", "x":13.25, "y":4.25},
{"label":"\u2193", "x":14.25, "y":4.25},
{"label":"\u2192", "x":15.25, "y":4.25}
]
}, },
{ "x": 15.25, "y": 2, "w": 1 }, "LAYOUT_iso_split_bs_space": {
{ "x": 0, "y": 3, "w": 1.25 }, "layout": [
{ "x": 1.25, "y": 3, "w": 1 }, {"label":"Esc", "x":0, "y":0},
{ "x": 2.25, "y": 3, "w": 1 }, {"label":"1!", "x":1, "y":0},
{ "x": 3.25, "y": 3, "w": 1 }, {"label":"2\"", "x":2, "y":0},
{ "x": 4.25, "y": 3, "w": 1 }, {"label":"3\u00a3", "x":3, "y":0},
{ "x": 5.25, "y": 3, "w": 1 }, {"label":"4$", "x":4, "y":0},
{ "x": 6.25, "y": 3, "w": 1 }, {"label":"5%", "x":5, "y":0},
{ "x": 7.25, "y": 3, "w": 1 }, {"label":"6^", "x":6, "y":0},
{ "x": 8.25, "y": 3, "w": 1 }, {"label":"7&", "x":7, "y":0},
{ "x": 9.25, "y": 3, "w": 1 }, {"label":"8*", "x":8, "y":0},
{ "x": 10.25, "y": 3, "w": 1 }, {"label":"9(", "x":9, "y":0},
{ "x": 11.25, "y": 3, "w": 1 }, {"label":"0)", "x":10, "y":0},
{ "x": 12.25, "y": 3, "w": 1.75 }, {"label":"-_", "x":11, "y":0},
{ "x": 14.25, "y": 3.25, "w": 1 }, {"label":"=+", "x":12, "y":0},
{ "x": 0, "y": 4, "w": 1.25 }, {"label":"Backspace", "x":13, "y":0},
{ "x": 1.25, "y": 4, "w": 1.25 }, {"label":"Backspace", "x":14, "y":0},
{ "x": 2.5, "y": 4, "w": 1.25 }, {"label":"Toggle RGB", "x":15.25, "y":0},
{ "x": 3.75, "y": 4, "w": 6.25 },
{ "x": 10, "y": 4, "w": 1 }, {"label":"Tab", "x":0, "y":1, "w":1.5},
{ "x": 11, "y": 4, "w": 1 }, {"label":"Q", "x":1.5, "y":1},
{ "x": 12, "y": 4, "w": 1 }, {"label":"W", "x":2.5, "y":1},
{ "x": 13.25, "y": 4.25, "w": 1 }, {"label":"E", "x":3.5, "y":1},
{ "x": 14.25, "y": 4.25, "w": 1 }, {"label":"R", "x":4.5, "y":1},
{ "x": 15.25, "y": 4.25, "w": 1 } {"label":"T", "x":5.5, "y":1},
{"label":"Y", "x":6.5, "y":1},
{"label":"U", "x":7.5, "y":1},
{"label":"I", "x":8.5, "y":1},
{"label":"O", "x":9.5, "y":1},
{"label":"P", "x":10.5, "y":1},
{"label":"[{", "x":11.5, "y":1},
{"label":"]}", "x":12.5, "y":1},
{"label":"RGB Mode +", "x":15.25, "y":1},
{"label":"Ctrl", "x":0, "y":2, "w":1.75},
{"label":"A", "x":1.75, "y":2},
{"label":"S", "x":2.75, "y":2},
{"label":"D", "x":3.75, "y":2},
{"label":"F", "x":4.75, "y":2},
{"label":"G", "x":5.75, "y":2},
{"label":"H", "x":6.75, "y":2},
{"label":"J", "x":7.75, "y":2},
{"label":"K", "x":8.75, "y":2},
{"label":"L", "x":9.75, "y":2},
{"label":";:", "x":10.75, "y":2},
{"label":"'\"", "x":11.75, "y":2},
{"label":"#~", "x":12.75, "y":2},
{"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
{"label":"Fn", "x":15.25, "y":2},
{"label":"Shift", "x":0, "y":3, "w":1.25},
{"label":"\\|", "x":1.25, "y":3},
{"label":"Z", "x":2.25, "y":3},
{"label":"X", "x":3.25, "y":3},
{"label":"C", "x":4.25, "y":3},
{"label":"V", "x":5.25, "y":3},
{"label":"B", "x":6.25, "y":3},
{"label":"N", "x":7.25, "y":3},
{"label":"M", "x":8.25, "y":3},
{"label":",<", "x":9.25, "y":3},
{"label":".>", "x":10.25, "y":3},
{"label":"/?", "x":11.25, "y":3},
{"label":"Shift", "x":12.25, "y":3, "w":1.75},
{"label":"\u2191", "x":14.25, "y":3.25},
{"label":"Ctrl", "x":0, "y":4, "w":1.25},
{"label":"GUI", "x":1.25, "y":4, "w":1.25},
{"label":"Alt", "x":2.5, "y":4, "w":1.25},
{"label":"Space", "x":3.75, "y":4, "w":2.25},
{"label":"Space", "x":6, "y":4, "w":1.25},
{"label":"Space", "x":7.25, "y":4, "w":2.75},
{"label":"Alt", "x":10, "y":4},
{"label":"Ctrl", "x":11, "y":4},
{"label":"`\u00ac", "x":12, "y":4},
{"label":"\u2190", "x":13.25, "y":4.25},
{"label":"\u2193", "x":14.25, "y":4.25},
{"label":"\u2192", "x":15.25, "y":4.25}
] ]
} }
} }

4
keyboards/boardsource/the_mark/keymaps/default/keymap.c
View file

@ -21,7 +21,6 @@ enum layer_names {
_FN _FN
}; };
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base */ /* Base */
[_BASE] = LAYOUT_all( [_BASE] = LAYOUT_all(
@ -38,7 +37,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
) )
}; };

4
keyboards/boardsource/the_mark/keymaps/default_ansi/keymap.c
View file

@ -21,7 +21,6 @@ enum layer_names {
_FN _FN
}; };
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base */ /* Base */
[_BASE] = LAYOUT_ansi( [_BASE] = LAYOUT_ansi(
@ -38,7 +37,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
) )
}; };

41
keyboards/boardsource/the_mark/keymaps/default_ansi_split_bs_space/keymap.c Normal file
View file

@ -0,0 +1,41 @@
/* Copyright 2020 Boardsource
* 2022 QMK / James Young (@noroadsleft)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
// Defines names for use in layer keycodes and the keymap
enum layer_names {
_BASE,
_FN
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base */
[_BASE] = LAYOUT_ansi_split_bs_space(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, RGB_TOG,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, RGB_MOD,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, MO(_FN),
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_LALT, KC_LCTL, KC_GRV, KC_LEFT, KC_DOWN, KC_RGHT
),
[_FN] = LAYOUT_ansi_split_bs_space(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, _______, KC_END,
RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
};

4
keyboards/boardsource/the_mark/keymaps/default_iso/keymap.c
View file

@ -21,7 +21,6 @@ enum layer_names {
_FN _FN
}; };
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base */ /* Base */
[_BASE] = LAYOUT_iso( [_BASE] = LAYOUT_iso(
@ -38,7 +37,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
) )
}; };

41
keyboards/boardsource/the_mark/keymaps/default_iso_split_bs_space/keymap.c Normal file
View file

@ -0,0 +1,41 @@
/* Copyright 2020 Boardsource
* 2022 QMK / James Young (@noroadsleft)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
// Defines names for use in layer keycodes and the keymap
enum layer_names {
_BASE,
_FN
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base */
[_BASE] = LAYOUT_iso_split_bs_space(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, RGB_TOG,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, RGB_MOD,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, MO(_FN),
KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_LALT, KC_LCTL, KC_GRV, KC_LEFT, KC_DOWN, KC_RGHT
),
[_FN] = LAYOUT_iso_split_bs_space(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, KC_END,
RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
};

16
keyboards/boardsource/the_mark/keymaps/via/keymap.c
View file

@ -15,40 +15,34 @@
*/ */
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base */ /* Base */
LAYOUT_all( [0] = LAYOUT_all(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, RGB_TOG, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, RGB_TOG,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_LALT, KC_LCTL, KC_GRV, KC_LEFT, KC_DOWN, KC_RGHT KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_LALT, KC_LCTL, KC_GRV, KC_LEFT, KC_DOWN, KC_RGHT
), ),
LAYOUT_all( [1] = LAYOUT_all(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME, KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_END, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,
RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
), ),
LAYOUT_all( [2] = LAYOUT_all(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
), ),
LAYOUT_all( [3] = LAYOUT_all(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
) ),
}; };

112
keyboards/boardsource/the_mark/the_mark.h
View file

@ -18,54 +18,92 @@
#include "quantum.h" #include "quantum.h"
/* This is a shortcut to help you visually see your layout. #define ___ KC_NO
*
* The first section contains all of the arguments representing the physical /*
* layout of the board and position of the keys. * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┐ ┌───────┐
* * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E ││0F │ │0D │ 2u Backspace
* The second converts the arguments into a two-dimensional array which * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┤ └─┬─────┤
* represents the switch matrix. * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E ││1F │ │ │
* 2.25u ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤├───┤ ┌──┴┐2D │ ISO Enter
* LShift │20 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D ││2F │ │1E │ │
* ┌────────┐ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘└───┘ └───┴────┘
* │31 │ │31 │30 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D │┌───┐
* └────────┘ ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┘│3E │
* │40 │41 │43 │44 │46 │48 │4A │4B │4C │┌───┼───┼───┐
* └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┘│4D │4E │4F │
* └───┴───┴───┘
* ┌────────────────────────┬─────┬─────┐
* 6.25u Space │46 │4A │4B │ RWKL
* └────────────────────────┴─────┴─────┘
*/ */
#define LAYOUT_all( \ #define LAYOUT_all( \
K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \ K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K215, \ K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \
K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \ K31, K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
K400, K401, K403, K404, K406, K408, K410, K411, K412, K413, K414, K415 \ K40, K41, K43, K44, K46, K48, K4A, K4B, K4C, K4D, K4E, K4F \
) { \ ) { \
{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015 }, \ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
{ K100, KC_NO, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115 }, \ { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
{ K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, KC_NO, K215 }, \ { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \
{ K301, K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314, KC_NO}, \ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, ___ }, \
{ K400, K401, KC_NO, K403, K404, KC_NO, K406, KC_NO, K408, KC_NO, K410, K411, K412, K413, K414, K415 } \ { K40, K41, ___, K43, K44, ___, K46, ___, K48, ___, K4A, K4B, K4C, K4D, K4E, K4F } \
} }
#define LAYOUT_ansi( \ #define LAYOUT_ansi( \
K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K015, \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \
K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \ K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K215, \ K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \
K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \ K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
K400, K401, K403, K406, K410, K411, K412, K413, K414, K415 \ K40, K41, K43, K46, K4A, K4B, K4C, K4D, K4E, K4F \
) { \ ) { \
{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, KC_NO, K015 }, \ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, K0F }, \
{ K100, KC_NO, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115 }, \ { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
{ K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, KC_NO, K215 }, \ { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \
{ KC_NO, K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314, KC_NO}, \ { ___, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, ___ }, \
{ K400, K401, KC_NO, K403, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, K412, K413, K414, K415 } \ { K40, K41, ___, K43, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D, K4E, K4F } \
} }
#define LAYOUT_ansi_split_bs_space( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \
K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
K40, K41, K43, K44, K46, K48, K4A, K4B, K4C, K4D, K4E, K4F \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
{ K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
{ K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \
{ ___, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, ___ }, \
{ K40, K41, ___, K43, K44, ___, K46, ___, K48, ___, K4A, K4B, K4C, K4D, K4E, K4F } \
}
#define LAYOUT_iso( \ #define LAYOUT_iso( \
K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K015, \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \
K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K115, \ K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, \
K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K114, K213, K215, \ K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1E, K2D, K2F, \
K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \ K31, K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
K400, K401, K403, K406, K410, K411, K412, K413, K414, K415 \ K40, K41, K43, K46, K4A, K4B, K4C, K4D, K4E, K4F \
) { \ ) { \
{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, KC_NO, K015 }, \ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, K0F }, \
{ K100, KC_NO, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115 }, \ { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
{ K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, KC_NO, K215 }, \ { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \
{ K301, K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314, KC_NO}, \ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, ___ }, \
{ K400, K401, KC_NO, K403, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, K412, K413, K414, K415 } \ { K40, K41, ___, K43, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D, K4E, K4F } \
} }
#define LAYOUT_iso_split_bs_space( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, \
K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1E, K2D, K2F, \
K31, K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
K40, K41, K43, K44, K46, K48, K4A, K4B, K4C, K4D, K4E, K4F \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
{ K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
{ K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \
{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, ___ }, \
{ K40, K41, ___, K43, K44, ___, K46, ___, K48, ___, K4A, K4B, K4C, K4D, K4E, K4F } \
}

56
keyboards/dailycraft/wings42/rev1/info.json Normal file
View file

@ -0,0 +1,56 @@
{
"keyboard_name": "wings42 rev1",
"url": "",
"maintainer": "yfuku",
"layouts": {
"LAYOUT_split_3x6_3": {
"layout": [
{"label":"L00", "x":0, "y":0.875},
{"label":"L01", "x":1, "y":0.625},
{"label":"L02", "x":2, "y":0.375},
{"label":"L03", "x":3, "y":0},
{"label":"L04", "x":4, "y":0},
{"label":"L05", "x":5, "y":0.125},
{"label":"R00", "x":9, "y":0.125},
{"label":"R01", "x":10, "y":0},
{"label":"R02", "x":11, "y":0},
{"label":"R03", "x":12, "y":0.375},
{"label":"R04", "x":13, "y":0.625},
{"label":"R05", "x":14, "y":0.875},
{"label":"L10", "x":0, "y":1.875},
{"label":"L11", "x":1, "y":1.625},
{"label":"L12", "x":2, "y":1.375},
{"label":"L13", "x":3, "y":1},
{"label":"L14", "x":4, "y":1},
{"label":"L15", "x":5, "y":1.125},
{"label":"R10", "x":9, "y":1.125},
{"label":"R11", "x":10, "y":1},
{"label":"R12", "x":11, "y":1},
{"label":"R13", "x":12, "y":1.375},
{"label":"R14", "x":13, "y":1.625},
{"label":"R15", "x":14, "y":1.875},
{"label":"L20", "x":0, "y":2.875},
{"label":"L21", "x":1, "y":2.625},
{"label":"L22", "x":2, "y":2.375},
{"label":"L23", "x":3, "y":2},
{"label":"L24", "x":4, "y":2},
{"label":"L25", "x":5, "y":2.125},
{"label":"R20", "x":9, "y":2.125},
{"label":"R21", "x":10, "y":2},
{"label":"R22", "x":11, "y":2},
{"label":"R23", "x":12, "y":2.375},
{"label":"R24", "x":13, "y":2.625},
{"label":"R25", "x":14, "y":2.875},
{"label":"L30", "x":4, "y":3},
{"label":"L31", "x":5, "y":3.125},
{"label":"L32", "x":6, "y":3.375},
{"label":"R30", "x":8, "y":3.375},
{"label":"R31", "x":9, "y":3.125},
{"label":"R32", "x":10, "y":3}
]
}
}
}

60
keyboards/dailycraft/wings42/rev1_extkeys/info.json Normal file
View file

@ -0,0 +1,60 @@
{
"keyboard_name": "wings42 rev1_extkeys",
"url": "",
"maintainer": "yfuku",
"layouts": {
"LAYOUT": {
"layout": [
{"label":"L00", "x":0, "y":0.875},
{"label":"L01", "x":1, "y":0.625},
{"label":"L02", "x":2, "y":0.375},
{"label":"L03", "x":3, "y":0},
{"label":"L04", "x":4, "y":0},
{"label":"L05", "x":5, "y":0.125},
{"label":"R00", "x":9, "y":0.125},
{"label":"R01", "x":10, "y":0},
{"label":"R02", "x":11, "y":0},
{"label":"R03", "x":12, "y":0.375},
{"label":"R04", "x":13, "y":0.625},
{"label":"R05", "x":14, "y":0.875},
{"label":"L10", "x":0, "y":1.875},
{"label":"L11", "x":1, "y":1.625},
{"label":"L12", "x":2, "y":1.375},
{"label":"L13", "x":3, "y":1},
{"label":"L14", "x":4, "y":1},
{"label":"L15", "x":5, "y":1.125},
{"label":"E01", "x":6, "y":1.625},
{"label":"E03", "x":8, "y":1.625},
{"label":"R10", "x":9, "y":1.125},
{"label":"R11", "x":10, "y":1},
{"label":"R12", "x":11, "y":1},
{"label":"R13", "x":12, "y":1.375},
{"label":"R14", "x":13, "y":1.625},
{"label":"R15", "x":14, "y":1.875},
{"label":"L20", "x":0, "y":2.875},
{"label":"L21", "x":1, "y":2.625},
{"label":"L22", "x":2, "y":2.375},
{"label":"L23", "x":3, "y":2},
{"label":"L24", "x":4, "y":2},
{"label":"L25", "x":5, "y":2.125},
{"label":"E02", "x":6, "y":2.625},
{"label":"E04", "x":8, "y":2.625},
{"label":"R20", "x":9, "y":2.125},
{"label":"R21", "x":10, "y":2},
{"label":"R22", "x":11, "y":2},
{"label":"R23", "x":12, "y":2.375},
{"label":"R24", "x":13, "y":2.625},
{"label":"R25", "x":14, "y":2.875},
{"label":"L30", "x":4, "y":3},
{"label":"L31", "x":5, "y":3.125},
{"label":"L32", "x":6, "y":3.375},
{"label":"R30", "x":8, "y":3.375},
{"label":"R31", "x":9, "y":3.125},
{"label":"R32", "x":10, "y":3}
]
}
}
}

60
keyboards/dailycraft/wings42/rev2/info.json Normal file
View file

@ -0,0 +1,60 @@
{
"keyboard_name": "wings42 rev2",
"url": "",
"maintainer": "yfuku",
"layouts": {
"LAYOUT_split_3x6_3_2": {
"layout": [
{"label":"L00", "x":0, "y":0.875},
{"label":"L01", "x":1, "y":0.625},
{"label":"L02", "x":2, "y":0.375},
{"label":"L03", "x":3, "y":0},
{"label":"L04", "x":4, "y":0},
{"label":"L05", "x":5, "y":0.125},
{"label":"R00", "x":9, "y":0.125},
{"label":"R01", "x":10, "y":0},
{"label":"R02", "x":11, "y":0},
{"label":"R03", "x":12, "y":0.375},
{"label":"R04", "x":13, "y":0.625},
{"label":"R05", "x":14, "y":0.875},
{"label":"L10", "x":0, "y":1.875},
{"label":"L11", "x":1, "y":1.625},
{"label":"L12", "x":2, "y":1.375},
{"label":"L13", "x":3, "y":1},
{"label":"L14", "x":4, "y":1},
{"label":"L15", "x":5, "y":1.125},
{"label":"L31", "x":6, "y":1.625},
{"label":"R33", "x":8, "y":1.625},
{"label":"R10", "x":9, "y":1.125},
{"label":"R11", "x":10, "y":1},
{"label":"R12", "x":11, "y":1},
{"label":"R13", "x":12, "y":1.375},
{"label":"R14", "x":13, "y":1.625},
{"label":"R15", "x":14, "y":1.875},
{"label":"L20", "x":0, "y":2.875},
{"label":"L21", "x":1, "y":2.625},
{"label":"L22", "x":2, "y":2.375},
{"label":"L23", "x":3, "y":2},
{"label":"L24", "x":4, "y":2},
{"label":"L25", "x":5, "y":2.125},
{"label":"L32", "x":6, "y":2.625},
{"label":"R34", "x":8, "y":2.625},
{"label":"R20", "x":9, "y":2.125},
{"label":"R21", "x":10, "y":2},
{"label":"R22", "x":11, "y":2},
{"label":"R23", "x":12, "y":2.375},
{"label":"R24", "x":13, "y":2.625},
{"label":"R25", "x":14, "y":2.875},
{"label":"L33", "x":4, "y":3},
{"label":"L34", "x":5, "y":3.125},
{"label":"L35", "x":6, "y":3.375},
{"label":"R30", "x":8, "y":3.375},
{"label":"R31", "x":9, "y":3.125},
{"label":"R32", "x":10, "y":3}
]
}
}
}

2
keyboards/keychron/q2/config.h
View file

@ -29,6 +29,8 @@
#define MATRIX_ROW_PINS { B4, B3, A15, A14, A13 } #define MATRIX_ROW_PINS { B4, B3, A15, A14, A13 }
#define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, A8, A9, H3 } #define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, A8, A9, H3 }
#define MATRIX_UNSELECT_DRIVE_HIGH
/* DIP switch */ /* DIP switch */
#define DIP_SWITCH_MATRIX_GRID { {4, 4} } #define DIP_SWITCH_MATRIX_GRID { {4, 4} }

139
keyboards/keychron/q2/matrix.c
View file

@ -1,139 +0,0 @@
/* Copyright 2021 @ Keychron (https://www.keychron.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
#include "util.h"
#include "matrix.h"
#include "debounce.h"
#include "quantum.h"
#ifdef MATRIX_ROW_PINS
static pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
#endif // MATRIX_ROW_PINS
#ifdef MATRIX_COL_PINS
static pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
#endif // MATRIX_COL_PINS
#define ROWS_PER_HAND (MATRIX_ROWS)
/* matrix state(1:on, 0:off) */
extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values
static inline void setPinOutput_writeLow(pin_t pin) {
ATOMIC_BLOCK_FORCEON {
setPinOutput(pin);
writePinLow(pin);
}
}
static inline void setPinOutput_writeHigh(pin_t pin) {
ATOMIC_BLOCK_FORCEON {
setPinOutput(pin);
writePinHigh(pin);
}
}
static inline void setPinInputHigh_atomic(pin_t pin) {
ATOMIC_BLOCK_FORCEON { setPinInputHigh(pin); }
}
static inline uint8_t readMatrixPin(pin_t pin) {
if (pin != NO_PIN) {
return readPin(pin);
} else {
return 1;
}
}
static bool select_col(uint8_t col) {
pin_t pin = col_pins[col];
if (pin != NO_PIN) {
setPinOutput_writeLow(pin);
return true;
}
return false;
}
static void unselect_col(uint8_t col) {
pin_t pin = col_pins[col];
if (pin != NO_PIN) {
setPinOutput_writeHigh(pin);
}
}
static void unselect_cols(void) {
for (uint8_t x = 0; x < MATRIX_COLS; x++) {
unselect_col(x);
}
}
void matrix_init_pins(void) {
unselect_cols();
for (uint8_t x = 0; x < ROWS_PER_HAND; x++) {
if (row_pins[x] != NO_PIN) {
setPinInputHigh_atomic(row_pins[x]);
}
}
}
void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
bool key_pressed = false;
// Select col
if (!select_col(current_col)) { // select col
return; // skip NO_PIN col
}
matrix_output_select_delay();
// For each row...
for (uint8_t row_index = 0; row_index < ROWS_PER_HAND; row_index++) {
// Check row pin state
if (readMatrixPin(row_pins[row_index]) == 0) {
// Pin LO, set col bit
current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col);
key_pressed = true;
} else {
// Pin HI, clear col bit
current_matrix[row_index] &= ~(MATRIX_ROW_SHIFTER << current_col);
}
}
// Unselect col
unselect_col(current_col);
matrix_output_unselect_delay(current_col, key_pressed); // wait for all Row signals to go HIGH
}
void matrix_init_custom(void) {
// initialize key pins
matrix_init_pins();
}
bool matrix_scan_custom(matrix_row_t current_matrix[]) {
matrix_row_t curr_matrix[MATRIX_ROWS] = {0};
// Set col, read rows
for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
matrix_read_rows_on_col(curr_matrix, current_col);
}
bool changed = memcmp(current_matrix, curr_matrix, sizeof(curr_matrix)) != 0;
if (changed) memcpy(current_matrix, curr_matrix, sizeof(curr_matrix));
return (uint8_t)changed;
}

2
keyboards/lfkeyboards/mini1800/config.h
View file

@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define PRODUCT_ID 0x6060 #define PRODUCT_ID 0x6060
#define DEVICE_VER 0x0001 #define DEVICE_VER 0x0001
#define MANUFACTURER LFKeyboards #define MANUFACTURER LFKeyboards
#define PRODUCT LFK87 #define PRODUCT Mini1800
#define DIODE_DIRECTION COL2ROW #define DIODE_DIRECTION COL2ROW

91
keyboards/lfkeyboards/mini1800/info.json
View file

@ -1,10 +1,97 @@
{ {
"keyboard_name": "Mini1800", "keyboard_name": "Mini1800",
"url": "", "url": "",
"maintainer": "qmk", "maintainer": "lfkeyboards",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Back Space", "x":13, "y":0, "w":2}, {"label":"Num Lock", "x":15.5, "y":0}, {"label":"/", "x":16.5, "y":0}, {"label":"*", "x":17.5, "y":0}, {"label":"-", "x":18.5, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"7", "x":15.5, "y":1}, {"label":"8", "x":16.5, "y":1}, {"label":"9", "x":17.5, "y":1}, {"label":"+", "x":18.5, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.25}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"4", "x":15.5, "y":2}, {"label":"5", "x":16.5, "y":2}, {"label":"6", "x":17.5, "y":2}, {"label":"+", "x":18.5, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"1", "x":15.5, "y":3}, {"label":"2", "x":16.5, "y":3}, {"label":"3", "x":17.5, "y":3}, {"label":"Enter", "x":18.5, "y":3, "h":2}, {"label":"\u2191", "x":14.25, "y":3.25}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Fn", "x":11, "y":4}, {"label":"Ctrl", "x":12, "y":4}, {"label":"0", "x":16.5, "y":4}, {"label":".", "x":17.5, "y":4}, {"label":"\u2190", "x":13.25, "y":4.25}, {"label":"\u2193", "x":14.25, "y":4.25}, {"label":"\u2192", "x":15.25, "y":4.25}] "layout": [
{"label":"Esc", "x":0, "y":0},
{"label":"1!", "x":1, "y":0},
{"label":"2@", "x":2, "y":0},
{"label":"3#", "x":3, "y":0},
{"label":"4$", "x":4, "y":0},
{"label":"5%", "x":5, "y":0},
{"label":"6^", "x":6, "y":0},
{"label":"7&", "x":7, "y":0},
{"label":"8*", "x":8, "y":0},
{"label":"9(", "x":9, "y":0},
{"label":"0)", "x":10, "y":0},
{"label":"-_", "x":11, "y":0},
{"label":"=+", "x":12, "y":0},
{"label":"Back Space", "x":13, "y":0, "w":2},
{"label":"Num Lock", "x":15.5, "y":0},
{"label":"/", "x":16.5, "y":0},
{"label":"*", "x":17.5, "y":0},
{"label":"-", "x":18.5, "y":0},
{"label":"Tab", "x":0, "y":1, "w":1.5},
{"label":"Q", "x":1.5, "y":1},
{"label":"W", "x":2.5, "y":1},
{"label":"E", "x":3.5, "y":1},
{"label":"R", "x":4.5, "y":1},
{"label":"T", "x":5.5, "y":1},
{"label":"Y", "x":6.5, "y":1},
{"label":"U", "x":7.5, "y":1},
{"label":"I", "x":8.5, "y":1},
{"label":"O", "x":9.5, "y":1},
{"label":"P", "x":10.5, "y":1},
{"label":"[{", "x":11.5, "y":1},
{"label":"]}", "x":12.5, "y":1},
{"label":"\\|", "x":13.5, "y":1, "w":1.5},
{"label":"7", "x":15.5, "y":1},
{"label":"8", "x":16.5, "y":1},
{"label":"9", "x":17.5, "y":1},
{"label":"+", "x":18.5, "y":1},
{"label":"Caps Lock", "x":0, "y":2, "w":1.25},
{"label":"A", "x":1.75, "y":2},
{"label":"S", "x":2.75, "y":2},
{"label":"D", "x":3.75, "y":2},
{"label":"F", "x":4.75, "y":2},
{"label":"G", "x":5.75, "y":2},
{"label":"H", "x":6.75, "y":2},
{"label":"J", "x":7.75, "y":2},
{"label":"K", "x":8.75, "y":2},
{"label":"L", "x":9.75, "y":2},
{"label":";:", "x":10.75, "y":2},
{"label":"'\"", "x":11.75, "y":2},
{"label":"Enter", "x":12.75, "y":2, "w":2.25},
{"label":"4", "x":15.5, "y":2},
{"label":"5", "x":16.5, "y":2},
{"label":"6", "x":17.5, "y":2},
{"label":"+", "x":18.5, "y":2},
{"label":"Shift", "x":0, "y":3, "w":2.25},
{"label":"Z", "x":2.25, "y":3},
{"label":"X", "x":3.25, "y":3},
{"label":"C", "x":4.25, "y":3},
{"label":"V", "x":5.25, "y":3},
{"label":"B", "x":6.25, "y":3},
{"label":"N", "x":7.25, "y":3},
{"label":"M", "x":8.25, "y":3},
{"label":",<", "x":9.25, "y":3},
{"label":".>", "x":10.25, "y":3},
{"label":"/?", "x":11.25, "y":3},
{"label":"Shift", "x":12.25, "y":3, "w":1.75},
{"label":"\u2191", "x":14.25, "y":3.25},
{"label":"1", "x":15.5, "y":3},
{"label":"2", "x":16.5, "y":3},
{"label":"3", "x":17.5, "y":3},
{"label":"Enter", "x":18.5, "y":3, "h":2},
{"label":"Ctrl", "x":0, "y":4, "w":1.25},
{"label":"Win", "x":1.25, "y":4, "w":1.25},
{"label":"Alt", "x":2.5, "y":4, "w":1.25},
{"label":"Space", "x":3.75, "y":4, "w":6.25},
{"label":"Alt", "x":10, "y":4},
{"label":"Fn", "x":11, "y":4},
{"label":"Ctrl", "x":12, "y":4},
{"label":"\u2190", "x":13.25, "y":4.25},
{"label":"\u2193", "x":14.25, "y":4.25},
{"label":"\u2192", "x":15.25, "y":4.25},
{"label":"0", "x":16.5, "y":4},
{"label":".", "x":17.5, "y":4}
]
} }
} }
} }

44
keyboards/lfkeyboards/mini1800/keymaps/ca178858/rules.mk
View file

@ -1,45 +1 @@
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys(+4700)
EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
CONSOLE_ENABLE = no # Console for debug(+400)
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
MIDI_ENABLE = no # MIDI controls
AUDIO_ENABLE = yes # Audio output on port C6
UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
RGBLIGHT_ENABLE = yes # Enable RGB underlight
RGBLIGHT_CUSTOM_DRIVER = yes # RGB code is implemented in lefkeyboards, not WS2812
SLEEP_LED_ENABLE = yes
TAP_DANCE_ENABLE = yes TAP_DANCE_ENABLE = yes
ISSI_ENABLE = yes # If the I2C pullup resistors aren't install this must be disabled
WATCHDOG_ENABLE = yes # Resets keyboard if matrix_scan isn't run every 250ms
ifeq ($(strip $(ISSI_ENABLE)), yes)
TMK_COMMON_DEFS += -DISSI_ENABLE
endif
ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
endif
# # Set the LFK78 hardware version. This is defined in rules.mk, but can be overidden here if desired
# #
# # RevB - first public release, uses atmega32u4, has audio, ISSI matrix split between RGB and backlight
# # RevC/D - at90usb1286, no audio, ISSI device 0 is backlight, 4 is RGB
# #
# # Set to B, C or D
# LFK_REV = D
# ifeq ($(LFK_REV), B)
# MCU = atmega32u4
# else
# MCU = at90usb1286
# endif
# OPT_DEFS += -DLFK_REV_$(LFK_REV)
# OPT_DEFS += -DUSB_PRODUCT=\"LFK_Rev$(LFK_REV)\"

40
keyboards/lfkeyboards/mini1800/keymaps/default/rules.mk
View file

@ -1,40 +0,0 @@
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
AUDIO_ENABLE = yes # Audio output
RGBLIGHT_ENABLE = yes # Enable RGB underlight
RGBLIGHT_CUSTOM_DRIVER = yes # RGB code is implemented in lefkeyboards, not WS2812
SLEEP_LED_ENABLE = yes
ISSI_ENABLE = yes # If the I2C pullup resistors aren't install this must be disabled
WATCHDOG_ENABLE = yes # Resets keyboard if matrix_scan isn't run every 250ms
ifeq ($(strip $(ISSI_ENABLE)), yes)
TMK_COMMON_DEFS += -DISSI_ENABLE
endif
ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
endif
# # Set the LFK78 hardware version. This is defined in rules.mk, but can be overidden here if desired
# #
# # RevB - first public release, uses atmega32u4, has audio, ISSI matrix split between RGB and backlight
# # RevC/D - at90usb1286, no audio, ISSI device 0 is backlight, 4 is RGB
# #
# # Set to B, C or D
# LFK_REV = D
# ifeq ($(LFK_REV), B)
# MCU = atmega32u4
# else
# MCU = at90usb1286
# endif
# OPT_DEFS += -DLFK_REV_$(LFK_REV)
# OPT_DEFS += -DUSB_PRODUCT=\"LFK_Rev$(LFK_REV)\"

9
keyboards/lfkeyboards/mini1800/post_rules.mk
View file

@ -1,9 +0,0 @@
ifeq ($(LFK_REV), A)
MCU = at90usb1286
else
MCU = at90usb646
endif
ifeq ($(strip $(ISSI_ENABLE)), yes)
# TMK_COMMON_DEFS += -DISSI_ENABLE
endif

28
keyboards/lfkeyboards/mini1800/readme.md
View file

@ -1,12 +1,26 @@
Mini1800 # Mini1800
===
Keyboard Maintainer: [LFKeyboards](https://github.com/lfkeyboards) * Keyboard Maintainer: [LFKeyboards](https://github.com/lfkeyboards)
Hardware Supported: Mini1800 * Hardware Supported:
Hardware Availability: [LFKeyboards.com](https://www.lfkeyboards.com/) * [Mini1800 RevA](reva/) - Green PCB with AT90USB1286
* [Mini1800 RevC](revc/) - Black PCB with AT90USB646; first public release
* Hardware Availability: [LFKeyboards.com](https://www.lfkeyboards.com/)
Make example for this keyboard (after setting up your build environment): Make example for this keyboard (after setting up your build environment):
make lfkeyboards/mini1800:default make lfkeyboards/mini1800/reva:default
make lfkeyboards/mini1800/revc:default
See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Flashing example for this keyboard:
make lfkeyboards/mini1800/reva:default:flash
make lfkeyboards/mini1800/revc:default:flash
## Bootloader
To reset the board into bootloader mode, do one of the following:
* **Physical reset button**: Briefly press the button on the bottom of the PCB (between Q and W keys)
* **Keycode in keymap**: Press the key mapped to `RESET` if it is available (`Fn`+`Right Shift`, then tap `Enter` by default)
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

7
keyboards/lfkeyboards/mini1800/reva/post_rules.mk Normal file
View file

@ -0,0 +1,7 @@
ifeq ($(strip $(ISSI_ENABLE)), yes)
TMK_COMMON_DEFS += -DISSI_ENABLE
endif
ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
endif

22
keyboards/lfkeyboards/mini1800/reva/readme.md Normal file
View file

@ -0,0 +1,22 @@
# Mini1800 RevA
* Keyboard Maintainer: [LFKeyboards](https://github.com/lfkeyboards)
* Hardware Supported: Mini1800 RevA (Green PCB with AT90USB1286)
* Hardware Availability: [LFKeyboards.com](https://www.lfkeyboards.com/)
Make example for this keyboard (after setting up your build environment):
make lfkeyboards/mini1800/reva:default
Flashing example for this keyboard:
make lfkeyboards/mini1800/reva:default:flash
## Bootloader
To reset the board into bootloader mode, do one of the following:
* **Physical reset button**: Briefly press the button on the bottom of the PCB (between Q and W keys)
* **Keycode in keymap**: Press the key mapped to `RESET` if it is available (`Fn`+`Right Shift`, then tap `Enter` by default)
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

29
keyboards/lfkeyboards/mini1800/reva/rules.mk Normal file
View file

@ -0,0 +1,29 @@
# MCU name
MCU = at90usb1286
# Bootloader selection
BOOTLOADER = atmel-dfu
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = yes # Audio output
# RGB code is implemented in lfkeyboards, not WS2812
RGBLIGHT_CUSTOM_DRIVER = yes
BACKLIGHT_DRIVER = custom
SLEEP_LED_ENABLE = yes
ISSI_ENABLE = yes # If the I2C pullup resistors aren't install this must be disabled
WATCHDOG_ENABLE = yes # Resets keyboard if matrix_scan isn't run every 250ms
# Extra source files for IS3731 lighting
SRC = TWIlib.c issi.c lighting.c

7
keyboards/lfkeyboards/mini1800/revc/post_rules.mk Normal file
View file

@ -0,0 +1,7 @@
ifeq ($(strip $(ISSI_ENABLE)), yes)
TMK_COMMON_DEFS += -DISSI_ENABLE
endif
ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
endif

24
keyboards/lfkeyboards/mini1800/revc/readme.md Normal file
View file

@ -0,0 +1,24 @@
# Mini1800 RevC
The first public release of the Mini1800.
* Keyboard Maintainer: [LFKeyboards](https://github.com/lfkeyboards)
* Hardware Supported: Mini1800 RevC (Black PCB with AT90USB646)
* Hardware Availability: [LFKeyboards.com](https://www.lfkeyboards.com/)
Make example for this keyboard (after setting up your build environment):
make lfkeyboards/mini1800/revc:default
Flashing example for this keyboard:
make lfkeyboards/mini1800/revc:default:flash
## Bootloader
To reset the board into bootloader mode, do one of the following:
* **Physical reset button**: Briefly press the button on the bottom of the PCB (between Q and W keys)
* **Keycode in keymap**: Press the key mapped to `RESET` if it is available (`Fn`+`Right Shift`, then tap `Enter` by default)
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

29
keyboards/lfkeyboards/mini1800/revc/rules.mk Normal file
View file

@ -0,0 +1,29 @@
# MCU name
MCU = at90usb646
# Bootloader selection
BOOTLOADER = atmel-dfu
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = yes # Audio output
# RGB code is implemented in lfkeyboards, not WS2812
RGBLIGHT_CUSTOM_DRIVER = yes
BACKLIGHT_DRIVER = custom
SLEEP_LED_ENABLE = yes
ISSI_ENABLE = yes # If the I2C pullup resistors aren't install this must be disabled
WATCHDOG_ENABLE = yes # Resets keyboard if matrix_scan isn't run every 250ms
# Extra source files for IS3731 lighting
SRC = TWIlib.c issi.c lighting.c

19
keyboards/lfkeyboards/mini1800/rules.mk
View file

@ -1,19 +0,0 @@
# Set the LFK87 hardware version.
#
# RevA - Green PCB. at90usb1286 Only 3 exist
# RevB - We don't talk about RevB
# RevC - Black PCB. at90usb646 First public release
#
# Set to A or C
LFK_REV = C
BOOTLOADER = atmel-dfu
OPT_DEFS += -DLFK_TKL_REV_$(LFK_REV)
# Extra source files for IS3731 lighting
SRC = TWIlib.c issi.c lighting.c
# Build Options
# change yes to no to disable
#
BACKLIGHT_DRIVER = custom

15
quantum/matrix.c
View file

@ -78,6 +78,13 @@ static inline void setPinOutput_writeLow(pin_t pin) {
} }
} }
static inline void setPinOutput_writeHigh(pin_t pin) {
ATOMIC_BLOCK_FORCEON {
setPinOutput(pin);
writePinHigh(pin);
}
}
static inline void setPinInputHigh_atomic(pin_t pin) { static inline void setPinInputHigh_atomic(pin_t pin) {
ATOMIC_BLOCK_FORCEON { setPinInputHigh(pin); } ATOMIC_BLOCK_FORCEON { setPinInputHigh(pin); }
} }
@ -137,7 +144,11 @@ static bool select_row(uint8_t row) {
static void unselect_row(uint8_t row) { static void unselect_row(uint8_t row) {
pin_t pin = row_pins[row]; pin_t pin = row_pins[row];
if (pin != NO_PIN) { if (pin != NO_PIN) {
# ifdef MATRIX_UNSELECT_DRIVE_HIGH
setPinOutput_writeHigh(pin);
# else
setPinInputHigh_atomic(pin); setPinInputHigh_atomic(pin);
# endif
} }
} }
@ -196,7 +207,11 @@ static bool select_col(uint8_t col) {
static void unselect_col(uint8_t col) { static void unselect_col(uint8_t col) {
pin_t pin = col_pins[col]; pin_t pin = col_pins[col];
if (pin != NO_PIN) { if (pin != NO_PIN) {
# ifdef MATRIX_UNSELECT_DRIVE_HIGH
setPinOutput_writeHigh(pin);
# else
setPinInputHigh_atomic(pin); setPinInputHigh_atomic(pin);
# endif
} }
} }