diff options
| author | Nick Brassel <nick@tzarc.org> | 2022-02-09 16:00:09 +1100 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2022-02-09 16:00:09 +1100 |
| commit | a2ffdb4abdbaf7de5206a1114394fbd6fd0b3a19 (patch) | |
| tree | 80d8c4bcb53ad7d08792d622ca0f65de5cc616a4 /keyboards | |
| parent | 74e8a71768c5b6ce04e45b4418784c70d6ca3386 (diff) | |
| parent | efdaa7f97205f8964c076677519d1848c5ac4b41 (diff) | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards')
26 files changed, 1005 insertions, 593 deletions
diff --git a/keyboards/boardsource/the_mark/info.json b/keyboards/boardsource/the_mark/info.json index 07e3a34e54..792585d12a 100644 --- a/keyboards/boardsource/the_mark/info.json +++ b/keyboards/boardsource/the_mark/info.json @@ -1,229 +1,393 @@ { "keyboard_name": "The Mark: 65", "url": "", - "maintainer": "Boardsource", + "maintainer": "daysgobye, Boardsource", "layouts": { "LAYOUT_all": { "layout": [ - { "x": 0, "y": 0, "w": 1 }, - { "x": 1, "y": 0, "w": 1 }, - { "x": 2, "y": 0, "w": 1 }, - { "x": 3, "y": 0, "w": 1 }, - { "x": 4, "y": 0, "w": 1 }, - { "x": 5, "y": 0, "w": 1 }, - { "x": 6, "y": 0, "w": 1 }, - { "x": 7, "y": 0, "w": 1 }, - { "x": 8, "y": 0, "w": 1 }, - { "x": 9, "y": 0, "w": 1 }, - { "x": 10, "y": 0, "w": 1 }, - { "x": 11, "y": 0, "w": 1 }, - { "x": 12, "y": 0, "w": 1 }, - { "x": 13, "y": 0, "w": 1 }, - { "x": 14, "y": 0, "w": 1 }, - { "x": 15.25, "y": 0, "w": 1 }, - { "x": 0, "y": 1, "w": 1.5 }, - { "x": 1.5, "y": 1, "w": 1 }, - { "x": 2.5, "y": 1, "w": 1 }, - { "x": 3.5, "y": 1, "w": 1 }, - { "x": 4.5, "y": 1, "w": 1 }, - { "x": 5.5, "y": 1, "w": 1 }, - { "x": 6.5, "y": 1, "w": 1 }, - { "x": 7.5, "y": 1, "w": 1 }, - { "x": 8.5, "y": 1, "w": 1 }, - { "x": 9.5, "y": 1, "w": 1 }, - { "x": 10.5, "y": 1, "w": 1 }, - { "x": 11.5, "y": 1, "w": 1 }, - { "x": 12.5, "y": 1, "w": 1 }, - { "x": 13.5, "y": 1, "w": 1.5 }, - { "x": 15.25, "y": 1, "w": 1 }, - { "x": 0, "y": 2, "w": 1.75 }, - { "x": 1.75, "y": 2, "w": 1 }, - { "x": 2.75, "y": 2, "w": 1 }, - { "x": 3.75, "y": 2, "w": 1 }, - { "x": 4.75, "y": 2, "w": 1 }, - { "x": 5.75, "y": 2, "w": 1 }, - { "x": 6.75, "y": 2, "w": 1 }, - { "x": 7.75, "y": 2, "w": 1 }, - { "x": 8.75, "y": 2, "w": 1 }, - { "x": 9.75, "y": 2, "w": 1 }, - { "x": 10.75, "y": 2, "w": 1 }, - { "x": 11.75, "y": 2, "w": 1 }, - { "x": 12.75, "y": 2, "w": 2.25 }, - { "x": 15.25, "y": 2, "w": 1 }, - { "x": 0, "y": 3, "w": 1.25 }, - { "x": 1.25, "y": 3, "w": 1 }, - { "x": 2.25, "y": 3, "w": 1 }, - { "x": 3.25, "y": 3, "w": 1 }, - { "x": 4.25, "y": 3, "w": 1 }, - { "x": 5.25, "y": 3, "w": 1 }, - { "x": 6.25, "y": 3, "w": 1 }, - { "x": 7.25, "y": 3, "w": 1 }, - { "x": 8.25, "y": 3, "w": 1 }, - { "x": 9.25, "y": 3, "w": 1 }, - { "x": 10.25, "y": 3, "w": 1 }, - { "x": 11.25, "y": 3, "w": 1 }, - { "x": 12.25, "y": 3, "w": 1.75 }, - { "x": 14.25, "y": 3.25, "w": 1 }, - { "x": 0, "y": 4, "w": 1.25 }, - { "x": 1.25, "y": 4, "w": 1.25 }, - { "x": 2.5, "y": 4, "w": 1.25 }, - { "x": 3.75, "y": 4, "w": 2.25 }, - { "x": 6, "y": 4, "w": 1.25 }, - { "x": 7.25, "y": 4, "w": 2.75 }, - { "x": 10, "y": 4, "w": 1 }, - { "x": 11, "y": 4, "w": 1 }, - { "x": 12, "y": 4, "w": 1 }, - { "x": 13.25, "y": 4.25, "w": 1 }, - { "x": 14.25, "y": 4.25, "w": 1 }, - { "x": 15.25, "y": 4.25, "w": 1 } + {"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":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":"`~", "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": [ - { "x": 0, "y": 0, "w": 1 }, - { "x": 1, "y": 0, "w": 1 }, - { "x": 2, "y": 0, "w": 1 }, - { "x": 3, "y": 0, "w": 1 }, - { "x": 4, "y": 0, "w": 1 }, - { "x": 5, "y": 0, "w": 1 }, - { "x": 6, "y": 0, "w": 1 }, - { "x": 7, "y": 0, "w": 1 }, - { "x": 8, "y": 0, "w": 1 }, - { "x": 9, "y": 0, "w": 1 }, - { "x": 10, "y": 0, "w": 1 }, - { "x": 11, "y": 0, "w": 1 }, - { "x": 12, "y": 0, "w": 1 }, - { "x": 13, "y": 0, "w": 2 }, - { "x": 15.25, "y": 0, "w": 1 }, - { "x": 0, "y": 1, "w": 1.5 }, - { "x": 1.5, "y": 1, "w": 1 }, - { "x": 2.5, "y": 1, "w": 1 }, - { "x": 3.5, "y": 1, "w": 1 }, - { "x": 4.5, "y": 1, "w": 1 }, - { "x": 5.5, "y": 1, "w": 1 }, - { "x": 6.5, "y": 1, "w": 1 }, - { "x": 7.5, "y": 1, "w": 1 }, - { "x": 8.5, "y": 1, "w": 1 }, - { "x": 9.5, "y": 1, "w": 1 }, - { "x": 10.5, "y": 1, "w": 1 }, - { "x": 11.5, "y": 1, "w": 1 }, - { "x": 12.5, "y": 1, "w": 1 }, - { "x": 13.5, "y": 1, "w": 1.5 }, - { "x": 15.25, "y": 1, "w": 1 }, - { "x": 0, "y": 2, "w": 1.75 }, - { "x": 1.75, "y": 2, "w": 1 }, - { "x": 2.75, "y": 2, "w": 1 }, - { "x": 3.75, "y": 2, "w": 1 }, - { "x": 4.75, "y": 2, "w": 1 }, - { "x": 5.75, "y": 2, "w": 1 }, - { "x": 6.75, "y": 2, "w": 1 }, - { "x": 7.75, "y": 2, "w": 1 }, - { "x": 8.75, "y": 2, "w": 1 }, - { "x": 9.75, "y": 2, "w": 1 }, - { "x": 10.75, "y": 2, "w": 1 }, - { "x": 11.75, "y": 2, "w": 1 }, - { "x": 12.75, "y": 2, "w": 2.25 }, - { "x": 15.25, "y": 2, "w": 1 }, - { "x": 0, "y": 3, "w": 2.25 }, - { "x": 2.25, "y": 3, "w": 1 }, - { "x": 3.25, "y": 3, "w": 1 }, - { "x": 4.25, "y": 3, "w": 1 }, - { "x": 5.25, "y": 3, "w": 1 }, - { "x": 6.25, "y": 3, "w": 1 }, - { "x": 7.25, "y": 3, "w": 1 }, - { "x": 8.25, "y": 3, "w": 1 }, - { "x": 9.25, "y": 3, "w": 1 }, - { "x": 10.25, "y": 3, "w": 1 }, - { "x": 11.25, "y": 3, "w": 1 }, - { "x": 12.25, "y": 3, "w": 1.75 }, - { "x": 14.25, "y": 3.25, "w": 1 }, - { "x": 0, "y": 4, "w": 1.25 }, - { "x": 1.25, "y": 4, "w": 1.25 }, - { "x": 2.5, "y": 4, "w": 1.25 }, - { "x": 3.75, "y": 4, "w": 6.25 }, - { "x": 10, "y": 4, "w": 1 }, - { "x": 11, "y": 4, "w": 1 }, - { "x": 12, "y": 4, "w": 1 }, - { "x": 13.25, "y": 4.25, "w": 1 }, - { "x": 14.25, "y": 4.25, "w": 1 }, - { "x": 15.25, "y": 4.25, "w": 1 } + {"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, "w":2}, + {"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":6.25}, + {"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_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": [ - { "x": 0, "y": 0, "w": 1 }, - { "x": 1, "y": 0, "w": 1 }, - { "x": 2, "y": 0, "w": 1 }, - { "x": 3, "y": 0, "w": 1 }, - { "x": 4, "y": 0, "w": 1 }, - { "x": 5, "y": 0, "w": 1 }, - { "x": 6, "y": 0, "w": 1 }, - { "x": 7, "y": 0, "w": 1 }, - { "x": 8, "y": 0, "w": 1 }, - { "x": 9, "y": 0, "w": 1 }, - { "x": 10, "y": 0, "w": 1 }, - { "x": 11, "y": 0, "w": 1 }, - { "x": 12, "y": 0, "w": 1 }, - { "x": 13, "y": 0, "w": 2 }, - { "x": 15.25, "y": 0, "w": 1 }, - { "x": 0, "y": 1, "w": 1.5 }, - { "x": 1.5, "y": 1, "w": 1 }, - { "x": 2.5, "y": 1, "w": 1 }, - { "x": 3.5, "y": 1, "w": 1 }, - { "x": 4.5, "y": 1, "w": 1 }, - { "x": 5.5, "y": 1, "w": 1 }, - { "x": 6.5, "y": 1, "w": 1 }, - { "x": 7.5, "y": 1, "w": 1 }, - { "x": 8.5, "y": 1, "w": 1 }, - { "x": 9.5, "y": 1, "w": 1 }, - { "x": 10.5, "y": 1, "w": 1 }, - { "x": 11.5, "y": 1, "w": 1 }, - { "x": 12.5, "y": 1, "w": 1 }, - { "x": 15.25, "y": 1, "w": 1 }, - { "x": 0, "y": 2, "w": 1.75 }, - { "x": 1.75, "y": 2, "w": 1 }, - { "x": 2.75, "y": 2, "w": 1 }, - { "x": 3.75, "y": 2, "w": 1 }, - { "x": 4.75, "y": 2, "w": 1 }, - { "x": 5.75, "y": 2, "w": 1 }, - { "x": 6.75, "y": 2, "w": 1 }, - { "x": 7.75, "y": 2, "w": 1 }, - { "x": 8.75, "y": 2, "w": 1 }, - { "x": 9.75, "y": 2, "w": 1 }, - { "x": 10.75, "y": 2, "w": 1 }, - { "x": 11.75, "y": 2, "w": 1 }, - { "x": 12.75, "y": 2, "w": 1 }, - { - "x": 13.75, - "y": 1, - "w": 1.25, - "h": 2 - }, - { "x": 15.25, "y": 2, "w": 1 }, - { "x": 0, "y": 3, "w": 1.25 }, - { "x": 1.25, "y": 3, "w": 1 }, - { "x": 2.25, "y": 3, "w": 1 }, - { "x": 3.25, "y": 3, "w": 1 }, - { "x": 4.25, "y": 3, "w": 1 }, - { "x": 5.25, "y": 3, "w": 1 }, - { "x": 6.25, "y": 3, "w": 1 }, - { "x": 7.25, "y": 3, "w": 1 }, - { "x": 8.25, "y": 3, "w": 1 }, - { "x": 9.25, "y": 3, "w": 1 }, - { "x": 10.25, "y": 3, "w": 1 }, - { "x": 11.25, "y": 3, "w": 1 }, - { "x": 12.25, "y": 3, "w": 1.75 }, - { "x": 14.25, "y": 3.25, "w": 1 }, - { "x": 0, "y": 4, "w": 1.25 }, - { "x": 1.25, "y": 4, "w": 1.25 }, - { "x": 2.5, "y": 4, "w": 1.25 }, - { "x": 3.75, "y": 4, "w": 6.25 }, - { "x": 10, "y": 4, "w": 1 }, - { "x": 11, "y": 4, "w": 1 }, - { "x": 12, "y": 4, "w": 1 }, - { "x": 13.25, "y": 4.25, "w": 1 }, - { "x": 14.25, "y": 4.25, "w": 1 }, - { "x": 15.25, "y": 4.25, "w": 1 } + {"label":"Esc", "x":0, "y":0}, + {"label":"1!", "x":1, "y":0}, + {"label":"2\"", "x":2, "y":0}, + {"label":"3\u00a3", "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, "w":2}, + {"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":"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":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} + ] + }, + "LAYOUT_iso_split_bs_space": { + "layout": [ + {"label":"Esc", "x":0, "y":0}, + {"label":"1!", "x":1, "y":0}, + {"label":"2\"", "x":2, "y":0}, + {"label":"3\u00a3", "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":"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} ] } } diff --git a/keyboards/boardsource/the_mark/keymaps/default/keymap.c b/keyboards/boardsource/the_mark/keymaps/default/keymap.c index ead93baf55..148795b0c3 100644 --- a/keyboards/boardsource/the_mark/keymaps/default/keymap.c +++ b/keyboards/boardsource/the_mark/keymaps/default/keymap.c @@ -21,24 +21,20 @@ enum layer_names { _FN }; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ [_BASE] = 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_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_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_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_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_END, - RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ -) - - + 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_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_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_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_END, + RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) }; - diff --git a/keyboards/boardsource/the_mark/keymaps/default_ansi/keymap.c b/keyboards/boardsource/the_mark/keymaps/default_ansi/keymap.c index 250ecf7669..4174e03603 100644 --- a/keyboards/boardsource/the_mark/keymaps/default_ansi/keymap.c +++ b/< |