summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keyboards/acheron/lasgweloth/info.json251
-rw-r--r--keyboards/acheron/lasgweloth/lasgweloth.h53
-rw-r--r--keyboards/al1/al1.h51
-rw-r--r--keyboards/al1/info.json391
-rw-r--r--keyboards/aozora/aozora.h47
-rw-r--r--keyboards/aozora/info.json316
-rw-r--r--keyboards/basekeys/slice/rev1/info.json356
-rw-r--r--keyboards/basekeys/slice/rev1/rev1.h118
-rw-r--r--keyboards/basekeys/slice/rev1_rgb/info.json261
-rw-r--r--keyboards/basekeys/slice/rev1_rgb/rev1_rgb.h96
-rw-r--r--keyboards/beatervan/beatervan.h70
-rw-r--r--keyboards/beatervan/info.json399
-rw-r--r--keyboards/blaster75/blaster75.h97
-rw-r--r--keyboards/blaster75/info.json352
-rw-r--r--keyboards/buzzard/rev1/info.json94
-rw-r--r--keyboards/buzzard/rev1/rev1.c2
-rw-r--r--keyboards/buzzard/rev1/rev1.h52
-rw-r--r--keyboards/capsunlocked/cu75/cu75.h69
-rw-r--r--keyboards/capsunlocked/cu75/info.json288
-rw-r--r--keyboards/converter/ibm_terminal/ibm_terminal.h81
-rw-r--r--keyboards/converter/ibm_terminal/info.json494
-rw-r--r--keyboards/converter/xt_usb/info.json449
-rw-r--r--keyboards/converter/xt_usb/xt_usb.h134
-rw-r--r--keyboards/duck/jetfire/info.json251
-rw-r--r--keyboards/duck/jetfire/jetfire.c2
-rw-r--r--keyboards/duck/jetfire/jetfire.h58
-rw-r--r--keyboards/duck/tcv3/info.json244
-rw-r--r--keyboards/duck/tcv3/tcv3.c2
-rw-r--r--keyboards/duck/tcv3/tcv3.h53
-rw-r--r--keyboards/eve/meteor/info.json177
-rw-r--r--keyboards/eve/meteor/meteor.h54
-rw-r--r--keyboards/evyd13/plain60/info.json874
-rw-r--r--keyboards/evyd13/plain60/plain60.h114
-rw-r--r--keyboards/exclusive/e6v2/le/info.json210
-rw-r--r--keyboards/exclusive/e6v2/le/le.h60
-rw-r--r--keyboards/exclusive/e6v2/oe/info.json277
-rw-r--r--keyboards/exclusive/e6v2/oe/oe.c2
-rw-r--r--keyboards/exclusive/e6v2/oe/oe.h61
-rw-r--r--keyboards/gh60/revc/info.json1073
-rw-r--r--keyboards/gh60/revc/revc.h133
-rw-r--r--keyboards/giabalanai/giabalanai.h64
-rw-r--r--keyboards/giabalanai/info.json324
-rw-r--r--keyboards/gl516/n51gl/info.json168
-rw-r--r--keyboards/gl516/n51gl/n51gl.h54
-rw-r--r--keyboards/gvalchca/spaccboard/info.json362
-rw-r--r--keyboards/gvalchca/spaccboard/spaccboard.h66
-rw-r--r--keyboards/handwired/jn68m/info.json165
-rw-r--r--keyboards/handwired/jn68m/jn68m.h49
-rw-r--r--keyboards/handwired/ms_sculpt_mobile/info.json166
-rw-r--r--keyboards/handwired/ms_sculpt_mobile/ms_sculpt_mobile.h43
-rw-r--r--keyboards/handwired/qc60/info.json1173
-rw-r--r--keyboards/handwired/qc60/proto/proto.h195
-rw-r--r--keyboards/handwired/sejin_eat1010r2/info.json122
-rw-r--r--keyboards/handwired/sejin_eat1010r2/keymaps/debug/keymap.c20
-rw-r--r--keyboards/handwired/sejin_eat1010r2/sejin_eat1010r2.h74
-rw-r--r--keyboards/handwired/sono1/info.json242
-rw-r--r--keyboards/handwired/sono1/keymaps/debug/keymap.c34
-rw-r--r--keyboards/handwired/sono1/sono1.c2
-rw-r--r--keyboards/handwired/sono1/sono1.h107
-rw-r--r--keyboards/kagizaraya/chidori/chidori.h57
-rw-r--r--keyboards/kagizaraya/chidori/info.json146
-rw-r--r--keyboards/kc60/info.json382
-rw-r--r--keyboards/kc60/kc60.c2
-rw-r--r--keyboards/kc60/kc60.h93
-rw-r--r--keyboards/kc60se/info.json367
-rw-r--r--keyboards/kc60se/kc60se.c2
-rw-r--r--keyboards/kc60se/kc60se.h93
-rw-r--r--keyboards/keebsforall/freebird60/freebird60.h57
-rw-r--r--keyboards/keebsforall/freebird60/info.json138
-rw-r--r--keyboards/keyboardio/model01/info.json199
-rw-r--r--keyboards/keyboardio/model01/model01.h39
-rw-r--r--keyboards/keyprez/bison/bison.c2
-rw-r--r--keyboards/keyprez/bison/bison.h99
-rw-r--r--keyboards/keyprez/bison/info.json583
-rw-r--r--keyboards/keystonecaps/gameroyadvance/gameroyadvance.c18
-rw-r--r--keyboards/keystonecaps/gameroyadvance/gameroyadvance.h104
-rw-r--r--keyboards/keystonecaps/gameroyadvance/info.json393
-rw-r--r--keyboards/kin80/info.json378
-rw-r--r--keyboards/kin80/kin80.h62
-rw-r--r--keyboards/kinesis/alvicstep/alvicstep.h93
-rw-r--r--keyboards/kinesis/alvicstep/info.json184
-rw-r--r--keyboards/kinesis/info.json11
-rw-r--r--keyboards/kinesis/kint2pp/info.json184
-rw-r--r--keyboards/kinesis/kint2pp/kint2pp.h99
-rw-r--r--keyboards/kinesis/kint36/info.json184
-rw-r--r--keyboards/kinesis/kint36/kint36.c2
-rw-r--r--keyboards/kinesis/kint36/kint36.h92
-rw-r--r--keyboards/kinesis/kint41/info.json184
-rw-r--r--keyboards/kinesis/kint41/kint41.c2
-rw-r--r--keyboards/kinesis/kint41/kint41.h92
-rw-r--r--keyboards/kinesis/kintlc/info.json184
-rw-r--r--keyboards/kinesis/kintlc/kintlc.c2
-rw-r--r--keyboards/kinesis/kintlc/kintlc.h92
-rw-r--r--keyboards/kinesis/nguyenvietyen/info.json184
-rw-r--r--keyboards/kinesis/nguyenvietyen/nguyenvietyen.h74
-rw-r--r--keyboards/kinesis/stapelberg/info.json184
-rw-r--r--keyboards/kinesis/stapelberg/stapelberg.h98
-rw-r--r--keyboards/ktec/daisy/daisy.h51
-rw-r--r--keyboards/ktec/daisy/info.json164
-rw-r--r--keyboards/lazydesigners/dimpleplus/dimpleplus.h47
-rw-r--r--keyboards/lazydesigners/dimpleplus/info.json220
-rw-r--r--keyboards/lfkeyboards/lfk78/lfk78.h9
-rw-r--r--keyboards/lfkeyboards/lfk78/revc/info.json734
-rw-r--r--keyboards/lfkeyboards/lfk78/revc/revc.h78
-rw-r--r--keyboards/lfkeyboards/lfk78/revj/info.json734
-rw-r--r--keyboards/lfkeyboards/lfk78/revj/revj.h78
-rw-r--r--keyboards/makenova/omega/omega4/info.json117
-rw-r--r--keyboards/makenova/omega/omega4/omega4.h51
-rw-r--r--keyboards/matthewdias/m3n3van/info.json140
-rw-r--r--keyboards/matthewdias/m3n3van/m3n3van.h48
-rw-r--r--keyboards/mechkeys/acr60/acr60.h122
-rw-r--r--keyboards/mechkeys/acr60/info.json776
-rw-r--r--keyboards/mechkeys/mechmini/v1/info.json164
-rw-r--r--keyboards/mechkeys/mechmini/v1/v1.h48
-rw-r--r--keyboards/mechlovin/pisces/info.json272
-rw-r--r--keyboards/mechlovin/pisces/pisces.h67
-rw-r--r--keyboards/meson/info.json197
-rw-r--r--keyboards/meson/meson.h56
-rw-r--r--keyboards/mokey/mokey63/info.json272
-rw-r--r--keyboards/mokey/mokey63/mokey63.h75
-rw-r--r--keyboards/mt/split75/info.json231
-rw-r--r--keyboards/mt/split75/matrix.c1
-rw-r--r--keyboards/mt/split75/split75.h50
-rw-r--r--keyboards/mxss/info.json979
-rw-r--r--keyboards/mxss/keymaps/default/keymap.c1
-rw-r--r--keyboards/mxss/mxss.c6
-rw-r--r--keyboards/mxss/mxss.h220
-rw-r--r--keyboards/mxss/templates/keymap.c1
-rw-r--r--keyboards/org60/info.json142
-rw-r--r--keyboards/org60/org60.h31
-rw-r--r--keyboards/retro_75/info.json185
-rw-r--r--keyboards/retro_75/retro_75.h61
-rw-r--r--keyboards/rotor/info.json175
-rw-r--r--keyboards/rotor/rotor.h58
-rw-r--r--keyboards/ryloo_studio/m0110/info.json378
-rwxr-xr-xkeyboards/ryloo_studio/m0110/m0110.h103
-rw-r--r--keyboards/salicylic_acid3/naked48/rev1/info.json424
-rw-r--r--keyboards/salicylic_acid3/naked48/rev1/rev1.c2
-rw-r--r--keyboards/salicylic_acid3/naked48/rev1/rev1.h99
-rw-r--r--keyboards/salicylic_acid3/naked60/rev1/info.json284
-rw-r--r--keyboards/salicylic_acid3/naked60/rev1/rev1.h107
-rw-r--r--keyboards/salicylic_acid3/naked64/rev1/info.json337
-rw-r--r--keyboards/salicylic_acid3/naked64/rev1/rev1.h79
-rw-r--r--keyboards/sam/sg81m/info.json345
-rw-r--r--keyboards/sam/sg81m/sg81m.h51
-rw-r--r--keyboards/sentraq/s60_x/default/default.h105
-rw-r--r--keyboards/sentraq/s60_x/default/info.json355
-rw-r--r--keyboards/sentraq/s60_x/info.json19
-rw-r--r--keyboards/sentraq/s60_x/rgb/info.json355
-rw-r--r--keyboards/sentraq/s60_x/rgb/rgb.h78
-rw-r--r--keyboards/singa/info.json652
-rw-r--r--keyboards/singa/singa.h140
-rw-r--r--keyboards/sirius/unigo66/info.json293
-rw-r--r--keyboards/sirius/unigo66/unigo66.h106
-rw-r--r--keyboards/thevankeyboards/minivan/info.json217
-rw-r--r--keyboards/thevankeyboards/minivan/minivan.h64
-rw-r--r--keyboards/tominabox1/littlefoot_lx/rev1/info.json100
-rw-r--r--keyboards/tominabox1/littlefoot_lx/rev1/rev1.h50
-rw-r--r--keyboards/tominabox1/littlefoot_lx/rev2/info.json100
-rw-r--r--keyboards/tominabox1/littlefoot_lx/rev2/rev2.h50
-rw-r--r--keyboards/tominabox1/qaz/info.json91
-rw-r--r--keyboards/tominabox1/qaz/qaz.h33
-rw-r--r--keyboards/trashman/ketch/info.json261
-rw-r--r--keyboards/trashman/ketch/ketch.h96
-rw-r--r--keyboards/viktus/z150_bh/info.json367
-rw-r--r--keyboards/viktus/z150_bh/z150_bh.h31
-rw-r--r--keyboards/winkeyless/bmini/bmini.h56
-rw-r--r--keyboards/winkeyless/bmini/info.json185
-rw-r--r--keyboards/winkeyless/bminiex/bminiex.h74
-rw-r--r--keyboards/winkeyless/bminiex/info.json669
-rw-r--r--keyboards/wolf/ts60/info.json399
-rw-r--r--keyboards/wolf/ts60/ts60.h82
-rw-r--r--keyboards/work_louder/work_board/info.json204
-rw-r--r--keyboards/work_louder/work_board/work_board.h36
-rw-r--r--keyboards/wsk/sl40/info.json111
-rw-r--r--keyboards/wsk/sl40/sl40.h45
-rw-r--r--keyboards/xw60/info.json144
-rw-r--r--keyboards/xw60/xw60.h60
-rw-r--r--keyboards/ymdk/yd60mq/info.json1593
-rw-r--r--keyboards/ymdk/yd60mq/yd60mq.c2
-rw-r--r--keyboards/ymdk/yd60mq/yd60mq.h173
181 files changed, 17939 insertions, 15082 deletions
diff --git a/keyboards/acheron/lasgweloth/info.json b/keyboards/acheron/lasgweloth/info.json
index 47d4b55105..653af34452 100644
--- a/keyboards/acheron/lasgweloth/info.json
+++ b/keyboards/acheron/lasgweloth/info.json
@@ -16,145 +16,148 @@
16 "processor": "STM32F072", 16 "processor": "STM32F072",
17 "bootloader": "stm32-dfu", 17 "bootloader": "stm32-dfu",
18 "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift"], 18 "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift"],
19 "layout_aliases": {
20 "LAYOUT": "LAYOUT_60_ansi_split_bs_rshift"
21 },
19 "layouts": { 22 "layouts": {
20 "LAYOUT_60_ansi": { 23 "LAYOUT_60_ansi": {
21 "layout": [ 24 "layout": [
22 {"x":0, "y":0}, 25 {"matrix": [0, 0], "x": 0, "y": 0},
23 {"x":1, "y":0}, 26 {"matrix": [0, 1], "x": 1, "y": 0},
24 {"x":2, "y":0}, 27 {"matrix": [0, 2], "x": 2, "y": 0},
25 {"x":3, "y":0}, 28 {"matrix": [0, 3], "x": 3, "y": 0},
26 {"x":4, "y":0}, 29 {"matrix": [0, 4], "x": 4, "y": 0},
27 {"x":5, "y":0}, 30 {"matrix": [0, 5], "x": 5, "y": 0},
28 {"x":6, "y":0}, 31 {"matrix": [0, 6], "x": 6, "y": 0},
29 {"x":7, "y":0}, 32 {"matrix": [0, 7], "x": 7, "y": 0},
30 {"x":8, "y":0}, 33 {"matrix": [0, 8], "x": 8, "y": 0},
31 {"x":9, "y":0}, 34 {"matrix": [0, 9], "x": 9, "y": 0},
32 {"x":10, "y":0}, 35 {"matrix": [0, 10], "x": 10, "y": 0},
33 {"x":11, "y":0}, 36 {"matrix": [0, 11], "x": 11, "y": 0},
34 {"x":12, "y":0}, 37 {"matrix": [0, 12], "x": 12, "y": 0},
35 {"x":13, "y":0, "w":2}, 38 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
36 39
37 {"x":0, "y":1, "w":1.5}, 40 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
38 {"x":1.5, "y":1}, 41 {"matrix": [1, 1], "x": 1.5, "y": 1},
39 {"x":2.5, "y":1}, 42 {"matrix": [1, 2], "x": 2.5, "y": 1},
40 {"x":3.5, "y":1}, 43 {"matrix": [1, 3], "x": 3.5, "y": 1},
41 {"x":4.5, "y":1}, 44 {"matrix": [1, 4], "x": 4.5, "y": 1},
42 {"x":5.5, "y":1}, 45 {"matrix": [1, 5], "x": 5.5, "y": 1},
43 {"x":6.5, "y":1}, 46 {"matrix": [1, 6], "x": 6.5, "y": 1},
44 {"x":7.5, "y":1}, 47 {"matrix": [1, 7], "x": 7.5, "y": 1},
45 {"x":8.5, "y":1}, 48 {"matrix": [1, 8], "x": 8.5, "y": 1},
46 {"x":9.5, "y":1}, 49 {"matrix": [1, 9], "x": 9.5, "y": 1},
47 {"x":10.5, "y":1}, 50 {"matrix": [1, 10], "x": 10.5, "y": 1},
48 {"x":11.5, "y":1}, 51 {"matrix": [1, 11], "x": 11.5, "y": 1},
49 {"x":12.5, "y":1}, 52 {"matrix": [1, 12], "x": 12.5, "y": 1},
50 {"x":13.5, "y":1, "w":1.5}, 53 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
51 54
52 {"x":0, "y":2, "w":1.75}, 55 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
53 {"x":1.75, "y":2}, 56 {"matrix": [2, 1], "x": 1.75, "y": 2},
54 {"x":2.75, "y":2}, 57 {"matrix": [2, 2], "x": 2.75, "y": 2},
55 {"x":3.75, "y":2}, 58 {"matrix": [2, 3], "x": 3.75, "y": 2},
56 {"x":4.75, "y":2}, 59 {"matrix": [2, 4], "x": 4.75, "y": 2},
57 {"x":5.75, "y":2}, 60 {"matrix": [2, 5], "x": 5.75, "y": 2},
58 {"x":6.75, "y":2}, 61 {"matrix": [2, 6], "x": 6.75, "y": 2},
59 {"x":7.75, "y":2}, 62 {"matrix": [2, 7], "x": 7.75, "y": 2},
60 {"x":8.75, "y":2}, 63 {"matrix": [2, 8], "x": 8.75, "y": 2},
61 {"x":9.75, "y":2}, 64 {"matrix": [2, 9], "x": 9.75, "y": 2},
62 {"x":10.75, "y":2}, 65 {"matrix": [2, 10], "x": 10.75, "y": 2},
63 {"x":11.75, "y":2}, 66 {"matrix": [2, 11], "x": 11.75, "y": 2},
64 {"x":12.75, "y":2, "w":2.25}, 67 {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
65 68
66 {"x":0, "y":3, "w":2.25}, 69 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
67 {"x":2.25, "y":3}, 70 {"matrix": [3, 1], "x": 2.25, "y": 3},
68 {"x":3.25, "y":3}, 71 {"matrix": [3, 2], "x": 3.25, "y": 3},
69 {"x":4.25, "y":3}, 72 {"matrix": [3, 3], "x": 4.25, "y": 3},
70 {"x":5.25, "y":3}, 73 {"matrix": [3, 4], "x": 5.25, "y": 3},
71 {"x":6.25, "y":3}, 74 {"matrix": [3, 5], "x": 6.25, "y": 3},
72 {"x":7.25, "y":3}, 75 {"matrix": [3, 6], "x": 7.25, "y": 3},
73 {"x":8.25, "y":3}, 76 {"matrix": [3, 7], "x": 8.25, "y": 3},
74 {"x":9.25, "y":3}, 77 {"matrix": [3, 8], "x": 9.25, "y": 3},
75 {"x":10.25, "y":3}, 78 {"matrix": [3, 9], "x": 10.25, "y": 3},
76 {"x":11.25, "y":3}, 79 {"matrix": [3, 10], "x": 11.25, "y": 3},
77 {"x":12.25, "y":3, "w":2.75}, 80 {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 2.75},
78 81
79 {"x":0, "y":4, "w":1.25}, 82 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
80 {"x":1.25, "y":4, "w":1.25}, 83 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
81 {"x":2.5, "y":4, "w":1.25}, 84 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
82 {"x":3.75, "y":4, "w":6.25}, 85 {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
83 {"x":10, "y":4, "w":1.25}, 86 {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
84 {"x":11.25, "y":4, "w":1.25}, 87 {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
85 {"x":12.5, "y":4, "w":1.25}, 88 {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
86 {"x":13.75, "y":4, "w":1.25} 89 {"matrix": [4, 11], "x": 13.75, "y": 4, "w": 1.25}
87 ] 90 ]
88 }, 91 },
89 "LAYOUT_60_ansi_split_bs_rshift": { 92 "LAYOUT_60_ansi_split_bs_rshift": {
90 "layout": [ 93 "layout": [
91 {"x":0, "y":0}, 94 {"matrix": [0, 0], "x": 0, "y": 0},
92 {"x":1, "y":0}, 95 {"matrix": [0, 1], "x": 1, "y": 0},
93 {"x":2, "y":0}, 96 {"matrix": [0, 2], "x": 2, "y": 0},
94 {"x":3, "y":0}, 97 {"matrix": [0, 3], "x": 3, "y": 0},
95 {"x":4, "y":0}, 98 {"matrix": [0, 4], "x": 4, "y": 0},
96 {"x":5, "y":0}, 99 {"matrix": [0, 5], "x": 5, "y": 0},
97 {"x":6, "y":0}, 100 {"matrix": [0, 6], "x": 6, "y": 0},
98 {"x":7, "y":0}, 101 {"matrix": [0, 7], "x": 7, "y": 0},
99 {"x":8, "y":0}, 102 {"matrix": [0, 8], "x": 8, "y": 0},
100 {"x":9, "y":0}, 103 {"matrix": [0, 9], "x": 9, "y": 0},
101 {"x":10, "y":0}, 104 {"matrix": [0, 10], "x": 10, "y": 0},
102 {"x":11, "y":0}, 105 {"matrix": [0, 11], "x": 11, "y": 0},
103 {"x":12, "y":0}, 106 {"matrix": [0, 12], "x": 12, "y": 0},
104 {"x":13, "y":0}, 107 {"matrix": [0, 13], "x": 13, "y": 0},
105 {"x":14, "y":0}, 108 {"matrix": [2, 13], "x": 14, "y": 0},
106 109
107 {"x":0, "y":1, "w":1.5}, 110 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
108 {"x":1.5, "y":1}, 111 {"matrix": [1, 1], "x": 1.5, "y": 1},
109 {"x":2.5, "y":1}, 112 {"matrix": [1, 2], "x": 2.5, "y": 1},
110 {"x":3.5, "y":1}, 113 {"matrix": [1, 3], "x": 3.5, "y": 1},
111 {"x":4.5, "y":1}, 114 {"matrix": [1, 4], "x": 4.5, "y": 1},
112 {"x":5.5, "y":1}, 115 {"matrix": [1, 5], "x": 5.5, "y": 1},
113 {"x":6.5, "y":1}, 116 {"matrix": [1, 6], "x": 6.5, "y": 1},
114 {"x":7.5, "y":1}, 117 {"matrix": [1, 7], "x": 7.5, "y": 1},
115 {"x":8.5, "y":1}, 118 {"matrix": [1, 8], "x": 8.5, "y": 1},
116 {"x":9.5, "y":1}, 119 {"matrix": [1, 9], "x": 9.5, "y": 1},
117 {"x":10.5, "y":1}, 120 {"matrix": [1, 10], "x": 10.5, "y": 1},
118 {"x":11.5, "y":1}, 121 {"matrix": [1, 11], "x": 11.5, "y": 1},
119 {"x":12.5, "y":1}, 122 {"matrix": [1, 12], "x": 12.5, "y": 1},
120 {"x":13.5, "y":1, "w":1.5}, 123 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
121 124
122 {"x":0, "y":2, "w":1.75}, 125 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
123 {"x":1.75, "y":2}, 126 {"matrix": [2, 1], "x": 1.75, "y": 2},
124 {"x":2.75, "y":2}, 127 {"matrix": [2, 2], "x": 2.75, "y": 2},
125 {"x":3.75, "y":2}, 128 {"matrix": [2, 3], "x": 3.75, "y": 2},
126 {"x":4.75, "y":2}, 129 {"matrix": [2, 4], "x": 4.75, "y": 2},
127 {"x":5.75, "y":2}, 130 {"matrix": [2, 5], "x": 5.75, "y": 2},
128 {"x":6.75, "y":2}, 131 {"matrix": [2, 6], "x": 6.75, "y": 2},
129 {"x":7.75, "y":2}, 132 {"matrix": [2, 7], "x": 7.75, "y": 2},
130 {"x":8.75, "y":2}, 133 {"matrix": [2, 8], "x": 8.75, "y": 2},
131 {"x":9.75, "y":2}, 134 {"matrix": [2, 9], "x": 9.75, "y": 2},
132 {"x":10.75, "y":2}, 135 {"matrix": [2, 10], "x": 10.75, "y": 2},
133 {"x":11.75, "y":2}, 136 {"matrix": [2, 11], "x": 11.75, "y": 2},
134 {"x":12.75, "y":2, "w":2.25}, 137 {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
135 138
136 {"x":0, "y":3, "w":2.25}, 139 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
137 {"x":2.25, "y":3}, 140 {"matrix": [3, 1], "x": 2.25, "y": 3},
138 {"x":3.25, "y":3}, 141 {"matrix": [3, 2], "x": 3.25, "y": 3},
139 {"x":4.25, "y":3}, 142 {"matrix": [3, 3], "x": 4.25, "y": 3},
140 {"x":5.25, "y":3}, 143 {"matrix": [3, 4], "x": 5.25, "y": 3},
141 {"x":6.25, "y":3}, 144 {"matrix": [3, 5], "x": 6.25, "y": 3},
142 {"x":7.25, "y":3}, 145 {"matrix": [3, 6], "x": 7.25, "y": 3},
143 {"x":8.25, "y":3}, 146 {"matrix": [3, 7], "x": 8.25, "y": 3},
144 {"x":9.25, "y":3}, 147 {"matrix": [3, 8], "x": 9.25, "y": 3},
145 {"x":10.25, "y":3}, 148 {"matrix": [3, 9], "x": 10.25, "y": 3},
146 {"x":11.25, "y":3}, 149 {"matrix": [3, 10], "x": 11.25, "y": 3},
147 {"x":12.25, "y":3, "w":1.75}, 150 {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
148 {"x":14, "y":3}, 151 {"matrix": [3, 12], "x": 14, "y": 3},
149 152
150 {"x":0, "y":4, "w":1.25}, 153 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
151 {"x":1.25, "y":4, "w":1.25}, 154 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
152 {"x":2.5, "y":4, "w":1.25}, 155 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
153 {"x":3.75, "y":4, "w":6.25}, 156 {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
154 {"x":10, "y":4, "w":1.25}, 157 {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
155 {"x":11.25, "y":4, "w":1.25}, 158 {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
156 {"x":12.5, "y":4, "w":1.25}, 159 {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
157 {"x":13.75, "y":4, "w":1.25} 160 {"matrix": [4, 11], "x": 13.75, "y": 4, "w": 1.25}
158 ] 161 ]
159 } 162 }
160 } 163 }
diff --git a/keyboards/acheron/lasgweloth/lasgweloth.h b/keyboards/acheron/lasgweloth/lasgweloth.h
deleted file mode 100644
index adcc298dd2..0000000000
--- a/keyboards/acheron/lasgweloth/lasgweloth.h
+++ /dev/null
@@ -1,53 +0,0 @@
1/*
2Copyright 2015 Álvaro "Gondolindrim" Volpato <gondolindrim@acheronproject.com>
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
19
20#define ___ KC_NO
21
22#include "quantum.h"
23
24// equivalent to LAYOUT_all
25#define LAYOUT_60_ansi_split_bs_rshift( \
26 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, \
27 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
28 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
29 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
30 K40, K41, K42, K46, K48, K49, K4A, K4B \
31) { \
32 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
33 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
34 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
35 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___ }, \
36 { K40, K41, K42, ___, ___, ___, K46, ___, K48, K49, K4A, K4B, ___, ___ } \
37}
38
39#define LAYOUT_60_ansi( \
40 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
41 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
42 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
43 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, \
44 K40, K41, K42, K46, K48, K49, K4A, K4B \
45) { \
46 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
47 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
48 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___ }, \
49 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, ___ }, \
50 { K40, K41, K42, ___, ___, ___, K46, ___, K48, K49, K4A, K4B, ___, ___ } \
51}
52
53#define LAYOUT LAYOUT_60_ansi_split_bs_rshift
diff --git a/keyboards/al1/al1.h b/keyboards/al1/al1.h
deleted file mode 100644
index 6b585cc18a..0000000000
--- a/keyboards/al1/al1.h
+++ /dev/null
@@ -1,51 +0,0 @@
1/* Copyright 2018 MechMerlin
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#include "quantum.h"
20
21#define XXX KC_NO
22
23#define LAYOUT( \
24 k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k4F, k4E, \
25 k51, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k2F, k4D, \
26 k52, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
27 k53, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k4C, \
28 k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B \
29) { \
30 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
31 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
32 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
33 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
34 { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \
35 { k50, k51, k52, k53, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
36}
37
38#define LAYOUT_split_bs( \
39 k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k5C, k0C, k0D, k0E, k0F, k4F, k4E, \
40 k51, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k2F, k4D, \
41 k52, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
42 k53, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k4C, \
43 k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B \
44) { \
45 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
46 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
47 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
48 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
49 { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \
50 { k50, k51, k52, k53, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k5C, XXX, XXX, XXX } \
51}
diff --git a/keyboards/al1/info.json b/keyboards/al1/info.json
index 5149373e48..c241b7c14d 100644
--- a/keyboards/al1/info.json
+++ b/keyboards/al1/info.json
@@ -23,206 +23,207 @@
23 "layouts": { 23 "layouts": {
24 "LAYOUT": { 24 "LAYOUT": {
25 "layout": [ 25 "layout": [
26 {"x": 0, "y": 0}, 26 {"matrix": [5, 0], "x": 0, "y": 0},
27 {"x": 1, "y": 0}, 27 {"matrix": [0, 0], "x": 1, "y": 0},
28 {"x": 2, "y": 0}, 28 {"matrix": [0, 1], "x": 2, "y": 0},
29 {"x": 3, "y": 0}, 29 {"matrix": [0, 2], "x": 3, "y": 0},
30 {"x": 4, "y": 0}, 30 {"matrix": [0, 3], "x": 4, "y": 0},
31 {"x": 5, "y": 0}, 31 {"matrix": [0, 4], "x": 5, "y": 0},
32 {"x": 6, "y": 0}, 32 {"matrix": [0, 5], "x": 6, "y": 0},
33 {"x": 7, "y": 0}, 33 {"matrix": [0, 6], "x": 7, "y": 0},
34 {"x": 8, "y": 0}, 34 {"matrix": [0, 7], "x": 8, "y": 0},
35 {"x": 9, "y": 0}, 35 {"matrix": [0, 8], "x": 9, "y": 0},
36 {"x": 10, "y": 0}, 36 {"matrix": [0, 9], "x": 10, "y": 0},
37 {"x": 11, "y": 0}, 37 {"matrix": [0, 10], "x": 11, "y": 0},
38 {"x": 12, "y": 0}, 38 {"matrix": [0, 11], "x": 12, "y": 0},
39 {"x": 13, "y": 0, "w": 2}, 39 {"matrix": [0, 12], "x": 13, "y": 0, "w": 2},
40 40
41 {"x": 15.25, "y": 0}, 41 {"matrix": [0, 13], "x": 15.25, "y": 0},
42 42
43 {"x": 16.5, "y": 0}, 43 {"matrix": [0, 14], "x": 16.5, "y": 0},
44 {"x": 17.5, "y": 0}, 44 {"matrix": [0, 15], "x": 17.5, "y": 0},
45 {"x": 18.5, "y": 0}, 45 {"matrix": [4, 15], "x": 18.5, "y": 0},
46 {"x": 19.5, "y": 0}, 46 {"matrix": [4, 14], "x": 19.5, "y": 0},
47 47
48 {"x": 0, "y": 1, "w": 1.5}, 48 {"matrix": [5, 1], "x": 0, "y": 1, "w": 1.5},
49 {"x": 1.5, "y": 1}, 49 {"matrix": [1, 0], "x": 1.5, "y": 1},
50 {"x": 2.5, "y": 1}, 50 {"matrix": [1, 1], "x": 2.5, "y": 1},
51 {"x": 3.5, "y": 1}, 51 {"matrix": [1, 2], "x": 3.5, "y": 1},
52 {"x": 4.5, "y": 1}, 52 {"matrix": [1, 3], "x": 4.5, "y": 1},
53 {"x": 5.5, "y": 1}, 53 {"matrix": [1, 4], "x": 5.5, "y": 1},
54 {"x": 6.5, "y": 1}, 54 {"matrix": [1, 5], "x": 6.5, "y": 1},
55 {"x": 7.5, "y": 1}, 55 {"matrix": [1, 6], "x": 7.5, "y": 1},
56 {"x": 8.5, "y": 1}, 56 {"matrix": [1, 7], "x": 8.5, "y": 1},
57 {"x": 9.5, "y": 1}, 57 {"matrix": [1, 8], "x": 9.5, "y": 1},
58 {"x": 10.5, "y": 1}, 58 {"matrix": [1, 9], "x": 10.5, "y": 1},
59 {"x": 11.5, "y": 1}, 59 {"matrix": [1, 10], "x": 11.5, "y": 1},
60 {"x": 12.5, "y": 1}, 60 {"matrix": [1, 11], "x": 12.5, "y": 1},
61 {"x": 13.5, "y": 1, "w": 1.5}, 61 {"matrix": [1, 12], "x": 13.5, "y": 1, "w": 1.5},
62 62
63 {"x": 15.25, "y": 1}, 63 {"matrix": [1, 13], "x": 15.25, "y": 1},
64 64
65 {"x": 16.5, "y": 1}, 65 {"matrix": [1, 14], "x": 16.5, "y": 1},
66 {"x": 17.5, "y": 1}, 66 {"matrix": [1, 15], "x": 17.5, "y": 1},
67 {"x": 18.5, "y": 1}, 67 {"matrix": [2, 15], "x": 18.5, "y": 1},
68 {"x": 19.5, "y": 1, "h": 2}, 68 {"matrix": [4, 13], "x": 19.5, "y": 1, "h": 2},
69 69
70 {"x": 0, "y": 2, "w": 1.75}, 70 {"matrix": [5, 2], "x": 0, "y": 2, "w": 1.75},
71 {"x": 1.75, "y": 2}, 71 {"matrix": [2, 0], "x": 1.75, "y": 2},
72 {"x": 2.75, "y": 2}, 72 {"matrix": [2, 1], "x": 2.75, "y": 2},
73 {"x": 3.75, "y": 2}, 73 {"matrix": [2, 2], "x": 3.75, "y": 2},
74 {"x": 4.75, "y": 2}, 74 {"matrix": [2, 3], "x": 4.75, "y": 2},
75 {"x": 5.75, "y": 2}, 75 {"matrix": [2, 4], "x": 5.75, "y": 2},
76 {"x": 6.75, "y": 2}, 76 {"matrix": [2, 5], "x": 6.75, "y": 2},
77 {"x": 7.75, "y": 2}, 77 {"matrix": [2, 6], "x": 7.75, "y": 2},
78 {"x": 8.75, "y": 2}, 78 {"matrix": [2, 7], "x": 8.75, "y": 2},
79 {"x": 9.75, "y": 2}, 79 {"matrix": [2, 8], "x": 9.75, "y": 2},
80 {"x": 10.75, "y": 2}, 80 {"matrix": [2, 9], "x": 10.75, "y": 2},
81 {"x": 11.75, "y": 2}, 81 {"matrix": [2, 10], "x": 11.75, "y": 2},
82 {"x": 12.75, "y": 2, "w": 2.25}, 82 {"matrix": [2, 11], "x": 12.75, "y": 2, "w": 2.25},
83 83
84 {"x": 16.5, "y": 2}, 84 {"matrix": [2, 12], "x": 16.5, "y": 2},
85 {"x": 17.5, "y": 2}, 85 {"matrix": [2, 13], "x": 17.5, "y": 2},
86 {"x": 18.5, "y": 2}, 86 {"matrix": [2, 14], "x": 18.5, "y": 2},
87 87
88 {"x": 0, "y": 3, "w": 2.25}, 88 {"matrix": [5, 3], "x": 0, "y": 3, "w": 2.25},
89 {"x": 2.25, "y": 3}, 89 {"matrix": [3, 0], "x": 2.25, "y": 3},
90 {"x": 3.25, "y": 3}, 90 {"matrix": [3, 1], "x": 3.25, "y": 3},
91 {"x": 4.25, "y": 3}, 91 {"matrix": [3, 2], "x": 4.25, "y": 3},
92 {"x": 5.25, "y": 3}, 92 {"matrix": [3, 3], "x": 5.25, "y": 3},
93 {"x": 6.25, "y": 3}, 93 {"matrix": [3, 4], "x": 6.25, "y": 3},
94 {"x": 7.25, "y": 3}, 94 {"matrix": [3, 5], "x": 7.25, "y": 3},
95 {"x": 8.25, "y": 3}, 95 {"matrix": [3, 6], "x": 8.25, "y": 3},
96 {"x": 9.25, "y": 3}, 96 {"matrix": [3, 7], "x": 9.25, "y": 3},
97 {"x": 10.25, "y": 3}, 97 {"matrix": [3, 8], "x": 10.25, "y": 3},
98 {"x": 11.25, "y": 3}, 98 {"matrix": [3, 9], "x": 11.25, "y": 3},
99 {"x": 12.25, "y": 3, "w": 1.75}, 99 {"matrix": [3, 10], "x": 12.25, "y": 3, "w": 1.75},
100 {"x": 14, "y": 3}, 100 {"matrix": [3, 11], "x": 14, "y": 3},
101 101
102 {"x": 15.25, "y": 3.25}, 102 {"matrix": [3, 12], "x": 15.25, "y": 3.25},
103 103
104 {"x": 16.5, "y": 3}, 104 {"matrix": [3, 13], "x": 16.5, "y": 3},
105 {"x": 17.5, "y": 3}, 105 {"matrix": [3, 14], "x": 17.5, "y": 3},
106 {"x": 18.5, "y": 3}, 106 {"matrix": [3, 15], "x": 18.5, "y": 3},
107 {"x": 19.5, "y": 3, "h": 2}, 107 {"matrix": [4, 12], "x": 19.5, "y": 3, "h": 2},
108 108
109 {"x": 0, "y": 4, "w": 1.25}, 109 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
110 {"x": 1.25, "y": 4}, 110 {"matrix": [4, 1], "x": 1.25, "y": 4},
111 {"x": 2.25, "y": 4, "w": 1.25}, 111 {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
112 {"x": 3.5, "y": 4, "w": 7}, 112 {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 7},
113 {"x": 10.5, "y": 4, "w": 1.25}, 113 {"matrix": [4, 4], "x": 10.5, "y": 4, "w": 1.25},
114 {"x": 11.75, "y": 4}, 114 {"matrix": [4, 5], "x": 11.75, "y": 4},
115 {"x": 12.75, "y": 4, "w": 1.25}, 115 {"matrix": [4, 6], "x": 12.75, "y": 4, "w": 1.25},
116 116
117 {"x": 14.25, "y": 4.25}, 117 {"matrix": [4, 7], "x": 14.25, "y": 4.25},
118 {"x": 15.25, "y": 4.25}, 118 {"matrix": [4, 8], "x": 15.25, "y": 4.25},
119 {"x": 16.25, "y": 4.25}, 119 {"matrix": [4, 9], "x": 16.25, "y": 4.25},
120 120
121 {"x": 17.5, "y": 4}, 121 {"matrix": [4, 10], "x": 17.5, "y": 4},
122 {"x": 18.5, "y": 4} 122 {"matrix": [4, 11], "x": 18.5, "y": 4}
123 ] 123 ]
124 }, 124 },
125 "LAYOUT_split_bs": { 125 "LAYOUT_split_bs": {
126 "layout": [ 126 "layout": [
127 {"x": 0, "y": 0}, 127 {"matrix": [5, 0], "x": 0, "y": 0},
128 {"x": 1, "y": 0}, 128 {"matrix": [0, 0], "x": 1, "y": 0},
129 {"x": 2, "y": 0}, 129 {"matrix": [0, 1], "x": 2, "y": 0},
130 {"x": 3, "y": 0}, 130 {"matrix": [0, 2], "x": 3, "y": 0},
131 {"x": 4, "y": 0}, 131 {"matrix": [0, 3], "x": 4, "y": 0},
132 {"x": 5, "y": 0}, 132 {"matrix": [0, 4], "x": 5, "y": 0},
133 {"x": 6, "y": 0}, 133 {"matrix": [0, 5], "x": 6, "y": 0},
134 {"x": 7, "y": 0}, 134 {"matrix": [0, 6], "x": 7, "y": 0},
135 {"x": 8, "y": 0}, 135 {"matrix": [0, 7], "x": 8, "y": 0},
136 {"x": 9, "y": 0}, 136 {"matrix": [0, 8], "x": 9, "y": 0},
137 {"x": 10, "y": 0}, 137 {"matrix": [0, 9], "x": 10, "y": 0},
138 {"x": 11, "y": 0}, 138 {"matrix": [0, 10], "x": 11, "y": 0},
139 {"x": 12, "y": 0}, 139 {"matrix": [0, 11], "x": 12, "y": 0},
140 {"x": 13, "y": 0}, 140 {"matrix": [5, 12], "x": 13, "y": 0},
141 {"x": 14, "y": 0}, 141 {"matrix": [0, 12], "x": 14, "y": 0},
142 142
143 {"x": 15.25, "y": 0}, 143 {"matrix": [0, 13], "x": 15.25, "y": 0},
144 144
145 {"x": 16.5, "y": 0}, 145 {"matrix": [0, 14], "x": 16.5, "y": 0},
146 {"x": 17.5, "y": 0}, 146 {"matrix": [0, 15], "x": 17.5, "y": 0},
147 {"x": 18.5, "y": 0}, 147 {"matrix": [4, 15], "x": 18.5, "y": 0},
148 {"x": 19.5, "y": 0}, 148 {"matrix": [4, 14], "x": 19.5, "y": 0},
149 149
150 {"x": 0, "y": 1, "w": 1.5}, 150 {"matrix": [5, 1], "x": 0, "y": 1, "w": 1.5},
151 {"x": 1.5, "y": 1}, 151 {"matrix": [1, 0], "x": 1.5, "y": 1},
152 {"x": 2.5, "y": 1}, 152 {"matrix": [1, 1], "x": 2.5, "y": 1},
153 {"x": 3.5, "y": 1}, 153 {"matrix": [1, 2], "x": 3.5, "y": 1},
154 {"x": 4.5, "y": 1}, 154 {"matrix": [1, 3], "x": 4.5, "y": 1},
155 {"x": 5.5, "y": 1}, 155 {"matrix": [1, 4], "x": 5.5, "y": 1},
156 {"x": 6.5, "y": 1}, 156 {"matrix": [1, 5], "x": 6.5, "y": 1},
157 {"x": 7.5, "y": 1}, 157 {"matrix": [1, 6], "x": 7.5, "y": 1},
158 {"x": 8.5, "y": 1}, 158 {"matrix": [1, 7], "x": 8.5, "y": 1},
159 {"x": 9.5, "y": 1}, 159 {"matrix": [1, 8], "x": 9.5, "y": 1},
160 {"x": 10.5, "y": 1}, 160 {"matrix": [1, 9], "x": 10.5, "y": 1},
161 {"x": 11.5, "y": 1}, 161 {"matrix": [1, 10], "x": 11.5, "y": 1},
162 {"x": 12.5, "y": 1}, 162 {"matrix": [1, 11], "x": 12.5, "y": 1},
163 {"x": 13.5, "y": 1, "w": 1.5}, 163 {"matrix": [1, 12], "x": 13.5, "y": 1, "w": 1.5},
164 164
165 {"x": 15.25, "y": 1}, 165 {"matrix": [1, 13], "x": 15.25, "y": 1},
166 166
167 {"x": 16.5, "y": 1}, 167 {"matrix": [1, 14], "x": 16.5, "y": 1},
168 {"x": 17.5, "y": 1}, 168 {"matrix": [1, 15], "x": 17.5, "y": 1},
169 {"x": 18.5, "y": 1}, 169 {"matrix": [2, 15], "x": 18.5, "y": 1},
170 {"x": 19.5, "y": 1, "h": 2}, 170 {"matrix": [4, 13], "x": 19.5, "y": 1, "h": 2},
171 171
172 {"x": 0, "y": 2, "w": 1.75}, 172 {"matrix": [5, 2], "x": 0, "y": 2, "w": 1.75},
173 {"x": 1.75, "y": 2}, 173 {"matrix": [2, 0], "x": 1.75, "y": 2},
174 {"x": 2.75, "y": 2}, 174 {"matrix": [2, 1], "x": 2.75, "y": 2},
175 {"x": 3.75, "y": 2}, 175 {"matrix": [2, 2], "x": 3.75, "y": 2},
176 {"x": 4.75, "y": 2}, 176 {"matrix": [2, 3], "x": 4.75, "y": 2},
177 {"x": 5.75, "y": 2}, 177 {"matrix": [2, 4], "x": 5.75, "y": 2},
178 {"x": 6.75, "y": 2}, 178 {"matrix": [2, 5], "x": 6.75, "y": 2},
179 {"x": 7.75, "y": 2}, 179 {"matrix": [2, 6], "x": 7.75, "y": 2},
180 {"x": 8.75, "y": 2}, 180 {"matrix": [2, 7], "x": 8.75, "y": 2},
181 {"x": 9.75, "y": 2}, 181 {"matrix": [2, 8], "x": 9.75, "y": 2},
182 {"x": 10.75, "y": 2}, 182 {"matrix": [2, 9], "x": 10.75, "y": 2},
183 {"x": 11.75, "y": 2}, 183 {"matrix": [2, 10], "x": 11.75, "y": 2},
184 {"x": 12.75, "y": 2, "w": 2.25}, 184 {"matrix": [2, 11], "x": 12.75, "y": 2, "w": 2.25},
185 185
186 {"x": 16.5, "y": 2}, 186 {"matrix": [2, 12], "x": 16.5, "y": 2},
187 {"x": 17.5, "y": 2}, 187 {"matrix": [2, 13], "x": 17.5, "y": 2},
188 {"x": 18.5, "y": 2}, 188 {"matrix": [2, 14], "x": 18.5, "y": 2},
189 189
190 {"x": 0, "y": 3, "w": 2.25}, 190 {"matrix": [5, 3], "x": 0, "y": 3, "w": 2.25},
191 {"x": 2.25, "y": 3}, 191 {"matrix": [3, 0], "x": 2.25, "y": 3},
192 {"x": 3.25, "y": 3}, 192 {"matrix": [3, 1], "x": 3.25, "y": 3},
193 {"x": 4.25, "y": 3}, 193 {"matrix": [3, 2], "x": 4.25, "y": 3},
194 {"x": 5.25, "y": 3}, 194 {"matrix": [3, 3], "x": 5.25, "y": 3},
195 {"x": 6.25, "y": 3}, 195 {"matrix": [3, 4], "x": 6.25, "y": 3},
196 {"x": 7.25, "y": 3}, 196 {"matrix": [3, 5], "x": 7.25, "y": 3},
197 {"x": 8.25, "y": 3}, 197 {"matrix": [3, 6], "x": 8.25, "y": 3},
198 {"x": 9.25, "y": 3}, 198 {"matrix": [3, 7], "x": 9.25, "y": 3},
199 {"x": 10.25, "y": 3}, 199 {"matrix": [3, 8], "x": 10.25, "y": 3},
200 {"x": 11.25, "y": 3}, 200 {"matrix": [3, 9], "x": 11.25, "y": 3},
201 {"x": 12.25, "y": 3, "w": 1.75}, 201 {"matrix": [3, 10], "x": 12.25, "y": 3, "w": 1.75},
202 {"x": 14, "y": 3}, 202 {"matrix": [3, 11], "x": 14, "y": 3},
203 203
204 {"x": 15.25, "y": 3.25}, 204 {"matrix": [3, 12], "x": 15.25, "y": 3.25},
205 205
206 {"x": 16.5, "y": 3}, 206 {"matrix": [3, 13], "x": 16.5, "y": 3},
207 {"x": 17.5, "y": 3}, 207 {"matrix": [3, 14], "x": 17.5, "y": 3},
208 {"x": 18.5, "y": 3}, 208 {"matrix": [3, 15], "x": 18.5, "y": 3},
209 {"x": 19.5, "y": 3, "h": 2}, 209 {"matrix": [4, 12], "x": 19.5, "y": 3, "h": 2},
210 210
211 {"x": 0, "y": 4, "w": 1.25}, 211 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
212 {"x": 1.25, "y": 4}, 212 {"matrix": [4, 1], "x": 1.25, "y": 4},
213 {"x": 2.25, "y": 4, "w": 1.25}, 213 {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
214 {"x": 3.5, "y": 4, "w": 7}, 214 {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 7},
215 {"x": 10.5, "y": 4, "w": 1.25}, 215 {"matrix": [4, 4], "x": 10.5, "y": 4, "w": 1.25},
216 {"x": 11.75, "y": 4}, 216 {"matrix": [4, 5], "x": 11.75, "y": 4},
217 {"x": 12.75, "y": 4, "w": 1.25}, 217 {"matrix": [4, 6], "x": 12.75, "y": 4, "w": 1.25},
218 218
219 {"x": 14.25, "y": 4.25}, 219 {"matrix": [4, 7], "x": 14.25, "y": 4.25},
220 {"x": 15.25, "y": 4.25}, 220 {"matrix": [4, 8], "x": 15.25, "y": 4.25},
221 {"x": 16.25, "y": 4.25}, 221 {"matrix": [4, 9], "x": 16.25, "y": 4.25},
222 222
223 {"x": 17.5, "y": 4}, 223 {"matrix": [4, 10], "x": 17.5, "y": 4},
224 {"x": 18.5, "y": 4} 224 {"matrix": [4, 11], "x": 18.5, "y": 4}
225 ] 225 ]
226 } 226 }
227 } 227 }
228
228} 229}
diff --git a/keyboards/aozora/aozora.h b/keyboards/aozora/aozora.h
deleted file mode 100644
index 30a4258ac8..0000000000
--- a/keyboards/aozora/aozora.h
+++ /dev/null
@@ -1,47 +0,0 @@
1/* Copyright 2021 Salmon Cat Studio
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#include "quantum.h"
20
21#define LAYOUT( \
22 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
23 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
24 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
25 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3D, K3E, K3F, \
26 K40, K41, K42, K44, K48, K49, K4A, K4D, K4E, K4F \
27) { \
28 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
29 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
30 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO, KC_NO }, \
31 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, KC_NO, KC_NO, K3D, K3E, K3F }, \
32 { K40, K41, K42, KC_NO, K44, KC_NO, KC_NO, KC_NO, K48, K49, K4A, KC_NO, KC_NO, K4D, K4E, K4F }, \
33}
34
35#define LAYOUT_all( \
36 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0G, K0D, K0E, K0F, \
37 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
38 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
39 K30, K3G, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3C, K3D, K3E, K3F, \
40 K40, K41, K42, K44, K48, K49, K4A, K4D, K4E, K4F \
41) { \
42 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
43 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, KC_NO }, \
44 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO, KC_NO, KC_NO }, \
45 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, KC_NO, K3C, K3D, K3E, K3F, K3G }, \
46 { K40, K41, K42, KC_NO, K44, KC_NO, KC_NO, KC_NO, K48, K49, K4A, KC_NO, KC_NO, K4D, K4E, K4F, KC_NO }, \
47}
diff --git a/keyboards/aozora/info.json b/keyboards/aozora/info.json
index 28bdfe072c..21db981dab 100644
--- a/keyboards/aozora/info.json
+++ b/keyboards/aozora/info.json
@@ -18,168 +18,168 @@
18 "layouts": { 18 "layouts": {
19 "LAYOUT": { 19 "LAYOUT": {
20 "layout": [ 20 "layout": [
21 {"x":0, "y":0}, 21 {"matrix": [0, 0], "x": 0, "y": 0},
22 {"x":1, "y":0}, 22 {"matrix": [0, 1], "x": 1, "y": 0},
23 {"x":2, "y":0}, 23 {"matrix": [0, 2], "x": 2, "y": 0},
24 {"x":3, "y":0}, 24 {"matrix": [0, 3], "x": 3, "y": 0},
25 {"x":4, "y":0}, 25 {"matrix": [0, 4], "x": 4, "y": 0},
26 {"x":5, "y":0}, 26 {"matrix": [0, 5], "x": 5, "y": 0},
27 {"x":6, "y":0}, 27 {"matrix": [0, 6], "x": 6, "y": 0},
28 {"x":7, "y":0}, 28 {"matrix": [0, 7], "x": 7, "y": 0},
29 {"x":8, "y":0}, 29 {"matrix": [0, 8], "x": 8, "y": 0},
30 {"x":9, "y":0}, 30 {"matrix": [0, 9], "x": 9, "y": 0},
31 {"x":10, "y":0}, 31 {"matrix": [0, 10], "x": 10, "y": 0},
32 {"x":11, "y":0}, 32 {"matrix": [0, 11], "x": 11, "y": 0},
33 {"x":12, "y":0}, 33 {"matrix": [0, 12], "x": 12, "y": 0},
34 {"x":13, "y":0, "w":2}, 34 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
35 35
36 {"x":15.25, "y":0}, 36 {"matrix": [0, 14], "x": 15.25, "y": 0},
37 {"x":16.25, "y":0}, 37 {"matrix": [0, 15], "x": 16.25, "y": 0},
38 38
39 {"x":0, "y":1, "w":1.5}, 39 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
40 {"x":1.5, "y":1}, 40 {"matrix": [1, 1], "x": 1.5, "y": 1},
41 {"x":2.5, "y":1}, 41 {"matrix": [1, 2], "x": 2.5, "y": 1},
42 {"x":3.5, "y":1}, 42 {"matrix": [1, 3], "x": 3.5, "y": 1},
43 {"x":4.5, "y":1}, 43 {"matrix": [1, 4], "x": 4.5, "y": 1},
44 {"x":5.5, "y":1}, 44 {"matrix": [1, 5], "x": 5.5, "y": 1},
45 {"x":6.5, "y":1}, 45 {"matrix": [1, 6], "x": 6.5, "y": 1},
46 {"x":7.5, "y":1}, 46 {"matrix": [1, 7], "x": 7.5, "y": 1},
47 {"x":8.5, "y":1}, 47 {"matrix": [1, 8], "x": 8.5, "y": 1},
48 {"x":9.5, "y":1}, 48 {"matrix": [1, 9], "x": 9.5, "y": 1},
49 {"x":10.5, "y":1}, 49 {"matrix": [1, 10], "x": 10.5, "y": 1},
50 {"x":11.5, "y":1}, 50 {"matrix": [1, 11], "x": 11.5, "y": 1},
51 {"x":12.5, "y":1}, 51 {"matrix": [1, 12], "x": 12.5, "y": 1},
52 {"x":13.5, "y":1, "w":1.5}, 52 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
53 53
54 {"x":15.25, "y":1}, 54 {"matrix": [1, 14], "x": 15.25, "y": 1},
55 {"x":16.25, "y":1}, 55 {"matrix": [1, 15], "x": 16.25, "y": 1},
56 56
57 {"x":0, "y":2, "w":1.75}, 57 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
58 {"x":1.75, "y":2}, 58 {"matrix": [2, 1], "x": 1.75, "y": 2},
59 {"x":2.75, "y":2}, 59 {"matrix": [2, 2], "x": 2.75, "y": 2},
60 {"x":3.75, "y":2}, 60 {"matrix": [2, 3], "x": 3.75, "y": 2},
61 {"x":4.75, "y":2}, 61 {"matrix": [2, 4], "x": 4.75, "y": 2},
62 {"x":5.75, "y":2}, 62 {"matrix": [2, 5], "x": 5.75, "y": 2},
63 {"x":6.75, "y":2}, 63 {"matrix": [2, 6], "x": 6.75, "y": 2},
64 {"x":7.75, "y":2}, 64 {"matrix": [2, 7], "x": 7.75, "y": 2},
65 {"x":8.75, "y":2}, 65 {"matrix": [2, 8], "x": 8.75, "y": 2},
66 {"x":9.75, "y":2}, 66 {"matrix": [2, 9], "x": 9.75, "y": 2},
67 {"x":10.75, "y":2}, 67 {"matrix": [2, 10], "x": 10.75, "y": 2},
68 {"x":11.75, "y":2}, 68 {"matrix": [2, 11], "x": 11.75, "y": 2},
69 {"x":12.75, "y":2, "w":2.25}, 69 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
70 70
71 {"x":0, "y":3, "w":2.25}, 71 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
72 {"x":2.25, "y":3}, 72 {"matrix": [3, 1], "x": 2.25, "y": 3},
73 {"x":3.25, "y":3}, 73 {"matrix": [3, 2], "x": 3.25, "y": 3},
74 {"x":4.25, "y":3}, 74 {"matrix": [3, 3], "x": 4.25, "y": 3},
75 {"x":5.25, "y":3}, 75 {"matrix": [3, 4], "x": 5.25, "y": 3},
76 {"x":6.25, "y":3}, 76 {"matrix": [3, 5], "x": 6.25, "y": 3},
77 {"x":7.25, "y":3}, 77 {"matrix": [3, 6], "x": 7.25, "y": 3},
78 {"x":8.25, "y":3}, 78 {"matrix": [3, 7], "x": 8.25, "y": 3},
79 {"x":9.25, "y":3}, 79 {"matrix": [3, 8], "x": 9.25, "y": 3},
80 {"x":10.25, "y":3}, 80 {"matrix": [3, 9], "x": 10.25, "y": 3},
81 {"x":11.25, "y":3}, 81 {"matrix": [3, 10], "x": 11.25, "y": 3},
82 {"x":12.25, "y":3, "w":2.75}, 82 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
83 83
84 {"x":15.25, "y":3}, 84 {"matrix": [3, 14], "x": 15.25, "y": 3},
85 {"x":16.25, "y":3}, 85 {"matrix": [3, 15], "x": 16.25, "y": 3},
86 86
87 {"x":0, "y":4, "w":1.25}, 87 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
88 {"x":1.25, "y":4, "w":1.25}, 88 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
89 {"x":2.5, "y":4, "w":1.25}, 89 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
90 {"x":3.75, "y":4, "w":6.25}, 90 {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
91 {"x":10, "y":4, "w":1.25}, 91 {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
92 {"x":11.25, "y":4, "w":1.25}, 92 {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
93 {"x":12.5, "y":4, "w":1.25}, 93 {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
94 94
95 {"x":14.25, "y":4}, 95 {"matrix": [4, 13], "x": 14.25, "y": 4},
96 {"x":15.25, "y":4}, 96 {"matrix": [4, 14], "x": 15.25, "y": 4},
97 {"x":16.25, "y":4} 97 {"matrix": [4, 15], "x": 16.25, "y": 4}
98 ] 98 ]
99 }, 99 },
100 "LAYOUT_all": { 100 "LAYOUT_all": {
101 "layout": [ 101 "layout": [
102 {"x":0, "y":0}, 102 {"matrix": [0, 0], "x": 0, "y": 0},
103 {"x":1, "y":0}, 103 {"matrix": [0, 1], "x": 1, "y": 0},
104 {"x":2, "y":0}, 104 {"matrix": [0, 2], "x": 2, "y": 0},
105 {"x":3, "y":0}, 105 {"matrix": [0, 3], "x": 3, "y": 0},
106 {"x":4, "y":0}, 106 {"matrix": [0, 4], "x": 4, "y": 0},
107 {"x":5, "y":0}, 107 {"matrix": [0, 5], "x": 5, "y": 0},
108 {"x":6, "y":0}, 108 {"matrix": [0, 6], "x": 6, "y": 0},
109 {"x":7, "y":0}, 109 {"matrix": [0, 7], "x": 7, "y": 0},
110 {"x":8, "y":0}, 110 {"matrix": [0, 8], "x": 8, "y": 0},
111 {"x":9, "y":0}, 111 {"matrix": [0, 9], "x": 9, "y": 0},
112 {"x":10, "y":0}, 112 {"matrix": [0, 10], "x": 10, "y": 0},
113 {"x":11, "y":0}, 113 {"matrix": [0, 11], "x": 11, "y": 0},
114 {"x":12, "y":0}, 114 {"matrix": [0, 12], "x": 12, "y": 0},
115 {"x":13, "y":0}, 115 {"matrix": [0, 16], "x": 13, "y": 0},
116 {"x":14, "y":0}, 116 {"matrix": [0, 13], "x": 14, "y": 0},
117 117
118 {"x":15.25, "y":0}, 118 {"matrix": [0, 14], "x": 15.25, "y": 0},
119 {"x":16.25, "y":0}, 119 {"matrix": [0, 15], "x": 16.25, "y": 0},
120 120
121 {"x":0, "y":1, "w":1.5}, 121 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
122 {"x":1.5, "y":1}, 122 {"matrix": [1, 1], "x": 1.5, "y": 1},
123 {"x":2.5, "y":1}, 123 {"matrix": [1, 2], "x": 2.5, "y": 1},
124 {"x":3.5, "y":1}, 124 {"matrix": [1, 3], "x": 3.5, "y": 1},
125 {"x":4.5, "y":1}, 125 {"matrix": [1, 4], "x": 4.5, "y": 1},
126 {"x":5.5, "y":1}, 126 {"matrix": [1, 5], "x": 5.5, "y": 1},
127 {"x":6.5, "y":1}, 127 {"matrix": [1, 6], "x": 6.5, "y": 1},
128 {"x":7.5, "y":1}, 128 {"matrix": [1, 7], "x": 7.5, "y": 1},
129 {"x":8.5, "y":1}, 129 {"matrix": [1, 8], "x": 8.5, "y": 1},
130 {"x":9.5, "y":1}, 130 {"matrix": [1, 9], "x": 9.5, "y": 1},
131 {"x":10.5, "y":1}, 131 {"matrix": [1, 10], "x": 10.5, "y": 1},
132 {"x":11.5, "y":1}, 132 {"matrix": [1, 11], "x": 11.5, "y": 1},
133 {"x":12.5, "y":1}, 133 {"matrix": [1, 12], "x": 12.5, "y": 1},
134 {"x":13.5, "y":1, "w":1.5}, 134 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
135 135
136 {"x":15.25, "y":1}, 136 {"matrix": [1, 14], "x": 15.25, "y": 1},
137 {"x":16.25, "y":1}, 137 {"matrix": [1, 15], "x": 16.25, "y": 1},
138 138
139 {"x":0, "y":2, "w":1.75}, 139 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
140 {"x":1.75, "y":2}, 140 {"matrix": [2, 1], "x": 1.75, "y": 2},
141 {"x":2.75, "y":2}, 141 {"matrix": [2, 2], "x": 2.75, "y": 2},
142 {"x":3.75, "y":2}, 142 {"matrix": [2, 3], "x": 3.75, "y": 2},
143 {"x":4.75, "y":2}, 143 {"matrix": [2, 4], "x": 4.75, "y": 2},
144 {"x":5.75, "y":2}, 144 {"matrix": [2, 5], "x": 5.75, "y": 2},
145 {"x":6.75, "y":2}, 145 {"matrix": [2, 6], "x": 6.75, "y": 2},
146 {"x":7.75, "y":2}, 146 {"matrix": [2, 7], "x": 7.75, "y": 2},
147 {"x":8.75, "y":2}, 147 {"matrix": [2, 8], "x": 8.75, "y": 2},
148 {"x":9.75, "y":2}, 148 {"matrix": [2, 9], "x": 9.75, "y": 2},
149 {"x":10.75, "y":2}, 149 {"matrix": [2, 10], "x": 10.75, "y": 2},
150 {"x":11.75, "y":2}, 150 {"matrix": [2, 11], "x": 11.75, "y": 2},
151 {"x":12.75, "y":2}, 151 {"matrix": [2, 12], "x": 12.75, "y": 2},
152 {"x":13.75, "y":2, "w":1.25}, 152 {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
153 153
154 {"x":0, "y":3, "w":1.25}, 154 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
155 {"x":1.25, "y":3}, 155 {"matrix": [3, 16], "x": 1.25, "y": 3},
156 {"x":2.25, "y":3}, 156 {"matrix": [3, 1], "x": 2.25, "y": 3},
157 {"x":3.25, "y":3}, 157 {"matrix": [3, 2], "x": 3.25, "y": 3},
158 {"x":4.25, "y":3}, 158 {"matrix": [3, 3], "x": 4.25, "y": 3},
159 {"x":5.25, "y":3}, 159 {"matrix": [3, 4], "x": 5.25, "y": 3},
160 {"x":6.25, "y":3}, 160 {"matrix": [3, 5], "x": 6.25, "y": 3},
161 {"x":7.25, "y":3}, 161 {"matrix": [3, 6], "x": 7.25, "y": 3},
162 {"x":8.25, "y":3}, 162 {"matrix": [3, 7], "x": 8.25, "y": 3},
163 {"x":9.25, "y":3}, 163 {"matrix": [3, 8], "x": 9.25, "y": 3},
164 {"x":10.25, "y":3}, 164 {"matrix": [3, 9], "x": 10.25, "y": 3},
165 {"x":11.25, "y":3}, 165 {"matrix": [3, 10], "x": 11.25, "y": 3},
166 {"x":12.25, "y":3}, 166 {"matrix": [3, 12], "x": 12.25, "y": 3},
167 {"x":13.25, "y":3, "w":1.75}, 167 {"matrix": [3, 13], "x": 13.25, "y": 3, "w": 1.75},
168 168
169 {"x":15.25, "y":3}, 169 {"matrix": [3, 14], "x": 15.25, "y": 3},
170 {"x":16.25, "y":3}, 170 {"matrix": [3, 15], "x": 16.25, "y": 3},
171 171
172 {"x":0, "y":4, "w":1.25}, 172 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
173 {"x":1.25, "y":4, "w":1.25}, 173 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
174 {"x":2.5, "y":4, "w":1.25}, 174 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
175 {"x":3.75, "y":4, "w":6.25}, 175 {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
176 {"x":10, "y":4, "w":1.25}, 176 {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
177 {"x":11.25, "y":4, "w":1.25}, 177 {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
178 {"x":12.5, "y":4, "w":1.25}, 178 {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
179 179
180 {"x":14.25, "y":4}, 180 {"matrix": [4, 13], "x": 14.25, "y": 4},
181 {"x":15.25, "y":4}, 181 {"matrix": [4, 14], "x": 15.25, "y": 4},
182 {"x":16.25, "y":4} 182 {"matrix": [4, 15], "x": 16.25, "y": 4}
183 ] 183 ]
184 } 184 }
185 } 185 }
diff --git a/keyboards/basekeys/slice/rev1/info.json b/keyboards/basekeys/slice/rev1/info.json
index d2dbd00a3d..1e7594df44 100644
--- a/keyboards/basekeys/slice/rev1/info.json
+++ b/keyboards/basekeys/slice/rev1/info.json
@@ -20,16 +20,358 @@
20 "bootloader": "caterina", 20 "bootloader": "caterina",
21 "layouts": { 21 "layouts": {
22 "LAYOUT": { 22 "LAYOUT": {
23 "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.6600000000000001, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.3900000000000001, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":2.75}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}] 23 "layout": [
24 {"matrix": [0, 0], "x": 0, "y": 0},
25
26 {"matrix": [0, 1], "x": 1.66, "y": 0},
27 {"matrix": [0, 2], "x": 2.66, "y": 0},
28 {"matrix": [0, 3], "x": 3.66, "y": 0},
29 {"matrix": [0, 4], "x": 4.66, "y": 0},
30 {"matrix": [0, 5], "x": 5.66, "y": 0},
31 {"matrix": [0, 6], "x": 6.66, "y": 0},
32 {"matrix": [0, 7], "x": 7.66, "y": 0},
33
34 {"matrix": [5, 0], "x": 9.32, "y": 0},
35 {"matrix": [5, 1], "x": 10.32, "y": 0},
36 {"matrix": [5, 2], "x": 11.32, "y": 0},
37 {"matrix": [5, 3], "x": 12.32, "y": 0},
38 {"matrix": [5, 4], "x": 13.32, "y": 0},
39 {"matrix": [5, 5], "x": 14.32, "y": 0},
40 {"matrix": [5, 7], "x": 15.32, "y": 0, "w": 2},
41
42 {"matrix": [1, 0], "x": 0, "y": 1},
43
44 {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
45 {"matrix": [1, 2], "x": 3.03, "y": 1},
46 {"matrix": [1, 3], "x": 4.03, "y": 1},
47 {"matrix": [1, 4], "x": 5.03, "y": 1},
48 {"matrix": [1, 5], "x": 6.03, "y": 1},
49 {"matrix": [1, 6], "x": 7.03, "y": 1},
50
51 {"matrix": [6, 0], "x": 9, "y": 1},
52 {"matrix": [6, 1], "x": 10, "y": 1},
53 {"matrix": [6, 2], "x": 11, "y": 1},
54 {"matrix": [6, 3], "x": 12, "y": 1},
55 {"matrix": [6, 4], "x": 13, "y": 1},
56 {"matrix": [6, 5], "x": 14, "y": 1},
57 {"matrix": [6, 6], "x": 15.05, "y": 1},
58 {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
59
60 {"matrix": [2, 0], "x": 0, "y": 2},
61
62 {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
63 {"matrix": [2, 2], "x": 3.14, "y": 2},
64 {"matrix": [2, 3], "x": 4.14, "y": 2},
65 {"matrix": [2, 4], "x": 5.14, "y": 2},
66 {"matrix": [2, 5], "x": 6.14, "y": 2},
67 {"matrix": [2, 6], "x": 7.14, "y": 2},
68
69 {"matrix": [7, 0], "x": 9.34, "y": 2},
70 {"matrix": [7, 1], "x": 10.34, "y": 2},
71 {"matrix": [7, 2], "x": 11.34, "y": 2},
72 {"matrix": [7, 3], "x": 12.34, "y": 2},
73 {"matrix": [7, 4], "x": 13.34, "y": 2},
74 {"matrix": [7, 5], "x": 14.34, "y": 2},
75 {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
76
77 {"matrix": [3, 0], "x": 0, "y": 3},
78
79 {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
80 {"matrix": [3, 2], "x": 3.5, "y": 3},
81 {"matrix": [3, 3], "x": 4.5, "y": 3},
82 {"matrix": [3, 4], "x": 5.5, "y": 3},
83 {"matrix": [3, 5], "x": 6.5, "y": 3},
84 {"matrix": [3, 6], "x": 7.5, "y": 3},
85
86 {"matrix": [8, 0], "x": 8.97, "y": 3},
87 {"matrix": [8, 1], "x": 9.97, "y": 3},
88 {"matrix": [8, 2], "x": 10.97, "y": 3},
89 {"matrix": [8, 3], "x": 11.97, "y": 3},
90 {"matrix": [8, 4], "x": 12.97, "y": 3},
91 {"matrix": [8, 5], "x": 13.97, "y": 3},
92 {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
93 {"matrix": [8, 8], "x": 16.72, "y": 3},
94
95 {"matrix": [4, 0], "x": 0, "y": 4},
96 {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
97 {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
98 {"matrix": [4, 3], "x": 4.75, "y": 4},
99 {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.75},
100
101 {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
102 {"matrix": [9, 1], "x": 11.22, "y": 4},
103 {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
104 {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
105 {"matrix": [9, 4], "x": 16.48, "y": 4}
106 ]
24 }, 107 },
25 "LAYOUT_split_backspace": { 108 "LAYOUT_split_backspace": {
26 "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.6600000000000001, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"BS", "x":15.32, "y":0}, {"label":"BS", "x":16.32, "y":0}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.3900000000000001, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":2.75}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}] 109 "layout": [
110 {"matrix": [0, 0], "x": 0, "y": 0},
111
112 {"matrix": [0, 1], "x": 1.66, "y": 0},
113 {"matrix": [0, 2], "x": 2.66, "y": 0},
114 {"matrix": [0, 3], "x": 3.66, "y": 0},
115 {"matrix": [0, 4], "x": 4.66, "y": 0},
116 {"matrix": [0, 5], "x": 5.66, "y": 0},
117 {"matrix": [0, 6], "x": 6.66, "y": 0},
118 {"matrix": [0, 7], "x": 7.66, "y": 0},
119
120 {"matrix": [5, 0], "x": 9.32, "y": 0},
121 {"matrix": [5, 1], "x": 10.32, "y": 0},
122 {"matrix": [5, 2], "x": 11.32, "y": 0},
123 {"matrix": [5, 3], "x": 12.32, "y": 0},
124 {"matrix": [5, 4], "x": 13.32, "y": 0},
125 {"matrix": [5, 5], "x": 14.32, "y": 0},
126 {"matrix": [5, 6], "x": 15.32, "y": 0},
127 {"matrix": [5, 8], "x": 16.32, "y": 0},
128
129 {"matrix": [1, 0], "x": 0, "y": 1},
130
131 {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
132 {"matrix": [1, 2], "x": 3.03, "y": 1},
133 {"matrix": [1, 3], "x": 4.03, "y": 1},
134 {"matrix": [1, 4], "x": 5.03, "y": 1},
135 {"matrix": [1, 5], "x": 6.03, "y": 1},
136 {"matrix": [1, 6], "x": 7.03, "y": 1},
137
138 {"matrix": [6, 0], "x": 9, "y": 1},
139 {"matrix": [6, 1], "x": 10, "y": 1},
140 {"matrix": [6, 2], "x": 11, "y": 1},
141 {"matrix": [6, 3], "x": 12, "y": 1},
142 {"matrix": [6, 4], "x": 13, "y": 1},
143 {"matrix": [6, 5], "x": 14, "y": 1},
144 {"matrix": [6, 6], "x": 15.05, "y": 1},
145 {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
146
147 {"matrix": [2, 0], "x": 0, "y": 2},
148
149 {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
150 {"matrix": [2, 2], "x": 3.14, "y": 2},
151 {"matrix": [2, 3], "x": 4.14, "y": 2},
152 {"matrix": [2, 4], "x": 5.14, "y": 2},
153 {"matrix": [2, 5], "x": 6.14, "y": 2},
154 {"matrix": [2, 6], "x": 7.14, "y": 2},
155
156 {"matrix": [7, 0], "x": 9.34, "y": 2},
157 {"matrix": [7, 1], "x": 10.34, "y": 2},
158 {"matrix": [7, 2], "x": 11.34, "y": 2},
159 {"matrix": [7, 3], "x": 12.34, "y": 2},
160 {"matrix": [7, 4], "x": 13.34, "y": 2},
161 {"matrix": [7, 5], "x": 14.34, "y": 2},
162 {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
163
164 {"matrix": [3, 0], "x": 0, "y": 3},
165
166 {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
167 {"matrix": [3, 2], "x": 3.5, "y": 3},
168 {"matrix": [3, 3], "x": 4.5, "y": 3},
169 {"matrix": [3, 4], "x": 5.5, "y": 3},
170 {"matrix": [3, 5], "x": 6.5, "y": 3},
171 {"matrix": [3, 6], "x": 7.5, "y": 3},
172
173 {"matrix": [8, 0], "x": 8.97, "y": 3},
174 {"matrix": [8, 1], "x": 9.97, "y": 3},
175 {"matrix": [8, 2], "x": 10.97, "y": 3},
176 {"matrix": [8, 3], "x": 11.97, "y": 3},
177 {"matrix": [8, 4], "x": 12.97, "y": 3},
178 {"matrix": [8, 5], "x": 13.97, "y": 3},
179 {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
180 {"matrix": [8, 8], "x": 16.72, "y": 3},
181
182 {"matrix": [4, 0], "x": 0, "y": 4},
183
184 {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
185 {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
186 {"matrix": [4, 3], "x": 4.75, "y": 4},
187 {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.75},
188
189 {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
190 {"matrix": [9, 1], "x": 11.22, "y": 4},
191 {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
192 {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
193 {"matrix": [9, 4], "x": 16.48, "y": 4}
194 ]
27 }, 195 },
28 "LAYOUT_split_left_space": { 196 "LAYOUT_split_left_space": {
29 "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.6600000000000001, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.3900000000000001, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":1.75}, {"x":7.5, "y":4}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}] 197 "layout": [
198 {"matrix": [0, 0], "x": 0, "y": 0},
199
200 {"matrix": [0, 1], "x": 1.66, "y": 0},
201 {"matrix": [0, 2], "x": 2.66, "y": 0},
202 {"matrix": [0, 3], "x": 3.66, "y": 0},
203 {"matrix": [0, 4], "x": 4.66, "y": 0},
204 {"matrix": [0, 5], "x": 5.66, "y": 0},
205 {"matrix": [0, 6], "x": 6.66, "y": 0},
206 {"matrix": [0, 7], "x": 7.66, "y": 0},
207
208 {"matrix": [5, 0], "x": 9.32, "y": 0},
209 {"matrix": [5, 1], "x": 10.32, "y": 0},
210 {"matrix": [5, 2], "x": 11.32, "y": 0},
211 {"matrix": [5, 3], "x": 12.32, "y": 0},
212 {"matrix": [5, 4], "x": 13.32, "y": 0},
213 {"matrix": [5, 5], "x": 14.32, "y": 0},
214 {"matrix": [5, 7], "x": 15.32, "y": 0, "w": 2},
215
216 {"matrix": [1, 0], "x": 0, "y": 1},
217
218 {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
219 {"matrix": [1, 2], "x": 3.03, "y": 1},
220 {"matrix": [1, 3], "x": 4.03, "y": 1},
221 {"matrix": [1, 4], "x": 5.03, "y": 1},
222 {"matrix": [1, 5], "x": 6.03, "y": 1},
223 {"matrix": [1, 6], "x": 7.03, "y": 1},
224
225 {"matrix": [6, 0], "x": 9, "y": 1},
226 {"matrix": [6, 1], "x": 10, "y": 1},
227 {"matrix": [6, 2], "x": 11, "y": 1},
228 {"matrix": [6, 3], "x": 12, "y": 1},
229 {"matrix": [6, 4], "x": 13, "y": 1},
230 {"matrix": [6, 5], "x": 14, "y": 1},
231 {"matrix": [6, 6], "x": 15.05, "y": 1},
232 {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
233
234 {"matrix": [2, 0], "x": 0, "y": 2},
235
236 {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
237 {"matrix": [2, 2], "x": 3.14, "y": 2},
238 {"matrix": [2, 3], "x": 4.14, "y": 2},
239 {"matrix": [2, 4], "x": 5.14, "y": 2},
240 {"matrix": [2, 5], "x": 6.14, "y": 2},
241 {"matrix": [2, 6], "x": 7.14, "y": 2},
242
243 {"matrix": [7, 0], "x": 9.34, "y": 2},
244 {"matrix": [7, 1], "x": 10.34, "y": 2},
245 {"matrix": [7, 2], "x": 11.34, "y": 2},
246 {"matrix": [7, 3], "x": 12.34, "y": 2},
247 {"matrix": [7, 4], "x": 13.34, "y": 2},
248 {"matrix": [7, 5], "x": 14.34, "y": 2},
249 {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
250
251 {"matrix": [3, 0], "x": 0, "y": 3},
252
253 {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
254 {"matrix": [3, 2], "x": 3.5, "y": 3},
255 {"matrix": [3, 3], "x": 4.5, "y": 3},
256 {"matrix": [3, 4], "x": 5.5, "y": 3},
257 {"matrix": [3, 5], "x": 6.5, "y": 3},
258 {"matrix": [3, 6], "x": 7.5, "y": 3},
259
260 {"matrix": [8, 0], "x": 8.97, "y": 3},
261 {"matrix": [8, 1], "x": 9.97, "y": 3},
262 {"matrix": [8, 2], "x": 10.97, "y": 3},
263 {"matrix": [8, 3], "x": 11.97, "y": 3},
264 {"matrix": [8, 4], "x": 12.97, "y": 3},
265 {"matrix": [8, 5], "x": 13.97, "y": 3},
266 {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
267 {"matrix": [8, 8], "x": 16.72, "y": 3},
268
269 {"matrix": [4, 0], "x": 0, "y": 4},
270
271 {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
272 {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
273 {"matrix": [4, 3], "x": 4.75, "y": 4},
274 {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 1.75},
275 {"matrix": [4, 6], "x": 7.5, "y": 4},
276
277 {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
278 {"matrix": [9, 1], "x": 11.22, "y": 4},
279 {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
280 {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
281 {"matrix": [9, 4], "x": 16.48, "y": 4}
282 ]
30 }, 283 },
31 "LAYOUT_all": { 284 "LAYOUT_all": {
32 "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.6600000000000001, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"BS", "x":15.32, "y":0}, {"label":"BS", "x":16.32, "y":0}, {"label":"BS", "x":17.32, "y":0}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.3900000000000001, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3}, {"label":"Shift", "x":15.97, "y":3}, {"label":"Shift", "x":16.97, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4}, {"x":6.75, "y":4}, {"x":7.75, "y":4}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}] 285 "layout": [
286 {"matrix": [0, 0], "x": 0, "y": 0},
287
288 {"matrix": [0, 1], "x": 1.66, "y": 0},
289 {"matrix": [0, 2], "x": 2.66, "y": 0},
290 {"matrix": [0, 3], "x": 3.66, "y": 0},
291 {"matrix": [0, 4], "x": 4.66, "y": 0},
292 {"matrix": [0, 5], "x": 5.66, "y": 0},
293 {"matrix": [0, 6], "x": 6.66, "y": 0},
294 {"matrix": [0, 7], "x": 7.66, "y": 0},
295
296 {"matrix": [5, 0], "x": 9.32, "y": 0},
297 {"matrix": [5, 1], "x": 10.32, "y": 0},
298 {"matrix": [5, 2], "x": 11.32, "y": 0},
299 {"matrix": [5, 3], "x": 12.32, "y": 0},
300 {"matrix": [5, 4], "x": 13.32, "y": 0},
301 {"matrix": [5, 5], "x": 14.32, "y": 0},
302 {"matrix": [5, 6], "x": 15.32, "y": 0},
303 {"matrix": [5, 7], "x": 16.32, "y": 0},
304 {"matrix": [5, 8], "x": 17.32, "y": 0},
305
306 {"matrix": [1, 0], "x": 0, "y": 1},
307
308 {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
309 {"matrix": [1, 2], "x": 3.03, "y": 1},
310 {"matrix": [1, 3], "x": 4.03, "y": 1},
311 {"matrix": [1, 4], "x": 5.03, "y": 1},
312 {"matrix": [1, 5], "x": 6.03, "y": 1},
313 {"matrix": [1, 6], "x": 7.03, "y": 1},
314
315 {"matrix": [6, 0], "x": 9, "y": 1},
316 {"matrix": [6, 1], "x": 10, "y": 1},
317 {"matrix": [6, 2], "x": 11, "y": 1},
318 {"matrix": [6, 3], "x": 12, "y": 1},
319 {"matrix": [6, 4], "x": 13, "y": 1},
320 {"matrix": [6, 5], "x": 14, "y": 1},
321 {"matrix": [6, 6], "x": 15.05, "y": 1},
322 {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
323
324 {"matrix": [2, 0], "x": 0, "y": 2},
325
326 {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
327 {"matrix": [2, 2], "x": 3.14, "y": 2},
328 {"matrix": [2, 3], "x": 4.14, "y": 2},
329 {"matrix": [2, 4], "x": 5.14, "y": 2},
330 {"matrix": [2, 5], "x": 6.14, "y": 2},
331 {"matrix": [2, 6], "x": 7.14, "y": 2},
332
333 {"matrix": [7, 0], "x": 9.34, "y": 2},
334 {"matrix": [7, 1], "x": 10.34, "y": 2},
335 {"matrix": [7, 2], "x": 11.34, "y": 2},
336 {"matrix": [7, 3], "x": 12.34, "y": 2},
337 {"matrix": [7, 4], "x": 13.34, "y": 2},
338 {"matrix": [7, 5], "x": 14.34, "y": 2},
339 {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
340
341 {"matrix": [3, 0], "x": 0, "y": 3},
342
343 {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
344 {"matrix": [3, 2], "x": 3.5, "y": 3},
345 {"matrix": [3, 3], "x": 4.5, "y": 3},
346 {"matrix": [3, 4], "x": 5.5, "y": 3},
347 {"matrix": [3, 5], "x": 6.5, "y": 3},
348 {"matrix": [3, 6], "x": 7.5, "y": 3},
349
350 {"matrix": [8, 0], "x": 8.97, "y": 3},
351 {"matrix": [8, 1], "x": 9.97, "y": 3},
352 {"matrix": [8, 2], "x": 10.97, "y": 3},
353 {"matrix": [8, 3], "x": 11.97, "y": 3},
354 {"matrix": [8, 4], "x": 12.97, "y": 3},
355 {"matrix": [8, 5], "x": 13.97, "y": 3},
356 {"matrix": [8, 6], "x": 14.97, "y": 3},
357 {"matrix": [8, 7], "x": 15.97, "y": 3},
358 {"matrix": [8, 8], "x": 16.97, "y": 3},
359
360 {"matrix": [4, 0], "x": 0, "y": 4},
361
362 {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
363 {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
364 {"matrix": [4, 3], "x": 4.75, "y": 4},
365 {"matrix": [4, 4], "x": 5.75, "y": 4},
366 {"matrix": [4, 5], "x": 6.75, "y": 4},
367 {"matrix": [4, 6], "x": 7.75, "y": 4},
368
369 {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
370 {"matrix": [9, 1], "x": 11.22, "y": 4},
371 {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
372 {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
373 {"matrix": [9, 4], "x": 16.48, "y": 4}
374 ]
33 } 375 }
34 } 376 }
35} 377}
diff --git a/keyboards/basekeys/slice/rev1/rev1.h b/keyboards/basekeys/slice/rev1/rev1.h
deleted file mode 100644
index f4d631eb6b..0000000000
--- a/keyboards/basekeys/slice/rev1/rev1.h
+++ /dev/null
@@ -1,118 +0,0 @@
1/* Copyright 2020 2Moons
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16#pragma once
17
18#include "quantum.h"
19
20//////////////////////////////////////////////////////////////////////////////
21// When only use Slice Rev1.
22//////////////////////////////////////////////////////////////////////////////
23/*
24 * ,------------------------------------------------ --------------------------------------------------.
25 * | L00 | L01 | L02 | L03 | L04 | L05 | L06 | L07 | | R00 | R01 | R02 | R03 | R04 | R05 | R06R07R08 |
26 * |------------------------------------------------ ------------------------------------------------------+
27 * | L10 | L11 | L12 | L13 | L14 | L15 | L16 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R37 |
28 * |---------------------------------------------- ------------------------------------------------------+
29 * | L20 | L21 | L22 | L23 | L24 | L25 | L26 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 |
30 * |------------------------------------------------- --------------------------------------------------------+
31 * | L30 | L31 | L32 | L33 | L34 | L35 | L36 | | R30 | R31 | R32 | R33 | R34 | R34 | R35 | R36R37R38 |
32 * |------------------------------------------------- --------------------------------------------------------'
33 * | L40 | L41 | L42 | L43 | L44L45L46 | | R40 | R41 | | R42 | R43 | R44 |
34 * |------------------------------------------------- -------------------------------------------------------'
35 */
36
37#define LAYOUT( \
38 L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R07, \
39 L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, R17, \
40 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
41 L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R38,\
42 L40, L41, L42, L43, L45, R40, R41, R42, R43, R44 \
43 ) \
44 { \
45 { L00, L01, L02, L03, L04, L05, L06, L07, KC_NO }, \
46 { L10, L11, L12, L13, L14, L15, L16, KC_NO, KC_NO }, \
47 { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO }, \
48 { L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO }, \
49 { L40, L41, L42, L43, KC_NO, L45, KC_NO, KC_NO, KC_NO }, \
50 { R00, R01, R02, R03, R04, R05, KC_NO, R07, KC_NO }, \
51 { R10, R11, R12, R13, R14, R15, R16, R17, KC_NO }, \
52 { R20, R21, R22, R23, R24, R25, R26, KC_NO, KC_NO }, \
53 { R30, R31, R32, R33, R34, R35, R36, KC_NO, R38 }, \
54 { R40, R41, R42, R43, R44, KC_NO, KC_NO, KC_NO, KC_NO } \
55 }
56
57#define LAYOUT_all( \
58 L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R07, R08, \
59 L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, R17, \
60 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
61 L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R37, R38,\
62 L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44 \
63 ) \
64 { \
65 { L00, L01, L02, L03, L04, L05, L06, L07, KC_NO }, \
66 { L10, L11, L12, L13, L14, L15, L16, KC_NO, KC_NO }, \
67 { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO }, \
68 { L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO }, \
69 { L40, L41, L42, L43, L44, L45, L46, KC_NO, KC_NO }, \
70 { R00, R01, R02, R03, R04, R05, R06, R07, R08 }, \
71 { R10, R11, R12, R13, R14, R15, R16, R17, KC_NO }, \
72 { R20, R21, R22, R23, R24, R25, R26, KC_NO, KC_NO }, \
73 { R30, R31, R32, R33, R34, R35, R36, R37, R38 }, \
74 { R40, R41, R42, R43, R44, KC_NO, KC_NO, KC_NO, KC_NO } \
75 }
76
77#define LAYOUT_split_backspace( \
78 L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R08, \
79 L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, R17, \
80 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
81 L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R38,\
82 L40, L41, L42, L43, L45, R40, R41, R42, R43, R44 \
83 ) \
84 { \
85 { L00, L01, L02, L03, L04, L05, L06, L07, KC_NO }, \
86 { L10, L11, L12, L13, L14, L15, L16, KC_NO, KC_NO }, \
87 { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO }, \
88 { L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO }, \
89 { L40, L41, L42, L43, KC_NO, L45, KC_NO, KC_NO, KC_NO }, \
90 { R00, R01, R02, R03, R04, R05, R06, KC_NO, R08 }, \
91 { R10, R11, R12, R13, R14, R15, R16, R17, KC_NO }, \
92 { R20, R21, R22, R23, R24, R25, R26, KC_NO, KC_NO }, \
93 { R30, R31, R32, R33, R34, R35, R36, KC_NO, R38 }, \
94 { R40, R41, R42, R43, R44, KC_NO, KC_NO, KC_NO, KC_NO } \
95 }
96
97
98#define LAYOUT_split_left_space( \
99 L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R07, \
100 L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, R17, \
101 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
102 L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R38,\
103 L40, L41, L42, L43, L44, L46, R40, R41, R42, R43, R44 \
104 ) \
105 { \
106 { L00, L01, L02, L03, L04, L05, L06, L07, KC_NO }, \
107 { L10, L11, L12, L13, L14, L15, L16, KC_NO, KC_NO }, \
108 { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO }, \
109 { L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO }, \
110 { L40, L41, L42, L43, L44, KC_NO, L46, KC_NO, KC_NO }, \
111 { R00, R01, R02, R03, R04, R05, KC_NO, R07, KC_NO }, \
112 { R10, R11, R12, R13, R14, R15, R16, R17, KC_NO }, \
113 { R20, R21, R22, R23, R24, R25, R26, KC_NO, KC_NO }, \
114 { R30, R31, R32, R33, R34, R35, R36, KC_NO, R38 }, \
115 { R40, R41, R42, R43, R44, KC_NO, KC_NO, KC_NO, KC_NO } \
116 }
117
118
diff --git a/keyboards/basekeys/slice/rev1_rgb/info.json b/keyboards/basekeys/slice/rev1_rgb/info.json
index d8791c7be5..66eaee5c40 100644
--- a/keyboards/basekeys/slice/rev1_rgb/info.json
+++ b/keyboards/basekeys/slice/rev1_rgb/info.json
@@ -23,13 +23,268 @@
23 "bootloader": "caterina", 23 "bootloader": "caterina",
24 "layouts": { 24 "layouts": {
25 "LAYOUT": { 25 "LAYOUT": {
26 "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.66, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.39, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":2.75}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}] 26 "layout": [
27 {"matrix": [0, 0], "x": 0, "y": 0},
28
29 {"matrix": [0, 1], "x": 1.66, "y": 0},
30 {"matrix": [0, 2], "x": 2.66, "y": 0},
31 {"matrix": [0, 3], "x": 3.66, "y": 0},
32 {"matrix": [0, 4], "x": 4.66, "y": 0},
33 {"matrix": [0, 5], "x": 5.66, "y": 0},
34 {"matrix": [0, 6], "x": 6.66, "y": 0},
35 {"matrix": [0, 7], "x": 7.66, "y": 0},
36
37 {"matrix": [5, 0], "x": 9.32, "y": 0},
38 {"matrix": [5, 1], "x": 10.32, "y": 0},
39 {"matrix": [5, 2], "x": 11.32, "y": 0},
40 {"matrix": [5, 3], "x": 12.32, "y": 0},
41 {"matrix": [5, 4], "x": 13.32, "y": 0},
42 {"matrix": [5, 5], "x": 14.32, "y": 0},
43 {"matrix": [5, 6], "x": 15.32, "y": 0, "w": 2},
44
45 {"matrix": [1, 0], "x": 0, "y": 1},
46
47 {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
48 {"matrix": [1, 2], "x": 3.03, "y": 1},
49 {"matrix": [1, 3], "x": 4.03, "y": 1},
50 {"matrix": [1, 4], "x": 5.03, "y": 1},
51 {"matrix": [1, 5], "x": 6.03, "y": 1},
52 {"matrix": [1, 6], "x": 7.03, "y": 1},
53
54 {"matrix": [6, 0], "x": 9, "y": 1},
55 {"matrix": [6, 1], "x": 10, "y": 1},
56 {"matrix": [6, 2], "x": 11, "y": 1},
57 {"matrix": [6, 3], "x": 12, "y": 1},
58 {"matrix": [6, 4], "x": 13, "y": 1},
59 {"matrix": [6, 5], "x": 14, "y": 1},
60 {"matrix": [6, 6], "x": 15.05, "y": 1},
61 {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
62
63 {"matrix": [2, 0], "x": 0, "y": 2},
64
65 {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
66 {"matrix": [2, 2], "x": 3.14, "y": 2},
67 {"matrix": [2, 3], "x": 4.14, "y": 2},
68 {"matrix": [2, 4], "x": 5.14, "y": 2},
69 {"matrix": [2, 5], "x": 6.14, "y": 2},
70 {"matrix": [2, 6], "x": 7.14, "y": 2},
71
72 {"matrix": [7, 0], "x": 9.34, "y": 2},
73 {"matrix": [7, 1], "x": 10.34, "y": 2},
74 {"matrix": [7, 2], "x": 11.34, "y": 2},
75 {"matrix": [7, 3], "x": 12.34, "y": 2},
76 {"matrix": [7, 4], "x": 13.34, "y": 2},
77 {"matrix": [7, 5], "x": 14.34, "y": 2},
78 {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
79
80 {"matrix": [3, 0], "x": 0, "y": 3},
81
82 {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
83 {"matrix": [3, 2], "x": 3.5, "y": 3},
84 {"matrix": [3, 3], "x": 4.5, "y": 3},
85 {"matrix": [3, 4], "x": 5.5, "y": 3},
86 {"matrix": [3, 5], "x": 6.5, "y": 3},
87 {"matrix": [3, 6], "x": 7.5, "y": 3},
88
89 {"matrix": [8, 0], "x": 8.97, "y": 3},
90 {"matrix": [8, 1], "x": 9.97, "y": 3},
91 {"matrix": [8, 2], "x": 10.97, "y": 3},
92 {"matrix": [8, 3], "x": 11.97, "y": 3},
93 {"matrix": [8, 4], "x": 12.97, "y": 3},
94 {"matrix": [8, 5], "x": 13.97, "y": 3},
95 {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
96 {"matrix": [8, 7], "x": 16.72, "y": 3},
97
98 {"matrix": [4, 0], "x": 0, "y": 4},
99
100 {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
101 {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
102 {"matrix": [4, 3], "x": 4.75, "y": 4},
103 {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.75},
104
105 {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
106 {"matrix": [9, 1], "x": 11.22, "y": 4},
107 {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
108 {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
109 {"matrix": [9, 4], "x": 16.48, "y": 4}
110 ]
27 }, 111 },
28 "LAYOUT_split_left_space": { 112 "LAYOUT_split_left_space": {
29 "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.66, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.39, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":1.75}, {"x":7.5, "y":4}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}] 113 "layout": [
114 {"matrix": [0, 0], "x": 0, "y": 0},
115
116 {"matrix": [0, 1], "x": 1.66, "y": 0},
117 {"matrix": [0, 2], "x": 2.66, "y": 0},
118 {"matrix": [0, 3], "x": 3.66, "y": 0},
119 {"matrix": [0, 4], "x": 4.66, "y": 0},
120 {"matrix": [0, 5], "x": 5.66, "y": 0},
121 {"matrix": [0, 6], "x": 6.66, "y": 0},
122 {"matrix": [0, 7], "x": 7.66, "y": 0},
123
124 {"matrix": [5, 0], "x": 9.32, "y": 0},
125 {"matrix": [5, 1], "x": 10.32, "y": 0},
126 {"matrix": [5, 2], "x": 11.32, "y": 0},
127 {"matrix": [5, 3], "x": 12.32, "y": 0},
128 {"matrix": [5, 4], "x": 13.32, "y": 0},
129 {"matrix": [5, 5], "x": 14.32, "y": 0},
130 {"matrix": [5, 6], "x": 15.32, "y": 0, "w": 2},
131
132 {"matrix": [1, 0], "x": 0, "y": 1},
133
134 {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
135 {"matrix": [1, 2], "x": 3.03, "y": 1},
136 {"matrix": [1, 3], "x": 4.03, "y": 1},
137 {"matrix": [1, 4], "x": 5.03, "y": 1},
138 {"matrix": [1, 5], "x": 6.03, "y": 1},
139 {"matrix": [1, 6], "x": 7.03, "y": 1},
140
141 {"matrix": [6, 0], "x": 9, "y": 1},
142 {"matrix": [6, 1], "x": 10, "y": 1},
143 {"matrix": [6, 2], "x": 11, "y": 1},
144 {"matrix": [6, 3], "x": 12, "y": 1},
145 {"matrix": [6, 4], "x": 13, "y": 1},
146 {"matrix": [6, 5], "x": 14, "y": 1},
147 {"matrix": [6, 6], "x": 15.05, "y": 1},
148 {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
149
150 {"matrix": [2, 0], "x": 0, "y": 2},
151
152 {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
153 {"matrix": [2, 2], "x": 3.14, "y": 2},
154 {"matrix": [2, 3], "x": 4.14, "y": 2},
155 {"matrix": [2, 4], "x": 5.14, "y": 2},
156 {"matrix": [2, 5], "x": 6.14, "y": 2},
157 {"matrix": [2, 6], "x": 7.14, "y": 2},
158
159 {"matrix": [7, 0], "x": 9.34, "y": 2},
160 {"matrix": [7, 1], "x": 10.34, "y": 2},
161 {"matrix": [7, 2], "x": 11.34, "y": 2},
162 {"matrix": [7, 3], "x": 12.34, "y": 2},
163 {"matrix": [7, 4], "x": 13.34, "y": 2},
164 {"matrix": [7, 5], "x": 14.34, "y": 2},
165 {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
166
167 {"matrix": [3, 0], "x": 0, "y": 3},
168
169 {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
170 {"matrix": [3, 2], "x": 3.5, "y": 3},
171 {"matrix": [3, 3], "x": 4.5, "y": 3},
172 {"matrix": [3, 4], "x": 5.5, "y": 3},
173 {"matrix": [3, 5], "x": 6.5, "y": 3},
174 {"matrix": [3, 6], "x": 7.5, "y": 3},
175
176 {"matrix": [8, 0], "x": 8.97, "y": 3},
177 {"matrix": [8, 1], "x": 9.97, "y": 3},
178 {"matrix": [8, 2], "x": 10.97, "y": 3},
179 {"matrix": [8, 3], "x": 11.97, "y": 3},
180 {"matrix": [8, 4], "x": 12.97, "y": 3},
181 {"matrix": [8, 5], "x": 13.97, "y": 3},
182 {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
183 {"matrix": [8, 7], "x": 16.72, "y": 3},
184
185 {"matrix": [4, 0], "x": 0, "y": 4},
186
187 {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
188 {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
189 {"matrix": [4, 3], "x": 4.75, "y": 4},
190 {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 1.75},
191 {"matrix": [4, 6], "x": 7.5, "y": 4},
192
193 {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
194 {"matrix": [9, 1], "x": 11.22, "y": 4},
195 {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
196 {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
197 {"matrix": [9, 4], "x": 16.48, "y": 4}
198 ]
30 }, 199 },
31 "LAYOUT_all": { 200 "LAYOUT_all": {
32 "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.66, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.39, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":0.917}, {"x":6.667, "y":4, "w":0.916}, {"x":7.583, "y":4, "w":0.917}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}] 201 "layout": [
202 {"matrix": [0, 0], "x": 0, "y": 0},
203
204 {"matrix": [0, 1], "x": 1.66, "y": 0},
205 {"matrix": [0, 2], "x": 2.66, "y": 0},
206 {"matrix": [0, 3], "x": 3.66, "y": 0},
207 {"matrix": [0, 4], "x": 4.66, "y": 0},
208 {"matrix": [0, 5], "x": 5.66, "y": 0},
209 {"matrix": [0, 6], "x": 6.66, "y": 0},
210 {"matrix": [0, 7], "x": 7.66, "y": 0},
211
212 {"matrix": [5, 0], "x": 9.32, "y": 0},
213 {"matrix": [5, 1], "x": 10.32, "y": 0},
214 {"matrix": [5, 2], "x": 11.32, "y": 0},
215 {"matrix": [5, 3], "x": 12.32, "y": 0},
216 {"matrix": [5, 4], "x": 13.32, "y": 0},
217 {"matrix": [5, 5], "x": 14.32, "y": 0},
218 {"matrix": [5, 6], "x": 15.32, "y": 0, "w": 2},
219
220 {"matrix": [1, 0], "x": 0, "y": 1},
221
222 {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
223 {"matrix": [1, 2], "x": 3.03, "y": 1},
224 {"matrix": [1, 3], "x": 4.03, "y": 1},
225 {"matrix": [1, 4], "x": 5.03, "y": 1},
226 {"matrix": [1, 5], "x": 6.03, "y": 1},
227 {"matrix": [1, 6], "x": 7.03, "y": 1},
228
229 {"matrix": [6, 0], "x": 9, "y": 1},
230 {"matrix": [6, 1], "x": 10, "y": 1},
231 {"matrix": [6, 2], "x": 11, "y": 1},
232 {"matrix": [6, 3], "x": 12, "y": 1},
233 {"matrix": [6, 4], "x": 13, "y": 1},
234 {"matrix": [6, 5], "x": 14, "y": 1},
235 {"matrix": [6, 6], "x": 15.05, "y": 1},
236 {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
237
238 {"matrix": [2, 0], "x": 0, "y": 2},
239
240 {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
241 {"matrix": [2, 2], "x": 3.14, "y": 2},
242 {"matrix": [2, 3], "x": 4.14, "y": 2},
243 {"matrix": [2, 4], "x": 5.14, "y": 2},
244 {"matrix": [2, 5], "x": 6.14, "y": 2},
245 {"matrix": [2, 6], "x": 7.14, "y": 2},
246
247 {"matrix": [7, 0], "x": 9.34, "y": 2},
248 {"matrix": [7, 1], "x": 10.34, "y": 2},
249 {"matrix": [7, 2], "x": 11.34, "y": 2},
250 {"matrix": [7, 3], "x": 12.34, "y": 2},
251 {"matrix": [7, 4], "x": 13.34, "y": 2},
252 {"matrix": [7, 5], "x": 14.34, "y": 2},
253 {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
254
255 {"matrix": [3, 0], "x": 0, "y": 3},
256
257 {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
258 {"matrix": [3, 2], "x": 3.5, "y": 3},
259 {"matrix": [3, 3], "x": 4.5, "y": 3},
260 {"matrix": [3, 4], "x": 5.5, "y": 3},
261 {"matrix": [3, 5], "x": 6.5, "y": 3},
262 {"matrix": [3, 6], "x": 7.5, "y": 3},
263
264 {"matrix": [8, 0], "x": 8.97, "y": 3},
265 {"matrix": [8, 1], "x": 9.97, "y": 3},
266 {"matrix": [8, 2], "x": 10.97, "y": 3},
267 {"matrix": [8, 3], "x": 11.97, "y": 3},
268 {"matrix": [8, 4], "x": 12.97, "y": 3},
269 {"matrix": [8, 5], "x": 13.97, "y": 3},
270 {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
271 {"matrix": [8, 7], "x": 16.72, "y": 3},
272
273 {"matrix": [4, 0], "x": 0, "y": 4},
274
275 {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
276 {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
277 {"matrix": [4, 3], "x": 4.75, "y": 4},
278 {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 0.917},
279 {"matrix": [4, 5], "x": 6.667, "y": 4, "w": 0.916},
280 {"matrix": [4, 6], "x": 7.583, "y": 4, "w": 0.917},
281
282 {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
283 {"matrix": [9, 1], "x": 11.22, "y": 4},
284 {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
285 {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
286 {"matrix": [9, 4], "x": 16.48, "y": 4}
287 ]
33 } 288 }
34 } 289 }
35} 290}
diff --git a/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.h b/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.h
deleted file mode 100644
index 0b0ea725e7..0000000000
--- a/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.h
+++ /dev/null
@@ -1,96 +0,0 @@
1/* Copyright 2020 2Moons
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16#pragma once
17
18#include "quantum.h"
19
20//////////////////////////////////////////////////////////////////////////////
21// When only use Slice Rev1.
22//////////////////////////////////////////////////////////////////////////////
23/*
24 * ,------------------------------------------------ --------------------------------------------------.
25 * | L00 | L01 | L02 | L03 | L04 | L05 | L06 | L07 | | R00 | R01 | R02 | R03 | R04 | R05 | R06 |
26 * |------------------------------------------------ ------------------------------------------------------+
27 * | L10 | L11 | L12 | L13 | L14 | L15 | L16 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R37 |
28 * |---------------------------------------------- ------------------------------------------------------+
29 * | L20 | L21 | L22 | L23 | L24 | L25 | L26 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 |
30 * |------------------------------------------------- --------------------------------------------------------+
31 * | L30 | L31 | L32 | L33 | L34 | L35 | L36 | | R30 | R31 | R32 | R33 | R34 | R34 | R35 | R36 | R37 |
32 * |------------------------------------------------- --------------------------------------------------------'
33 * | L40 | L41 | L42 | L43 | L44L45L46 | | R40 | R41 | | R42 | R43 | R44 |
34 * |------------------------------------------------- -------------------------------------------------------'
35 */
36
37#define LAYOUT( \
38 L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, \
39 L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, R17, \
40 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
41 L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R37,\
42 L40, L41, L42, L43, L45, R40, R41, R42, R43, R44 \
43 ) \
44 { \
45 { L00, L01, L02, L03, L04, L05, L06, L07, KC_NO }, \
46 { L10, L11, L12, L13, L14, L15, L16, KC_NO, KC_NO }, \
47 { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO }, \
48 { L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO }, \
49 { L40, L41, L42, L43, KC_NO, L45, KC_NO, KC_NO, KC_NO }, \
50 { R00, R01, R02, R03, R04, R05, R06, KC_NO, KC_NO }, \
51 { R10, R11, R12, R13, R14, R15, R16, R17, KC_NO }, \
52 { R20, R21, R22, R23, R24, R25, R26, KC_NO, KC_NO }, \
53 { R30, R31, R32, R33, R34, R35, R36, R37, KC_NO }, \
54 { R40, R41, R42, R43, R44, KC_NO, KC_NO, KC_NO, KC_NO } \
55 }
56
57#define LAYOUT_split_left_space( \
58 L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, \
59 L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, R17, \
60 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
61 L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R37,\
62 L40, L41, L42, L43, L44, L46, R40, R41, R42, R43, R44 \
63 ) \
64 { \
65 { L00, L01, L02, L03, L04, L05, L06, L07, KC_NO }, \
66 { L10, L11, L12, L13, L14, L15, L16, KC_NO, KC_NO }, \
67 { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO }, \
68 { L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO }, \
69 { L40, L41, L42, L43, L44, KC_NO, L46, KC_NO, KC_NO }, \
70 { R00, R01, R02, R03, R04, R05, R06, KC_NO, KC_NO }, \
71 { R10, R11, R12, R13, R14, R15, R16, R17, KC_NO }, \
72 { R20, R21, R22, R23, R24, R25, R26, KC_NO, KC_NO }, \
73 { R30, R31, R32, R33, R34, R35, R36, R37, KC_NO }, \
74 { R40, R41, R42, R43, R44, KC_NO, KC_NO, KC_NO, KC_NO } \
75 }
76
77#define LAYOUT_all( \
78 L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, \
79 L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, R17, \
80 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
81 L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R37,\
82 L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44 \
83 ) \
84 { \
85 { L00, L01, L02, L03, L04, L05, L06, L07, KC_NO }, \
86 { L10, L11, L12, L13, L14, L15, L16, KC_NO, KC_NO }, \
87 { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO }, \
88 { L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO }, \
89 { L40, L41, L42, L43, L44, L45, L46, KC_NO, KC_NO }, \
90 { R00, R01, R02, R03, R04, R05, R06, KC_NO, KC_NO }, \
91 { R10, R11, R12, R13, R14, R15, R16, R17, KC_NO }, \
92 { R20, R21, R22, R23, R24, R25, R26, KC_NO, KC_NO }, \
93 { R30, R31, R32, R33, R34, R35, R36, R37, KC_NO }, \
94 { R40, R41, R42, R43, R44, KC_NO, KC_NO, KC_NO, KC_NO } \
95 }
96
diff --git a/keyboards/beatervan/beatervan.h b/keyboards/beatervan/beatervan.h
deleted file mode 100644
index e645809825..0000000000
--- a/keyboards/beatervan/beatervan.h
+++ /dev/null
@@ -1,70 +0,0 @@
1/* Copyright 2020 OJtheTiny
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16#pragma once
17
18#include "quantum.h"
19
20#define LAYOUT( \
21 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
22 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
23 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
24 K30, K31, K32, K34, K36, K37, K38, K39 \
25) \
26{ \
27 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
28 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
29 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
30 { K30, K31, K32, KC_NO, K34, KC_NO, K36, K37, K38, K39, KC_NO, KC_NO } \
31}
32
33#define LAYOUT_arrow( \
34 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
35 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
36 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
37 K30, K31, K32, K33, K37, K38, K39, K3A, K3B \
38) \
39{ \
40 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
41 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
42 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
43 { K30, K31, K32, K33, KC_NO, KC_NO, KC_NO, K37, K38, K39, K3A, K3B } \
44}
45
46#define LAYOUT_command( \
47 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
48 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
49 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
50 K30, K31, K32, K34, K33, K37, K38, K39, K3B \
51) \
52{ \
53 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
54 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
55 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
56 { K30, K31, K32, K33, K34, KC_NO, KC_NO, K37, K38, K39, KC_NO, K3B } \
57}
58
59#define LAYOUT_arrow_command( \
60 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
61 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
62 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
63 K30, K31, K32, K34, K33, K37, K38, K39, K3A, K3B \
64) \
65{ \
66 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
67 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
68 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
69 { K30, K31, K32, K33, K34, KC_NO, KC_NO, K37, K38, K39, K3A, K3B } \
70}
diff --git a/keyboards/beatervan/info.json b/keyboards/beatervan/info.json
index c86466e44f..8d4c77d2ce 100644
--- a/keyboards/beatervan/info.json
+++ b/keyboards/beatervan/info.json
@@ -15,201 +15,214 @@
15 "diode_direction": "COL2ROW", 15 "diode_direction": "COL2ROW",
16 "processor": "atmega32u4", 16 "processor": "atmega32u4",
17 "bootloader": "caterina", 17 "bootloader": "caterina",
18 "layouts": { 18 "layouts": {
19 "LAYOUT": { 19 "LAYOUT": {
20 "layout": [ 20 "layout": [
21 {"label":"Tab", "x":0, "y":0}, 21 {"matrix": [0, 0], "x": 0, "y": 0},
22 {"label":"Q", "x":1, "y":0}, 22 {"matrix": [0, 1], "x": 1, "y": 0},
23 {"label":"W", "x":2, "y":0}, 23 {"matrix": [0, 2], "x": 2, "y": 0},
24 {"label":"E", "x":3, "y":0}, 24 {"matrix": [0, 3], "x": 3, "y": 0},
25 {"label":"R", "x":4, "y":0}, 25 {"matrix": [0, 4], "x": 4, "y": 0},
26 {"label":"T", "x":5, "y":0}, 26 {"matrix": [0, 5], "x": 5, "y": 0},
27 {"label":"Y", "x":6, "y":0}, 27 {"matrix": [0, 6], "x": 6, "y": 0},
28 {"label":"U", "x":7, "y":0}, 28 {"matrix": [0, 7], "x": 7, "y": 0},
29 {"label":"I", "x":8, "y":0}, 29 {"matrix": [0, 8], "x": 8, "y": 0},
30 {"label":"O", "x":9, "y":0}, 30 {"matrix": [0, 9], "x": 9, "y": 0},
31 {"label":"P", "x":10, "y":0}, 31 {"matrix": [0, 10], "x": 10, "y": 0},
32 {"label":"|", "x":11, "y":0, "w":1.75}, 32 {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
33 {"label":"Caps Lock", "x":0, "y":1, "w":1.25},
34 {"label":"A", "x":1.25, "y":1},
35 {"label":"S", "x":2.25, "y":1},
36 {"label":"D", "x":3.25, "y":1},
37 {"label":"F", "x":4.25, "y":1},
38 {"label":"G", "x":5.25, "y":1},
39 {"label":"H", "x":6.25, "y":1},
40 {"label":"J", "x":7.25, "y":1},
41 {"label":"K", "x":8.25, "y":1},
42 {"label":"L", "x":9.25, "y":1},
43 {"label":":", "x":10.25, "y":1},
44 {"label":"\"", "x":11.25, "y":1, "w":1.5},
45 {"label":"Shift", "x":0, "y":2, "w":1.75},
46 {"label":"Z", "x":1.75, "y":2},
47 {"label":"X", "x":2.75, "y":2},
48 {"label":"C", "x":3.75, "y":2},
49 {"label":"V", "x":4.75, "y":2},
50 {"label":"B", "x":5.75, "y":2},
51 {"label":"N", "x":6.75, "y":2},
52 {"label":"M", "x":7.75, "y":2},
53 {"label":"<", "x":8.75, "y":2},
54 {"label":">", "x":9.75, "y":2},
55 {"label":"?", "x":10.75, "y":2},
56 {"x":11.75, "y":2},
57 {"label":"Ctrl", "x":0, "y":3, "w":1.25},
58 {"label":"Win", "x":1.25, "y":3, "w":1.5},
59 {"label":"Alt", "x":2.75, "y":3, "w":1.25},
60 {"x":4, "y":3, "w":2.25},
61 {"x":6.25, "y":3, "w":2},
62 {"label":"Alt", "x":8.25, "y":3, "w":1.25},
63 {"label":"Win", "x":9.5, "y":3, "w":1.5},
64 {"label":"Menu", "x":11, "y":3, "w":1.75} ]
65 },
66 33
67 "LAYOUT_arrow": { 34 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
68 "layout": [ 35 {"matrix": [1, 1], "x": 1.25, "y": 1},
69 {"label":"Tab", "x":0, "y":0}, 36 {"matrix": [1, 2], "x": 2.25, "y": 1},
70 {"label":"Q", "x":1, "y":0}, 37 {"matrix": [1, 3], "x": 3.25, "y": 1},
71 {"label":"W", "x":2, "y":0}, 38 {"matrix": [1, 4], "x": 4.25, "y": 1},
72 {"label":"E", "x":3, "y":0}, 39 {"matrix": [1, 5], "x": 5.25, "y": 1},
73 {"label":"R", "x":4, "y":0}, 40 {"matrix": [1, 6], "x": 6.25, "y": 1},
74 {"label":"T", "x":5, "y":0}, 41 {"matrix": [1, 7], "x": 7.25, "y": 1},
75 {"label":"Y", "x":6, "y":0}, 42 {"matrix": [1, 8], "x": 8.25, "y": 1},
76 {"label":"U", "x":7, "y":0}, 43 {"matrix": [1, 9], "x": 9.25, "y": 1},
77 {"label":"I", "x":8, "y":0}, 44 {"matrix": [1, 10], "x": 10.25, "y": 1},
78 {"label":"O", "x":9, "y":0}, 45 {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
79 {"label":"P", "x":10, "y":0},
80 {"label":"|", "x":11, "y":0, "w":1.75},
81 {"label":"Caps Lock", "x":0, "y":1, "w":1.25},
82 {"label":"A", "x":1.25, "y":1},
83 {"label":"S", "x":2.25, "y":1},
84 {"label":"D", "x":3.25, "y":1},
85 {"label":"F", "x":4.25, "y":1},
86 {"label":"G", "x":5.25, "y":1},
87 {"label":"H", "x":6.25, "y":1},
88 {"label":"J", "x":7.25, "y":1},
89 {"label":"K", "x":8.25, "y":1},
90 {"label":"L", "x":9.25, "y":1},
91 {"label":":", "x":10.25, "y":1},
92 {"label":"\"", "x":11.25, "y":1, "w":1.5},
93 {"label":"Shift", "x":0, "y":2, "w":1.75},
94 {"label":"Z", "x":1.75, "y":2},
95 {"label":"X", "x":2.75, "y":2},
96 {"label":"C", "x":3.75, "y":2},
97 {"label":"V", "x":4.75, "y":2},
98 {"label":"B", "x":5.75, "y":2},
99 {"label":"N", "x":6.75, "y":2},
100 {"label":"M", "x":7.75, "y":2},
101 {"label":"<", "x":8.75, "y":2},
102 {"label":">", "x":9.75, "y":2},
103 {"label":"?", "x":10.75, "y":2},
104 {"x":11.75, "y":2},
105 {"label":"Ctrl", "x":0, "y":3, "w":1.25},
106 {"label":"Win", "x":1.25, "y":3, "w":1.5},
107 {"label":"Alt", "x":2.75, "y":3, "w":1.25},
108 {"x":4, "y":3, "w":2.25},
109 {"x":6.25, "y":3, "w":2},
110 {"x":8.25, "y":3, "w":1.5},
111 {"label":"Alt", "x":9.75, "y":3},
112 {"label":"Win", "x":10.75, "y":3},
113 {"label":"Menu", "x":11.75, "y":3} ]
114 },
115 46
116 "LAYOUT_command": { 47 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
117 "layout": [ 48 {"matrix": [2, 1], "x": 1.75, "y": 2},
118 {"label":"Tab", "x":0, "y":0}, 49 {"matrix": [2, 2], "x": 2.75, "y": 2},
119 {"label":"Q", "x":1, "y":0}, 50 {"matrix": [2, 3], "x": 3.75, "y": 2},
120 {"label":"W", "x":2, "y":0}, 51 {"matrix": [2, 4], "x": 4.75, "y": 2},
121 {"label":"E", "x":3, "y":0}, 52 {"matrix": [2, 5], "x": 5.75, "y": 2},
122 {"label":"R", "x":4, "y":0}, 53 {"matrix": [2, 6], "x": 6.75, "y": 2},
123 {"label":"T", "x":5, "y":0}, 54 {"matrix": [2, 7], "x": 7.75, "y": 2},
124 {"label":"Y", "x":6, "y":0}, 55 {"matrix": [2, 8], "x": 8.75, "y": 2},
125 {"label":"U", "x":7, "y":0}, 56 {"matrix": [2, 9], "x": 9.75, "y": 2},
126 {"label":"I", "x":8, "y":0}, 57 {"matrix": [2, 10], "x": 10.75, "y": 2},
127 {"label":"O", "x":9, "y":0}, 58 {"matrix": [2, 11], "x": 11.75, "y": 2},
128 {"label":"P", "x":10, "y":0},
129 {"label":"|", "x":11, "y":0, "w":1.75},
130 {"label":"Caps Lock", "x":0, "y":1, "w":1.25},
131 {"label":"A", "x":1.25, "y":1},
132 {"label":"S", "x":2.25, "y":1},
133 {"label":"D", "x":3.25, "y":1},
134 {"label":"F", "x":4.25, "y":1},
135 {"label":"G", "x":5.25, "y":1},
136 {"label":"H", "x":6.25, "y":1},
137 {"label":"J", "x":7.25, "y":1},
138 {"label":"K", "x":8.25, "y":1},
139 {"label":"L", "x":9.25, "y":1},
140 {"label":":", "x":10.25, "y":1},
141 {"label":"\"", "x":11.25, "y":1, "w":1.5},
142 {"label":"Shift", "x":0, "y":2, "w":1.75},
143 {"label":"Z", "x":1.75, "y":2},
144 {"label":"X", "x":2.75, "y":2},
145 {"label":"C", "x":3.75, "y":2},
146 {"label":"V", "x":4.75, "y":2},
147 {"label":"B", "x":5.75, "y":2},
148 {"label":"N", "x":6.75, "y":2},
149 {"label":"M", "x":7.75, "y":2},
150 {"label":"<", "x":8.75, "y":2},
151 {"label":">", "x":9.75, "y":2},
152 {"label":"?", "x":10.75, "y":2},
153 {"x":11.75, "y":2},
154 {"label":"Ctrl", "x":0, "y":3},
155 {"label":"Win", "x":1, "y":3},
156 {"label":"Alt", "x":2, "y":3},
157 {"x":3, "y":3},
158 {"x":4, "y":3, "w":2.25},
159 {"x":6.25, "y":3, "w":2},
160 {"x":8.25, "y":3, "w":1.5},
161 {"label":"Alt", "x":9.75, "y":3, "w":1.5},
162 {"label":"Win", "x":11.25, "y":3, "w":1.5} ]
163 },
164 59
165 "LAYOUT_arrow_command": { 60 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
166 "layout": [ 61 {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.5},
167 {"label":"Tab", "x":0, "y":0}, 62 {"matrix": [3, 2], "x": 2.75, "y": 3, "w": 1.25},
168 {"label":"Q", "x":1, "y":0}, 63 {"matrix": [3, 4], "x": 4, "y": 3, "w": 2.25},
169 {"label":"W", "x":2, "y":0}, 64 {"matrix": [3, 6], "x": 6.25, "y": 3, "w": 2},
170 {"label":"E", "x":3, "y":0}, 65 {"matrix": [3, 7], "x": 8.25, "y": 3, "w": 1.25},
171 {"label":"R", "x":4, "y":0}, 66 {"matrix": [3, 8], "x": 9.5, "y": 3, "w": 1.5},
172 {"label":"T", "x":5, "y":0}, 67 {"matrix": [3, 9], "x": 11, "y": 3, "w": 1.75}
173 {"label":"Y", "x":6, "y":0}, 68 ]
174 {"label":"U", "x":7, "y":0}, 69 },
175 {"label":"I", "x":8, "y":0}, 70 "LAYOUT_arrow": {
176 {"label":"O", "x":9, "y":0}, 71 "layout": [
177 {"label":"P", "x":10, "y":0}, 72 {"matrix": [0, 0], "x": 0, "y": 0},
178 {"label":"|", "x":11, "y":0, "w":1.75}, 73 {"matrix": [0, 1], "x": 1, "y": 0},
179 {"label":"Caps Lock", "x":0, "y":1, "w":1.25}, 74 {"matrix": [0, 2], "x": 2, "y": 0},
180 {"label":"A", "x":1.25, "y":1}, 75 {"matrix": [0, 3], "x": 3, "y": 0},
181 {"label":"S", "x":2.25, "y":1}, 76 {"matrix": [0, 4], "x": 4, "y": 0},
182 {"label":"D", "x":3.25, "y":1}, 77 {"matrix": [0, 5], "x": 5, "y": 0},
183 {"label":"F", "x":4.25, "y":1}, 78 {"matrix": [0, 6], "x": 6, "y": 0},
184 {"label":"G", "x":5.25, "y":1}, 79 {"matrix": [0, 7], "x": 7, "y": 0},
185 {"label":"H", "x":6.25, "y":1}, 80 {"matrix": [0, 8], "x": 8, "y": 0},
186 {"label":"J", "x":7.25, "y":1}, 81 {"matrix": [0, 9], "x": 9, "y": 0},
187 {"label":"K", "x":8.25, "y":1}, 82 {"matrix": [0, 10], "x": 10, "y": 0},
188 {"label":"L", "x":9.25, "y":1}, 83 {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
189 {"label":":", "x":10.25, "y":1}, 84
190 {"label":"\"", "x":11.25, "y":1, "w":1.5}, 85 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
191 {"label":"Shift", "x":0, "y":2, "w":1.75}, 86 {"matrix": [1, 1], "x": 1.25, "y": 1},
192 {"label":"Z", "x":1.75, "y":2}, 87 {"matrix": [1, 2], "x": 2.25, "y": 1},
193 {"label":"X", "x":2.75, "y":2}, 88 {"matrix": [1, 3], "x": 3.25, "y": 1},
194 {"label":"C", "x":3.75, "y":2}, 89 {"matrix": [1, 4], "x": 4.25, "y": 1},
195 {"label":"V", "x":4.75, "y":2}, 90 {"matrix": [1, 5], "x": 5.25, "y": 1},
196 {"label":"B", "x":5.75, "y":2}, 91 {"matrix": [1, 6], "x": 6.25, "y": 1},
197 {"label":"N", "x":6.75, "y":2}, 92 {"matrix": [1, 7], "x": 7.25, "y": 1},
198 {"label":"M", "x":7.75, "y":2}, 93 {"matrix": [1, 8], "x": 8.25, "y": 1},
199 {"label":"<", "x":8.75, "y":2}, 94 {"matrix": [1, 9], "x": 9.25, "y": 1},
200 {"label":">", "x":9.75, "y":2}, 95 {"matrix": [1, 10], "x": 10.25, "y": 1},
201 {"label":"?", "x":10.75, "y":2}, 96 {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
202 {"x":11.75, "y":2}, 97
203 {"label":"Ctrl", "x":0, "y":3}, 98 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
204 {"label":"Win", "x":1, "y":3}, 99 {"matrix": [2, 1], "x": 1.75, "y": 2},
205 {"label":"Alt", "x":2, "y":3}, 100 {"matrix": [2, 2], "x": 2.75, "y": 2},
206 {"x":3, "y":3}, 101 {"matrix": [2, 3], "x": 3.75, "y": 2},
207 {"x":4, "y":3, "w":2.25}, 102 {"matrix": [2, 4], "x": 4.75, "y": 2},
208 {"x":6.25, "y":3, "w":2}, 103 {"matrix": [2, 5], "x": 5.75, "y": 2},
209 {"x":8.25, "y":3, "w":1.5}, 104 {"matrix": [2, 6], "x": 6.75, "y": 2},
210 {"label":"Alt", "x":9.75, "y":3}, 105 {"matrix": [2, 7], "x": 7.75, "y": 2},
211 {"label":"Win", "x":10.75, "y":3}, 106 {"matrix": [2, 8], "x": 8.75, "y": 2},
212 {"label":"Menu", "x":11.75, "y":3} ] 107 {"matrix": [2, 9], "x": 9.75, "y": 2},
108 {"matrix": [2, 10], "x": 10.75, "y": 2},
109 {"matrix": [2, 11], "x": 11.75, "y": 2},
110
111 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
112 {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.5},
113 {"matrix": [3, 2], "x": 2.75, "y": 3, "w": 1.25},
114 {"matrix": [3, 3], "x": 4, "y": 3, "w": 2.25},
115 {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 2},
116 {"matrix": [3, 8], "x": 8.25, "y": 3, "w": 1.5},
117 {"matrix": [3, 9], "x": 9.75, "y": 3},
118 {"matrix": [3, 10], "x": 10.75, "y": 3},
119 {"matrix": [3, 11], "x": 11.75, "y": 3}
120 ]
121 },
122 "LAYOUT_command": {
123 "layout": [
124 {"matrix": [0, 0], "x": 0, "y": 0},
125 {"matrix": [0, 1], "x": 1, "y": 0},
126 {"matrix": [0, 2], "x": 2, "y": 0},
127 {"matrix": [0, 3], "x": 3, "y": 0},
128 {"matrix": [0, 4], "x": 4, "y": 0},
129 {"matrix": [0, 5], "x": 5, "y": 0},
130 {"matrix": [0, 6], "x": 6, "y": 0},
131 {"matrix": [0, 7], "x": 7, "y": 0},
132 {"matrix": [0, 8], "x": 8, "y": 0},
133 {"matrix": [0, 9], "x": 9, "y": 0},
134 {"matrix": [0, 10], "x": 10, "y": 0},
135 {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
136
137 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
138 {"matrix": [1, 1], "x": 1.25, "y": 1},
139 {"matrix": [1, 2], "x": 2.25, "y": 1},
140 {"matrix": [1, 3], "x": 3.25, "y": 1},
141 {"matrix": [1, 4], "x": 4.25, "y": 1},
142 {"matrix": [1, 5], "x": 5.25, "y": 1},
143 {"matrix": [1, 6], "x": 6.25, "y": 1},
144 {"matrix": [1, 7], "x": 7.25, "y": 1},
145 {"matrix": [1, 8], "x": 8.25, "y": 1},
146 {"matrix": [1, 9], "x": 9.25, "y": 1},
147 {"matrix": [1, 10], "x": 10.25, "y": 1},
148 {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
149
150 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
151 {"matrix": [2, 1], "x": 1.75, "y": 2},
152 {"matrix": [2, 2], "x": 2.75, "y": 2},
153 {"matrix": [2, 3], "x": 3.75, "y": 2},
154 {"matrix": [2, 4], "x": 4.75, "y": 2},
155 {"matrix": [2, 5], "x": 5.75, "y": 2},
156 {"matrix": [2, 6], "x": 6.75, "y": 2},
157 {"matrix": [2, 7], "x": 7.75, "y": 2},
158 {"matrix": [2, 8], "x": 8.75, "y": 2},
159 {"matrix": [2, 9], "x": 9.75, "y": 2},
160 {"matrix": [2, 10], "x": 10.75, "y": 2},
161 {"matrix": [2, 11], "x": 11.75, "y": 2},
162
163 {"matrix": [3, 0], "x": 0, "y": 3},
164 {"matrix": [3, 1], "x": 1, "y": 3},
165 {"matrix": [3, 2], "x": 2, "y": 3},
166 {"matrix": [3, 4], "x": 3, "y": 3},
167 {"matrix": [3, 3], "x": 4, "y": 3, "w": 2.25},
168 {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 2},
169 {"matrix": [3, 8], "x": 8.25, "y": 3, "w": 1.5},
170 {"matrix": [3, 9], "x": 9.75, "y": 3, "w": 1.5},
171 {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.5}
172 ]
173 },
174 "LAYOUT_arrow_command": {
175 "layout": [
176 {"matrix": [0, 0], "x": 0, "y": 0},
177 {"matrix": [0, 1], "x": 1, "y": 0},
178 {"matrix": [0, 2], "x": 2, "y": 0},
179 {"matrix": [0, 3], "x": 3, "y": 0},
180 {"matrix": [0, 4], "x": 4, "y": 0},
181 {"matrix": [0, 5], "x": 5, "y": 0},
182 {"matrix": [0, 6], "x": 6, "y": 0},
183 {"matrix": [0, 7], "x": 7, "y": 0},
184 {"matrix": [0, 8], "x": 8, "y": 0},
185 {"matrix": [0, 9], "x": 9, "y": 0},
186 {"matrix": [0, 10], "x": 10, "y": 0},
187 {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
188
189 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
190 {"matrix": [1, 1], "x": 1.25, "y": 1},
191 {"matrix": [1, 2], "x": 2.25, "y": 1},
192 {"matrix": [1, 3], "x": 3.25, "y": 1},
193 {"matrix": [1, 4], "x": 4.25, "y": 1},
194 {"matrix": [1, 5], "x": 5.25, "y": 1},
195 {"matrix": [1, 6], "x": 6.25, "y": 1},
196 {"matrix": [1, 7], "x": 7.25, "y": 1},
197 {"matrix": [1, 8], "x": 8.25, "y": 1},
198 {"matrix": [1, 9], "x": 9.25, "y": 1},
199 {"matrix": [1, 10], "x": 10.25, "y": 1},
200 {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
201
202 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
203 {"matrix": [2, 1], "x": 1.75, "y": 2},
204 {"matrix": [2, 2], "x": 2.75, "y": 2},
205 {"matrix": [2, 3], "x": 3.75, "y": 2},
206 {"matrix": [2, 4], "x": 4.75, "y": 2},
207 {"matrix": [2, 5], "x": 5.75, "y": 2},
208 {"matrix": [2, 6], "x": 6.75, "y": 2},
209 {"matrix": [2, 7], "x": 7.75, "y": 2},
210 {"matrix": [2, 8], "x": 8.75, "y": 2},
211 {"matrix": [2, 9], "x": 9.75, "y": 2},
212 {"matrix": [2, 10], "x": 10.75, "y": 2},
213 {"matrix": [2, 11], "x": 11.75, "y": 2},
214
215 {"matrix": [3, 0], "x": 0, "y": 3},
216 {"matrix": [3, 1], "x": 1, "y": 3},
217 {"matrix": [3, 2], "x": 2, "y": 3},
218 {"matrix": [3, 4], "x": 3, "y": 3},
219 {"matrix": [3, 3], "x": 4, "y": 3, "w": 2.25},
220 {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 2},
221 {"matrix": [3, 8], "x": 8.25, "y": 3, "w": 1.5},
222 {"matrix": [3, 9], "x": 9.75, "y": 3},
223 {"matrix": [3, 10], "x": 10.75, "y": 3},
224 {"matrix": [3, 11], "x": 11.75, "y": 3}
225 ]
226 }
213 } 227 }
214 }
215} 228}
diff --git a/keyboards/blaster75/blaster75.h b/keyboards/blaster75/blaster75.h
deleted file mode 100644
index 4bf63f7fa0..0000000000
--- a/keyboards/blaster75/blaster75.h
+++ /dev/null
@@ -1,97 +0,0 @@
1/* Copyright 2021 Altain
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#include "quantum.h"
20
21
22/* This section is to help viewers visually clarify the physical layout of Blaster 75 PCB.
23
24ANSI Layout :
25 * ,----------------------------------------------------------------
26 * | ESC| F1| F2| F3| F4| F5| F6| F7| F8| F9| F10| F11| F12|PSC|INS|
27 * ,---------------------------------------------------------------|
28 * | ` |1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | + | BKSPC |HOME|
29 * |---------------------------------------------------------------|
30 * | TAB | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | DEL|
31 * |---------------------------------------------------------------|
32 * | CTRL | A | S | D | F | G | H | J | K | L | ; | ' | ENTER| END|
33 * |---------------------------------------------------------------|
34 * | LSHIFT | Z | X | C | V | B | N | M | , | . | / |RSHFT | ↑ | |
35 * |---------------------------------------------------------------|
36 * |LCTL|LWIN|LALT| 6.25U SPACE |RALT|RCTL| ← | ↓ | → |
37 * `----------------------------------------------------------------
38 *
39 *
40
41
427U Spacebar Layout :
43 * ,----------------------------------------------------------------
44 * | ESC| F1| F2| F3| F4| F5| F6| F7| F8| F9| F10| F11| F12|PSC|INS|
45 * ,---------------------------------------------------------------|
46 * | ` |1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | + | BKSPC |HOME|
47 * |---------------------------------------------------------------|
48 * | TAB | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | DEL|
49 * |---------------------------------------------------------------|
50 * | CTRL | A | S | D | F | G | H | J | K | L | ; | ' | ENTER| END|
51 * |---------------------------------------------------------------|
52 * | LSHIFT | Z | X | C | V | B | N | M | , | . | / |RSHFT | ↑ | |
53 * |---------------------------------------------------------------|
54 * | LCTL |LWIN| LALT | 7U SPACE | RCTL | ← | ↓ | → |
55 * `----------------------------------------------------------------
56 *
57 * */
58
59#define XXX KC_NO
60
61// BLASTER75 DEFAULT ANSI LAYOUT
62// 6.25U SPACEBAR
63// BOTTOM ROW 1.25 , 1.25 , 1.25 , 6.25 , 1.25 , 1.25 CONFIGURATION
64#define LAYOUT( \
65 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
66 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
67 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
68 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, \
69 K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4B, K4C, K4D, \
70 K50, K51, K52, K55, K59, K5B, K5C, K5D, K5E \
71) { \
72 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
73 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
74 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
75 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, K3E }, \
76 { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, XXX, K4B, K4C, K4D, XXX }, \
77 { K50, K51, K52, XXX, XXX, K55, XXX, XXX, XXX, K59, XXX, K5B, K5C, K5D, K5E } \
78}
79
80// BLASTER75 7U LAYOUT
81// 7U SPACEBAR
82// BOTTOM ROW 1.5 , 1 , 1.5 , 7 , 1.5 CONFIGURATION
83#define LAYOUT_7u( \
84 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
85 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
86 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
87 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, \
88 K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4B, K4C, K4D, \
89 K50, K51, K52, K55, K5B, K5C, K5D, K5E \
90) { \
91 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
92 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
93 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
94 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, K3E }, \
95 { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, XXX, K4B, K4C, K4D, XXX }, \
96 { K50, K51, K52, XXX, XXX, K55, XXX, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E } \
97}
diff --git a/keyboards/blaster75/info.json b/keyboards/blaster75/info.json
index e357422b62..71d2fee97c 100644
--- a/keyboards/blaster75/info.json
+++ b/keyboards/blaster75/info.json
@@ -18,181 +18,191 @@
18 "layouts": { 18 "layouts": {
19 "LAYOUT": { 19 "LAYOUT": {
20 "layout": [ 20 "layout": [
21 {"label": "ESC", "y": 0,"x": 0}, 21 {"matrix": [0, 0], "x": 0, "y": 0},
22 {"label": "F1", "y": 0,"x": 1.25}, 22
23 {"label": "F2", "y": 0,"x": 2.25}, 23 {"matrix": [0, 1], "x": 1.25, "y": 0},
24 {"label": "F3", "y": 0,"x": 3.25}, 24 {"matrix": [0, 2], "x": 2.25, "y": 0},
25 {"label": "F4", "y": 0,"x": 4.25}, 25 {"matrix": [0, 3], "x": 3.25, "y": 0},
26 {"label": "F5", "y": 0,"x": 5.5}, 26 {"matrix": [0, 4], "x": 4.25, "y": 0},
27 {"label": "F6", "y": 0,"x": 6.5}, 27
28 {"label": "F7", "y": 0,"x": 7.5}, 28 {"matrix": [0, 5], "x": 5.5, "y": 0},
29 {"label": "F8", "y": 0,"x": 8.5}, 29 {"matrix": [0, 6], "x": 6.5, "y": 0},
30 {"label": "F9", "y": 0,"x": 9.75}, 30 {"matrix": [0, 7], "x": 7.5, "y": 0},
31 {"label": "F10", "y": 0,"x": 10.75}, 31 {"matrix": [0, 8], "x": 8.5, "y": 0},
32 {"label": "F11", "y": 0,"x": 11.75}, 32
33 {"label": "F12", "y": 0,"x": 12.75}, 33 {"matrix": [0, 9], "x": 9.75, "y": 0},
34 {"label": "PrtSc", "y": 0,"x": 14}, 34 {"matrix": [0, 10], "x": 10.75, "y": 0},
35 {"label": "INS", "y": 0,"x": 15}, 35 {"matrix": [0, 11], "x": 11.75, "y": 0},
36 36 {"matrix": [0, 12], "x": 12.75, "y": 0},
37 {"label": "~", "y": 1.25,"x": 0}, 37
38 {"label": "!", "y": 1.25,"x": 1}, 38 {"matrix": [0, 13], "x": 14, "y": 0},
39 {"label": "@", "y": 1.25,"x": 2}, 39 {"matrix": [0, 14], "x": 15, "y": 0},
40 {"label": "#", "y": 1.25,"x": 3}, 40
41 {"label": "$", "y": 1.25,"x": 4}, 41 {"matrix": [1, 0], "x": 0, "y": 1.25},
42 {"label": "%", "y": 1.25,"x": 5}, 42 {"matrix": [1, 1], "x": 1, "y": 1.25},
43 {"label": "^", "y": 1.25,"x": 6}, 43 {"matrix": [1, 2], "x": 2, "y": 1.25},
44 {"label": "&", "y": 1.25,"x": 7}, 44 {"matrix": [1, 3], "x": 3, "y": 1.25},
45 {"label": "*", "y": 1.25,"x": 8}, 45 {"matrix": [1, 4], "x": 4, "y": 1.25},
46 {"label": "(", "y": 1.25,"x": 9}, 46 {"matrix": [1, 5], "x": 5, "y": 1.25},
47 {"label": ")", "y": 1.25,"x": 10}, 47 {"matrix": [1, 6], "x": 6, "y": 1.25},
48 {"label": "_", "y": 1.25,"x": 11}, 48 {"matrix": [1, 7], "x": 7, "y": 1.25},
49 {"label": "+", "y": 1.25,"x": 12}, 49 {"matrix": [1, 8], "x": 8, "y": 1.25},
50 {"label": "Backspace", "y": 1.25,"x": 13, "w": 2}, 50 {"matrix": [1, 9], "x": 9, "y": 1.25},
51 {"label": "Home", "y": 1.25,"x": 15}, 51 {"matrix": [1, 10], "x": 10, "y": 1.25},
52 52 {"matrix": [1, 11], "x": 11, "y": 1.25},
53 {"label": "Tab", "y": 2.25,"x": 0, "w": 1.5}, 53 {"matrix": [1, 12], "x": 12, "y": 1.25},
54 {"label": "Q", "y": 2.25,"x": 1.5}, 54 {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
55 {"label": "W", "y": 2.25,"x": 2.5}, 55 {"matrix": [1, 14], "x": 15, "y": 1.25},
56 {"label": "E", "y": 2.25,"x": 3.5}, 56
57 {"label": "R", "y": 2.25,"x": 4.5}, 57 {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
58 {"label": "T", "y": 2.25,"x": 5.5}, 58 {"matrix": [2, 1], "x": 1.5, "y": 2.25},
59 {"label": "Y", "y": 2.25,"x": 6.5}, 59 {"matrix": [2, 2], "x": 2.5, "y": 2.25},
60 {"label": "U", "y": 2.25,"x": 7.5}, 60 {"matrix": [2, 3], "x": 3.5, "y": 2.25},
61 {"label": "I", "y": 2.25,"x": 8.5}, 61 {"matrix": [2, 4], "x": 4.5, "y": 2.25},
62 {"label": "O", "y": 2.25,"x": 9.5}, 62 {"matrix": [2, 5], "x": 5.5, "y": 2.25},
63 {"label": "P", "y": 2.25,"x": 10.5}, 63 {"matrix": [2, 6], "x": 6.5, "y": 2.25},
64 {"label": "{", "y": 2.25,"x": 11.5}, 64 {"matrix": [2, 7], "x": 7.5, "y": 2.25},
65 {"label": "}", "y": 2.25,"x": 12.5}, 65 {"matrix": [2, 8], "x": 8.5, "y": 2.25},
66 {"label": "|", "y": 2.25,"x": 13.5, "w": 1.5}, 66 {"matrix": [2, 9], "x": 9.5, "y": 2.25},
67 {"label": "Del", "y": 2.25,"x": 15}, 67 {"matrix": [2, 10], "x": 10.5, "y": 2.25},
68 68 {"matrix": [2, 11], "x": 11.5, "y": 2.25},
69 {"label": "Caps Lock", "y": 3.25,"x": 0, "w": 1.75}, 69 {"matrix": [2, 12], "x": 12.5, "y": 2.25},
70 {"label": "A", "y": 3.25,"x": 1.75}, 70 {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
71 {"label": "S", "y": 3.25,"x": 2.75}, 71 {"matrix": [2, 14], "x": 15, "y": 2.25},
72 {"label": "D", "y": 3.25,"x": 3.75}, 72
73 {"label": "F", "y": 3.25,"x": 4.75}, 73 {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
74 {"label": "G", "y": 3.25,"x": 5.75}, 74 {"matrix": [3, 1], "x": 1.75, "y": 3.25},
75 {"label": "H", "y": 3.25,"x": 6.75}, 75 {"matrix": [3, 2], "x": 2.75, "y": 3.25},
76 {"label": "J", "y": 3.25,"x": 7.75}, 76 {"matrix": [3, 3], "x": 3.75, "y": 3.25},
77 {"label": "K", "y": 3.25,"x": 8.75}, 77 {"matrix": [3, 4], "x": 4.75, "y": 3.25},
78 {"label": "L", "y": 3.25,"x": 9.75}, 78 {"matrix": [3, 5], "x": 5.75, "y": 3.25},
79 {"label": ":", "y": 3.25,"x": 10.75}, 79 {"matrix": [3, 6], "x": 6.75, "y": 3.25},
80 {"label": "\"", "y": 3.25,"x": 11.75}, 80 {"matrix": [3, 7], "x": 7.75, "y": 3.25},
81 {"label": "Enter", "y": 3.25,"x": 12.75, "w": 2.25}, 81 {"matrix": [3, 8], "x": 8.75, "y": 3.25},
82 {"label": "End", "y": 3.25,"x": 15}, 82 {"matrix": [3, 9], "x": 9.75, "y": 3.25},
83 83 {"matrix": [3, 10], "x": 10.75, "y": 3.25},
84 {"label": "Shift", "y": 4.25,"x": 0, "w": 2.25}, 84 {"matrix": [3, 11], "x": 11.75, "y": 3.25},
85 {"label": "Z", "y": 4.25,"x": 2.25}, 85 {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
86 {"label": "X", "y": 4.25,"x": 3.25}, 86 {"matrix": [3, 14], "x": 15, "y": 3.25},
87 {"label": "C", "y": 4.25,"x": 4.25}, 87
88 {"label": "V", "y": 4.25,"x": 5.25}, 88 {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
89 {"label": "B", "y": 4.25,"x": 6.25}, 89 {"matrix": [4, 1], "x": 2.25, "y": 4.25},
90 {"label": "N", "y": 4.25,"x": 7.25}, 90 {"matrix": [4, 2], "x": 3.25, "y": 4.25},
91 {"label": "M", "y": 4.25,"x": 8.25}, 91 {"matrix": [4, 3], "x": 4.25, "y": 4.25},
92 {"label": "<", "y": 4.25,"x": 9.25}, 92 {"matrix": [4, 4], "x": 5.25, "y": 4.25},
93 {"label": ">", "y": 4.25,"x": 10.25}, 93 {"matrix": [4, 5], "x": 6.25, "y": 4.25},
94 {"label": "?", "y": 4.25,"x": 11.25}, 94 {"matrix": [4, 6], "x": 7.25, "y": 4.25},
95 {"label": "Shift", "y": 4.25,"x": 12.25, "w": 1.75}, 95 {"matrix": [4, 7], "x": 8.25, "y": 4.25},
96 {"label": "\u2191", "y": 4.25,"x": 14}, 96 {"matrix": [4, 8], "x": 9.25, "y": 4.25},
97 97 {"matrix": [4, 9], "x": 10.25, "y": 4.25},
98 {"label":"Ctrl", "y":5.25, "x":0, "w":1.25}, 98 {"matrix": [4, 11], "x": 11.25, "y": 4.25},
99 {"label":"Win", "y":5.25, "x":1.25, "w": 1.25}, 99 {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
100 {"label":"Alt", "y":5.25, "x":2.5, "w":1.25}, 100 {"matrix": [4, 13], "x": 14, "y": 4.25},
101 {"label":"Spacebar", "y":5.25, "x":3.75, "w":6.25}, 101
102 {"label":"Win", "y":5.25, "x":10, "w":1.25}, 102 {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
103 {"label":"Alt", "y":5.25, "x":11.25, "w":1.25}, 103 {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
104 {"label":"\u2190", "y":5.25, "x":13}, 104 {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
105 {"label":"\u2193", "y":5.25, "x":14}, 105 {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
106 {"label":"\u2192", "y":5.25, "x":15} 106 {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
107 {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
108
109 {"matrix": [5, 12], "x": 13, "y": 5.25},
110 {"matrix": [5, 13], "x": 14, "y": 5.25},
111 {"matrix": [5, 14], "x": 15, "y": 5.25}
107 ] 112 ]
108 }, 113 },
109 "LAYOUT_7u": { 114 "LAYOUT_7u": {
110 "layout": [ 115 "layout": [
111 {"label": "ESC", "y": 0,"x": 0}, 116 {"matrix": [0, 0], "x": 0, "y": 0},
112 {"label": "F1", "y": 0,"x": 1.25}, 117
113 {"label": "F2", "y": 0,"x": 2.25}, 118 {"matrix": [0, 1], "x": 1.25, "y": 0},
114 {"label": "F3", "y": 0,"x": 3.25}, 119 {"matrix": [0, 2], "x": 2.25, "y": 0},
115 {"label": "F4", "y": 0,"x": 4.25}, 120 {"matrix": [0, 3], "x": 3.25, "y": 0},
116 {"label": "F5", "y": 0,"x": 5.5}, 121 {"matrix": [0, 4], "x": 4.25, "y": 0},
117 {"label": "F6", "y": 0,"x": 6.5}, 122
118 {"label": "F7", "y": 0,"x": 7.5}, 123 {"matrix": [0, 5], "x": 5.5, "y": 0},
119 {"label": "F8", "y": 0,"x": 8.5}, 124 {"matrix": [0, 6], "x": 6.5, "y": 0},
120 {"label": "F9", "y": 0,"x": 9.75}, 125 {"matrix": [0, 7], "x": 7.5, "y": 0},
121 {"label": "F10", "y": 0,"x": 10.75}, 126 {"matrix": [0, 8], "x": 8.5, "y": 0},
122 {"label": "F11", "y": 0,"x": 11.75}, 127
123 {"label": "F12", "y": 0,"x": 12.75}, 128 {"matrix": [0, 9], "x": 9.75, "y": 0},
124 {"label": "PrtSc", "y": 0,"x": 14}, 129 {"matrix": [0, 10], "x": 10.75, "y": 0},
125 {"label": "INS", "y": 0,"x": 15}, 130 {"matrix": [0, 11], "x": 11.75, "y": 0},
126 131 {"matrix": [0, 12], "x": 12.75, "y": 0},
127 {"label": "~", "y": 1.25,"x": 0}, 132
128 {"label": "!", "y": 1.25,"x": 1}, 133 {"matrix": [0, 13], "x": 14, "y": 0},
129 {"label": "@", "y": 1.25,"x": 2}, 134 {"matrix": [0, 14], "x": 15, "y": 0},
130 {"label": "#", "y": 1.25,"x": 3}, 135
131 {"label": "$", "y": 1.25,"x": 4}, 136 {"matrix": [1, 0], "x": 0, "y": 1.25},
132 {"label": "%", "y": 1.25,"x": 5}, 137 {"matrix": [1, 1], "x": 1, "y": 1.25},
133 {"label": "^", "y": 1.25,"x": 6}, 138 {"matrix": [1, 2], "x": 2, "y": 1.25},
134 {"label": "&", "y": 1.25,"x": 7}, 139 {"matrix": [1, 3], "x": 3, "y": 1.25},
135 {"label": "*", "y": 1.25,"x": 8}, 140 {"matrix": [1, 4], "x": 4, "y": 1.25},
136 {"label": "(", "y": 1.25,"x": 9}, 141 {"matrix": [1, 5], "x": 5, "y": 1.25},
137 {"label": ")", "y": 1.25,"x": 10}, 142 {"matrix": [1, 6], "x": 6, "y": 1.25},
138 {"label": "_", "y": 1.25,"x": 11}, 143 {"matrix": [1, 7], "x": 7, "y": 1.25},
139 {"label": "+", "y": 1.25,"x": 12}, 144 {"matrix": [1, 8], "x": 8, "y": 1.25},
140 {"label": "Backspace", "y": 1.25,"x": 13, "w": 2}, 145 {"matrix": [1, 9], "x": 9, "y": 1.25},
141 {"label": "Home", "y": 1.25,"x": 15}, 146 {"matrix": [1, 10], "x": 10, "y": 1.25},
142 147 {"matrix": [1, 11], "x": 11, "y": 1.25},
143 {"label": "Tab", "y": 2.25,"x": 0, "w": 1.5}, 148 {"matrix": [1, 12], "x": 12, "y": 1.25},
144 {"label": "Q", "y": 2.25,"x": 1.5}, 149 {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
145 {"label": "W", "y": 2.25,"x": 2.5}, 150 {"matrix": [1, 14], "x": 15, "y": 1.25},
146 {"label": "E", "y": 2.25,"x": 3.5}, 151
147 {"label": "R", "y": 2.25,"x": 4.5}, 152 {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
148 {"label": "T", "y": 2.25,"x": 5.5}, 153 {"matrix": [2, 1], "x": 1.5, "y": 2.25},
149 {"label": "Y", "y": 2.25,"x": 6.5}, 154 {"matrix": [2, 2], "x": 2.5, "y": 2.25},
150 {"label": "U", "y": 2.25,"x": 7.5}, 155 {"matrix": [2, 3], "x": 3.5, "y": 2.25},
151 {"label": "I", "y": 2.25,"x": 8.5}, 156 {"matrix": [2, 4], "x": 4.5, "y": 2.25},
152 {"label": "O", "y": 2.25,"x": 9.5}, 157 {"matrix": [2, 5], "x": 5.5, "y": 2.25},
153 {"label": "P", "y": 2.25,"x": 10.5}, 158 {"matrix": [2, 6], "x": 6.5, "y": 2.25},
154 {"label": "{", "y": 2.25,"x": 11.5}, 159 {"matrix": [2, 7], "x": 7.5, "y": 2.25},
155 {"label": "}", "y": 2.25,"x": 12.5}, 160 {"matrix": [2, 8], "x": 8.5, "y": 2.25},
156 {"label": "|", "y": 2.25,"x": 13.5, "w": 1.5}, 161 {"matrix": [2, 9], "x": 9.5, "y": 2.25},
157 {"label": "Del", "y": 2.25,"x": 15}, 162 {"matrix": [2, 10], "x": 10.5, "y": 2.25},
158 163 {"matrix": [2, 11], "x": 11.5, "y": 2.25},
159 {"label": "Caps Lock", "y": 3.25,"x": 0, "w": 1.75}, 164 {"matrix": [2, 12], "x": 12.5, "y": 2.25},
160 {"label": "A", "y": 3.25,"x": 1.75}, 165 {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
161 {"label": "S", "y": 3.25,"x": 2.75}, 166 {"matrix": [2, 14], "x": 15, "y": 2.25},
162 {"label": "D", "y": 3.25,"x": 3.75}, 167
163 {"label": "F", "y": 3.25,"x": 4.75}, 168 {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
164 {"label": "G", "y": 3.25,"x": 5.75}, 169 {"matrix": [3, 1], "x": 1.75, "y": 3.25},
165 {"label": "H", "y": 3.25,"x": 6.75}, 170 {"matrix": [3, 2], "x": 2.75, "y": 3.25},
166 {"label": "J", "y": 3.25,"x": 7.75}, 171 {"matrix": [3, 3], "x": 3.75, "y": 3.25},
167 {"label": "K", "y": 3.25,"x": 8.75}, 172 {"matrix": [3, 4], "x": 4.75, "y": 3.25},
168 {"label": "L", "y": 3.25,"x": 9.75}, 173 {"matrix": [3, 5], "x": 5.75, "y": 3.25},
169 {"label": ":", "y": 3.25,"x": 10.75}, 174 {"matrix": [3, 6], "x": 6.75, "y": 3.25},
170 {"label": "\"", "y": 3.25,"x": 11.75}, 175 {"matrix": [3, 7], "x": 7.75, "y": 3.25},
171 {"label": "Enter", "y": 3.25,"x": 12.75, "w": 2.25}, 176 {"matrix": [3, 8], "x": 8.75, "y": 3.25},
172 {"label": "End", "y": 3.25,"x": 15}, 177 {"matrix": [3, 9], "x": 9.75, "y": 3.25},
173 178 {"matrix": [3, 10], "x": 10.75, "y": 3.25},
174 {"label": "Shift", "y": 4.25,"x": 0, "w": 2.25}, 179 {"matrix": [3, 11], "x": 11.75, "y": 3.25},
175 {"label": "Z", "y": 4.25,"x": 2.25}, 180 {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
176 {"label": "X", "y": 4.25,"x": 3.25}, 181 {"matrix": [3, 14], "x": 15, "y": 3.25},
177 {"label": "C", "y": 4.25,"x": 4.25}, 182
178 {"label": "V", "y": 4.25,"x": 5.25}, 183 {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
179 {"label": "B", "y": 4.25,"x": 6.25}, 184 {"matrix": [4, 1], "x": 2.25, "y": 4.25},
180 {"label": "N", "y": 4.25,"x": 7.25}, 185 {"matrix": [4, 2], "x": 3.25, "y": 4.25},
181 {"label": "M", "y": 4.25,"x": 8.25}, 186 {"matrix": [4, 3], "x": 4.25, "y": 4.25},
182 {"label": "<", "y": 4.25,"x": 9.25}, 187 {"matrix": [4, 4], "x": 5.25, "y": 4.25},
183 {"label": ">", "y": 4.25,"x": 10.25}, 188 {"matrix": [4, 5], "x": 6.25, "y": 4.25},
184 {"label": "?", "y": 4.25,"x": 11.25}, 189 {"matrix": [4, 6], "x": 7.25, "y": 4.25},
185 {"label": "Shift", "y": 4.25,"x": 12.25, "w": 1.75}, 190 {"matrix": [4, 7], "x": 8.25, "y": 4.25},
186 {"label": "\u2191", "y": 4.25,"x": 14}, 191 {"matrix": [4, 8], "x": 9.25, "y": 4.25},
187 192 {"matrix": [4, 9], "x": 10.25, "y": 4.25},
188 {"label":"Ctrl", "y":5.25, "x": 0, "w":1.5}, 193 {"matrix": [4, 11], "x": 11.25, "y": 4.25},
189 {"label":"Win", "y":5.25, "x":1.5}, 194 {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
190 {"label":"Alt", "y":5.25, "x":2.5, "w":1.5}, 195 {"matrix": [4, 13], "x": 14, "y": 4.25},
191 {"label":"Spacebar", "y":5.25, "x":4, "w":7}, 196
192 {"label":"Alt", "y":5.25, "x":11, "w":1.5}, 197 {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
193 {"label":"\u2190", "y":5.25, "x":13}, 198 {"matrix": [5, 1], "x": 1.5, "y": 5.25},
194 {"label":"\u2193", "y":5.25, "x":14}, 199 {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
195 {"label":"\u2192", "y":5.25, "x":15} 200 {"matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
201 {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
202
203 {"matrix": [5, 12], "x": 13, "y": 5.25},
204 {"matrix": [5, 13], "x": 14, "y": 5.25},
205 {"matrix": [5, 14], "x": 15, "y": 5.25}
196 ] 206 ]
197 } 207 }
198 } 208 }
diff --git a/keyboards/buzzard/rev1/info.json b/keyboards/buzzard/rev1/info.json
index 3cd9d387ca..78479a8dd2 100644
--- a/keyboards/buzzard/rev1/info.json
+++ b/keyboards/buzzard/rev1/info.json
@@ -20,7 +20,99 @@
20 "bootloader": "atmel-dfu", 20 "bootloader": "atmel-dfu",
21 "layouts": { 21 "layouts": {
22 "LAYOUT": { 22 "LAYOUT": {
23 "layout": [{"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}] 23 "layout": [
24 {"matrix": [0, 4], "x": 1, "y": 0},
25 {"matrix": [0, 3], "x": 2, "y": 0},
26 {"matrix": [0, 2], "x": 3, "y": 0},
27 {"matrix": [0, 1], "x": 4, "y": 0},
28 {"matrix": [0, 0], "x": 5, "y": 0},
29
30 {"matrix": [4, 0], "x": 11, "y": 0},
31 {"matrix": [4, 1], "x": 12, "y": 0},
32 {"matrix": [4, 2], "x": 13, "y": 0},
33 {"matrix": [4, 3], "x": 14, "y": 0},
34 {"matrix": [4, 4], "x": 15, "y": 0},
35
36 {"matrix": [1, 5], "x": 0, "y": 1},
37 {"matrix": [1, 4], "x": 1, "y": 1},
38 {"matrix": [1, 3], "x": 2, "y": 1},
39 {"matrix": [1, 2], "x": 3, "y": 1},
40 {"matrix": [1, 1], "x": 4, "y": 1},
41 {"matrix": [1, 0], "x": 5, "y": 1},
42
43 {"matrix": [5, 0], "x": 11, "y": 1},
44 {"matrix": [5, 1], "x": 12, "y": 1},
45 {"matrix": [5, 2], "x": 13, "y": 1},
46 {"matrix": [5, 3], "x": 14, "y": 1},
47 {"matrix": [5, 4], "x": 15, "y": 1},
48 {"matrix": [5, 5], "x": 16, "y": 1},
49
50 {"matrix": [2, 5], "x": 0, "y": 2},
51 {"matrix": [2, 4], "x": 1, "y": 2},
52 {"matrix": [2, 3], "x": 2, "y": 2},
53 {"matrix": [2, 2], "x": 3, "y": 2},
54 {"matrix": [2, 1], "x": 4, "y": 2},
55 {"matrix": [2, 0], "x": 5, "y": 2},
56
57 {"matrix": [6, 0], "x": 11, "y": 2},
58 {"matrix": [6, 1], "x": 12, "y": 2},
59 {"matrix": [6, 2], "x": 13, "y": 2},
60 {"matrix": [6, 3], "x": 14, "y": 2},
61 {"matrix": [6, 4], "x": 15, "y": 2},
62 {"matrix": [6, 5], "x": 16, "y": 2},
63
64 {"matrix": [3, 2], "x": 5, "y": 3},
65 {"matrix": [3, 1], "x": 6, "y": 3},
66 {"matrix": [3, 0], "x": 7, "y": 3},
67
68 {"matrix": [7, 0], "x": 9, "y": 3},
69 {"matrix": [7, 1], "x": 10, "y": 3},
70 {"matrix": [7, 2], "x": 11, "y": 3}
71 ]
72 },
73 "LAYOUT_stack": {
74 "layout": [
75 {"matrix": [0, 4], "x": 0, "y": 0},
76 {"matrix": [0, 3], "x": 1, "y": 0},
77 {"matrix": [0, 2], "x": 2, "y": 0},
78 {"matrix": [0, 1], "x": 3, "y": 0},
79 {"matrix": [0, 0], "x": 4, "y": 0},
80 {"matrix": [1, 5], "x": 5, "y": 0},
81 {"matrix": [1, 4], "x": 6, "y": 0},
82 {"matrix": [1, 3], "x": 7, "y": 0},
83 {"matrix": [1, 2], "x": 8, "y": 0},
84 {"matrix": [1, 1], "x": 9, "y": 0},
85 {"matrix": [1, 0], "x": 10, "y": 0},
86 {"matrix": [2, 5], "x": 11, "y": 0},
87 {"matrix": [2, 4], "x": 12, "y": 0},
88 {"matrix": [2, 3], "x": 13, "y": 0},
89 {"matrix": [2, 2], "x": 14, "y": 0},
90 {"matrix": [2, 1], "x": 15, "y": 0},
91 {"matrix": [2, 0], "x": 16, "y": 0},
92 {"matrix": [3, 2], "x": 17, "y": 0},
93 {"matrix": [3, 1], "x": 18, "y": 0},
94 {"matrix": [3, 0], "x": 19, "y": 0},
95 {"matrix": [4, 0], "x": 20, "y": 0},
96 {"matrix": [4, 1], "x": 21, "y": 0},
97 {"matrix": [4, 2], "x": 22, "y": 0},
98 {"matrix": [4, 3], "x": 23, "y": 0},
99 {"matrix": [4, 4], "x": 24, "y": 0},
100 {"matrix": [5, 0], "x": 25, "y": 0},
101 {"matrix": [5, 1], "x": 26, "y": 0},
102 {"matrix": [5, 2], "x": 27, "y": 0},
103 {"matrix": [5, 3], "x": 28, "y": 0},
104 {"matrix": [5, 4], "x": 29, "y": 0},
105 {"matrix": [5, 5], "x": 30, "y": 0},
106 {"matrix": [6, 0], "x": 31, "y": 0},
107 {"matrix": [6, 1], "x": 32, "y": 0},
108 {"matrix": [6, 2], "x": 33, "y": 0},
109 {"matrix": [6, 3], "x": 34, "y": 0},
110 {"matrix": [6, 4], "x": 35, "y": 0},
111 {"matrix": [6, 5], "x": 36, "y": 0},
112 {"matrix": [7, 0], "x": 37, "y": 0},
113 {"matrix": [7, 1], "x": 38, "y": 0},
114 {"matrix": [7, 2], "x": 39, "y": 0}
115 ]
24 } 116 }
25 } 117 }
26} \ No newline at end of file 118} \ No newline at end of file
diff --git a/keyboards/buzzard/rev1/rev1.c b/keyboards/buzzard/rev1/rev1.c
index 0124a92c32..c6cdc66187 100644
--- a/keyboards/buzzard/rev1/rev1.c
+++ b/keyboards/buzzard/rev1/rev1.c
@@ -1,6 +1,6 @@
1// Copyright 2021 Christoph Rehmann (crehmann) 1// Copyright 2021 Christoph Rehmann (crehmann)
2// SPDX-License-Identifier: GPL-2.0-or-later 2// SPDX-License-Identifier: GPL-2.0-or-later
3#include "rev1.h" 3#include "quantum.h"
4 4
5#ifdef HAPTIC_ENABLE 5#ifdef HAPTIC_ENABLE
6#include "drivers/haptic/DRV2605L.h" 6#include "drivers/haptic/DRV2605L.h"
diff --git a/keyboards/buzzard/rev1/rev1.h b/keyboards/buzzard/rev1/rev1.h
deleted file mode 100644
index 74c5fef08e..0000000000
--- a/keyboards/buzzard/rev1/rev1.h
+++ /dev/null
@@ -1,52 +0,0 @@
1// Copyright 2021 Christoph Rehmann (crehmann)
2// SPDX-License-Identifier: GPL-2.0-or-later
3#pragma once
4
5#include "quantum.h"
6
7/* This a shortcut to help you visually see your layout.
8 *
9 * The first section contains all of the arguments representing the physical
10 * layout of the board and position of the keys.
11 *
12 * The second converts the arguments into a two-dimensional array which
13 * represents the switch matrix.
14 */
15#define LAYOUT( \
16 L00, L01, L02, L03, L04, R05, R06, R07, R08, R09, \
17 L10, L11, L12, L13, L14, L15, R16, R17, R18, R19, R20, R21, \
18 L22, L23, L24, L25, L26, L27, R28, R29, R30, R31, R32, R33, \
19 L34, L35, L36, R37, R38, R39 \
20) \
21{ \
22 { L04, L03, L02, L01, L00, KC_NO }, \
23 { L15, L14, L13, L12, L11, L10 }, \
24 { L27, L26, L25, L24, L23, L22 }, \
25 { L36, L35, L34, KC_NO, KC_NO, KC_NO }, \
26 { R05, R06, R07, R08, R09, KC_NO }, \
27 { R16, R17, R18, R19, R20, R21 }, \
28 { R28, R29, R30, R31, R32, R33 }, \
29 { R37, R38, R39, KC_NO, KC_NO, KC_NO }, \
30}
31
32#define LAYOUT_stack( \
33 L00, L01, L02, L03, L04, \
34 L10, L11, L12, L13, L14, L15, \
35 L22, L23, L24, L25, L26, L27, \
36 L34, L35, L36, \
37 \
38 R05, R06, R07, R08, R09, \
39 R16, R17, R18, R19, R20, R21, \
40 R28, R29, R30, R31, R32, R33, \
41 R37, R38, R39 \
42) \
43{ \
44 { L04, L03, L02, L01, L00, KC_NO }, \
45 { L15, L14, L13, L12, L11, L10 }, \
46 { L27, L26, L25, L24, L23, L22 }, \
47 { L36, L35, L34, KC_NO, KC_NO, KC_NO }, \
48 { R05, R06, R07, R08, R09, KC_NO }, \
49 { R16, R17, R18, R19, R20, R21 }, \
50 { R28, R29, R30, R31, R32, R33 }, \
51 { R37, R38, R39, KC_NO, KC_NO, KC_NO }, \
52}
diff --git a/keyboards/capsunlocked/cu75/cu75.h b/keyboards/capsunlocked/cu75/cu75.h
index 11a01b8b7e..d17c1da26f 100644
--- a/keyboards/capsunlocked/cu75/cu75.h
+++ b/keyboards/capsunlocked/cu75/cu75.h
@@ -25,72 +25,3 @@ extern const Layer_Info layer_info[];
25 25
26void reset_keyboard_kb(void); 26void reset_keyboard_kb(void);
27void click(uint16_t freq, uint16_t duration); 27void click(uint16_t freq, uint16_t duration);
28
29#define XXX KC_NO
30
31/* Vanilla Keymap */
32// This a shortcut to help you visually see your layout.
33/*
34* ,-------------------------------------------------------------------------------.
35* | 00 | 01 | 02 | 03 | 04 | 05 | 06 | 07 | 08 | 09 | 0A | 0B | 0C | 0D | 0E | 0F |
36* |-------------------------------------------------------------------------------|
37* | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 1A | 1B | 1C | 1D | 1F |
38* |-------------------------------------------------------------------------------|
39* | 20 | 21 |22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 2A | 2B | 2C | 2D | 2E |
40* |-------------------------------------------------------------------------------|
41* | 30 | 31 |32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | 3A | 3B | 3C | 3E |
42* |-------------------------------------------------------------------------------|
43* | 40 | 42 |43 | 44 | 45 | 46 | 47 | 48 | 49 | 4A | 4B | 4C | 4D | 4E |
44* |-------------------------------------------------------------------------------|
45* | 50 | 51 | 52 | 53 | 56 | 58 | 59 | 5A | 5B | 5C | 5D | 5E |
46* `-------------------------------------------------------------------------------'
47*/
48// The first section contains all of the arguements
49// The second converts the arguments into a two-dimensional array
50#define LAYOUT( \
51 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
52 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1F, \
53 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
54 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3E, \
55 k40, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, \
56 k50, k51, k52, k53, k56, k58, k59, k5A, k5B, k5C, k5D, k5E \
57) { \
58 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
59 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX, k1F }, \
60 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, XXX }, \
61 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, XXX, k3E, XXX }, \
62 { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, XXX }, \
63 { k50, k51, k52, k53, XXX, XXX, k56, XXX, k58, k59, k5A, k5B, k5C, k5D, k5E, XXX } \
64}
65
66#define LAYOUT_all( \
67 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
68 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \
69 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
70 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
71 k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, \
72 k50, k51, k52, k53, k56, k58, k59, k5A, k5B, k5C, k5D, k5E \
73) { \
74 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
75 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
76 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, XXX }, \
77 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, XXX }, \
78 { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, XXX }, \
79 { k50, k51, k52, k53, XXX, XXX, k56, XXX, k58, k59, k5A, k5B, k5C, k5D, k5E, XXX } \
80}
81
82#define LAYOUT_iso( \
83 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
84 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1F, \
85 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
86 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3E, \
87 k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, \
88 k50, k51, k52, k53, k56, k58, k59, k5A, k5B, k5C, k5D, k5E \
89) { \
90 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
91 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX, k1F }, \
92 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, XXX }, \
93 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, XXX, k3E, XXX }, \
94 { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, XXX }, \
95 { k50, k51, k52, k53, XXX, XXX, k56, XXX, k58, k59, k5A, k5B, k5C, k5D, k5E, XXX } \
96}
diff --git a/keyboards/capsunlocked/cu75/info.json b/keyboards/capsunlocked/cu75/info.json
index 5be11f6cb0..3ea17a46e1 100644
--- a/keyboards/capsunlocked/cu75/info.json
+++ b/keyboards/capsunlocked/cu75/info.json
@@ -24,15 +24,293 @@
24 "bootloader": "atmel-dfu", 24 "bootloader": "atmel-dfu",
25 "layouts": { 25 "layouts": {
26 "LAYOUT": { 26 "LAYOUT": {
27 "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"PrtSc", "x":13, "y":0}, {"label":"Pause", "x":14, "y":0}, {"label":"Delete", "x":15, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"Backspace", "x":13, "y":1, "w":2}, {"label":"Home", "x":15, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"Page Up", "x":15, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"Page Down", "x":15, "y":3}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14, "y":4}, {"label":"End", "x":15, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":2.75}, {"x":6.5, "y":5}, {"x":7.5, "y":5, "w":2.5}, {"label":"Alt", "x":10, "y":5}, {"label":"Fn", "x":11, "y":5}, {"label":"Ctrl", "x":12, "y":5}, {"label":"\u2190", "x":13, "y":5}, {"label":"\u2193", "x":14, "y":5}, {"label":"\u2192", "x":15, "y":5}] 27 "layout": [
28 }, 28 {"matrix": [0, 0], "x": 0, "y": 0},
29 {"matrix": [0, 1], "x": 1, "y": 0},
30 {"matrix": [0, 2], "x": 2, "y": 0},
31 {"matrix": [0, 3], "x": 3, "y": 0},
32 {"matrix": [0, 4], "x": 4, "y": 0},
33 {"matrix": [0, 5], "x": 5, "y": 0},
34 {"matrix": [0, 6], "x": 6, "y": 0},
35 {"matrix": [0, 7], "x": 7, "y": 0},
36 {"matrix": [0, 8], "x": 8, "y": 0},
37 {"matrix": [0, 9], "x": 9, "y": 0},
38 {"matrix": [0, 10], "x": 10, "y": 0},
39 {"matrix": [0, 11], "x": 11, "y": 0},
40 {"matrix": [0, 12], "x": 12, "y": 0},
41 {"matrix": [0, 13], "x": 13, "y": 0},
42 {"matrix": [0, 14], "x": 14, "y": 0},
43 {"matrix": [0, 15], "x": 15, "y": 0},
29 44
30 "LAYOUT_all": { 45 {"matrix": [1, 0], "x": 0, "y": 1},
31 "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"PrtSc", "x":13, "y":0}, {"label":"Pause", "x":14, "y":0}, {"label":"Delete", "x":15, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"label":"Home", "x":15, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"Page Up", "x":15, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"x":12.75, "y":3}, {"label":"Enter", "x":13.75, "y":3, "w":1.25}, {"label":"Page Down", "x":15, "y":3}, {"label":"Shift", "x":0, "y":4, "w":1.25}, {"x":1.25, "y":4}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14, "y":4}, {"label":"End", "x":15, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":2.75}, {"x":6.5, "y":5}, {"x":7.5, "y":5, "w":2.5}, {"label":"Alt", "x":10, "y":5}, {"label":"Fn", "x":11, "y":5}, {"label":"Ctrl", "x":12, "y":5}, {"label":"\u2190", "x":13, "y":5}, {"label":"\u2193", "x":14, "y":5}, {"label":"\u2192", "x":15, "y":5}] 46 {"matrix": [1, 1], "x": 1, "y": 1},
47 {"matrix": [1, 2], "x": 2, "y": 1},
48 {"matrix": [1, 3], "x": 3, "y": 1},
49 {"matrix": [1, 4], "x": 4, "y": 1},
50 {"matrix": [1, 5], "x": 5, "y": 1},
51 {"matrix": [1, 6], "x": 6, "y": 1},
52 {"matrix": [1, 7], "x": 7, "y": 1},
53 {"matrix": [1, 8], "x": 8, "y": 1},
54 {"matrix": [1, 9], "x": 9, "y": 1},
55 {"matrix": [1, 10], "x": 10, "y": 1},
56 {"matrix": [1, 11], "x": 11, "y": 1},
57 {"matrix": [1, 12], "x": 12, "y": 1},
58 {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
59 {"matrix": [1, 15], "x": 15, "y": 1},
60
61 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
62 {"matrix": [2, 1], "x": 1.5, "y": 2},
63 {"matrix": [2, 2], "x": 2.5, "y": 2},
64 {"matrix": [2, 3], "x": 3.5, "y": 2},
65 {"matrix": [2, 4], "x": 4.5, "y": 2},
66 {"matrix": [2, 5], "x": 5.5, "y": 2},
67 {"matrix": [2, 6], "x": 6.5, "y": 2},
68 {"matrix": [2, 7], "x": 7.5, "y": 2},
69 {"matrix": [2, 8], "x": 8.5, "y": 2},
70 {"matrix": [2, 9], "x": 9.5, "y": 2},
71 {"matrix": [2, 10], "x": 10.5, "y": 2},
72 {"matrix": [2, 11], "x": 11.5, "y": 2},
73 {"matrix": [2, 12], "x": 12.5, "y": 2},
74 {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
75 {"matrix": [2, 14], "x": 15, "y": 2},
76
77 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
78 {"matrix": [3, 1], "x": 1.75, "y": 3},
79 {"matrix": [3, 2], "x": 2.75, "y": 3},
80 {"matrix": [3, 3], "x": 3.75, "y": 3},
81 {"matrix": [3, 4], "x": 4.75, "y": 3},
82 {"matrix": [3, 5], "x": 5.75, "y": 3},
83 {"matrix": [3, 6], "x": 6.75, "y": 3},
84 {"matrix": [3, 7], "x": 7.75, "y": 3},
85 {"matrix": [3, 8], "x": 8.75, "y": 3},
86 {"matrix": [3, 9], "x": 9.75, "y": 3},
87 {"matrix": [3, 10], "x": 10.75, "y": 3},
88 {"matrix": [3, 11], "x": 11.75, "y": 3},
89 {"matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25},
90 {"matrix": [3, 14], "x": 15, "y": 3},
91
92 {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
93 {"matrix": [4, 2], "x": 2.25, "y": 4},
94 {"matrix": [4, 3], "x": 3.25, "y": 4},
95 {"matrix": [4, 4], "x": 4.25, "y": 4},
96 {"matrix": [4, 5], "x": 5.25, "y": 4},
97 {"matrix": [4, 6], "x": 6.25, "y": 4},
98 {"matrix": [4, 7], "x": 7.25, "y": 4},
99 {"matrix": [4, 8], "x": 8.25, "y": 4},
100 {"matrix": [4, 9], "x": 9.25, "y": 4},
101 {"matrix": [4, 10], "x": 10.25, "y": 4},
102 {"matrix": [4, 11], "x": 11.25, "y": 4},
103 {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
104 {"matrix": [4, 13], "x": 14, "y": 4},
105 {"matrix": [4, 14], "x": 15, "y": 4},
106
107 {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
108 {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
109 {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
110 {"matrix": [5, 3], "x": 3.75, "y": 5, "w": 2.75},
111 {"matrix": [5, 6], "x": 6.5, "y": 5},
112 {"matrix": [5, 8], "x": 7.5, "y": 5, "w": 2.5},
113 {"matrix": [5, 9], "x": 10, "y": 5},
114 {"matrix": [5, 10], "x": 11, "y": 5},
115 {"matrix": [5, 11], "x": 12, "y": 5},
116 {"matrix": [5, 12], "x": 13, "y": 5},
117 {"matrix": [5, 13], "x": 14, "y": 5},
118 {"matrix": [5, 14], "x": 15, "y": 5}
119 ]
32 }, 120 },
121 "LAYOUT_all": {
122 "layout": [
123 {"matrix": [0, 0], "x": 0, "y": 0},
124 {"matrix": [0, 1], "x": 1, "y": 0},
125 {"matrix": [0, 2], "x": 2, "y": 0},
126 {"matrix": [0, 3], "x": 3, "y": 0},
127 {"matrix": [0, 4], "x": 4, "y": 0},
128 {"matrix": [0, 5], "x": 5, "y": 0},
129 {"matrix": [0, 6], "x": 6, "y": 0},
130 {"matrix": [0, 7], "x": 7, "y": 0},
131 {"matrix": [0, 8], "x": 8, "y": 0},
132 {"matrix": [0, 9], "x": 9, "y": 0},
133 {"matrix": [0, 10], "x": 10, "y": 0},
134 {"matrix": [0, 11], "x": 11, "y": 0},
135 {"matrix": [0, 12], "x": 12, "y": 0},
136 {"matrix": [0, 13], "x": 13, "y": 0},
137 {"matrix": [0, 14], "x": 14, "y": 0},
138 {"matrix": [0, 15], "x": 15, "y": 0},
139
140 {"matrix": [1, 0], "x": 0, "y": 1},
141 {"matrix": [1, 1], "x": 1, "y": 1},
142 {"matrix": [1, 2], "x": 2, "y": 1},
143 {"matrix": [1, 3], "x": 3, "y": 1},
144 {"matrix": [1, 4], "x": 4, "y": 1},
145 {"matrix": [1, 5], "x": 5, "y": 1},
146 {"matrix": [1, 6], "x": 6, "y": 1},
147 {"matrix": [1, 7], "x": 7, "y": 1},
148 {"matrix": [1, 8], "x": 8, "y": 1},
149 {"matrix": [1, 9], "x": 9, "y": 1},
150 {"matrix": [1, 10], "x": 10, "y": 1},
151 {"matrix": [1, 11], "x": 11, "y": 1},
152 {"matrix": [1, 12], "x": 12, "y": 1},
153 {"matrix": [1, 13], "x": 13, "y": 1},
154 {"matrix": [1, 14], "x": 14, "y": 1},
155 {"matrix": [1, 15], "x": 15, "y": 1},
156
157 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
158 {"matrix": [2, 1], "x": 1.5, "y": 2},
159 {"matrix": [2, 2], "x": 2.5, "y": 2},
160 {"matrix": [2, 3], "x": 3.5, "y": 2},
161 {"matrix": [2, 4], "x": 4.5, "y": 2},
162 {"matrix": [2, 5], "x": 5.5, "y": 2},
163 {"matrix": [2, 6], "x": 6.5, "y": 2},
164 {"matrix": [2, 7], "x": 7.5, "y": 2},
165 {"matrix": [2, 8], "x": 8.5, "y": 2},
166 {"matrix": [2, 9], "x": 9.5, "y": 2},
167 {"matrix": [2, 10], "x": 10.5, "y": 2},
168 {"matrix": [2, 11], "x": 11.5, "y": 2},
169 {"matrix": [2, 12], "x": 12.5, "y": 2},
170 {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
171 {"matrix": [2, 14], "x": 15, "y": 2},
33 172
173 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
174 {"matrix": [3, 1], "x": 1.75, "y": 3},
175 {"matrix": [3, 2], "x": 2.75, "y": 3},
176 {"matrix": [3, 3], "x": 3.75, "y": 3},
177 {"matrix": [3, 4], "x": 4.75, "y": 3},
178 {"matrix": [3, 5], "x": 5.75, "y": 3},
179 {"matrix": [3, 6], "x": 6.75, "y": 3},
180 {"matrix": [3, 7], "x": 7.75, "y": 3},
181 {"matrix": [3, 8], "x": 8.75, "y": 3},
182 {"matrix": [3, 9], "x": 9.75, "y": 3},
183 {"matrix": [3, 10], "x": 10.75, "y": 3},
184 {"matrix": [3, 11], "x": 11.75, "y": 3},
185 {"matrix": [3, 12], "x": 12.75, "y": 3},
186 {"matrix": [3, 13], "x": 13.75, "y": 3, "w": 1.25},
187 {"matrix": [3, 14], "x": 15, "y": 3},
188
189 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
190 {"matrix": [4, 1], "x": 1.25, "y": 4},
191 {"matrix": [4, 2], "x": 2.25, "y": 4},
192 {"matrix": [4, 3], "x": 3.25, "y": 4},
193 {"matrix": [4, 4], "x": 4.25, "y": 4},
194 {"matrix": [4, 5], "x": 5.25, "y": 4},
195 {"matrix": [4, 6], "x": 6.25, "y": 4},
196 {"matrix": [4, 7], "x": 7.25, "y": 4},
197 {"matrix": [4, 8], "x": 8.25, "y": 4},
198 {"matrix": [4, 9], "x": 9.25, "y": 4},
199 {"matrix": [4, 10], "x": 10.25, "y": 4},
200 {"matrix": [4, 11], "x": 11.25, "y": 4},
201 {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
202 {"matrix": [4, 13], "x": 14, "y": 4},
203 {"matrix": [4, 14], "x": 15, "y": 4},
204
205 {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
206 {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
207 {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
208 {"matrix": [5, 3], "x": 3.75, "y": 5, "w": 2.75},
209 {"matrix": [5, 6], "x": 6.5, "y": 5},
210 {"matrix": [5, 8], "x": 7.5, "y": 5, "w": 2.5},
211 {"matrix": [5, 9], "x": 10, "y": 5},
212 {"matrix": [5, 10], "x": 11, "y": 5},
213 {"matrix": [5, 11], "x": 12, "y": 5},
214 {"matrix": [5, 12], "x": 13, "y": 5},
215 {"matrix": [5, 13], "x": 14, "y": 5},
216 {"matrix": [5, 14], "x": 15, "y": 5}
217 ]
218 },
34 "LAYOUT_iso": { 219 "LAYOUT_iso": {
35 "layout": [{"label":"k01", "x":0, "y":0}, {"label":"k02", "x":1, "y":0}, {"label":"k03", "x":2, "y":0}, {"label":"k04", "x":3, "y":0}, {"label":"k05", "x":4, "y":0}, {"label":"k06", "x":5, "y":0}, {"label":"k07", "x":6, "y":0}, {"label":"k08", "x":7, "y":0}, {"label":"k09", "x":8, "y":0}, {"label":"k0A", "x":9, "y":0}, {"label":"k0B", "x":10, "y":0}, {"label":"k0C", "x":11, "y":0}, {"label":"k0D", "x":12, "y":0}, {"label":"k0E", "x":13, "y":0}, {"label":"k0F", "x":14, "y":0}, {"label":"k0G", "x":15, "y":0}, {"label":"k11", "x":0, "y":1}, {"label":"k12", "x":1, "y":1}, {"label":"k13", "x":2, "y":1}, {"label":"k14", "x":3, "y":1}, {"label":"k15", "x":4, "y":1}, {"label":"k16", "x":5, "y":1}, {"label":"k17", "x":6, "y":1}, {"label":"k18", "x":7, "y":1}, {"label":"k19", "x":8, "y":1}, {"label":"k1A", "x":9, "y":1}, {"label":"k1B", "x":10, "y":1}, {"label":"k1C", "x":11, "y":1}, {"label":"k1D", "x":12, "y":1}, {"label":"k1E", "x":13, "y":1, "w":2}, {"label":"k1G", "x":15, "y":1}, {"label":"k21", "x":0, "y":2, "w":1.5}, {"label":"k22", "x":1.5, "y":2}, {"label":"k23", "x":2.5, "y":2}, {"label":"k24", "x":3.5, "y":2}, {"label":"k25", "x":4.5, "y":2}, {"label":"k26", "x":5.5, "y":2}, {"label":"k27", "x":6.5, "y":2}, {"label":"k28", "x":7.5, "y":2}, {"label":"k29", "x":8.5, "y":2}, {"label":"k2A", "x":9.5, "y":2}, {"label":"k2B", "x":10.5, "y":2}, {"label":"k2C", "x":11.5, "y":2}, {"label":"k2D", "x":12.5, "y":2}, {"label":"k2E", "x":13.75, "y":2, "w":1.25, "h":2}, {"label":"k2F", "x":15, "y":2}, {"label":"k31", "x":0, "y":3, "w":1.75}, {"label":"k32", "x":1.75, "y":3}, {"label":"k33", "x":2.75, "y":3}, {"label":"k34", "x":3.75, "y":3}, {"label":"k35", "x":4.75, "y":3}, {"label":"k36", "x":5.75, "y":3}, {"label":"k37", "x":6.75, "y":3}, {"label":"k38", "x":7.75, "y":3}, {"label":"k39", "x":8.75, "y":3}, {"label":"k3A", "x":9.75, "y":3}, {"label":"k3B", "x":10.75, "y":3}, {"label":"k3C", "x":11.75, "y":3}, {"label":"k3D", "x":12.75, "y":3}, {"label":"k3F", "x":15, "y":3}, {"label":"k41", "x":0, "y":4, "w":1.25}, {"label":"k42", "x":1.25, "y":4}, {"label":"k43", "x":2.25, "y":4}, {"label":"k44", "x":3.25, "y":4}, {"label":"k45", "x":4.25, "y":4}, {"label":"k46", "x":5.25, "y":4}, {"label":"k47", "x":6.25, "y":4}, {"label":"k48", "x":7.25, "y":4}, {"label":"k49", "x":8.25, "y":4}, {"label":"k4A", "x":9.25, "y":4}, {"label":"k4B", "x":10.25, "y":4}, {"label":"k4C", "x":11.25, "y":4}, {"label":"k4D", "x":12.25, "y":4, "w":1.75}, {"label":"k4E", "x":14, "y":4}, {"label":"k4F", "x":15, "y":4}, {"label":"k51", "x":0, "y":5, "w":1.25}, {"label":"k52", "x":1.25, "y":5, "w":1.25}, {"label":"k53", "x":2.5, "y":5, "w":1.25}, {"label":"k54", "x":3.75, "y":5, "w":2.25}, {"label":"k57", "x":6, "y":5, "w":1.25}, {"label":"k59", "x":7.25, "y":5, "w":2.75}, {"label":"k5A", "x":10, "y":5}, {"label":"k5B", "x":11, "y":5}, {"label":"k5C", "x":12, "y":5}, {"label":"k5D", "x":13, "y":5}, {"label":"k5E", "x":14, "y":5}, {"label":"k5F", "x":15, "y":5}] 220 "layout": [
221 {"matrix": [0, 0], "x": 0, "y": 0},
222 {"matrix": [0, 1], "x": 1, "y": 0},
223 {"matrix": [0, 2], "x": 2, "y": 0},
224 {"matrix": [0, 3], "x": 3, "y": 0},
225 {"matrix": [0, 4], "x": 4, "y": 0},
226 {"matrix": [0, 5], "x": 5, "y": 0},
227 {"matrix": [0, 6], "x": 6, "y": 0},
228 {"matrix": [0, 7], "x": 7, "y": 0},
229 {"matrix": [0, 8], "x": 8, "y": 0},
230 {"matrix": [0, 9], "x": 9, "y": 0},
231 {"matrix": [0, 10], "x": 10, "y": 0},
232 {"matrix": [0, 11], "x": 11, "y": 0},
233 {"matrix": [0, 12], "x": 12, "y": 0},
234 {"matrix": [0, 13], "x": 13, "y": 0},
235 {"matrix": [0, 14], "x": 14, "y": 0},
236 {"matrix": [0, 15], "x": 15, "y": 0},
237
238 {"matrix": [1, 0], "x": 0, "y": 1},
239 {"matrix": [1, 1], "x": 1, "y": 1},
240 {"matrix": [1, 2], "x": 2, "y": 1},
241 {"matrix": [1, 3], "x": 3, "y": 1},
242 {"matrix": [1, 4], "x": 4, "y": 1},
243 {"matrix": [1, 5], "x": 5, "y": 1},
244 {"matrix": [1, 6], "x": 6, "y": 1},
245 {"matrix": [1, 7], "x": 7, "y": 1},
246 {"matrix": [1, 8], "x": 8, "y": 1},
247 {"matrix": [1, 9], "x": 9, "y": 1},
248 {"matrix": [1, 10], "x": 10, "y": 1},
249 {"matrix": [1, 11], "x": 11, "y": 1},
250 {"matrix": [1, 12], "x": 12, "y": 1},
251 {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
252 {"matrix": [1, 15], "x": 15, "y": 1},
253
254 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
255 {"matrix": [2, 1], "x": 1.5, "y": 2},
256 {"matrix": [2, 2], "x": 2.5, "y": 2},
257 {"matrix": [2, 3], "x": 3.5, "y": 2},
258 {"matrix": [2, 4], "x": 4.5, "y": 2},
259 {"matrix": [2, 5], "x": 5.5, "y": 2},
260 {"matrix": [2, 6], "x": 6.5, "y": 2},
261 {"matrix": [2, 7], "x": 7.5, "y": 2},
262 {"matrix": [2, 8], "x": 8.5, "y": 2},
263 {"matrix": [2, 9], "x": 9.5, "y": 2},
264 {"matrix": [2, 10], "x": 10.5, "y": 2},
265 {"matrix": [2, 11], "x": 11.5, "y": 2},
266 {"matrix": [2, 12], "x": 12.5, "y": 2},
267 {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
268 {"matrix": [2, 14], "x": 15, "y": 2},
269
270 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
271 {"matrix": [3, 1], "x": 1.75, "y": 3},
272 {"matrix": [3, 2], "x": 2.75, "y": 3},
273 {"matrix": [3, 3], "x": 3.75, "y": 3},
274 {"matrix": [3, 4], "x": 4.75, "y": 3},
275 {"matrix": [3, 5], "x": 5.75, "y": 3},
276 {"matrix": [3, 6], "x": 6.75, "y": 3},
277 {"matrix": [3, 7], "x": 7.75, "y": 3},
278 {"matrix": [3, 8], "x": 8.75, "y": 3},
279 {"matrix": [3, 9], "x": 9.75, "y": 3},
280 {"matrix": [3, 10], "x": 10.75, "y": 3},
281 {"matrix": [3, 11], "x": 11.75, "y": 3},
282 {"matrix": [3, 12], "x": 12.75, "y": 3},
283 {"matrix": [3, 14], "x": 15, "y": 3},
284
285 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
286 {"matrix": [4, 1], "x": 1.25, "y": 4},
287 {"matrix": [4, 2], "x": 2.25, "y": 4},
288 {"matrix": [4, 3], "x": 3.25, "y": 4},
289 {"matrix": [4, 4], "x": 4.25, "y": 4},
290 {"matrix": [4, 5], "x": 5.25, "y": 4},
291 {"matrix": [4, 6], "x": 6.25, "y": 4},
292 {"matrix": [4, 7], "x": 7.25, "y": 4},
293 {"matrix": [4, 8], "x": 8.25, "y": 4},
294 {"matrix": [4, 9], "x": 9.25, "y": 4},
295 {"matrix": [4, 10], "x": 10.25, "y": 4},
296 {"matrix": [4, 11], "x": 11.25, "y": 4},
297 {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
298 {"matrix": [4, 13], "x": 14, "y": 4},
299 {"matrix": [4, 14], "x": 15, "y": 4},
300
301 {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
302 {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
303 {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
304 {"matrix": [5, 3], "x": 3.75, "y": 5, "w": 2.25},
305 {"matrix": [5, 6], "x": 6, "y": 5, "w": 1.25},
306 {"matrix": [5, 8], "x": 7.25, "y": 5, "w": 2.75},
307 {"matrix": [5, 9], "x": 10, "y": 5},
308 {"matrix": [5, 10], "x": 11, "y": 5},
309 {"matrix": [5, 11], "x": 12, "y": 5},
310 {"matrix": [5, 12], "x": 13, "y": 5},
311 {"matrix": [5, 13], "x": 14, "y": 5},
312 {"matrix": [5, 14], "x": 15, "y": 5}
313 ]
36 } 314 }
37 } 315 }
38} 316}
diff --git a/keyboards/converter/ibm_terminal/ibm_terminal.h b/keyboards/converter/ibm_terminal/ibm_terminal.h
deleted file mode 100644
index ce50e5f437..0000000000
--- a/keyboards/converter/ibm_terminal/ibm_terminal.h
+++ /dev/null
@@ -1,81 +0,0 @@
1#pragma once
2
3#include "quantum.h"
4
5#define XXX KC_NO
6
7void matrix_init_user(void);
8
9/*
10 * IBM Terminal keyboard 6110345(122keys)/1392595(102keys)
11 * http://geekhack.org/showthread.php?10737-What-Can-I-Do-With-a-Terminal-Model-M
12 * http://www.seasip.info/VintagePC/ibm_1391406.html
13 *
14 * Keymap array:
15 * 8 bytes
16 * +---------+
17 * 0| |
18 * :| | 0x00-0x87
19 * ;| |
20 * 17| |
21 * +---------+
22 */
23#define LAYOUT( \
24 k08, k10, k18, k20, k28, k30, k38, k40, k48, k50, k57, k5F, \
25 k07, k0F, k17, k1F, k27, k2F, k37, k3F, k47, k4F, k56, k5E, \
26\
27 k05, k06, k0E, k16, k1E, k26, k25, k2E, k36, k3D, k3E, k46, k45, k4E, k55, k5D, k66, k67, k6E, k6F, k76, k77, k7E, k84, \
28 k04, k0C, k0D, k15, k1D, k24, k2D, k2C, k35, k3C, k43, k44, k4D, k54, k5B, k5C, k64, k65, k6D, k6C, k75, k7D, k7C, \
29 k03, k0B, k14, k1C, k1B, k23, k2B, k34, k33, k3B, k42, k4B, k4C, k52, k53, k5A, k63, k6B, k73, k74, k7B, \
30 k83, k0A, k12, k13, k1A, k22, k21, k2A, k32, k31, k3A, k41, k49, k4A, k51, k59, k61, k62, k6A, k69, k72, k7A, k79, \
31 k01, k09, k11, k19, k29, k39, k58, k60, k68, k70, k71, k78 \
32) { \
33 { XXX, k01, XXX, k03, k04, k05, k06, k07 }, \
34 { k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
35 { k10, k11, k12, k13, k14, k15, k16, k17 }, \
36 { k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
37 { k20, k21, k22, k23, k24, k25, k26, k27 }, \
38 { k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
39 { k30, k31, k32, k33, k34, k35, k36, k37 }, \
40 { k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
41 { k40, k41, k42, k43, k44, k45, k46, k47 }, \
42 { k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \
43 { k50, k51, k52, k53, k54, k55, k56, k57 }, \
44 { k58, k59, k5A, k5B, k5C, k5D, k5E, k5F }, \
45 { k60, k61, k62, k63, k64, k65, k66, k67 }, \
46 { k68, k69, k6A, k6B, k6C, k6D, k6E, k6F }, \
47 { k70, k71, k72, k73, k74, k75, k76, k77 }, \
48 { k78, k79, k7A, k7B, k7C, k7D, k7E, XXX }, \
49 { XXX, XXX, XXX, k83, k84, XXX, XXX, XXX } \
50}
51
52/*
53 * IBM Terminal keyboard 1399625, 101-key
54 */
55#define LAYOUT_101( \
56 k08, k07, k0F, k17, k1F, k27, k2F, k37, k3F, k47, k4F, k56, k5E, k57, k5F, k62, \
57\
58 k0E, k16, k1E, k26, k25, k2E, k36, k3D, k3E, k46, k45, k4E, k55, k66, k67, k6E, k6F, k76, k77, k7E, k84, \
59 k0D, k15, k1D, k24, k2D, k2C, k35, k3C, k43, k44, k4D, k54, k5B, k5C, k64, k65, k6D, k6C, k75, k7D, \
60 k14, k1C, k1B, k23, k2B, k34, k33, k3B, k42, k4B, k4C, k52, k5A, k6B, k73, k74, k7C, \
61 k12, k1A, k22, k21, k2A, k32, k31, k3A, k41, k49, k4A, k59, k63, k69, k72, k7A, \
62 k11, k19, k29, k39, k58, k61, k60, k6A, k70, k71, k79 \
63) { \
64 { XXX, XXX, XXX, XXX, XXX, XXX, XXX, k07 }, \
65 { k08, XXX, XXX, XXX, XXX, k0D, k0E, k0F }, \
66 { XXX, k11, k12, XXX, k14, k15, k16, k17 }, \
67 { XXX, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
68 { XXX, k21, k22, k23, k24, k25, k26, k27 }, \
69 { XXX, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
70 { XXX, k31, k32, k33, k34, k35, k36, k37 }, \
71 { XXX, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
72 { XXX, k41, k42, k43, k44, k45, k46, k47 }, \
73 { XXX, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \
74 { XXX, XXX, k52, XXX, k54, k55, k56, k57 }, \
75 { k58, k59, k5A, k5B, k5C, XXX, k5E, k5F }, \
76 { k60, k61, k62, k63, k64, k65, k66, k67 }, \
77 { XXX, k69, k6A, k6B, k6C, k6D, k6E, k6F }, \
78 { k70, k71, k72, k73, k74, k75, k76, k77 }, \
79 { XXX, k79, k7A, XXX, k7C, k7D, k7E, XXX }, \
80 { XXX, XXX, XXX, XXX, k84, XXX, XXX, XXX } \
81}
diff --git a/keyboards/converter/ibm_terminal/info.json b/keyboards/converter/ibm_terminal/info.json
index 51bc208c9c..39840eb627 100644
--- a/keyboards/converter/ibm_terminal/info.json
+++ b/keyboards/converter/ibm_terminal/info.json
@@ -13,238 +13,276 @@
13 "layouts": { 13 "layouts": {
14 "LAYOUT": { 14 "LAYOUT": {
15 "layout": [ 15 "layout": [
16 {"label":"F13", "x":3.25, "y":0}, 16 {"matrix": [1, 0], "x": 3.25, "y": 0},
17 {"label":"F14", "x":4.25, "y":0}, 17 {"matrix": [2, 0], "x": 4.25, "y": 0},
18 {"label":"F15", "x":5.25, "y":0}, 18 {"matrix": [3, 0], "x": 5.25, "y": 0},
19 {"label":"F16", "x":6.25, "y":0}, 19 {"matrix": [4, 0], "x": 6.25, "y": 0},
20 {"label":"F17", "x":7.25, "y":0}, 20 {"matrix": [5, 0], "x": 7.25, "y": 0},
21 {"label":"F18", "x":8.25, "y":0}, 21 {"matrix": [6, 0], "x": 8.25, "y": 0},
22 {"label":"F19", "x":9.25, "y":0}, 22 {"matrix": [7, 0], "x": 9.25, "y": 0},
23 {"label":"F20", "x":10.25, "y":0}, 23 {"matrix": [8, 0], "x": 10.25, "y": 0},
24 {"label":"F21", "x":11.25, "y":0}, 24 {"matrix": [9, 0], "x": 11.25, "y": 0},
25 {"label":"F22", "x":12.25, "y":0}, 25 {"matrix": [10, 0], "x": 12.25, "y": 0},
26 {"label":"F23", "x":13.25, "y":0}, 26 {"matrix": [10, 7], "x": 13.25, "y": 0},
27 {"label":"F24", "x":14.25, "y":0}, 27 {"matrix": [11, 7], "x": 14.25, "y": 0},
28 {"label":"F1", "x":3.25, "y":1}, 28
29 {"label":"F2", "x":4.25, "y":1}, 29 {"matrix": [0, 7], "x": 3.25, "y": 1},
30 {"label":"F3", "x":5.25, "y":1}, 30 {"matrix": [1, 7], "x": 4.25, "y": 1},
31 {"label":"F4", "x":6.25, "y":1}, 31 {"matrix": [2, 7], "x": 5.25, "y": 1},
32 {"label":"F5", "x":7.25, "y":1}, 32 {"matrix": [3, 7], "x": 6.25, "y": 1},
33 {"label":"F6", "x":8.25, "y":1}, 33 {"matrix": [4, 7], "x": 7.25, "y": 1},
34 {"label":"F7", "x":9.25, "y":1}, 34 {"matrix": [5, 7], "x": 8.25, "y": 1},
35 {"label":"F8", "x":10.25, "y":1}, 35 {"matrix": [6, 7], "x": 9.25, "y": 1},
36 {"label":"F9", "x":11.25, "y":1}, 36 {"matrix": [7, 7], "x": 10.25, "y": 1},
37 {"label":"F10", "x":12.25, "y":1}, 37 {"matrix": [8, 7], "x": 11.25, "y": 1},
38 {"label":"F11", "x":13.25, "y":1}, 38 {"matrix": [9, 7], "x": 12.25, "y": 1},
39 {"label":"F12", "x":14.25, "y":1}, 39 {"matrix": [10, 6], "x": 13.25, "y": 1},
40 {"label":"Print Screen", "x":0, "y":3}, 40 {"matrix": [11, 6], "x": 14.25, "y": 1},
41 {"label":"Esc", "x":1, "y":3}, 41
42 {"label":"Esc", "x":2.25, "y":3}, 42 {"matrix": [0, 5], "x": 0, "y": 3},
43 {"label":"1", "x":3.25, "y":3}, 43 {"matrix": [0, 6], "x": 1, "y": 3},
44 {"label":"2", "x":4.25, "y":3}, 44
45 {"label":"3", "x":5.25, "y":3}, 45 {"matrix": [1, 6], "x": 2.25, "y": 3},
46 {"label":"4", "x":6.25, "y":3}, 46 {"matrix": [2, 6], "x": 3.25, "y": 3},
47 {"label":"5", "x":7.25, "y":3}, 47 {"matrix": [3, 6], "x": 4.25, "y": 3},
48 {"label":"6", "x":8.25, "y":3}, 48 {"matrix": [4, 6], "x": 5.25, "y": 3},
49 {"label":"7", "x":9.25, "y":3}, 49 {"matrix": [4, 5], "x": 6.25, "y": 3},
50 {"label":"8", "x":10.25, "y":3}, 50 {"matrix": [5, 6], "x": 7.25, "y": 3},
51 {"label":"9", "x":11.25, "y":3}, 51 {"matrix": [6, 6], "x": 8.25, "y": 3},
52 {"label":"0", "x":12.25, "y":3}, 52 {"matrix": [7, 5], "x": 9.25, "y": 3},
53 {"label":"-", "x":13.25, "y":3}, 53 {"matrix": [7, 6], "x": 10.25, "y": 3},
54 {"label":"=", "x":14.25, "y":3}, 54 {"matrix": [8, 6], "x": 11.25, "y": 3},
55 {"label":"No", "x":15.25, "y":3}, 55 {"matrix": [8, 5], "x": 12.25, "y": 3},
56 {"label":"Back Space", "x":16.25, "y":3}, 56 {"matrix": [9, 6], "x": 13.25, "y": 3},
57 {"label":"Insert", "x":17.5, "y":3}, 57 {"matrix": [10, 5], "x": 14.25, "y": 3},
58 {"label":"Home", "x":18.5, "y":3}, 58 {"matrix": [11, 5], "x": 15.25, "y": 3},
59 {"label":"Page Up", "x":19.5, "y":3}, 59 {"matrix": [12, 6], "x": 16.25, "y": 3},
60 {"label":"Num Lock", "x":20.75, "y":3}, 60
61 {"label":"/", "x":21.75, "y":3}, 61 {"matrix": [12, 7], "x": 17.5, "y": 3},
62 {"label":"*", "x":22.75, "y":3}, 62 {"matrix": [13, 6], "x": 18.5, "y": 3},
63 {"label":"-", "x":23.75, "y":3}, 63 {"matrix": [13, 7], "x": 19.5, "y": 3},
64 {"label":"Scroll Lock", "x":0, "y":4}, 64
65 {"label":"Int4", "x":1, "y":4}, 65 {"matrix": [14, 6], "x": 20.75, "y": 3},
66 {"label":"Tab", "x":2.25, "y":4, "w":1.5}, 66 {"matrix": [14, 7], "x": 21.75, "y": 3},
67 {"label":"Q", "x":3.75, "y":4}, 67 {"matrix": [15, 6], "x": 22.75, "y": 3},
68 {"label":"W", "x":4.75, "y":4}, 68 {"matrix": [16, 4], "x": 23.75, "y": 3},
69 {"label":"E", "x":5.75, "y":4}, 69
70 {"label":"R", "x":6.75, "y":4}, 70 {"matrix": [0, 4], "x": 0, "y": 4},
71 {"label":"T", "x":7.75, "y":4}, 71 {"matrix": [1, 4], "x": 1, "y": 4},
72 {"label":"Y", "x":8.75, "y":4}, 72
73 {"label":"U", "x":9.75, "y":4}, 73 {"matrix": [1, 5], "x": 2.25, "y": 4, "w": 1.5},
74 {"label":"I", "x":10.75, "y":4}, 74 {"matrix": [2, 5], "x": 3.75, "y": 4},
75 {"label":"O", "x":11.75, "y":4}, 75 {"matrix": [3, 5], "x": 4.75, "y": 4},
76 {"label":"P", "x":12.75, "y":4}, 76 {"matrix": [4, 4], "x": 5.75, "y": 4},
77 {"label":"[", "x":13.75, "y":4}, 77 {"matrix": [5, 5], "x": 6.75, "y": 4},
78 {"label":"]", "x":14.75, "y":4}, 78 {"matrix": [5, 4], "x": 7.75, "y": 4},
79 {"label":"No", "x":15.75, "y":4, "w":1.5}, 79 {"matrix": [6, 5], "x": 8.75, "y": 4},
80 {"label":"Delete", "x":17.5, "y":4}, 80 {"matrix": [7, 4], "x": 9.75, "y": 4},
81 {"label":"End", "x":18.5, "y":4}, 81 {"matrix": [8, 3], "x": 10.75, "y": 4},
82 {"label":"Page Down", "x":19.5, "y":4}, 82 {"matrix": [8, 4], "x": 11.75, "y": 4},
83 {"label":"7", "x":20.75, "y":4}, 83 {"matrix": [9, 5], "x": 12.75, "y": 4},
84 {"label":"8", "x":21.75, "y":4}, 84 {"matrix": [10, 4], "x": 13.75, "y": 4},
85 {"label":"9", "x":22.75, "y":4}, 85 {"matrix": [11, 3], "x": 14.75, "y": 4},
86 {"label":"+", "x":23.75, "y":4}, 86 {"matrix": [11, 4], "x": 15.75, "y": 4, "w": 1.5},
87 {"label":"Pause", "x":0, "y":5}, 87
88 {"label":"Int5", "x":1, "y":5}, 88 {"matrix": [12, 4], "x": 17.5, "y": 4},
89 {"label":"Caps Lock", "x":2.25, "y":5, "w":1.75}, 89 {"matrix": [12, 5], "x": 18.5, "y": 4},
90 {"label":"A", "x":4, "y":5}, 90 {"matrix": [13, 5], "x": 19.5, "y": 4},
91 {"label":"S", "x":5, "y":5}, 91
92 {"label":"D", "x":6, "y":5}, 92 {"matrix": [13, 4], "x": 20.75, "y": 4},
93 {"label":"F", "x":7, "y":5}, 93 {"matrix": [14, 5], "x": 21.75, "y": 4},
94 {"label":"G", "x":8, "y":5}, 94 {"matrix": [15, 5], "x": 22.75, "y": 4},
95 {"label":"H", "x":9, "y":5}, 95 {"matrix": [15, 4], "x": 23.75, "y": 4},
96 {"label":"J", "x":10, "y":5}, 96
97 {"label":"K", "x":11, "y":5}, 97 {"matrix": [0, 3], "x": 0, "y": 5},
98 {"label":"L", "x":12, "y":5}, 98 {"matrix": [1, 3], "x": 1, "y": 5},
99 {"label":";", "x":13, "y":5}, 99
100 {"label":"'", "x":14, "y":5}, 100 {"matrix": [2, 4], "x": 2.25, "y": 5, "w": 1.75},
101 {"label":"\\", "x":15, "y":5}, 101 {"matrix": [3, 4], "x": 4, "y": 5},
102 {"label":"Enter", "x":16, "y":5, "w":1.25}, 102 {"matrix": [3, 3], "x": 5, "y": 5},
103 {"label":"Up", "x":18.5, "y":5}, 103 {"matrix": [4, 3], "x": 6, "y": 5},
104 {"label":"4", "x":20.75, "y":5}, 104 {"matrix": [5, 3], "x": 7, "y": 5},
105 {"label":"5", "x":21.75, "y":5}, 105 {"matrix": [6, 4], "x": 8, "y": 5},
106 {"label":"6", "x":22.75, "y":5}, 106 {"matrix": [6, 3], "x": 9, "y": 5},
107 {"label":",", "x":23.75, "y":5}, 107 {"matrix": [7, 3], "x": 10, "y": 5},
108 {"label":"App", "x":0, "y":6}, 108 {"matrix": [8, 2], "x": 11, "y": 5},
109 {"label":"Int6", "x":1, "y":6}, 109 {"matrix": [9, 3], "x": 12, "y": 5},
110 {"label":"Shift", "x":2.25, "y":6, "w":1.25}, 110 {"matrix": [9, 4], "x": 13, "y": 5},
111 {"label":"ISO \\", "x":3.5, "y":6}, 111 {"matrix": [10, 2], "x": 14, "y": 5},
112 {"label":"Z", "x":4.5, "y":6}, 112 {"matrix": [10, 3], "x": 15, "y": 5},
113 {"label":"X", "x":5.5, "y":6}, 113 {"matrix": [11, 2], "x": 16, "y": 5, "w": 1.25},
114 {"label":"C", "x":6.5, "y":6}, 114
115 {"label":"V", "x":7.5, "y":6}, 115 {"matrix": [12, 3], "x": 18.5, "y": 5},
116 {"label":"B", "x":8.5, "y":6}, 116
117 {"label":"N", "x":9.5, "y":6}, 117 {"matrix": [13, 3], "x": 20.75, "y": 5},
118 {"label":"M", "x":10.5, "y":6}, 118 {"matrix": [14, 3], "x": 21.75, "y": 5},
119 {"label":",", "x":11.5, "y":6}, 119 {"matrix": [14, 4], "x": 22.75, "y": 5},
120 {"label":".", "x":12.5, "y":6}, 120 {"matrix": [15, 3], "x": 23.75, "y": 5},
121 {"label":"/", "x":13.5, "y":6}, 121
122 {"label":"No", "x":14.5, "y":6}, 122 {"matrix": [16, 3], "x": 0, "y": 6},
123 {"label":"Shift", "x":15.5, "y":6, "w":1.75}, 123 {"matrix": [1, 2], "x": 1, "y": 6},
124 {"label":"Left", "x":17.5, "y":6}, 124
125 {"label":"Int2", "x":18.5, "y":6}, 125 {"matrix": [2, 2], "x": 2.25, "y": 6, "w": 1.25},
126 {"label":"Right", "x":19.5, "y":6}, 126 {"matrix": [2, 3], "x": 3.5, "y": 6},
127 {"label":"1", "x":20.75, "y":6}, 127 {"matrix": [3, 2], "x": 4.5, "y": 6},
128 {"label":"2", "x":21.75, "y":6}, 128 {"matrix": [4, 2], "x": 5.5, "y": 6},
129 {"label":"3", "x":22.75, "y":6}, 129 {"matrix": [4, 1], "x": 6.5, "y": 6},
130 {"label":"Enter", "x":23.75, "y":6}, 130 {"matrix": [5, 2], "x": 7.5, "y": 6},
131 {"label":"RGUI", "x":0, "y":7}, 131 {"matrix": [6, 2], "x": 8.5, "y": 6},
132 {"label":"lgui", "x":1, "y":7}, 132 {"matrix": [6, 1], "x": 9.5, "y": 6},
133 {"label":"Ctrl", "x":2.25, "y":7, "w":1.5}, 133 {"matrix": [7, 2], "x": 10.5, "y": 6},
134 {"label":"Alt", "x":4.75, "y":7, "w":1.5}, 134 {"matrix": [8, 1], "x": 11.5, "y": 6},
135 {"label":"Space", "x":6.25, "y":7, "w":7}, 135 {"matrix": [9, 1], "x": 12.5, "y": 6},
136 {"label":"Alt", "x":13.25, "y":7, "w":1.5}, 136 {"matrix": [9, 2], "x": 13.5, "y": 6},
137 {"label":"Ctrl", "x":15.75, "y":7, "w":1.5}, 137 {"matrix": [10, 1], "x": 14.5, "y": 6},
138 {"label":"Down", "x":18.5, "y":7}, 138 {"matrix": [11, 1], "x": 15.5, "y": 6, "w": 1.75},
139 {"label":"No", "x":20.75, "y":7}, 139
140 {"label":"0", "x":21.75, "y":7}, 140 {"matrix": [12, 1], "x": 17.5, "y": 6},
141 {"label":".", "x":22.75, "y":7}, 141 {"matrix": [12, 2], "x": 18.5, "y": 6},
142 {"label":"No", "x":23.75, "y":7} 142 {"matrix": [13, 2], "x": 19.5, "y": 6},
143
144 {"matrix": [13, 1], "x": 20.75, "y": 6},
145 {"matrix": [14, 2], "x": 21.75, "y": 6},
146 {"matrix": [15, 2], "x": 22.75, "y": 6},
147 {"matrix": [15, 1], "x": 23.75, "y": 6},
148
149 {"matrix": [0, 1], "x": 0, "y": 7},
150 {"matrix": [1, 1], "x": 1, "y": 7},
151 {"matrix": [2, 1], "x": 2.25, "y": 7, "w": 1.5},
152 {"matrix": [3, 1], "x": 4.75, "y": 7, "w": 1.5},
153 {"matrix": [5, 1], "x": 6.25, "y": 7, "w": 7},
154 {"matrix": [7, 1], "x": 13.25, "y": 7, "w": 1.5},
155 {"matrix": [11, 0], "x": 15.75, "y": 7, "w": 1.5},
156
157 {"matrix": [12, 0], "x": 18.5, "y": 7},
158
159 {"matrix": [13, 0], "x": 20.75, "y": 7},
160 {"matrix": [14, 0], "x": 21.75, "y": 7},
161 {"matrix": [14, 1], "x": 22.75, "y": 7},
162 {"matrix": [15, 0], "x": 23.75, "y": 7}
143 ] 163 ]
144 }, 164 },
145 "LAYOUT_101": { 165 "LAYOUT_101": {
146 "layout": [ 166 "layout": [
147 {"label":"Esc", "x":0, "y":0}, 167 {"matrix": [1, 0], "x": 0, "y": 0},
148 {"label":"F1", "x":2, "y":0}, 168
149 {"label":"F2", "x":3, "y":0}, 169 {"matrix": [0, 7], "x": 2, "y": 0},
150 {"label":"F3", "x":4, "y":0}, 170 {"matrix": [1, 7], "x": 3, "y": 0},
151 {"label":"F4", "x":5, "y":0}, 171 {"matrix": [2, 7], "x": 4, "y": 0},
152 {"label":"F5", "x":6.5, "y":0}, 172 {"matrix": [3, 7], "x": 5, "y": 0},
153 {"label":"F6", "x":7.5, "y":0}, 173
154 {"label":"F7", "x":8.5, "y":0}, 174 {"matrix": [4, 7], "x": 6.5, "y": 0},
155 {"label":"F8", "x":9.5, "y":0}, 175 {"matrix": [5, 7], "x": 7.5, "y": 0},
156 {"label":"F9", "x":11, "y":0}, 176 {"matrix": [6, 7], "x": 8.5, "y": 0},
157 {"label":"F10", "x":12, "y":0}, 177 {"matrix": [7, 7], "x": 9.5, "y": 0},
158 {"label":"F11", "x":13, "y":0}, 178
159 {"label":"F12", "x":14, "y":0}, 179 {"matrix": [8, 7], "x": 11, "y": 0},
160 {"label":"Print Screen", "x":15.25, "y":0}, 180 {"matrix": [9, 7], "x": 12, "y": 0},
161 {"label":"Scroll Lock", "x":16.25, "y":0}, 181 {"matrix": [10, 6], "x": 13, "y": 0},
162 {"label":"Pause", "x":17.25, "y":0}, 182 {"matrix": [11, 6], "x": 14, "y": 0},
163 {"label":"`", "x":0, "y":2}, 183
164 {"label":"1", "x":1, "y":2}, 184 {"matrix": [10, 7], "x": 15.25, "y": 0},
165 {"label":"2", "x":2, "y":2}, 185 {"matrix": [11, 7], "x": 16.25, "y": 0},
166 {"label":"3", "x":3, "y":2}, 186 {"matrix": [12, 2], "x": 17.25, "y": 0},
167 {"label":"4", "x":4, "y":2}, 187
168 {"label":"5", "x":5, "y":2}, 188 {"matrix": [1, 6], "x": 0, "y": 2},
169 {"label":"6", "x":6, "y":2}, 189 {"matrix": [2, 6], "x": 1, "y": 2},
170 {"label":"7", "x":7, "y":2}, 190 {"matrix": [3, 6], "x": 2, "y": 2},
171 {"label":"8", "x":8, "y":2}, 191 {"matrix": [4, 6], "x": 3, "y": 2},
172 {"label":"9", "x":9, "y":2}, 192 {"matrix": [4, 5], "x": 4, "y": 2},
173 {"label":"0", "x":10, "y":2}, 193 {"matrix": [5, 6], "x": 5, "y": 2},
174 {"label":"-", "x":11, "y":2}, 194 {"matrix": [6, 6], "x": 6, "y": 2},
175 {"label":"=", "x":12, "y":2}, 195 {"matrix": [7, 5], "x": 7, "y": 2},
176 {"label":"Back Space", "x":13, "y":2, "w":2}, 196 {"matrix": [7, 6], "x": 8, "y": 2},
177 {"label":"Insert", "x":15.25, "y":2}, 197 {"matrix": [8, 6], "x": 9, "y": 2},
178 {"label":"Home", "x":16.25, "y":2}, 198 {"matrix": [8, 5], "x": 10, "y": 2},
179 {"label":"Page Up", "x":17.25, "y":2}, 199 {"matrix": [9, 6], "x": 11, "y": 2},
180 {"label":"Num Lock", "x":18.5, "y":2}, 200 {"matrix": [10, 5], "x": 12, "y": 2},
181 {"label":"/", "x":19.5, "y":2}, 201 {"matrix": [12, 6], "x": 13, "y": 2, "w": 2},
182 {"label":"*", "x":20.5, "y":2}, 202
183 {"label":"-", "x":21.5, "y":2}, 203 {"matrix": [12, 7], "x": 15.25, "y": 2},
184 {"label":"Tab", "x":0, "y":3, "w":1.5}, 204 {"matrix": [13, 6], "x": 16.25, "y": 2},
185 {"label":"Q", "x":1.5, "y":3}, 205 {"matrix": [13, 7], "x": 17.25, "y": 2},
186 {"label":"W", "x":2.5, "y":3}, 206
187 {"label":"E", "x":3.5, "y":3}, 207 {"matrix": [14, 6], "x": 18.5, "y": 2},
188 {"label":"R", "x":4.5, "y":3}, 208 {"matrix": [14, 7], "x": 19.5, "y": 2},
189 {"label":"T", "x":5.5, "y":3}, 209 {"matrix": [15, 6], "x": 20.5, "y": 2},
190 {"label":"Y", "x":6.5, "y":3}, 210 {"matrix": [16, 4], "x": 21.5, "y": 2},
191 {"label":"U", "x":7.5, "y":3}, 211
192 {"label":"I", "x":8.5, "y":3}, 212 {"matrix": [1, 5], "x": 0, "y": 3, "w": 1.5},
193 {"label":"O", "x":9.5, "y":3}, 213 {"matrix": [2, 5], "x": 1.5, "y": 3},
194 {"label":"P", "x":10.5, "y":3}, 214 {"matrix": [3, 5], "x": 2.5, "y": 3},
195 {"label":"[", "x":11.5, "y":3}, 215 {"matrix": [4, 4], "x": 3.5, "y": 3},
196 {"label":"]", "x":12.5, "y":3}, 216 {"matrix": [5, 5], "x": 4.5, "y": 3},
197 {"label":"\\", "x":13.5, "y":3, "w":1.5}, 217 {"matrix": [5, 4], "x": 5.5, "y": 3},
198 {"label":"Delete", "x":15.25, "y":3}, 218 {"matrix": [6, 5], "x": 6.5, "y": 3},
199 {"label":"End", "x":16.25, "y":3}, 219 {"matrix": [7, 4], "x": 7.5, "y": 3},
200 {"label":"Page Down", "x":17.25, "y":3}, 220 {"matrix": [8, 3], "x": 8.5, "y": 3},
201 {"label":"7", "x":18.5, "y":3}, 221 {"matrix": [8, 4], "x": 9.5, "y": 3},
202 {"label":"8", "x":19.5, "y":3}, 222 {"matrix": [9, 5], "x": 10.5, "y": 3},
203 {"label":"9", "x":20.5, "y":3}, 223 {"matrix": [10, 4], "x": 11.5, "y": 3},
204 {"label":"Caps Lock", "x":0, "y":4, "w":1.75}, 224 {"matrix": [11, 3], "x": 12.5, "y": 3},
205 {"label":"A", "x":1.75, "y":4}, 225 {"matrix": [11, 4], "x": 13.5, "y": 3, "w": 1.5},
206 {"label":"S", "x":2.75, "y":4}, 226
207 {"label":"D", "x":3.75, "y":4}, 227 {"matrix": [12, 4], "x": 15.25, "y": 3},
208 {"label":"F", "x":4.75, "y":4}, 228 {"matrix": [12, 5], "x": 16.25, "y": 3},
209 {"label":"G", "x":5.75, "y":4}, 229 {"matrix": [13, 5], "x": 17.25, "y": 3},
210 {"label":"H", "x":6.75, "y":4}, 230
211 {"label":"J", "x":7.75, "y":4}, 231 {"matrix": [13, 4], "x": 18.5, "y": 3},
212 {"label":"K", "x":8.75, "y":4}, 232 {"matrix": [14, 5], "x": 19.5, "y": 3},
213 {"label":"L", "x":9.75, "y":4}, 233 {"matrix": [15, 5], "x": 20.5, "y": 3},
214 {"label":";", "x":10.75, "y":4}, 234
215 {"label":"'", "x":11.75, "y":4}, 235 {"matrix": [2, 4], "x": 0, "y": 4, "w": 1.75},
216 {"label":"Enter", "x":12.75, "y":4, "w":2.25}, 236 {"matrix": [3, 4], "x": 1.75, "y": 4},
217 {"label":"4", "x":18.5, "y":4}, 237 {"matrix": [3, 3], "x": 2.75, "y": 4},
218 {"label":"5", "x":19.5, "y":4}, 238 {"matrix": [4, 3], "x": 3.75, "y": 4},
219 {"label":"6", "x":20.5, "y":4}, 239 {"matrix": [5, 3], "x": 4.75, "y": 4},
220 {"label":"+", "x":21.5, "y":3, "h":2}, 240 {"matrix": [6, 4], "x": 5.75, "y": 4},
221 {"label":"Shift", "x":0, "y":5, "w":2.25}, 241 {"matrix": [6, 3], "x": 6.75, "y": 4},
222 {"label":"Z", "x":2.25, "y":5}, 242 {"matrix": [7, 3], "x": 7.75, "y": 4},
223 {"label":"X", "x":3.25, "y":5}, 243 {"matrix": [8, 2], "x": 8.75, "y": 4},
224 {"label":"C", "x":4.25, "y":5}, 244 {"matrix": [9, 3], "x": 9.75, "y": 4},
225 {"label":"V", "x":5.25, "y":5}, 245 {"matrix": [9, 4], "x": 10.75, "y": 4},
226 {"label":"B", "x":6.25, "y":5}, 246 {"matrix": [10, 2], "x": 11.75, "y": 4},
227 {"label":"N", "x":7.25, "y":5}, 247 {"matrix": [11, 2], "x": 12.75, "y": 4, "w": 2.25},
228 {"label":"M", "x":8.25, "y":5}, 248
229 {"label":",", "x":9.25, "y":5}, 249 {"matrix": [13, 3], "x": 18.5, "y": 4},
230 {"label":".", "x":10.25, "y":5}, 250 {"matrix": [14, 3], "x": 19.5, "y": 4},
231 {"label":"/", "x":11.25, "y":5}, 251 {"matrix": [14, 4], "x": 20.5, "y": 4},
232 {"label":"Shift", "x":12.25, "y":5, "w":2.75}, 252 {"matrix": [15, 4], "x": 21.5, "y": 3, "h": 2},
233 {"label":"Up", "x":16.25, "y":5}, 253
234 {"label":"1", "x":18.5, "y":5}, 254 {"matrix": [2, 2], "x": 0, "y": 5, "w": 2.25},
235 {"label":"2", "x":19.5, "y":5}, 255 {"matrix": [3, 2], "x": 2.25, "y": 5},
236 {"label":"3", "x":20.5, "y":5}, 256 {"matrix": [4, 2], "x": 3.25, "y": 5},
237 {"label":"Ctrl", "x":0, "y":6, "w":1.5}, 257 {"matrix": [4, 1], "x": 4.25, "y": 5},
238 {"label":"Alt", "x":2.5, "y":6, "w":1.5}, 258 {"matrix": [5, 2], "x": 5.25, "y": 5},
239 {"label":"Space", "x":4, "y":6, "w":7}, 259 {"matrix": [6, 2], "x": 6.25, "y": 5},
240 {"label":"Alt", "x":11, "y":6, "w":1.5}, 260 {"matrix": [6, 1], "x": 7.25, "y": 5},
241 {"label":"Ctrl", "x":13.5, "y":6, "w":1.5}, 261 {"matrix": [7, 2], "x": 8.25, "y": 5},
242 {"label":"Left", "x":15.25, "y":6}, 262 {"matrix": [8, 1], "x": 9.25, "y": 5},
243 {"label":"Down", "x":16.25, "y":6}, 263 {"matrix": [9, 1], "x": 10.25, "y": 5},
244 {"label":"Right", "x":17.25, "y":6}, 264 {"matrix": [9, 2], "x": 11.25, "y": 5},
245 {"label":"0", "x":18.5, "y":6, "w":2}, 265 {"matrix": [11, 1], "x": 12.25, "y": 5, "w": 2.75},
246 {"label":".", "x":20.5, "y":6}, 266
247 {"label":"Enter", "x":21.5, "y":5, "h":2} 267 {"matrix": [12, 3], "x": 16.25, "y": 5},
268
269 {"matrix": [13, 1], "x": 18.5, "y": 5},
270 {"matrix": [14, 2], "x": 19.5, "y": 5},
271 {"matrix": [15, 2], "x": 20.5, "y": 5},
272
273 {"matrix": [2, 1], "x": 0, "y": 6, "w": 1.5},
274 {"matrix": [3, 1], "x": 2.5, "y": 6, "w": 1.5},
275 {"matrix": [5, 1], "x": 4, "y": 6, "w": 7},
276 {"matrix": [7, 1], "x": 11, "y": 6, "w": 1.5},
277 {"matrix": [11, 0], "x": 13.5, "y": 6, "w": 1.5},
278
279 {"matrix": [12, 1], "x": 15.25, "y": 6},
280 {"matrix": [12, 0], "x": 16.25, "y": 6},
281 {"matrix": [13, 2], "x": 17.25, "y": 6},
282
283 {"matrix": [14, 0], "x": 18.5, "y": 6, "w": 2},
284 {"matrix": [14, 1], "x": 20.5, "y": 6},
285 {"matrix": [15, 1], "x": 21.5, "y": 5, "h": 2}
248 ] 286 ]
249 } 287 }
250 } 288 }
diff --git a/keyboards/converter/xt_usb/info.json b/keyboards/converter/xt_usb/info.json
index d266a1d3c1..1c9bcf5e34 100644
--- a/keyboards/converter/xt_usb/info.json
+++ b/keyboards/converter/xt_usb/info.json
@@ -13,221 +13,248 @@
13 "layouts": { 13 "layouts": {
14 "LAYOUT_xt": { 14 "LAYOUT_xt": {
15 "layout": [ 15 "layout": [
16 {"x": 0, "y": 0}, 16 {"matrix": [7, 3], "x": 0, "y": 0},
17 {"x": 1, "y": 0}, 17 {"matrix": [7, 4], "x": 1, "y": 0},
18 {"x": 2.25, "y": 0}, 18
19 {"x": 3.25, "y": 0}, 19 {"matrix": [0, 1], "x": 2.25, "y": 0},
20 {"x": 4.25, "y": 0}, 20 {"matrix": [0, 2], "x": 3.25, "y": 0},
21 {"x": 5.25, "y": 0}, 21 {"matrix": [0, 3], "x": 4.25, "y": 0},
22 {"x": 6.25, "y": 0}, 22 {"matrix": [0, 4], "x": 5.25, "y": 0},
23 {"x": 7.25, "y": 0}, 23 {"matrix": [0, 5], "x": 6.25, "y": 0},
24 {"x": 8.25, "y": 0}, 24 {"matrix": [0, 6], "x": 7.25, "y": 0},
25 {"x": 9.25, "y": 0}, 25 {"matrix": [0, 7], "x": 8.25, "y": 0},
26 {"x": 10.25, "y": 0}, 26 {"matrix": [1, 0], "x": 9.25, "y": 0},
27 {"x": 11.25, "y": 0}, 27 {"matrix": [1, 1], "x": 10.25, "y": 0},
28 {"x": 12.25, "y": 0}, 28 {"matrix": [1, 2], "x": 11.25, "y": 0},
29 {"x": 13.25, "y": 0}, 29 {"matrix": [1, 3], "x": 12.25, "y": 0},
30 {"x": 14.25, "y": 0}, 30 {"matrix": [1, 4], "x": 13.25, "y": 0},
31 {"x": 15.25, "y": 0, "w": 1.75}, 31 {"matrix": [1, 5], "x": 14.25, "y": 0},
32 {"x": 17, "y": 0, "w": 2}, 32 {"matrix": [1, 6], "x": 15.25, "y": 0, "w": 1.75},
33 {"x": 19, "y": 0, "w": 2}, 33 {"matrix": [8, 5], "x": 17, "y": 0, "w": 2},
34 {"x": 0, "y": 1}, 34 {"matrix": [8, 6], "x": 19, "y": 0, "w": 2},
35 {"x": 1, "y": 1}, 35
36 {"x": 2.25, "y": 1, "w": 1.5}, 36 {"matrix": [7, 5], "x": 0, "y": 1},
37 {"x": 3.75, "y": 1}, 37 {"matrix": [7, 6], "x": 1, "y": 1},
38 {"x": 4.75, "y": 1}, 38
39 {"x": 5.75, "y": 1}, 39 {"matrix": [1, 7], "x": 2.25, "y": 1, "w": 1.5},
40 {"x": 6.75, "y": 1}, 40 {"matrix": [2, 0], "x": 3.75, "y": 1},
41 {"x": 7.75, "y": 1}, 41 {"matrix": [2, 1], "x": 4.75, "y": 1},
42 {"x": 8.75, "y": 1}, 42 {"matrix": [2, 2], "x": 5.75, "y": 1},
43 {"x": 9.75, "y": 1}, 43 {"matrix": [2, 3], "x": 6.75, "y": 1},
44 {"x": 10.75, "y": 1}, 44 {"matrix": [2, 4], "x": 7.75, "y": 1},
45 {"x": 11.75, "y": 1}, 45 {"matrix": [2, 5], "x": 8.75, "y": 1},
46 {"x": 12.75, "y": 1}, 46 {"matrix": [2, 6], "x": 9.75, "y": 1},
47 {"x": 13.75, "y": 1}, 47 {"matrix": [2, 7], "x": 10.75, "y": 1},
48 {"x": 14.75, "y": 1, "w": 1.25}, 48 {"matrix": [3, 0], "x": 11.75, "y": 1},
49 {"x": 17, "y": 1}, 49 {"matrix": [3, 1], "x": 12.75, "y": 1},
50 {"x": 18, "y": 1}, 50 {"matrix": [3, 2], "x": 13.75, "y": 1},
51 {"x": 19, "y": 1}, 51 {"matrix": [3, 3], "x": 14.75, "y": 1, "w": 1.25},
52 {"x": 20, "y": 1}, 52 {"matrix": [8, 7], "x": 17, "y": 1},
53 {"x": 0, "y": 2}, 53 {"matrix": [9, 0], "x": 18, "y": 1},
54 {"x": 1, "y": 2}, 54 {"matrix": [9, 1], "x": 19, "y": 1},
55 {"x": 2.25, "y": 2, "w": 1.75}, 55 {"matrix": [9, 2], "x": 20, "y": 1},
56 {"x": 4, "y": 2}, 56
57 {"x": 5, "y": 2}, 57 {"matrix": [7, 7], "x": 0, "y": 2},
58 {"x": 6, "y": 2}, 58 {"matrix": [8, 0], "x": 1, "y": 2},
59 {"x": 7, "y": 2}, 59
60 {"x": 8, "y": 2}, 60 {"matrix": [3, 5], "x": 2.25, "y": 2, "w": 1.75},
61 {"x": 9, "y": 2}, 61 {"matrix": [3, 6], "x": 4, "y": 2},
62 {"x": 10, "y": 2}, 62 {"matrix": [3, 7], "x": 5, "y": 2},
63 {"x": 11, "y": 2}, 63 {"matrix": [4, 0], "x": 6, "y": 2},
64 {"x": 12, "y": 2}, 64 {"matrix": [4, 1], "x": 7, "y": 2},
65 {"x": 13, "y": 2}, 65 {"matrix": [4, 2], "x": 8, "y": 2},
66 {"x": 14, "y": 2}, 66 {"matrix": [4, 3], "x": 9, "y": 2},
67 {"x": 15, "y": 2}, 67 {"matrix": [4, 4], "x": 10, "y": 2},
68 {"x": 16, "y": 1, "h": 2}, 68 {"matrix": [4, 5], "x": 11, "y": 2},
69 {"x": 17, "y": 2}, 69 {"matrix": [4, 6], "x": 12, "y": 2},
70 {"x": 18, "y": 2}, 70 {"matrix": [4, 7], "x": 13, "y": 2},
71 {"x": 19, "y": 2}, 71 {"matrix": [5, 0], "x": 14, "y": 2},
72 {"x": 0, "y": 3}, 72 {"matrix": [5, 1], "x": 15, "y": 2},
73 {"x": 1, "y": 3}, 73 {"matrix": [3, 4], "x": 16, "y": 1, "h": 2},
74 {"x": 2.25, "y": 3, "w": 1.25}, 74 {"matrix": [9, 3], "x": 17, "y": 2},
75 {"x": 3.5, "y": 3}, 75 {"matrix": [9, 4], "x": 18, "y": 2},
76 {"x": 4.5, "y": 3}, 76 {"matrix": [9, 5], "x": 19, "y": 2},
77 {"x": 5.5, "y": 3}, 77
78 {"x": 6.5, "y": 3}, 78 {"matrix": [8, 1], "x": 0, "y": 3},
79 {"x": 7.5, "y": 3}, 79 {"matrix": [8, 2], "x": 1, "y": 3},
80 {"x": 8.5, "y": 3}, 80
81 {"x": 9.5, "y": 3}, 81 {"matrix": [5, 2], "x": 2.25, "y": 3, "w": 1.25},
82 {"x": 10.5, "y": 3}, 82 {"matrix": [5, 3], "x": 3.5, "y": 3},
83 {"x": 11.5, "y": 3}, 83 {"matrix": [5, 4], "x": 4.5, "y": 3},
84 {"x": 12.5, "y": 3}, 84 {"matrix": [5, 5], "x": 5.5, "y": 3},
85 {"x": 13.5, "y": 3}, 85 {"matrix": [5, 6], "x": 6.5, "y": 3},
86 {"x": 14.5, "y": 3, "w": 1.5}, 86 {"matrix": [5, 7], "x": 7.5, "y": 3},
87 {"x": 16, "y": 3}, 87 {"matrix": [6, 0], "x": 8.5, "y": 3},
88 {"x": 17, "y": 3}, 88 {"matrix": [6, 1], "x": 9.5, "y": 3},
89 {"x": 18, "y": 3}, 89 {"matrix": [6, 2], "x": 10.5, "y": 3},
90 {"x": 19, "y": 3}, 90 {"matrix": [6, 3], "x": 11.5, "y": 3},
91 {"x": 20, "y": 2, "h": 3}, 91 {"matrix": [6, 4], "x": 12.5, "y": 3},
92 {"x": 0, "y": 4}, 92 {"matrix": [6, 5], "x": 13.5, "y": 3},
93 {"x": 1, "y": 4}, 93 {"matrix": [6, 6], "x": 14.5, "y": 3, "w": 1.5},
94 {"x": 2.25, "y": 4, "w": 2}, 94 {"matrix": [6, 7], "x": 16, "y": 3},
95 {"x": 4.25, "y": 4, "w": 9.75}, 95 {"matrix": [9, 7], "x": 17, "y": 3},
96 {"x": 14, "y": 4, "w": 2}, 96 {"matrix": [10, 0], "x": 18, "y": 3},
97 {"x": 16, "y": 4, "w": 2}, 97 {"matrix": [10, 1], "x": 19, "y": 3},
98 {"x": 18, "y": 4, "w": 2} 98 {"matrix": [9, 6], "x": 20, "y": 2, "h": 3},
99
100 {"matrix": [8, 3], "x": 0, "y": 4},
101 {"matrix": [8, 4], "x": 1, "y": 4},
102
103 {"matrix": [7, 0], "x": 2.25, "y": 4, "w": 2},
104 {"matrix": [7, 1], "x": 4.25, "y": 4, "w": 9.75},
105 {"matrix": [7, 2], "x": 14, "y": 4, "w": 2},
106 {"matrix": [10, 2], "x": 16, "y": 4, "w": 2},
107 {"matrix": [10, 3], "x": 18, "y": 4, "w": 2}
99 ] 108 ]
100 }, 109 },
101 "LAYOUT": { 110 "LAYOUT": {
102 "layout": [ 111 "layout": [
103 {"x": 2, "y": 0}, 112 {"matrix": [12, 4], "x": 2, "y": 0},
104 {"x": 3, "y": 0}, 113 {"matrix": [12, 5], "x": 3, "y": 0},
105 {"x": 4, "y": 0}, 114 {"matrix": [12, 6], "x": 4, "y": 0},
106 {"x": 5, "y": 0}, 115 {"matrix": [12, 7], "x": 5, "y": 0},
107 {"x": 6, "y": 0}, 116 {"matrix": [13, 0], "x": 6, "y": 0},
108 {"x": 7, "y": 0}, 117 {"matrix": [13, 1], "x": 7, "y": 0},
109 {"x": 8, "y": 0}, 118 {"matrix": [13, 2], "x": 8, "y": 0},
110 {"x": 9, "y": 0}, 119 {"matrix": [13, 3], "x": 9, "y": 0},
111 {"x": 10, "y": 0}, 120 {"matrix": [13, 4], "x": 10, "y": 0},
112 {"x": 11, "y": 0}, 121 {"matrix": [13, 5], "x": 11, "y": 0},
113 {"x": 12, "y": 0}, 122 {"matrix": [13, 6], "x": 12, "y": 0},
114 {"x": 13, "y": 0}, 123 {"matrix": [14, 6], "x": 13, "y": 0},
115 {"x": 0, "y": 1}, 124
116 {"x": 2, "y": 1}, 125 {"matrix": [0, 1], "x": 0, "y": 1},
117 {"x": 3, "y": 1}, 126
118 {"x": 4, "y": 1}, 127 {"matrix": [7, 3], "x": 2, "y": 1},
119 {"x": 5, "y": 1}, 128 {"matrix": [7, 4], "x": 3, "y": 1},
120 {"x": 6, "y": 1}, 129 {"matrix": [7, 5], "x": 4, "y": 1},
121 {"x": 7, "y": 1}, 130 {"matrix": [7, 6], "x": 5, "y": 1},
122 {"x": 8, "y": 1}, 131 {"matrix": [7, 7], "x": 6, "y": 1},
123 {"x": 9, "y": 1}, 132 {"matrix": [8, 0], "x": 7, "y": 1},
124 {"x": 10, "y": 1}, 133 {"matrix": [8, 1], "x": 8, "y": 1},
125 {"x": 11, "y": 1}, 134 {"matrix": [8, 2], "x": 9, "y": 1},
126 {"x": 12, "y": 1}, 135 {"matrix": [8, 3], "x": 10, "y": 1},
127 {"x": 13, "y": 1}, 136 {"matrix": [8, 4], "x": 11, "y": 1},
128 {"x": 15.25, "y": 1}, 137 {"matrix": [10, 7], "x": 12, "y": 1},
129 {"x": 16.25, "y": 1}, 138 {"matrix": [11, 0], "x": 13, "y": 1},
130 {"x": 17.25, "y": 1}, 139
131 {"x": 19.5, "y": 1}, 140 {"matrix": [10, 4], "x": 15.25, "y": 1},
132 {"x": 20.5, "y": 1}, 141 {"matrix": [8, 6], "x": 16.25, "y": 1},
133 {"x": 21.5, "y": 1}, 142 {"matrix": [10, 5], "x": 17.25, "y": 1},
134 {"x": 0, "y": 2.5}, 143
135 {"x": 1, "y": 2.5}, 144 {"matrix": [11, 5], "x": 19.5, "y": 1},
136 {"x": 2, "y": 2.5}, 145 {"matrix": [11, 6], "x": 20.5, "y": 1},
137 {"x": 3, "y": 2.5}, 146 {"matrix": [11, 7], "x": 21.5, "y": 1},
138 {"x": 4, "y": 2.5}, 147
139 {"x": 5, "y": 2.5}, 148 {"matrix": [5, 1], "x": 0, "y": 2.5},
140 {"x": 6, "y": 2.5}, 149 {"matrix": [0, 2], "x": 1, "y": 2.5},
141 {"x": 7, "y": 2.5}, 150 {"matrix": [0, 3], "x": 2, "y": 2.5},
142 {"x": 8, "y": 2.5}, 151 {"matrix": [0, 4], "x": 3, "y": 2.5},
143 {"x": 9, "y": 2.5}, 152 {"matrix": [0, 5], "x": 4, "y": 2.5},
144 {"x": 10, "y": 2.5}, 153 {"matrix": [0, 6], "x": 5, "y": 2.5},
145 {"x": 11, "y": 2.5}, 154 {"matrix": [0, 7], "x": 6, "y": 2.5},
146 {"x": 12, "y": 2.5}, 155 {"matrix": [1, 0], "x": 7, "y": 2.5},
147 {"x": 13, "y": 2.5}, 156 {"matrix": [1, 1], "x": 8, "y": 2.5},
148 {"x": 14, "y": 2.5}, 157 {"matrix": [1, 2], "x": 9, "y": 2.5},
149 {"x": 15.25, "y": 2.5}, 158 {"matrix": [1, 3], "x": 10, "y": 2.5},
150 {"x": 16.25, "y": 2.5}, 159 {"matrix": [1, 4], "x": 11, "y": 2.5},
151 {"x": 17.25, "y": 2.5}, 160 {"matrix": [1, 5], "x": 12, "y": 2.5},
152 {"x": 18.5, "y": 2.5}, 161 {"matrix": [15, 5], "x": 13, "y": 2.5},
153 {"x": 19.5, "y": 2.5}, 162 {"matrix": [1, 6], "x": 14, "y": 2.5},
154 {"x": 20.5, "y": 2.5}, 163
155 {"x": 21.5, "y": 2.5}, 164 {"matrix": [14, 1], "x": 15.25, "y": 2.5},
156 {"x": 0, "y": 3.5, "w": 1.5}, 165 {"matrix": [14, 4], "x": 16.25, "y": 2.5},
157 {"x": 1.5, "y": 3.5}, 166 {"matrix": [14, 7], "x": 17.25, "y": 2.5},
158 {"x": 2.5, "y": 3.5}, 167
159 {"x": 3.5, "y": 3.5}, 168 {"matrix": [8, 5], "x": 18.5, "y": 2.5},
160 {"x": 4.5, "y": 3.5}, 169 {"matrix": [15, 7], "x": 19.5, "y": 2.5},
161 {"x": 5.5, "y": 3.5}, 170 {"matrix": [6, 7], "x": 20.5, "y": 2.5},
162 {"x": 6.5, "y": 3.5}, 171 {"matrix": [9, 2], "x": 21.5, "y": 2.5},
163 {"x": 7.5, "y": 3.5}, 172
164 {"x": 8.5, "y": 3.5}, 173 {"matrix": [1, 7], "x": 0, "y": 3.5, "w": 1.5},
165 {"x": 9.5, "y": 3.5}, 174 {"matrix": [2, 0], "x": 1.5, "y": 3.5},
166 {"x": 10.5, "y": 3.5}, 175 {"matrix": [2, 1], "x": 2.5, "y": 3.5},
167 {"x": 11.5, "y": 3.5}, 176 {"matrix": [2, 2], "x": 3.5, "y": 3.5},
168 {"x": 12.5, "y": 3.5}, 177 {"matrix": [2, 3], "x": 4.5, "y": 3.5},
169 {"x": 13.5, "y": 3.5, "w": 1.5}, 178 {"matrix": [2, 4], "x": 5.5, "y": 3.5},
170 {"x": 15.25, "y": 3.5}, 179 {"matrix": [2, 5], "x": 6.5, "y": 3.5},
171 {"x": 16.25, "y": 3.5}, 180 {"matrix": [2, 6], "x": 7.5, "y": 3.5},
172 {"x": 17.25, "y": 3.5}, 181 {"matrix": [2, 7], "x": 8.5, "y": 3.5},
173 {"x": 18.5, "y": 3.5}, 182 {"matrix": [3, 0], "x": 9.5, "y": 3.5},
174 {"x": 19.5, "y": 3.5}, 183 {"matrix": [3, 1], "x": 10.5, "y": 3.5},
175 {"x": 20.5, "y": 3.5}, 184 {"matrix": [3, 2], "x": 11.5, "y": 3.5},
176 {"x": 21.5, "y": 3.5}, 185 {"matrix": [3, 3], "x": 12.5, "y": 3.5},
177 {"x": 0, "y": 4.5, "w": 1.75}, 186 {"matrix": [5, 3], "x": 13.5, "y": 3.5, "w": 1.5},
178 {"x": 1.75, "y": 4.5}, 187
179 {"x": 2.75, "y": 4.5}, 188 {"matrix": [14, 2], "x": 15.25, "y": 3.5},
180 {"x": 3.75, "y": 4.5}, 189 {"matrix": [14, 5], "x": 16.25, "y": 3.5},
181 {"x": 4.75, "y": 4.5}, 190 {"matrix": [15, 0], "x": 17.25, "y": 3.5},
182 {"x": 5.75, "y": 4.5}, 191
183 {"x": 6.75, "y": 4.5}, 192 {"matrix": [8, 7], "x": 18.5, "y": 3.5},
184 {"x": 7.75, "y": 4.5}, 193 {"matrix": [9, 0], "x": 19.5, "y": 3.5},
185 {"x": 8.75, "y": 4.5}, 194 {"matrix": [9, 1], "x": 20.5, "y": 3.5},
186 {"x": 9.75, "y": 4.5}, 195 {"matrix": [9, 6], "x": 21.5, "y": 3.5},
187 {"x": 10.75, "y": 4.5}, 196
188 {"x": 11.75, "y": 4.5}, 197 {"matrix": [7, 2], "x": 0, "y": 4.5, "w": 1.75},
189 {"x": 12.75, "y": 4.5}, 198 {"matrix": [3, 6], "x": 1.75, "y": 4.5},
190 {"x": 13.75, "y": 4.5, "w": 1.25}, 199 {"matrix": [3, 7], "x": 2.75, "y": 4.5},
191 {"x": 18.5, "y": 4.5}, 200 {"matrix": [4, 0], "x": 3.75, "y": 4.5},
192 {"x": 19.5, "y": 4.5}, 201 {"matrix": [4, 1], "x": 4.75, "y": 4.5},
193 {"x": 20.5, "y": 4.5}, 202 {"matrix": [4, 2], "x": 5.75, "y": 4.5},
194 {"x": 21.5, "y": 4.5}, 203 {"matrix": [4, 3], "x": 6.75, "y": 4.5},
195 {"x": 0, "y": 5.5, "w": 1.25}, 204 {"matrix": [4, 4], "x": 7.75, "y": 4.5},
196 {"x": 1.25, "y": 5.5}, 205 {"matrix": [4, 5], "x": 8.75, "y": 4.5},
197 {"x": 2.25, "y": 5.5}, 206 {"matrix": [4, 6], "x": 9.75, "y": 4.5},
198 {"x": 3.25, "y": 5.5}, 207 {"matrix": [4, 7], "x": 10.75, "y": 4.5},
199 {"x": 4.25, "y": 5.5}, 208 {"matrix": [5, 0], "x": 11.75, "y": 4.5},
200 {"x": 5.25, "y": 5.5}, 209 {"matrix": [0, 0], "x": 12.75, "y": 4.5},
201 {"x": 6.25, "y": 5.5}, 210 {"matrix": [3, 4], "x": 13.75, "y": 4.5, "w": 1.25},
202 {"x": 7.25, "y": 5.5}, 211
203 {"x": 8.25, "y": 5.5}, 212 {"matrix": [9, 3], "x": 18.5, "y": 4.5},
204 {"x": 9.25, "y": 5.5}, 213 {"matrix": [9, 4], "x": 19.5, "y": 4.5},
205 {"x": 10.25, "y": 5.5}, 214 {"matrix": [9, 5], "x": 20.5, "y": 4.5},
206 {"x": 11.25, "y": 5.5}, 215 {"matrix": [15, 6], "x": 21.5, "y": 4.5},
207 {"x": 12.25, "y": 5.5}, 216
208 {"x": 13.25, "y": 5.5, "w": 1.75}, 217 {"matrix": [5, 2], "x": 0, "y": 5.5, "w": 1.25},
209 {"x": 16.25, "y": 5.5}, 218 {"matrix": [10, 6], "x": 1.25, "y": 5.5},
210 {"x": 18.5, "y": 5.5}, 219 {"matrix": [5, 4], "x": 2.25, "y": 5.5},
211 {"x": 19.5, "y": 5.5}, 220 {"matrix": [5, 5], "x": 3.25, "y": 5.5},
212 {"x": 20.5, "y": 5.5}, 221 {"matrix": [5, 6], "x": 4.25, "y": 5.5},
213 {"x": 21.5, "y": 5.5}, 222 {"matrix": [5, 7], "x": 5.25, "y": 5.5},
214 {"x": 0, "y": 6.5, "w": 1.25}, 223 {"matrix": [6, 0], "x": 6.25, "y": 5.5},
215 {"x": 1.25, "y": 6.5, "w": 1.25}, 224 {"matrix": [6, 1], "x": 7.25, "y": 5.5},
216 {"x": 2.5, "y": 6.5, "w": 1.25}, 225 {"matrix": [6, 2], "x": 8.25, "y": 5.5},
217 {"x": 3.75, "y": 6.5, "w": 1.25}, 226 {"matrix": [6, 3], "x": 9.25, "y": 5.5},
218 {"x": 5, "y": 6.5, "w": 3.25}, 227 {"matrix": [6, 4], "x": 10.25, "y": 5.5},
219 {"x": 8.25, "y": 6.5, "w": 1.25}, 228 {"matrix": [6, 5], "x": 11.25, "y": 5.5},
220 {"x": 9.5, "y": 6.5, "w": 1.25}, 229 {"matrix": [14, 3], "x": 12.25, "y": 5.5},
221 {"x": 10.75, "y": 6.5}, 230 {"matrix": [6, 6], "x": 13.25, "y": 5.5, "w": 1.75},
222 {"x": 11.75, "y": 6.5}, 231
223 {"x": 12.75, "y": 6.5}, 232 {"matrix": [12, 0], "x": 16.25, "y": 5.5},
224 {"x": 13.75, "y": 6.5, "w": 1.25}, 233
225 {"x": 15.25, "y": 6.5}, 234 {"matrix": [9, 7], "x": 18.5, "y": 5.5},
226 {"x": 16.25, "y": 6.5}, 235 {"matrix": [10, 0], "x": 19.5, "y": 5.5},
227 {"x": 17.25, "y": 6.5}, 236 {"matrix": [10, 1], "x": 20.5, "y": 5.5},
228 {"x": 18.5, "y": 6.5, "w": 2}, 237 {"matrix": [13, 7], "x": 21.5, "y": 5.5},
229 {"x": 20.5, "y": 6.5}, 238
230 {"x": 21.5, "y": 6.5} 239 {"matrix": [3, 5], "x": 0, "y": 6.5, "w": 1.25},
240 {"matrix": [11, 2], "x": 1.25, "y": 6.5, "w": 1.25},
241 {"matrix": [7, 0], "x": 2.5, "y": 6.5, "w": 1.25},
242 {"matrix": [15, 3], "x": 3.75, "y": 6.5, "w": 1.25},
243 {"matrix": [7, 1], "x": 5, "y": 6.5, "w": 3.25},
244 {"matrix": [15, 1], "x": 8.25, "y": 6.5, "w": 1.25},
245 {"matrix": [14, 0], "x": 9.5, "y": 6.5, "w": 1.25},
246 {"matrix": [15, 4], "x": 10.75, "y": 6.5},
247 {"matrix": [11, 3], "x": 11.75, "y": 6.5},
248 {"matrix": [11, 4], "x": 12.75, "y": 6.5},
249 {"matrix": [15, 2], "x": 13.75, "y": 6.5, "w": 1.25},
250
251 {"matrix": [12, 1], "x": 15.25, "y": 6.5},
252 {"matrix": [12, 2], "x": 16.25, "y": 6.5},
253 {"matrix": [12, 3], "x": 17.25, "y": 6.5},
254
255 {"matrix": [10, 2], "x": 18.5, "y": 6.5, "w": 2},
256 {"matrix": [10, 3], "x": 20.5, "y": 6.5},
257 {"matrix": [11, 1], "x": 21.5, "y": 6.5}
231 ] 258 ]
232 } 259 }
233 } 260 }
diff --git a/keyboards/converter/xt_usb/xt_usb.h b/keyboards/converter/xt_usb/xt_usb.h
deleted file mode 100644
index 570f1a376c..0000000000
--- a/keyboards/converter/xt_usb/xt_usb.h
+++ /dev/null
@@ -1,134 +0,0 @@
1/*
2Copyright 2011,2012,2013 Jun Wako <wakojun@gmail.com>
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17#pragma once
18
19#include "quantum.h"
20
21#define XXX KC_NO
22
23/* IBM XT keyboard layout
24 * ,-------. ,--------------------------------------------------------------------------.
25 * | F1| F2| |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| BS |NumLck |ScrLck |
26 * |-------| |--------------------------------------------------------------------------|
27 * | F3| F4| | Tab | Q| W| E| R| T| Y| U| I| O| P| [| ] | | 7| 8| 9| -|
28 * |-------| |------------------------------------------------------|Ent|---------------|
29 * | F5| F6| | Ctrl | A| S| D| F| G| H| J| K| L| ;| '| `| | 4| 5| 6| |
30 * |-------| |----------------------------------------------------------------------| |
31 * | F7| F8| |Shif| \| Z| X| C| V| B| N| M| ,| .| /|Shift| *| 1| 2| 3| +|
32 * |-------| |----------------------------------------------------------------------| |
33 * | F9|F10| | Alt | Space |CapsLck| 0 | . | |
34 * `-------' `--------------------------------------------------------------------------'
35 * Scan code set 1
36 * ,-------. ,--------------------------------------------------------------------------.
37 * | 3B| 3C| | 01| 02| 03| 04| 05| 06| 07| 08| 09| 0A| 0B| 0C| 0D| 0E | 45 | 46 |
38 * |-------| |--------------------------------------------------------------------------|
39 * | 3D| 3E| | 0F | 10| 11| 12| 13| 14| 15| 16| 17| 18| 19| 1A| 1B | | 47| 48| 49| 4A|
40 * |-------| |------------------------------------------------------| 1C|---------------|
41 * | 3F| 40| | 1D | 1E| 1F| 20| 21| 22| 23| 24| 25| 26| 27| 28| 29| | 4B| 4C| 4D| |
42 * |-------| |----------------------------------------------------------------------| |
43 * | 41| 42| | 2A | 2B| 2C| 2D| 2E| 2F| 30| 31| 32| 33| 34| 35| 36 | 37| 4F| 50| 51| 4E|
44 * |-------| |----------------------------------------------------------------------| |
45 * | 43| 44| | 38 | 39 | 3A | 52 | 53 | |
46 * `-------' `--------------------------------------------------------------------------'
47 */
48#define LAYOUT_xt( \
49 k3B, k3C, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k45, k46, \
50 k3D, k3E, k0F, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k47, k48, k49, k4A, \
51 k3F, k40, k1D, k1E, k1F, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k1C, k4B, k4C, k4D, \
52 k41, k42, k2A, k2B, k2C, k2D, k2E, k2F, k30, k31, k32, k33, k34, k35, k36, k37, k4F, k50, k51, k4E, \
53 k43, k44, k38, k39, k3A, k52, k53 \
54) { \
55 { XXX, k01, k02, k03, k04, k05, k06, k07 }, \
56 { k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
57 { k10, k11, k12, k13, k14, k15, k16, k17 }, \
58 { k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
59 { k20, k21, k22, k23, k24, k25, k26, k27 }, \
60 { k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
61 { k30, k31, k32, k33, k34, k35, k36, k37 }, \
62 { k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
63 { k40, k41, k42, k43, k44, k45, k46, k47 }, \
64 { k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \
65 { k50, k51, k52, k53, XXX, XXX, XXX, XXX }, \
66 { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
67 { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
68 { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
69 { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
70 { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
71}
72
73/* Extended keyboard layout
74 * ,-----------------------------------------------.
75 * |F13|F14|F15|F16|F17|F18|F19|F20|F21|F22|F23|F24|
76 * ,---. |-----------------------------------------------| ,-----------. ,-----------.
77 * |Esc| |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12| |PrS|ScL|Pau| |VDn|VUp|Mut|
78 * `---' `-----------------------------------------------' `-----------' `-----------'
79 * ,-----------------------------------------------------------. ,-----------. ,---------------.
80 * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|JPY|Bsp| |Ins|Hom|PgU| |NmL| /| *| -|
81 * |-----------------------------------------------------------| |-----------| |---------------|
82 * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \ | |Del|End|PgD| | 7| 8| 9| +|
83 * |-----------------------------------------------------------| `-----------' |---------------|
84 * |CapsL | A| S| D| F| G| H| J| K| L| ;| '| #|Entr| | 4| 5| 6|KP,|
85 * |-----------------------------------------------------------| ,---. |---------------|
86 * |Shft| <| Z| X| C| V| B| N| M| ,| .| /| RO|Shift | |Up | | 1| 2| 3|Ent|
87 * |-----------------------------------------------------------| ,-----------. |---------------|
88 * |Ctl|Gui|Alt|MHEN| Space |HENK|KANA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| | 0| .|KP=|
89 * `-----------------------------------------------------------' `-----------' `---------------'
90 * ,-----------------------------------------------.
91 * | 64| 65| 66| 67| 68| 69| 6A| 6B| 6C| 6D| 6E| 76|
92 * ,---. |-----------------------------------------------| ,-----------. ,-----------.
93 * | 01| | 3B| 3C| 3D| 3E| 3F| 40| 41| 42| 43| 44| 57| 58| |*37| 46|*45| |e5E|e5F|e63|
94 * `---' `-----------------------------------------------' `-----------' `-----------'
95 * ,-----------------------------------------------------------. ,-----------. ,---------------.
96 * | 29| 02| 03| 04| 05| 06| 07| 08| 09| 0A| 0B| 0C| 0D| 7D| 0E| |e52|e47|e49| | 45|e35| 37| 4A|
97 * |-----------------------------------------------------------| |-----------| |---------------|
98 * | 0F | 10| 11| 12| 13| 14| 15| 16| 17| 18| 19| 1A| 1B| 2B | |e53|e4F|e51| | 47| 48| 49| 4E|
99 * |-----------------------------------------------------------| `-----------' |---------------|
100 * | 3A | 1E| 1F| 20| 21| 22| 23| 24| 25| 26| 27| 28| 00| 1C | | 4B| 4C| 4D| 7E|
101 * |-----------------------------------------------------------| ,---. |---------------|
102 * | 2A | 56| 2C| 2D| 2E| 2F| 30| 31| 32| 33| 34| 35| 73| 36 | |e48| | 4F| 50| 51|e1C|
103 * |-----------------------------------------------------------| ,-----------. |---------------|
104 * | 1D|e5B| 38| 7B | 39 | 79 | 70 |e38|e5C|e5D|e1D| |e4B|e50|e4D| | 52| 53| 59|
105 * `-----------------------------------------------------------' `-----------' `---------------'
106 * e: E0-escaped codes
107 * *: special handling codes
108 */
109#define LAYOUT( \
110 k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E, k76, \
111 k01, k3B, k3C, k3D, k3E, k3F, k40, k41, k42, k43, k44, k57, k58, k54, k46, k55, k5D, k5E, k5F, \
112 k29, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k7D, k0E, k71, k74, k77, k45, k7F, k37, k4A, \
113 k0F, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k2B, k72, k75, k78, k47, k48, k49, k4E, \
114 k3A, k1E, k1F, k20, k21, k22, k23, k24, k25, k26, k27, k28, k00, k1C, k4B, k4C, k4D, k7E, \
115 k2A, k56, k2C, k2D, k2E, k2F, k30, k31, k32, k33, k34, k35, k73, k36, k60, k4F, k50, k51, k6F, \
116 k1D, k5A, k38, k7B, k39, k79, k70, k7C, k5B, k5C, k7A, k61, k62, k63, k52, k53, k59 \
117) { \
118 { k00, k01, k02, k03, k04, k05, k06, k07 }, \
119 { k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
120 { k10, k11, k12, k13, k14, k15, k16, k17 }, \
121 { k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
122 { k20, k21, k22, k23, k24, k25, k26, k27 }, \
123 { k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
124 { k30, k31, k32, k33, k34, k35, k36, k37 }, \
125 { k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
126 { k40, k41, k42, k43, k44, k45, k46, k47 }, \
127 { k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \
128 { k50, k51, k52, k53, k54, k55, k56, k57 }, \
129 { k58, k59, k5A, k5B, k5C, k5D, k5E, k5F }, \
130 { k60, k61, k62, k63, k64, k65, k66, k67 }, \
131 { k68, k69, k6A, k6B, k6C, k6D, k6E, k6F }, \
132 { k70, k71, k72, k73, k74, k75, k76, k77 }, \
133 { k78, k79, k7A, k7B, k7C, k7D, k7E, k7F } \
134}
diff --git a/keyboards/duck/jetfire/info.json b/keyboards/duck/jetfire/info.json
index 4df56c164a..287ab0ac4a 100644
--- a/keyboards/duck/jetfire/info.json
+++ b/keyboards/duck/jetfire/info.json
@@ -22,11 +22,256 @@
22 "bootloader": "atmel-dfu", 22 "bootloader": "atmel-dfu",
23 "layouts": { 23 "layouts": {
24 "LAYOUT_all": { 24 "LAYOUT_all": {
25 "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"x":15.25, "y":0}, {"label":"PrtSc", "x":16.5, "y":0}, {"label":"Scroll Lock", "x":17.5, "y":0}, {"label":"Pause", "x":18.5, "y":0}, {"x":19.5, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Back Space", "x":13, "y":1.25}, {"x":14, "y":1.25}, {"label":"Insert", "x":15.25, "y":1.25}, {"label":"Num Lock", "x":16.5, "y":1.25}, {"label":"/", "x":17.5, "y":1.25}, {"label":"*", "x":18.5, "y":1.25}, {"label":"-", "x":19.5, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.25}, {"label":"7", "x":16.5, "y":2.25}, {"label":"8", "x":17.5, "y":2.25}, {"label":"9", "x":18.5, "y":2.25}, {"label":"+", "x":19.5, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"4", "x":16.5, "y":3.25}, {"label":"5", "x":17.5, "y":3.25}, {"label":"6", "x":18.5, "y":3.25}, {"x":19.5, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":1.25}, {"label":"ISO \\", "x":1.25, "y":4.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"x":14, "y":4.25}, {"label":"\u2191", "x":15.25, "y":4.5}, {"label":"1", "x":16.5, "y":4.25}, {"label":"2", "x":17.5, "y":4.25}, {"label":"3", "x":18.5, "y":4.25}, {"label":"Enter", "x":19.5, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.5}, {"label":"Win", "x":1.5, "y":5.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.5}, {"x":4, "y":5.25, "w":6.25}, {"label":"Alt", "x":10.25, "y":5.25, "w":1.25}, {"x":11.5, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":12.75, "y":5.25, "w":1.25}, {"label":"\u2190", "x":14.25, "y":5.5}, {"label":"\u2193", "x":15.25, "y":5.5}, {"label":"\u2192", "x":16.25, "y":5.5}, {"label":"0", "x":17.5, "y":5.25}, {"label":".", "x":18.5, "y":5.25}, {"x":19.5, "y":5.25}] 25 "layout": [
26 }, 26 {"matrix": [0, 0], "x": 0, "y": 0},
27
28 {"matrix": [0, 2], "x": 2, "y": 0},
29 {"matrix": [0, 3], "x": 3, "y": 0},
30 {"matrix": [0, 4], "x": 4, "y": 0},
31 {"matrix": [0, 5], "x": 5, "y": 0},
32
33 {"matrix": [0, 7], "x": 6.5, "y": 0},
34 {"matrix": [0, 8], "x": 7.5, "y": 0},
35 {"matrix": [0, 9], "x": 8.5, "y": 0},
36 {"matrix": [0, 10], "x": 9.5, "y": 0},
37
38 {"matrix": [0, 11], "x": 11, "y": 0},
39 {"matrix": [0, 12], "x": 12, "y": 0},
40 {"matrix": [0, 13], "x": 13, "y": 0},
41 {"matrix": [0, 14], "x": 14, "y": 0},
42
43 {"matrix": [0, 15], "x": 15.25, "y": 0},
44
45 {"matrix": [0, 16], "x": 16.5, "y": 0},
46 {"matrix": [0, 17], "x": 17.5, "y": 0},
47 {"matrix": [0, 18], "x": 18.5, "y": 0},
48 {"matrix": [0, 19], "x": 19.5, "y": 0},
49
50 {"matrix": [1, 0], "x": 0, "y": 1.25},
51 {"matrix": [1, 1], "x": 1, "y": 1.25},
52 {"matrix": [1, 2], "x": 2, "y": 1.25},
53 {"matrix": [1, 3], "x": 3, "y": 1.25},
54 {"matrix": [1, 4], "x": 4, "y": 1.25},
55 {"matrix": [1, 5], "x": 5, "y": 1.25},
56 {"matrix": [1, 6], "x": 6, "y": 1.25},
57 {"matrix": [1, 7], "x": 7, "y": 1.25},
58 {"matrix": [1, 8], "x": 8, "y": 1.25},
59 {"matrix": [1, 9], "x": 9, "y": 1.25},
60 {"matrix": [1, 10], "x": 10, "y": 1.25},
61 {"matrix": [1, 11], "x": 11, "y": 1.25},
62 {"matrix": [1, 12], "x": 12, "y": 1.25},
63 {"matrix": [1, 13], "x": 13, "y": 1.25},
64 {"matrix": [1, 14], "x": 14, "y": 1.25},
65
66 {"matrix": [1, 15], "x": 15.25, "y": 1.25},
67
68 {"matrix": [1, 16], "x": 16.5, "y": 1.25},
69 {"matrix": [1, 17], "x": 17.5, "y": 1.25},
70 {"matrix": [1, 18], "x": 18.5, "y": 1.25},
71 {"matrix": [1, 19], "x": 19.5, "y": 1.25},
72
73 {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
74 {"matrix": [2, 1], "x": 1.5, "y": 2.25},
75 {"matrix": [2, 2], "x": 2.5, "y": 2.25},
76 {"matrix": [2, 3], "x": 3.5, "y": 2.25},
77 {"matrix": [2, 4], "x": 4.5, "y": 2.25},
78 {"matrix": [2, 5], "x": 5.5, "y": 2.25},
79 {"matrix": [2, 6], "x": 6.5, "y": 2.25},
80 {"matrix": [2, 7], "x": 7.5, "y": 2.25},
81 {"matrix": [2, 8], "x": 8.5, "y": 2.25},
82 {"matrix": [2, 9], "x": 9.5, "y": 2.25},
83 {"matrix": [2, 10], "x": 10.5, "y": 2.25},
84 {"matrix": [2, 11], "x": 11.5, "y": 2.25},
85 {"matrix": [2, 12], "x": 12.5, "y": 2.25},
86 {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
27 87
88 {"matrix": [2, 15], "x": 15.25, "y": 2.25},
89
90 {"matrix": [2, 16], "x": 16.5, "y": 2.25},
91 {"matrix": [2, 17], "x": 17.5, "y": 2.25},
92 {"matrix": [2, 18], "x": 18.5, "y": 2.25},
93 {"matrix": [2, 19], "x": 19.5, "y": 2.25},
94
95 {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
96 {"matrix": [3, 1], "x": 1.75, "y": 3.25},
97 {"matrix": [3, 2], "x": 2.75, "y": 3.25},
98 {"matrix": [3, 3], "x": 3.75, "y": 3.25},
99 {"matrix": [3, 4], "x": 4.75, "y": 3.25},
100 {"matrix": [3, 5], "x": 5.75, "y": 3.25},
101 {"matrix": [3, 6], "x": 6.75, "y": 3.25},
102 {"matrix": [3, 7], "x": 7.75, "y": 3.25},
103 {"matrix": [3, 8], "x": 8.75, "y": 3.25},
104 {"matrix": [3, 9], "x": 9.75, "y": 3.25},
105 {"matrix": [3, 10], "x": 10.75, "y": 3.25},
106 {"matrix": [3, 11], "x": 11.75, "y": 3.25},
107 {"matrix": [3, 14], "x": 12.75, "y": 3.25, "w": 2.25},
108
109 {"matrix": [3, 16], "x": 16.5, "y": 3.25},
110 {"matrix": [3, 17], "x": 17.5, "y": 3.25},
111 {"matrix": [3, 18], "x": 18.5, "y": 3.25},
112 {"matrix": [3, 19], "x": 19.5, "y": 3.25},
113
114 {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
115 {"matrix": [4, 1], "x": 1.25, "y": 4.25},
116 {"matrix": [4, 2], "x": 2.25, "y": 4.25},
117 {"matrix": [4, 3], "x": 3.25, "y": 4.25},
118 {"matrix": [4, 4], "x": 4.25, "y": 4.25},
119 {"matrix": [4, 5], "x": 5.25, "y": 4.25},
120 {"matrix": [4, 6], "x": 6.25, "y": 4.25},
121 {"matrix": [4, 7], "x": 7.25, "y": 4.25},
122 {"matrix": [4, 8], "x": 8.25, "y": 4.25},
123 {"matrix": [4, 9], "x": 9.25, "y": 4.25},
124 {"matrix": [4, 10], "x": 10.25, "y": 4.25},
125 {"matrix": [4, 12], "x": 11.25, "y": 4.25},
126 {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
127 {"matrix": [4, 14], "x": 14, "y": 4.25},
128
129 {"matrix": [4, 15], "x": 15.25, "y": 4.5},
130
131 {"matrix": [4, 16], "x": 16.5, "y": 4.25},
132 {"matrix": [4, 17], "x": 17.5, "y": 4.25},
133 {"matrix": [4, 18], "x": 18.5, "y": 4.25},
134 {"matrix": [4, 19], "x": 19.5, "y": 4.25},
135
136 {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
137 {"matrix": [5, 1], "x": 1.5, "y": 5.25},
138 {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
139 {"matrix": [5, 8], "x": 4, "y": 5.25, "w": 6.25},
140 {"matrix": [5, 11], "x": 10.25, "y": 5.25, "w": 1.25},
141 {"matrix": [5, 12], "x": 11.5, "y": 5.25, "w": 1.25},
142 {"matrix": [5, 13], "x": 12.75, "y": 5.25, "w": 1.25},
143
144 {"matrix": [5, 14], "x": 14.25, "y": 5.5},
145 {"matrix": [5, 15], "x": 15.25, "y": 5.5},
146 {"matrix": [5, 16], "x": 16.25, "y": 5.5},
147
148 {"matrix": [5, 17], "x": 17.5, "y": 5.25},
149 {"matrix": [5, 18], "x": 18.5, "y": 5.25},
150 {"matrix": [5, 19], "x": 19.5, "y": 5.25}
151 ]
152 },
28 "LAYOUT": { 153 "LAYOUT": {
29 "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"x":15.25, "y":0}, {"label":"PrtSc", "x":16.5, "y":0}, {"label":"Scroll Lock", "x":17.5, "y":0}, {"label":"Pause", "x":18.5, "y":0}, {"x":19.5, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"Insert", "x":15.25, "y":1.25}, {"label":"Num Lock", "x":16.5, "y":1.25}, {"label":"/", "x":17.5, "y":1.25}, {"label":"*", "x":18.5, "y":1.25}, {"label":"-", "x":19.5, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.25}, {"label":"7", "x":16.5, "y":2.25}, {"label":"8", "x":17.5, "y":2.25}, {"label":"9", "x":18.5, "y":2.25}, {"label":"+", "x":19.5, "y":2.25, "h":2}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"4", "x":16.5, "y":3.25}, {"label":"5", "x":17.5, "y":3.25}, {"label":"6", "x":18.5, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, {"label":"\u2191", "x":15.25, "y":4.5}, {"label":"1", "x":16.5, "y":4.25}, {"label":"2", "x":17.5, "y":4.25}, {"label":"3", "x":18.5, "y":4.25}, {"label":"Enter", "x":19.5, "y":4.25, "h":2}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.5}, {"label":"Win", "x":1.5, "y":5.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.5}, {"x":4, "y":5.25, "w":7}, {"label":"Alt", "x":11, "y":5.25, "w":1.5}, {"label":"Ctrl", "x":12.5, "y":5.25, "w":1.5}, {"label":"\u2190", "x":14.25, "y":5.5}, {"label":"\u2193", "x":15.25, "y":5.5}, {"label":"\u2192", "x":16.25, "y":5.5}, {"label":"0", "x":17.5, "y":5.25}, {"label":".", "x":18.5, "y":5.25}] 154 "layout": [
155 {"matrix": [0, 0], "x": 0, "y": 0},
156
157 {"matrix": [0, 2], "x": 2, "y": 0},
158 {"matrix": [0, 3], "x": 3, "y": 0},
159 {"matrix": [0, 4], "x": 4, "y": 0},
160 {"matrix": [0, 5], "x": 5, "y": 0},
161
162 {"matrix": [0, 7], "x": 6.5, "y": 0},
163 {"matrix": [0, 8], "x": 7.5, "y": 0},
164 {"matrix": [0, 9], "x": 8.5, "y": 0},
165 {"matrix": [0, 10], "x": 9.5, "y": 0},
166
167 {"matrix": [0, 11], "x": 11, "y": 0},
168 {"matrix": [0, 12], "x": 12, "y": 0},
169 {"matrix": [0, 13], "x": 13, "y": 0},
170 {"matrix": [0, 14], "x": 14, "y": 0},
171
172 {"matrix": [0, 15], "x": 15.25, "y": 0},
173
174 {"matrix": [0, 16], "x": 16.5, "y": 0},
175 {"matrix": [0, 17], "x": 17.5, "y": 0},
176 {"matrix": [0, 18], "x": 18.5, "y": 0},
177 {"matrix": [0, 19], "x": 19.5, "y": 0},
178
179 {"matrix": [1, 0], "x": 0, "y": 1.25},
180 {"matrix": [1, 1], "x": 1, "y": 1.25},
181 {"matrix": [1, 2], "x": 2, "y": 1.25},
182 {"matrix": [1, 3], "x": 3, "y": 1.25},
183 {"matrix": [1, 4], "x": 4, "y": 1.25},
184 {"matrix": [1, 5], "x": 5, "y": 1.25},
185 {"matrix": [1, 6], "x": 6, "y": 1.25},
186 {"matrix": [1, 7], "x": 7, "y": 1.25},
187 {"matrix": [1, 8], "x": 8, "y": 1.25},
188 {"matrix": [1, 9], "x": 9, "y": 1.25},
189 {"matrix": [1, 10], "x": 10, "y": 1.25},
190 {"matrix": [1, 11], "x": 11, "y": 1.25},
191 {"matrix": [1, 12], "x": 12, "y": 1.25},
192 {"matrix": [1, 14], "x": 13, "y": 1.25, "w": 2},
193
194 {"matrix": [1, 15], "x": 15.25, "y": 1.25},
195
196 {"matrix": [1, 16], "x": 16.5, "y": 1.25},
197 {"matrix": [1, 17], "x": 17.5, "y": 1.25},
198 {"matrix": [1, 18], "x": 18.5, "y": 1.25},
199 {"matrix": [1, 19], "x": 19.5, "y": 1.25},
200
201 {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
202 {"matrix": [2, 1], "x": 1.5, "y": 2.25},
203 {"matrix": [2, 2], "x": 2.5, "y": 2.25},
204 {"matrix": [2, 3], "x": 3.5, "y": 2.25},
205 {"matrix": [2, 4], "x": 4.5, "y": 2.25},
206 {"matrix": [2, 5], "x": 5.5, "y": 2.25},
207 {"matrix": [2, 6], "x": 6.5, "y": 2.25},
208 {"matrix": [2, 7], "x": 7.5, "y": 2.25},
209 {"matrix": [2, 8], "x": 8.5, "y": 2.25},
210 {"matrix": [2, 9], "x": 9.5, "y": 2.25},
211 {"matrix": [2, 10], "x": 10.5, "y": 2.25},
212 {"matrix": [2, 11], "x": 11.5, "y": 2.25},
213 {"matrix": [2, 12], "x": 12.5, "y": 2.25},
214 {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
215
216 {"matrix": [2, 15], "x": 15.25, "y": 2.25},
217
218 {"matrix": [2, 16], "x": 16.5, "y": 2.25},
219 {"matrix": [2, 17], "x": 17.5, "y": 2.25},
220 {"matrix": [2, 18], "x": 18.5, "y": 2.25},
221 {"matrix": [2, 19], "x": 19.5, "y": 2.25, "h": 2},
222
223 {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
224 {"matrix": [3, 1], "x": 1.75, "y": 3.25},
225 {"matrix": [3, 2], "x": 2.75, "y": 3.25},
226 {"matrix": [3, 3], "x": 3.75, "y": 3.25},
227 {"matrix": [3, 4], "x": 4.75, "y": 3.25},
228 {"matrix": [3, 5], "x": 5.75, "y": 3.25},
229 {"matrix": [3, 6], "x": 6.75, "y": 3.25},
230 {"matrix": [3, 7], "x": 7.75, "y": 3.25},
231 {"matrix": [3, 8], "x": 8.75, "y": 3.25},
232 {"matrix": [3, 9], "x": 9.75, "y": 3.25},
233 {"matrix": [3, 10], "x": 10.75, "y": 3.25},
234 {"matrix": [3, 11], "x": 11.75, "y": 3.25},
235 {"matrix": [3, 14], "x": 12.75, "y": 3.25, "w": 2.25},
236
237 {"matrix": [3, 16], "x": 16.5, "y": 3.25},
238 {"matrix": [3, 17], "x": 17.5, "y": 3.25},
239 {"matrix": [3, 18], "x": 18.5, "y": 3.25},
240
241 {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
242 {"matrix": [4, 2], "x": 2.25, "y": 4.25},
243 {"matrix": [4, 3], "x": 3.25, "y": 4.25},
244 {"matrix": [4, 4], "x": 4.25, "y": 4.25},
245 {"matrix": [4, 5], "x": 5.25, "y": 4.25},
246 {"matrix": [4, 6], "x": 6.25, "y": 4.25},
247 {"matrix": [4, 7], "x": 7.25, "y": 4.25},
248 {"matrix": [4, 8], "x": 8.25, "y": 4.25},
249 {"matrix": [4, 9], "x": 9.25, "y": 4.25},
250 {"matrix": [4, 10], "x": 10.25, "y": 4.25},
251 {"matrix": [4, 12], "x": 11.25, "y": 4.25},
252 {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
253
254 {"matrix": [4, 15], "x": 15.25, "y": 4.5},
255
256 {"matrix": [4, 16], "x": 16.5, "y": 4.25},
257 {"matrix": [4, 17], "x": 17.5, "y": 4.25},
258 {"matrix": [4, 18], "x": 18.5, "y": 4.25},
259
260 {"matrix": [4, 19], "x": 19.5, "y": 4.25, "h": 2},
261 {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
262 {"matrix": [5, 1], "x": 1.5, "y": 5.25},
263 {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
264 {"matrix": [5, 8], "x": 4, "y": 5.25, "w": 7},
265 {"matrix": [5, 12], "x": 11, "y": 5.25, "w": 1.5},
266 {"matrix": [5, 13], "x": 12.5, "y": 5.25, "w": 1.5},
267
268 {"matrix": [5, 14], "x": 14.25, "y": 5.5},
269 {"matrix": [5, 15], "x": 15.25, "y": 5.5},
270 {"matrix": [5, 16], "x": 16.25, "y": 5.5},
271
272 {"matrix": [5, 17], "x": 17.5, "y": 5.25},
273 {"matrix": [5, 18], "x": 18.5, "y": 5.25}
274 ]
30 } 275 }
31 } 276 }
32} 277}
diff --git a/keyboards/duck/jetfire/jetfire.c b/keyboards/duck/jetfire/jetfire.c
index d42cb22ff3..23e6e9095a 100644
--- a/keyboards/duck/jetfire/jetfire.c
+++ b/keyboards/duck/jetfire/jetfire.c
@@ -13,7 +13,7 @@
13 * You should have received a copy of the GNU General Public License 13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16#include "jetfire.h" 16#include "quantum.h"
17#include "indicator_leds.h" 17#include "indicator_leds.h"
18 18
19enum BACKLIGHT_AREAS { 19enum BACKLIGHT_AREAS {
diff --git a/keyboards/duck/jetfire/jetfire.h b/keyboards/duck/jetfire/jetfire.h
deleted file mode 100644
index 3c4834bce4..0000000000
--- a/keyboards/duck/jetfire/jetfire.h
+++ /dev/null
@@ -1,58 +0,0 @@
1/* Copyright 2018 MechMerlin
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16#pragma once
17
18#include "quantum.h"
19
20// This a shortcut to help you visually see your layout.
21// The following is an example using the Planck MIT layout
22// The first section contains all of the arguments representing the physical
23// layout of the board and position of the keys
24// The second converts the arguments into a two-dimensional array which
25// represents the switch matrix.
26
27#define LAYOUT_all( \
28 K5A, K5C, K5D, K5E, K5F, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, K5Q, K5R, K5S, K5T, \
29 K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, K4O, K4P, K4Q, K4R, K4S, K4T, \
30 K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3O, K3P, K3Q, K3R, K3S, K3T, \
31 K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2O, K2Q, K2R, K2S, K2T, \
32 K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1M, K1N, K1O, K1P, K1Q, K1R, K1S, K1T, \
33 K0A, K0B, K0C, K0I, K0L, K0M, K0N, K0O, K0P, K0Q, K0R, K0S, K0T \
34) { \
35 { K5A, KC_NO, K5C, K5D, K5E, K5F, KC_NO, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, K5Q, K5R, K5S, K5T }, \
36 { K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, K4O, K4P, K4Q, K4R, K4S, K4T }, \
37 { K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, KC_NO, K3O, K3P, K3Q, K3R, K3S, K3T }, \
38 { K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, KC_NO, KC_NO, K2O, KC_NO, K2Q, K2R, K2S, K2T }, \
39 { K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, KC_NO, K1M, K1N, K1O, K1P, K1Q, K1R, K1S, K1T }, \
40 { K0A, K0B, K0C, KC_NO,KC_NO,KC_NO,KC_NO,KC_NO, K0I, KC_NO,KC_NO, K0L, K0M, K0N, K0O, K0P, K0Q, K0R, K0S, K0T } \
41}
42
43#define LAYOUT( \
44 K5A, K5C, K5D, K5E, K5F, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, K5Q, K5R, K5S, K5T, \
45 K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4O, K4P, K4Q, K4R, K4S, K4T, \
46 K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3O, K3P, K3Q, K3R, K3S, K3T, \
47 K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2O, K2Q, K2R, K2S, \
48 K1A, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1M, K1N, K1P, K1Q, K1R, K1S, K1T, \
49 K0A, K0B, K0C, K0I, K0M, K0N, K0O, K0P, K0Q, K0R, K0S \
50) { \
51 { K5A, KC_NO, K5C, K5D, K5E, K5F, KC_NO, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, K5Q, K5R, K5S, K5T }, \
52 { K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, KC_NO, K4O, K4P, K4Q, K4R, K4S, K4T }, \
53 { K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, KC_NO, K3O, K3P, K3Q, K3R, K3S, K3T }, \
54 { K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, KC_NO, KC_NO, K2O, KC_NO, K2Q, K2R, K2S, KC_NO }, \
55 { K1A, KC_NO, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, KC_NO, K1M, K1N, KC_NO, K1P, K1Q, K1R, K1S, K1T }, \
56 { K0A, K0B, K0C, KC_NO,KC_NO,KC_NO,KC_NO,KC_NO, K0I, KC_NO,KC_NO,KC_NO, K0M, K0N, K0O, K0P, K0Q, K0R, K0S, KC_NO } \
57}
58
diff --git a/keyboards/duck/tcv3/info.json b/keyboards/duck/tcv3/info.json
index f1e29d8d99..455aeda060 100644
--- a/keyboards/duck/tcv3/info.json
+++ b/keyboards/duck/tcv3/info.json
@@ -18,11 +18,249 @@
18 "bootloader": "atmel-dfu", 18 "bootloader": "atmel-dfu",
19 "layouts": { 19 "layouts": {
20 "LAYOUT_all": { 20 "LAYOUT_all": {
21 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":8.75, "y":0}, {"x":9.75, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.5, "y":0}, {"x":18.5, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2.25, "y":1.25}, {"x":3.25, "y":1.25}, {"x":4.25, "y":1.25}, {"x":5.25, "y":1.25}, {"x":6.25, "y":1.25}, {"x":7.25, "y":1.25}, {"x":8.25, "y":1.25}, {"x":9.25, "y":1.25}, {"x":10.25, "y":1.25}, {"x":11.25, "y":1.25}, {"x":12.25, "y":1.25}, {"x":13.25, "y":1.25}, {"x":14.25, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.5, "y":1.25}, {"x":18.5, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2.25, "y":2.25, "w":1.5}, {"x":3.75, "y":2.25}, {"x":4.75, "y":2.25}, {"x":5.75, "y":2.25}, {"x":6.75, "y":2.25}, {"x":7.75, "y":2.25}, {"x":8.75, "y":2.25}, {"x":9.75, "y":2.25}, {"x":10.75, "y":2.25}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2.25}, {"x":13.75, "y":2.25}, {"x":14.75, "y":2.25}, {"x":15.75, "y":2.25, "w":1.5}, {"x":17.5, "y":2.25}, {"x":18.5, "y":2.25}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2.25, "y":3.25, "w":1.75}, {"x":4, "y":3.25}, {"x":5, "y":3.25}, {"x":6, "y":3.25}, {"x":7, "y":3.25}, {"x":8, "y":3.25}, {"x":9, "y":3.25}, {"x":10, "y":3.25}, {"x":11, "y":3.25}, {"x":12, "y":3.25}, {"x":13, "y":3.25}, {"x":14, "y":3.25}, {"x":15, "y":3.25}, {"x":16, "y":3.25, "w":1.25}, {"x":17.5, "y":3.25}, {"x":18.5, "y":3.25}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2.25, "y":4.25, "w":1.25}, {"x":3.5, "y":4.25}, {"x":4.5, "y":4.25}, {"x":5.5, "y":4.25}, {"x":6.5, "y":4.25}, {"x":7.5, "y":4.25}, {"x":8.5, "y":4.25}, {"x":9.5, "y":4.25}, {"x":10.5, "y":4.25}, {"x":11.5, "y":4.25}, {"x":12.5, "y":4.25}, {"x":13.5, "y":4.25}, {"x":14.5, "y":4.25, "w":1.75}, {"x":16.25, "y":4.25}, {"x":17.5, "y":4.5}, {"x":0, "y":5.25}, {"x":1, "y":5.25}, {"x":2.25, "y":5.25, "w":1.5}, {"x":3.75, "y":5.25}, {"x":4.75, "y":5.25, "w":1.5}, {"x":6.25, "y":5.25, "w":6}, {"x":12.25, "y":5.25, "w":1.5}, {"x":13.75, "y":5.25}, {"x":14.75, "y":5.25, "w":1.5}, {"x":16.5, "y":5.5}, {"x":17.5, "y":5.5}, {"x":18.5, "y":5.5}] 21 "layout": [
22 }, 22 {"matrix": [0, 0], "x": 0, "y": 0},
23 {"matrix": [0, 1], "x": 1, "y": 0},
24
25 {"matrix": [0, 2], "x": 2.25, "y": 0},
26
27 {"matrix": [0, 4], "x": 4.25, "y": 0},
28 {"matrix": [0, 5], "x": 5.25, "y": 0},
29 {"matrix": [0, 6], "x": 6.25, "y": 0},
30 {"matrix": [0, 7], "x": 7.25, "y": 0},
31
32 {"matrix": [0, 9], "x": 8.75, "y": 0},
33 {"matrix": [0, 10], "x": 9.75, "y": 0},
34 {"matrix": [0, 11], "x": 10.75, "y": 0},
35 {"matrix": [0, 12], "x": 11.75, "y": 0},
36
37 {"matrix": [0, 13], "x": 13.25, "y": 0},
38 {"matrix": [0, 14], "x": 14.25, "y": 0},
39 {"matrix": [0, 15], "x": 15.25, "y": 0},
40 {"matrix": [0, 16], "x": 16.25, "y": 0},
41
42 {"matrix": [0, 19], "x": 17.5, "y": 0},
43 {"matrix": [0, 18], "x": 18.5, "y": 0},
44
45 {"matrix": [1, 0], "x": 0, "y": 1.25},
46 {"matrix": [1, 1], "x": 1, "y": 1.25},
47
48 {"matrix": [1, 2], "x": 2.25, "y": 1.25},
49 {"matrix": [1, 3], "x": 3.25, "y": 1.25},
50 {"matrix": [1, 4], "x": 4.25, "y": 1.25},
51 {"matrix": [1, 5], "x": 5.25, "y": 1.25},
52 {"matrix": [1, 6], "x": 6.25, "y": 1.25},
53 {"matrix": [1, 7], "x": 7.25, "y": 1.25},
54 {"matrix": [1, 8], "x": 8.25, "y": 1.25},
55 {"matrix": [1, 9], "x": 9.25, "y": 1.25},
56 {"matrix": [1, 10], "x": 10.25, "y": 1.25},
57 {"matrix": [1, 11], "x": 11.25, "y": 1.25},
58 {"matrix": [1, 12], "x": 12.25, "y": 1.25},
59 {"matrix": [1, 13], "x": 13.25, "y": 1.25},
60 {"matrix": [1, 14], "x": 14.25, "y": 1.25},
61 {"matrix": [1, 15], "x": 15.25, "y": 1.25},
62 {"matrix": [1, 16], "x": 16.25, "y": 1.25},
63
64 {"matrix": [1, 17], "x": 17.5, "y": 1.25},
65 {"matrix": [1, 18], "x": 18.5, "y": 1.25},
66
67 {"matrix": [2, 0], "x": 0, "y": 2.25},
68 {"matrix": [2, 1], "x": 1, "y": 2.25},
69
70 {"matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
71 {"matrix": [2, 3], "x": 3.75, "y": 2.25},
72 {"matrix": [2, 4], "x": 4.75, "y": 2.25},
73 {"matrix": [2, 5], "x": 5.75, "y": 2.25},
74 {"matrix": [2, 6], "x": 6.75, "y": 2.25},
75 {"matrix": [2, 7], "x": 7.75, "y": 2.25},
76 {"matrix": [2, 8], "x": 8.75, "y": 2.25},
77 {"matrix": [2, 9], "x": 9.75, "y": 2.25},
78 {"matrix": [2, 10], "x": 10.75, "y": 2.25},
79 {"matrix": [2, 11], "x": 11.75, "y": 2.25},
80 {"matrix": [2, 12], "x": 12.75, "y": 2.25},
81 {"matrix": [2, 13], "x": 13.75, "y": 2.25},
82 {"matrix": [2, 14], "x": 14.75, "y": 2.25},
83 {"matrix": [2, 16], "x": 15.75, "y": 2.25, "w": 1.5},
84
85 {"matrix": [2, 17], "x": 17.5, "y": 2.25},
86 {"matrix": [2, 18], "x": 18.5, "y": 2.25},
87
88 {"matrix": [3, 0], "x": 0, "y": 3.25},
89 {"matrix": [3, 1], "x": 1, "y": 3.25},
90
91 {"matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
92 {"matrix": [3, 3], "x": 4, "y": 3.25},
93 {"matrix": [3, 4], "x": 5, "y": 3.25},
94 {"matrix": [3, 5], "x": 6, "y": 3.25},
95 {"matrix": [3, 6], "x": 7, "y": 3.25},
96 {"matrix": [3, 7], "x": 8, "y": 3.25},
97 {"matrix": [3, 8], "x": 9, "y": 3.25},
98 {"matrix": [3, 9], "x": 10, "y": 3.25},
99 {"matrix": [3, 10], "x": 11, "y": 3.25},
100 {"matrix": [3, 11], "x": 12, "y": 3.25},
101 {"matrix": [3, 12], "x": 13, "y": 3.25},
102 {"matrix": [3, 13], "x": 14, "y": 3.25},
103 {"matrix": [3, 14], "x": 15, "y": 3.25},
104 {"matrix": [3, 16], "x": 16, "y": 3.25, "w": 1.25},
105
106 {"matrix": [3, 17], "x": 17.5, "y": 3.25},
107 {"matrix": [3, 18], "x": 18.5, "y": 3.25},
108
109 {"matrix": [4, 0], "x": 0, "y": 4.25},
110 {"matrix": [4, 1], "x": 1, "y": 4.25},
111
112 {"matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 1.25},
113 {"matrix": [4, 3], "x": 3.5, "y": 4.25},
114 {"matrix": [4, 4], "x": 4.5, "y": 4.25},
115 {"matrix": [4, 5], "x": 5.5, "y": 4.25},
116 {"matrix": [4, 6], "x": 6.5, "y": 4.25},
117 {"matrix": [4, 7], "x": 7.5, "y": 4.25},
118 {"matrix": [4, 8], "x": 8.5, "y": 4.25},
119 {"matrix": [4, 9], "x": 9.5, "y": 4.25},
120 {"matrix": [4, 10], "x": 10.5, "y": 4.25},
121 {"matrix": [4, 11], "x": 11.5, "y": 4.25},
122 {"matrix": [4, 12], "x": 12.5, "y": 4.25},
123 {"matrix": [4, 14], "x": 13.5, "y": 4.25},
124 {"matrix": [4, 15], "x": 14.5, "y": 4.25, "w": 1.75},
125 {"matrix": [4, 16], "x": 16.25, "y": 4.25},
126
127 {"matrix": [4, 17], "x": 17.5, "y": 4.5},
128
129 {"matrix": [5, 0], "x": 0, "y": 5.25},
130 {"matrix": [5, 1], "x": 1, "y": 5.25},
131
132 {"matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
133 {"matrix": [5, 3], "x": 3.75, "y": 5.25},
134 {"matrix": [5, 4], "x": 4.75, "y": 5.25, "w": 1.5},
135 {"matrix": [5, 10], "x": 6.25, "y": 5.25, "w": 6},
136 {"matrix": [5, 12], "x": 12.25, "y": 5.25, "w": 1.5},
137 {"matrix": [5, 14], "x": 13.75, "y": 5.25},
138 {"matrix": [5, 15], "x": 14.75, "y": 5.25, "w": 1.5},
23 139
140 {"matrix": [5, 16], "x": 16.5, "y": 5.5},
141 {"matrix": [5, 17], "x": 17.5, "y": 5.5},
142 {"matrix": [5, 18], "x": 18.5, "y": 5.5}
143 ]
144 },
24 "LAYOUT": { 145 "LAYOUT": {
25 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":8.75, "y":0}, {"x":9.75, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.5, "y":0}, {"x":18.5, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2.25, "y":1.25}, {"x":3.25, "y":1.25}, {"x":4.25, "y":1.25}, {"x":5.25, "y":1.25}, {"x":6.25, "y":1.25}, {"x":7.25, "y":1.25}, {"x":8.25, "y":1.25}, {"x":9.25, "y":1.25}, {"x":10.25, "y":1.25}, {"x":11.25, "y":1.25}, {"x":12.25, "y":1.25}, {"x":13.25, "y":1.25}, {"x":14.25, "y":1.25}, {"x":15.25, "y":1.25, "w":2}, {"x":17.5, "y":1.25}, {"x":18.5, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2.25, "y":2.25, "w":1.5}, {"x":3.75, "y":2.25}, {"x":4.75, "y":2.25}, {"x":5.75, "y":2.25}, {"x":6.75, "y":2.25}, {"x":7.75, "y":2.25}, {"x":8.75, "y":2.25}, {"x":9.75, "y":2.25}, {"x":10.75, "y":2.25}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2.25}, {"x":13.75, "y":2.25}, {"x":14.75, "y":2.25}, {"x":15.75, "y":2.25, "w":1.5}, {"x":17.5, "y":2.25}, {"x":18.5, "y":2.25}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2.25, "y":3.25, "w":1.75}, {"x":4, "y":3.25}, {"x":5, "y":3.25}, {"x":6, "y":3.25}, {"x":7, "y":3.25}, {"x":8, "y":3.25}, {"x":9, "y":3.25}, {"x":10, "y":3.25}, {"x":11, "y":3.25}, {"x":12, "y":3.25}, {"x":13, "y":3.25}, {"x":14, "y":3.25}, {"x":15, "y":3.25, "w":2.25}, {"x":17.5, "y":3.25}, {"x":18.5, "y":3.25}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2.25, "y":4.25, "w":2.25}, {"x":4.5, "y":4.25}, {"x":5.5, "y":4.25}, {"x":6.5, "y":4.25}, {"x":7.5, "y":4.25}, {"x":8.5, "y":4.25}, {"x":9.5, "y":4.25}, {"x":10.5, "y":4.25}, {"x":11.5, "y":4.25}, {"x":12.5, "y":4.25}, {"x":13.5, "y":4.25}, {"x":14.5, "y":4.25, "w":2.75}, {"x":17.5, "y":4.5}, {"x":0, "y":5.25}, {"x":1, "y":5.25}, {"x":2.25, "y":5.25, "w":1.5}, {"x":3.75, "y":5.25}, {"x":4.75, "y":5.25, "w":1.5}, {"x":6.25, "y":5.25, "w":6}, {"x":12.25, "y":5.25, "w":1.5}, {"x":13.75, "y":5.25}, {"x":14.75, "y":5.25, "w":1.5}, {"x":16.5, "y":5.5}, {"x":17.5, "y":5.5}, {"x":18.5, "y":5.5}] 146 "layout": [
147 {"matrix": [0, 0], "x": 0, "y": 0},
148 {"matrix": [0, 1], "x": 1, "y": 0},
149
150 {"matrix": [0, 2], "x": 2.25, "y": 0},
151
152 {"matrix": [0, 4], "x": 4.25, "y": 0},
153 {"matrix": [0, 5], "x": 5.25, "y": 0},
154 {"matrix": [0, 6], "x": 6.25, "y": 0},
155 {"matrix": [0, 7], "x": 7.25, "y": 0},
156
157 {"matrix": [0, 9], "x": 8.75, "y": 0},
158 {"matrix": [0, 10], "x": 9.75, "y": 0},
159 {"matrix": [0, 11], "x": 10.75, "y": 0},
160 {"matrix": [0, 12], "x": 11.75, "y": 0},
161
162 {"matrix": [0, 13], "x": 13.25, "y": 0},
163 {"matrix": [0, 14], "x": 14.25, "y": 0},
164 {"matrix": [0, 15], "x": 15.25, "y": 0},
165 {"matrix": [0, 16], "x": 16.25, "y": 0},
166
167 {"matrix": [0, 19], "x": 17.5, "y": 0},
168 {"matrix": [0, 18], "x": 18.5, "y": 0},
169
170 {"matrix": [1, 0], "x": 0, "y": 1.25},
171 {"matrix": [1, 1], "x": 1, "y": 1.25},
172
173 {"matrix": [1, 2], "x": 2.25, "y": 1.25},
174 {"matrix": [1, 3], "x": 3.25, "y": 1.25},
175 {"matrix": [1, 4], "x": 4.25, "y": 1.25},
176 {"matrix": [1, 5], "x": 5.25, "y": 1.25},
177 {"matrix": [1, 6], "x": 6.25, "y": 1.25},
178 {"matrix": [1, 7], "x": 7.25, "y": 1.25},
179 {"matrix": [1, 8], "x": 8.25, "y": 1.25},
180 {"matrix": [1, 9], "x": 9.25, "y": 1.25},
181 {"matrix": [1, 10], "x": 10.25, "y": 1.25},
182 {"matrix": [1, 11], "x": 11.25, "y": 1.25},
183 {"matrix": [1, 12], "x": 12.25, "y": 1.25},
184 {"matrix": [1, 13], "x": 13.25, "y": 1.25},
185 {"matrix": [1, 14], "x": 14.25, "y": 1.25},
186 {"matrix": [1, 16], "x": 15.25, "y": 1.25, "w": 2},
187
188 {"matrix": [1, 17], "x": 17.5, "y": 1.25},
189 {"matrix": [1, 18], "x": 18.5, "y": 1.25},
190
191 {"matrix": [2, 0], "x": 0, "y": 2.25},
192 {"matrix": [2, 1], "x": 1, "y": 2.25},
193
194 {"matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
195 {"matrix": [2, 3], "x": 3.75, "y": 2.25},
196 {"matrix": [2, 4], "x": 4.75, "y": 2.25},
197 {"matrix": [2, 5], "x": 5.75, "y": 2.25},
198 {"matrix": [2, 6], "x": 6.75, "y": 2.25},
199 {"matrix": [2, 7], "x": 7.75, "y": 2.25},
200 {"matrix": [2, 8], "x": 8.75, "y": 2.25},
201 {"matrix": [2, 9], "x": 9.75, "y": 2.25},
202 {"matrix": [2, 10], "x": 10.75, "y": 2.25},
203 {"matrix": [2, 11], "x": 11.75, "y": 2.25},
204 {"matrix": [2, 12], "x": 12.75, "y": 2.25},
205 {"matrix": [2, 13], "x": 13.75, "y": 2.25},
206 {"matrix": [2, 14], "x": 14.75, "y": 2.25},
207 {"matrix": [2, 16], "x": 15.75, "y": 2.25, "w": 1.5},
208
209 {"matrix": [2, 17], "x": 17.5, "y": 2.25},
210 {"matrix": [2, 18], "x": 18.5, "y": 2.25},
211
212 {"matrix": [3, 0], "x": 0, "y": 3.25},
213 {"matrix": [3, 1], "x": 1, "y": 3.25},
214
215 {"matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
216 {"matrix": [3, 3], "x": 4, "y": 3.25},
217 {"matrix": [3, 4], "x": 5, "y": 3.25},
218 {"matrix": [3, 5], "x": 6, "y": 3.25},
219 {"matrix": [3, 6], "x": 7, "y": 3.25},
220 {"matrix": [3, 7], "x": 8, "y": 3.25},
221 {"matrix": [3, 8], "x": 9, "y": 3.25},
222 {"matrix": [3, 9], "x": 10, "y": 3.25},
223 {"matrix": [3, 10], "x": 11, "y": 3.25},
224 {"matrix": [3, 11], "x": 12, "y": 3.25},
225 {"matrix": [3, 12], "x": 13, "y": 3.25},
226 {"matrix": [3, 13], "x": 14, "y": 3.25},
227 {"matrix": [3, 16], "x": 15, "y": 3.25, "w": 2.25},
228
229 {"matrix": [3, 17], "x": 17.5, "y": 3.25},
230 {"matrix": [3, 18], "x": 18.5, "y": 3.25},
231
232 {"matrix": [4, 0], "x": 0, "y": 4.25},
233 {"matrix": [4, 1], "x": 1, "y": 4.25},
234
235 {"matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 2.25},
236 {"matrix": [4, 4], "x": 4.5, "y": 4.25},
237 {"matrix": [4, 5], "x": 5.5, "y": 4.25},
238 {"matrix": [4, 6], "x": 6.5, "y": 4.25},
239 {"matrix": [4, 7], "x": 7.5, "y": 4.25},
240 {"matrix": [4, 8], "x": 8.5, "y": 4.25},
241 {"matrix": [4, 9], "x": 9.5, "y": 4.25},
242 {"matrix": [4, 10], "x": 10.5, "y": 4.25},
243 {"matrix": [4, 11], "x": 11.5, "y": 4.25},
244 {"matrix": [4, 12], "x": 12.5, "y": 4.25},
245 {"matrix": [4, 14], "x": 13.5, "y": 4.25},
246 {"matrix": [4, 15], "x": 14.5, "y": 4.25, "w": 2.75},
247 {"matrix": [4, 17], "x": 17.5, "y": 4.5},
248
249 {"matrix": [5, 0], "x": 0, "y": 5.25},
250 {"matrix": [5, 1], "x": 1, "y": 5.25},
251
252 {"matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
253 {"matrix": [5, 3], "x": 3.75, "y": 5.25},
254 {"matrix": [5, 4], "x": 4.75, "y": 5.25, "w": 1.5},
255 {"matrix": [5, 10], "x": 6.25, "y": 5.25, "w": 6},
256 {"matrix": [5, 12], "x": 12.25, "y": 5.25, "w": 1.5},
257 {"matrix": [5, 14], "x": 13.75, "y": 5.25},
258 {"matrix": [5, 15], "x": 14.75, "y": 5.25, "w": 1.5},
259
260 {"matrix": [5, 16], "x": 16.5, "y": 5.5},
261 {"matrix": [5, 17], "x": 17.5, "y": 5.5},
262 {"matrix": [5, 18], "x": 18.5, "y": 5.5}
263 ]
26 } 264 }
27 } 265 }
28} 266}
diff --git a/keyboards/duck/tcv3/tcv3.c b/keyboards/duck/tcv3/tcv3.c
index 805d2b75d5..ab89e180c0 100644
--- a/keyboards/duck/tcv3/tcv3.c
+++ b/keyboards/duck/tcv3/tcv3.c
@@ -13,7 +13,7 @@
13 * You should have received a copy of the GNU General Public License 13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16#include "tcv3.h" 16#include "quantum.h"
17#include "indicator_leds.h" 17#include "indicator_leds.h"
18 18
19enum BACKLIGHT_AREAS { 19enum BACKLIGHT_AREAS {
diff --git a/keyboards/duck/tcv3/tcv3.h b/keyboards/duck/tcv3/tcv3.h
deleted file mode 100644
index 33792d4e6a..0000000000
--- a/keyboards/duck/tcv3/tcv3.h
+++ /dev/null
@@ -1,53 +0,0 @@
1/* Copyright 2019 MechMerlin <mechmerlin@gmail.com>
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16#pragma once
17
18#include "quantum.h"
19
20#define XXX KC_NO
21
22#define LAYOUT_all( \
23 K00, K01, K02, K04, K05, K06, K07, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0J, K0I, \
24 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, \
25 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2G, K2H, K2I, \
26 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3G, K3H, K3I, \
27 K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4E, K4F, K4G, K4H, \
28 K50, K51, K52, K53, K54, K5A, K5C, K5E, K5F, K5G, K5H, K5I \
29) { \
30 { K00, K01, K02, XXX, K04, K05, K06, K07, XXX, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, XXX, K0I, K0J }, \
31 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, XXX }, \
32 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, XXX, K2G, K2H, K2I, XXX }, \
33 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, XXX, K3G, K3H, K3I, XXX }, \
34 { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, XXX, K4E, K4F, K4G, K4H, XXX, XXX }, \
35 { K50, K51, K52, K53, K54, XXX, XXX, XXX, XXX, XXX, K5A, XXX, K5C, XXX, K5E, K5F, K5G, K5H, K5I, XXX }, \
36}
37
38
39#define LAYOUT( \
40 K00, K01, K02, K04, K05, K06, K07, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0J, K0I, \
41 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1G, K1H, K1I, \
42 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2G, K2H, K2I, \
43 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3G, K3H, K3I, \
44 K40, K41, K42, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4E, K4F, K4H, \
45 K50, K51, K52, K53, K54, K5A, K5C, K5E, K5F, K5G, K5H, K5I \
46) { \
47 { K00, K01, K02, XXX, K04, K05, K06, K07, XXX, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, XXX, K0I, K0J }, \
48 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, XXX, K1G, K1H, K1I, XXX }, \
49 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, XXX, K2G, K2H, K2I, XXX }, \
50 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX, K3G, K3H, K3I, XXX }, \
51 { K40, K41, K42, XXX, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, XXX, K4E, K4F, XXX, K4H, XXX, XXX }, \
52 { K50, K51, K52, K53, K54, XXX, XXX, XXX, XXX, XXX, K5A, XXX, K5C, XXX, K5E, K5F, K5G, K5H, K5I, XXX }, \
53}
diff --git a/keyboards/eve/meteor/info.json b/keyboards/eve/meteor/info.json
index a00ae77f40..983051b07a 100644
--- a/keyboards/eve/meteor/info.json
+++ b/keyboards/eve/meteor/info.json
@@ -26,11 +26,182 @@
26 "bootloader": "bootloadhid", 26 "bootloader": "bootloadhid",
27 "layouts": { 27 "layouts": {
28 "LAYOUT_all": { 28 "LAYOUT_all": {
29 "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5}, {"x":14, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5, "w":2.25}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"x":0, "y":5.5, "w":1.25}, {"x":1.25, "y":5.5, "w":1.25}, {"x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"x":10, "y":5.5}, {"x":11, "y":5.5}, {"x":12, "y":5.5}, {"x":13, "y":5.5}, {"x":14, "y":5.5}] 29 "layout": [
30 }, 30 {"matrix": [0, 0], "x": 0, "y": 0},
31
32 {"matrix": [0, 2], "x": 2, "y": 0},
33 {"matrix": [0, 3], "x": 3, "y": 0},
34 {"matrix": [0, 4], "x": 4, "y": 0},
35 {"matrix": [0, 5], "x": 5, "y": 0},
36
37 {"matrix": [0, 6], "x": 6.5, "y": 0},
38 {"matrix": [0, 7], "x": 7.5, "y": 0},
39 {"matrix": [0, 8], "x": 8.5, "y": 0},
40 {"matrix": [0, 9], "x": 9.5, "y": 0},
41
42 {"matrix": [0, 10], "x": 11, "y": 0},
43 {"matrix": [0, 11], "x": 12, "y": 0},
44 {"matrix": [0, 12], "x": 13, "y": 0},
45 {"matrix": [0, 13], "x": 14, "y": 0},
46
47 {"matrix": [1, 0], "x": 0, "y": 1.5},
48 {"matrix": [1, 1], "x": 1, "y": 1.5},
49 {"matrix": [1, 2], "x": 2, "y": 1.5},
50 {"matrix": [1, 3], "x": 3, "y": 1.5},
51 {"matrix": [1, 4], "x": 4, "y": 1.5},
52 {"matrix": [1, 5], "x": 5, "y": 1.5},
53 {"matrix": [1, 6], "x": 6, "y": 1.5},
54 {"matrix": [1, 7], "x": 7, "y": 1.5},
55 {"matrix": [1, 8], "x": 8, "y": 1.5},
56 {"matrix": [1, 9], "x": 9, "y": 1.5},
57 {"matrix": [1, 10], "x": 10, "y": 1.5},
58 {"matrix": [1, 11], "x": 11, "y": 1.5},
59 {"matrix": [1, 12], "x": 12, "y": 1.5},
60 {"matrix": [1, 13], "x": 13, "y": 1.5},
61 {"matrix": [1, 14], "x": 14, "y": 1.5},
31 62
63 {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
64 {"matrix": [2, 1], "x": 1.5, "y": 2.5},
65 {"matrix": [2, 2], "x": 2.5, "y": 2.5},
66 {"matrix": [2, 3], "x": 3.5, "y": 2.5},
67 {"matrix": [2, 4], "x": 4.5, "y": 2.5},
68 {"matrix": [2, 5], "x": 5.5, "y": 2.5},
69 {"matrix": [2, 6], "x": 6.5, "y": 2.5},
70 {"matrix": [2, 7], "x": 7.5, "y": 2.5},
71 {"matrix": [2, 8], "x": 8.5, "y": 2.5},
72 {"matrix": [2, 9], "x": 9.5, "y": 2.5},
73 {"matrix": [2, 10], "x": 10.5, "y": 2.5},
74 {"matrix": [2, 11], "x": 11.5, "y": 2.5},
75 {"matrix": [2, 12], "x": 12.5, "y": 2.5},
76 {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
77
78 {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
79 {"matrix": [3, 1], "x": 1.75, "y": 3.5},
80 {"matrix": [3, 2], "x": 2.75, "y": 3.5},
81 {"matrix": [3, 3], "x": 3.75, "y": 3.5},
82 {"matrix": [3, 4], "x": 4.75, "y": 3.5},
83 {"matrix": [3, 5], "x": 5.75, "y": 3.5},
84 {"matrix": [3, 6], "x": 6.75, "y": 3.5},
85 {"matrix": [3, 7], "x": 7.75, "y": 3.5},
86 {"matrix": [3, 8], "x": 8.75, "y": 3.5},
87 {"matrix": [3, 9], "x": 9.75, "y": 3.5},
88 {"matrix": [3, 10], "x": 10.75, "y": 3.5},
89 {"matrix": [3, 11], "x": 11.75, "y": 3.5},
90 {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
91
92 {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
93 {"matrix": [5, 3], "x": 1.25, "y": 4.5},
94 {"matrix": [4, 1], "x": 2.25, "y": 4.5},
95 {"matrix": [4, 2], "x": 3.25, "y": 4.5},
96 {"matrix": [4, 3], "x": 4.25, "y": 4.5},
97 {"matrix": [4, 4], "x": 5.25, "y": 4.5},
98 {"matrix": [4, 5], "x": 6.25, "y": 4.5},
99 {"matrix": [4, 6], "x": 7.25, "y": 4.5},
100 {"matrix": [4, 7], "x": 8.25, "y": 4.5},
101 {"matrix": [4, 8], "x": 9.25, "y": 4.5},
102 {"matrix": [4, 9], "x": 10.25, "y": 4.5},
103 {"matrix": [4, 10], "x": 11.25, "y": 4.5},
104 {"matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 1.75},
105 {"matrix": [4, 13], "x": 14, "y": 4.5},
106
107 {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
108 {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
109 {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
110 {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
111 {"matrix": [5, 9], "x": 10, "y": 5.5},
112 {"matrix": [5, 10], "x": 11, "y": 5.5},
113 {"matrix": [5, 11], "x": 12, "y": 5.5},
114 {"matrix": [5, 12], "x": 13, "y": 5.5},
115 {"matrix": [5, 13], "x": 14, "y": 5.5}
116 ]
117 },
32 "LAYOUT": { 118 "LAYOUT": {
33 "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5, "w":2}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5, "w":2.25}, {"x":0, "y":4.5, "w":2.25}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5, "w":1.75}, {"x":13, "y":4.5}, {"x":14, "y":4.5}, {"x":0, "y":5.5, "w":1.25}, {"x":1.25, "y":5.5, "w":1.25}, {"x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"x":10, "y":5.5}, {"x":11, "y":5.5}, {"x":12, "y":5.5}, {"x":13, "y":5.5}, {"x":14, "y":5.5}] 119 "layout": [
120 {"matrix": [0, 0], "x": 0, "y": 0},
121
122 {"matrix": [0, 2], "x": 2, "y": 0},
123 {"matrix": [0, 3], "x": 3, "y": 0},
124 {"matrix": [0, 4], "x": 4, "y": 0},
125 {"matrix": [0, 5], "x": 5, "y": 0},
126
127 {"matrix": [0, 6], "x": 6.5, "y": 0},
128 {"matrix": [0, 7], "x": 7.5, "y": 0},
129 {"matrix": [0, 8], "x": 8.5, "y": 0},
130 {"matrix": [0, 9], "x": 9.5, "y": 0},
131
132 {"matrix": [0, 10], "x": 11, "y": 0},
133 {"matrix": [0, 11], "x": 12, "y": 0},
134 {"matrix": [0, 12], "x": 13, "y": 0},
135 {"matrix": [0, 13], "x": 14, "y": 0},
136
137 {"matrix": [1, 0], "x": 0, "y": 1.5},
138 {"matrix": [1, 1], "x": 1, "y": 1.5},
139 {"matrix": [1, 2], "x": 2, "y": 1.5},
140 {"matrix": [1, 3], "x": 3, "y": 1.5},
141 {"matrix": [1, 4], "x": 4, "y": 1.5},
142 {"matrix": [1, 5], "x": 5, "y": 1.5},
143 {"matrix": [1, 6], "x": 6, "y": 1.5},
144 {"matrix": [1, 7], "x": 7, "y": 1.5},
145 {"matrix": [1, 8], "x": 8, "y": 1.5},
146 {"matrix": [1, 9], "x": 9, "y": 1.5},
147 {"matrix": [1, 10], "x": 10, "y": 1.5},
148 {"matrix": [1, 11], "x": 11, "y": 1.5},
149 {"matrix": [1, 12], "x": 12, "y": 1.5},
150 {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
151
152 {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
153 {"matrix": [2, 1], "x": 1.5, "y": 2.5},
154 {"matrix": [2, 2], "x": 2.5, "y": 2.5},
155 {"matrix": [2, 3], "x": 3.5, "y": 2.5},
156 {"matrix": [2, 4], "x": 4.5, "y": 2.5},
157 {"matrix": [2, 5], "x": 5.5, "y": 2.5},
158 {"matrix": [2, 6], "x": 6.5, "y": 2.5},
159 {"matrix": [2, 7], "x": 7.5, "y": 2.5},
160 {"matrix": [2, 8], "x": 8.5, "y": 2.5},
161 {"matrix": [2, 9], "x": 9.5, "y": 2.5},
162 {"matrix": [2, 10], "x": 10.5, "y": 2.5},
163 {"matrix": [2, 11], "x": 11.5, "y": 2.5},
164 {"matrix": [2, 12], "x": 12.5, "y": 2.5},
165 {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
166
167 {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
168 {"matrix": [3, 1], "x": 1.75, "y": 3.5},
169 {"matrix": [3, 2], "x": 2.75, "y": 3.5},
170 {"matrix": [3, 3], "x": 3.75, "y": 3.5},
171 {"matrix": [3, 4], "x": 4.75, "y": 3.5},
172 {"matrix": [3, 5], "x": 5.75, "y": 3.5},
173 {"matrix": [3, 6], "x": 6.75, "y": 3.5},
174 {"matrix": [3, 7], "x": 7.75, "y": 3.5},
175 {"matrix": [3, 8], "x": 8.75, "y": 3.5},
176 {"matrix": [3, 9], "x": 9.75, "y": 3.5},
177 {"matrix": [3, 10], "x": 10.75, "y": 3.5},
178 {"matrix": [3, 11], "x": 11.75, "y": 3.5},
179 {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
180
181 {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
182 {"matrix": [4, 1], "x": 2.25, "y": 4.5},
183 {"matrix": [4, 2], "x": 3.25, "y": 4.5},
184 {"matrix": [4, 3], "x": 4.25, "y": 4.5},
185 {"matrix": [4, 4], "x": 5.25, "y": 4.5},
186 {"matrix": [4, 5], "x": 6.25, "y": 4.5},
187 {"matrix": [4, 6], "x": 7.25, "y": 4.5},
188 {"matrix": [4, 7], "x": 8.25, "y": 4.5},
189 {"matrix": [4, 8], "x": 9.25, "y": 4.5},
190 {"matrix": [4, 9], "x": 10.25, "y": 4.5},
191 {"matrix": [4, 10], "x": 11.25, "y": 4.5, "w": 1.75},
192 {"matrix": [4, 11], "x": 13, "y": 4.5},
193 {"matrix": [4, 13], "x": 14, "y": 4.5},
194
195 {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
196 {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
197 {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
198 {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
199 {"matrix": [5, 9], "x": 10, "y": 5.5},
200 {"matrix": [5, 10], "x": 11, "y": 5.5},
201 {"matrix": [5, 11], "x": 12, "y": 5.5},
202 {"matrix": [5, 12], "x": 13, "y": 5.5},
203 {"matrix": [5, 13], "x": 14, "y": 5.5}
204 ]
34 } 205 }
35 } 206 }
36} 207}
diff --git a/keyboards/eve/meteor/meteor.h b/keyboards/eve/meteor/meteor.h
deleted file mode 100644
index f8f8ee4ff3..0000000000
--- a/keyboards/eve/meteor/meteor.h
+++ /dev/null
@@ -1,54 +0,0 @@
1/* Copyright 2019 MechMerlin
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16#pragma once
17
18#include "quantum.h"
19
20// This a shortcut to help you visually see your layout.
21// The first section contains all of the arguments
22// The second converts the arguments into a two-dimensional array
23
24#define LAYOUT_all( \
25 k00, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
26 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
27 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \
28 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, \
29 k40, k53, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4D, \
30 k50, k51, k52, k55, k59, k5A, k5B, k5C, k5D \
31){ \
32 { k00, KC_NO, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, KC_NO }, \
33 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
34 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, KC_NO }, \
35 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, KC_NO, KC_NO }, \
36 { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, KC_NO, k4D, KC_NO }, \
37 { k50, k51, k52, k53, KC_NO, k55, KC_NO, KC_NO, KC_NO, k59, k5A, k5B, k5C, k5D, KC_NO }, \
38}
39
40#define LAYOUT( \
41 k00, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
42 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
43 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \
44 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, \
45 k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4D, \
46 k50, k51, k52, k55, k59, k5A, k5B, k5C, k5D \
47){ \
48 { k00, KC_NO, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, KC_NO }, \
49 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, KC_NO }, \
50 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, KC_NO }, \
51 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, KC_NO, KC_NO }, \
52 { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, KC_NO, k4D, KC_NO }, \
53 { k50, k51, k52, KC_NO, KC_NO, k55, KC_NO, KC_NO, KC_NO, k59, k5A, k5B, k5C, k5D, KC_NO }, \
54}
diff --git a/keyboards/evyd13/plain60/info.json b/keyboards/evyd13/plain60/info.json
index f2e3a55bce..7db6a08f07 100644
--- a/keyboards/evyd13/plain60/info.json
+++ b/keyboards/evyd13/plain60/info.json
@@ -23,495 +23,495 @@
23 "layouts": { 23 "layouts": {
24 "LAYOUT": { 24 "LAYOUT": {
25 "layout": [ 25 "layout": [
26 {"x": 0, "y": 0}, 26 {"matrix": [0, 0], "x": 0, "y": 0},
27 {"x": 1, "y": 0}, 27 {"matrix": [0, 1], "x": 1, "y": 0},
28 {"x": 2, "y": 0}, 28 {"matrix": [0, 2], "x": 2, "y": 0},
29 {"x": 3, "y": 0}, 29 {"matrix": [0, 3], "x": 3, "y": 0},
30 {"x": 4, "y": 0}, 30 {"matrix": [0, 4], "x": 4, "y": 0},
31 {"x": 5, "y": 0}, 31 {"matrix": [0, 5], "x": 5, "y": 0},
32 {"x": 6, "y": 0}, 32 {"matrix": [0, 6], "x": 6, "y": 0},
33 {"x": 7, "y": 0}, 33 {"matrix": [0, 7], "x": 7, "y": 0},
34 {"x": 8, "y": 0}, 34 {"matrix": [0, 8], "x": 8, "y": 0},
35 {"x": 9, "y": 0}, 35 {"matrix": [0, 9], "x": 9, "y": 0},
36 {"x": 10, "y": 0}, 36 {"matrix": [0, 10], "x": 10, "y": 0},
37 {"x": 11, "y": 0}, 37 {"matrix": [0, 11], "x": 11, "y": 0},
38 {"x": 12, "y": 0}, 38 {"matrix": [0, 12], "x": 12, "y": 0},
39 {"x": 13, "y": 0}, 39 {"matrix": [0, 13], "x": 13, "y": 0},
40 {"x": 14, "y": 0}, 40 {"matrix": [0, 14], "x": 14, "y": 0},
41 41
42 {"x": 0, "y": 1, "w": 1.5}, 42 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
43 {"x": 1.5, "y": 1}, 43 {"matrix": [1, 1], "x": 1.5, "y": 1},
44 {"x": 2.5, "y": 1}, 44 {"matrix": [1, 2], "x": 2.5, "y": 1},
45 {"x": 3.5, "y": 1}, 45 {"matrix": [1, 3], "x": 3.5, "y": 1},
46 {"x": 4.5, "y": 1}, 46 {"matrix": [1, 4], "x": 4.5, "y": 1},
47 {"x": 5.5, "y": 1}, 47 {"matrix": [1, 5], "x": 5.5, "y": 1},
48 {"x": 6.5, "y": 1}, 48 {"matrix": [1, 6], "x": 6.5, "y": 1},
49 {"x": 7.5, "y": 1}, 49 {"matrix": [1, 7], "x": 7.5, "y": 1},
50 {"x": 8.5, "y": 1}, 50 {"matrix": [1, 8], "x": 8.5, "y": 1},
51 {"x": 9.5, "y": 1}, 51 {"matrix": [1, 9], "x": 9.5, "y": 1},
52 {"x": 10.5, "y": 1}, 52 {"matrix": [1, 10], "x": 10.5, "y": 1},
53 {"x": 11.5, "y": 1}, 53 {"matrix": [1, 11], "x": 11.5, "y": 1},
54 {"x": 12.5, "y": 1}, 54 {"matrix": [1, 12], "x": 12.5, "y": 1},
55 {"x": 13.5, "y": 1, "w": 1.5}, 55 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
56 56
57 {"x": 0, "y": 2, "w": 1.75}, 57 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
58 {"x": 1.75, "y": 2}, 58 {"matrix": [2, 1], "x": 1.75, "y": 2},
59 {"x": 2.75, "y": 2}, 59 {"matrix": [2, 2], "x": 2.75, "y": 2},
60 {"x": 3.75, "y": 2}, 60 {"matrix": [2, 3], "x": 3.75, "y": 2},
61 {"x": 4.75, "y": 2}, 61 {"matrix": [2, 4], "x": 4.75, "y": 2},
62 {"x": 5.75, "y": 2}, 62 {"matrix": [2, 5], "x": 5.75, "y": 2},
63 {"x": 6.75, "y": 2}, 63 {"matrix": [2, 6], "x": 6.75, "y": 2},
64 {"x": 7.75, "y": 2}, 64 {"matrix": [2, 7], "x": 7.75, "y": 2},
65 {"x": 8.75, "y": 2}, 65 {"matrix": [2, 8], "x": 8.75, "y": 2},
66 {"x": 9.75, "y": 2}, 66 {"matrix": [2, 9], "x": 9.75, "y": 2},
67 {"x": 10.75, "y": 2}, 67 {"matrix": [2, 10], "x": 10.75, "y": 2},
68 {"x": 11.75, "y": 2}, 68 {"matrix": [2, 11], "x": 11.75, "y": 2},
69 {"x": 12.75, "y": 2}, 69 {"matrix": [2, 12], "x": 12.75, "y": 2},
70 {"x": 13.75, "y": 2, "w": 1.25}, 70 {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
71 71
72 {"x": 0, "y": 3, "w": 1.25}, 72 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
73 {"x": 1.25, "y": 3}, 73 {"matrix": [3, 1], "x": 1.25, "y": 3},
74 {"x": 2.25, "y": 3}, 74 {"matrix": [3, 2], "x": 2.25, "y": 3},
75 {"x": 3.25, "y": 3}, 75 {"matrix": [3, 3], "x": 3.25, "y": 3},
76 {"x": 4.25, "y": 3}, 76 {"matrix": [3, 4], "x": 4.25, "y": 3},
77 {"x": 5.25, "y": 3}, 77 {"matrix": [3, 5], "x": 5.25, "y": 3},
78 {"x": 6.25, "y": 3}, 78 {"matrix": [3, 6], "x": 6.25, "y": 3},
79 {"x": 7.25, "y": 3}, 79 {"matrix": [3, 7], "x": 7.25, "y": 3},
80 {"x": 8.25, "y": 3}, 80 {"matrix": [3, 8], "x": 8.25, "y": 3},
81 {"x": 9.25, "y": 3}, 81 {"matrix": [3, 9], "x": 9.25, "y": 3},
82 {"x": 10.25, "y": 3}, 82 {"matrix": [3, 10], "x": 10.25, "y": 3},
83 {"x": 11.25, "y": 3}, 83 {"matrix": [3, 11], "x": 11.25, "y": 3},
84 {"x": 12.25, "y": 3, "w": 1.75}, 84 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
85 {"x": 14, "y": 3}, 85 {"matrix": [3, 13], "x": 14, "y": 3},
86 86
87 {"x": 0, "y": 4, "w": 1.25}, 87 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
88 {"x": 1.25, "y": 4, "w": 1.25}, 88 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
89 {"x": 2.5, "y": 4, "w": 1.25}, 89 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
90 {"x": 3.75, "y": 4, "w": 6.25}, 90 {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
91 {"x": 10, "y": 4, "w": 1.25}, 91 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
92 {"x": 11.25, "y": 4, "w": 1.25}, 92 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
93 {"x": 12.5, "y": 4, "w": 1.25}, 93 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
94 {"x": 13.75, "y": 4, "w": 1.25} 94 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
95 ] 95 ]
96 }, 96 },
97 "LAYOUT_60_ansi": { 97 "LAYOUT_60_ansi": {
98 "layout": [ 98 "layout": [
99 {"x": 0, "y": 0}, 99 {"matrix": [0, 0], "x": 0, "y": 0},
100 {"x": 1, "y": 0}, 100 {"matrix": [0, 1], "x": 1, "y": 0},
101 {"x": 2, "y": 0}, 101 {"matrix": [0, 2], "x": 2, "y": 0},
102 {"x": 3, "y": 0}, 102 {"matrix": [0, 3], "x": 3, "y": 0},
103 {"x": 4, "y": 0}, 103 {"matrix": [0, 4], "x": 4, "y": 0},
104 {"x": 5, "y": 0}, 104 {"matrix": [0, 5], "x": 5, "y": 0},
105 {"x": 6, "y": 0}, 105 {"matrix": [0, 6], "x": 6, "y": 0},
106 {"x": 7, "y": 0}, 106 {"matrix": [0, 7], "x": 7, "y": 0},
107 {"x": 8, "y": 0}, 107 {"matrix": [0, 8], "x": 8, "y": 0},
108 {"x": 9, "y": 0}, 108 {"matrix": [0, 9], "x": 9, "y": 0},
109 {"x": 10, "y": 0}, 109 {"matrix": [0, 10], "x": 10, "y": 0},
110 {"x": 11, "y": 0}, 110 {"matrix": [0, 11], "x": 11, "y": 0},
111 {"x": 12, "y": 0}, 111 {"matrix": [0, 12], "x": 12, "y": 0},
112 {"x": 13, "y": 0, "w": 2}, 112 {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
113 113
114 {"x": 0, "y": 1, "w": 1.5}, 114 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
115 {"x": 1.5, "y": 1}, 115 {"matrix": [1, 1], "x": 1.5, "y": 1},
116 {"x": 2.5, "y": 1}, 116 {"matrix": [1, 2], "x": 2.5, "y": 1},
117 {"x": 3.5, "y": 1}, 117 {"matrix": [1, 3], "x": 3.5, "y": 1},
118 {"x": 4.5, "y": 1}, 118 {"matrix": [1, 4], "x": 4.5, "y": 1},
119 {"x": 5.5, "y": 1}, 119 {"matrix": [1, 5], "x": 5.5, "y": 1},
120 {"x": 6.5, "y": 1}, 120 {"matrix": [1, 6], "x": 6.5, "y": 1},
121 {"x": 7.5, "y": 1}, 121 {"matrix": [1, 7], "x": 7.5, "y": 1},
122 {"x": 8.5, "y": 1}, 122 {"matrix": [1, 8], "x": 8.5, "y": 1},
123 {"x": 9.5, "y": 1}, 123 {"matrix": [1, 9], "x": 9.5, "y": 1},
124 {"x": 10.5, "y": 1}, 124 {"matrix": [1, 10], "x": 10.5, "y": 1},
125 {"x": 11.5, "y": 1}, 125 {"matrix": [1, 11], "x": 11.5, "y": 1},
126 {"x": 12.5, "y": 1}, 126 {"matrix": [1, 12], "x": 12.5, "y": 1},
127 {"x": 13.5, "y": 1, "w": 1.5}, 127 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
128 128
129 {"x": 0, "y": 2, "w": 1.75}, 129 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
130 {"x": 1.75, "y": 2}, 130 {"matrix": [2, 1], "x": 1.75, "y": 2},
131 {"x": 2.75, "y": 2}, 131 {"matrix": [2, 2], "x": 2.75, "y": 2},
132 {"x": 3.75, "y": 2}, 132 {"matrix": [2, 3], "x": 3.75, "y": 2},
133 {"x": 4.75, "y": 2}, 133 {"matrix": [2, 4], "x": 4.75, "y": 2},
134 {"x": 5.75, "y": 2}, 134 {"matrix": [2, 5], "x": 5.75, "y": 2},
135 {"x": 6.75, "y": 2}, 135 {"matrix": [2, 6], "x": 6.75, "y": 2},
136 {"x": 7.75, "y": 2}, 136 {"matrix": [2, 7], "x": 7.75, "y": 2},
137 {"x": 8.75, "y": 2}, 137 {"matrix": [2, 8], "x": 8.75, "y": 2},
138 {"x": 9.75, "y": 2}, 138 {"matrix": [2, 9], "x": 9.75, "y": 2},
139 {"x": 10.75, "y": 2}, 139 {"matrix": [2, 10], "x": 10.75, "y": 2},
140 {"x": 11.75, "y": 2}, 140 {"matrix": [2, 11], "x": 11.75, "y": 2},
141 {"x": 12.75, "y": 2, "w": 2.25}, 141 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
142 142
143 {"x": 0, "y": 3, "w": 2.25}, 143 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
144 {"x": 2.25, "y": 3}, 144 {"matrix": [3, 2], "x": 2.25, "y": 3},
145 {"x": 3.25, "y": 3}, 145 {"matrix": [3, 3], "x": 3.25, "y": 3},
146 {"x": 4.25, "y": 3}, 146 {"matrix": [3, 4], "x": 4.25, "y": 3},
147 {"x": 5.25, "y": 3}, 147 {"matrix": [3, 5], "x": 5.25, "y": 3},
148 {"x": 6.25, "y": 3}, 148 {"matrix": [3, 6], "x": 6.25, "y": 3},
149 {"x": 7.25, "y": 3}, 149 {"matrix": [3, 7], "x": 7.25, "y": 3},
150 {"x": 8.25, "y": 3}, 150 {"matrix": [3, 8], "x": 8.25, "y": 3},
151 {"x": 9.25, "y": 3}, 151 {"matrix": [3, 9], "x": 9.25, "y": 3},
152 {"x": 10.25, "y": 3}, 152 {"matrix": [3, 10], "x": 10.25, "y": 3},
153 {"x": 11.25, "y": 3}, 153 {"matrix": [3, 11], "x": 11.25, "y": 3},
154 {"x": 12.25, "y": 3, "w": 2.75}, 154 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
155 155
156 {"x": 0, "y": 4, "w": 1.25}, 156 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
157 {"x": 1.25, "y": 4, "w": 1.25}, 157 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
158 {"x": 2.5, "y": 4, "w": 1.25}, 158 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
159 {"x": 3.75, "y": 4, "w": 6.25}, 159 {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
160 {"x": 10, "y": 4, "w": 1.25}, 160 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
161 {"x": 11.25, "y": 4, "w": 1.25}, 161 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
162 {"x": 12.5, "y": 4, "w": 1.25}, 162 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
163 {"x": 13.75, "y": 4, "w": 1.25} 163 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
164 ] 164 ]
165 }, 165 },
166 "LAYOUT_60_ansi_split_bs_rshift": { 166 "LAYOUT_60_ansi_split_bs_rshift": {
167 "layout": [ 167 "layout": [
168 {"x": 0, "y": 0}, 168 {"matrix": [0, 0], "x": 0, "y": 0},
169 {"x": 1, "y": 0}, 169 {"matrix": [0, 1], "x": 1, "y": 0},
170 {"x": 2, "y": 0}, 170 {"matrix": [0, 2], "x": 2, "y": 0},
171 {"x": 3, "y": 0}, 171 {"matrix": [0, 3], "x": 3, "y": 0},
172 {"x": 4, "y": 0}, 172 {"matrix": [0, 4], "x": 4, "y": 0},
173 {"x": 5, "y": 0}, 173 {"matrix": [0, 5], "x": 5, "y": 0},
174 {"x": 6, "y": 0}, 174 {"matrix": [0, 6], "x": 6, "y": 0},
175 {"x": 7, "y": 0}, 175 {"matrix": [0, 7], "x": 7, "y": 0},
176 {"x": 8, "y": 0}, 176 {"matrix": [0, 8], "x": 8, "y": 0},
177 {"x": 9, "y": 0}, 177 {"matrix": [0, 9], "x": 9, "y": 0},
178 {"x": 10, "y": 0}, 178 {"matrix": [0, 10], "x": 10, "y": 0},
179 {"x": 11, "y": 0}, 179 {"matrix": [0, 11], "x": 11, "y": 0},
180 {"x": 12, "y": 0}, 180 {"matrix": [0, 12], "x": 12, "y": 0},
181 {"x": 13, "y": 0}, 181 {"matrix": [0, 13], "x": 13, "y": 0},
182 {"x": 14, "y": 0}, 182 {"matrix": [0, 14], "x": 14, "y": 0},
183 183
184 {"x": 0, "y": 1, "w": 1.5}, 184 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
185 {"x": 1.5, "y": 1}, 185 {"matrix": [1, 1], "x": 1.5, "y": 1},
186 {"x": 2.5, "y": 1}, 186 {"matrix": [1, 2], "x": 2.5, "y": 1},
187 {"x": 3.5, "y": 1}, 187 {"matrix": [1, 3], "x": 3.5, "y": 1},
188 {"x": 4.5, "y": 1}, 188 {"matrix": [1, 4], "x": 4.5, "y": 1},
189 {"x": 5.5, "y": 1}, 189 {"matrix": [1, 5], "x": 5.5, "y": 1},
190 {"x": 6.5, "y": 1}, 190 {"matrix": [1, 6], "x": 6.5, "y": 1},
191 {"x": 7.5, "y": 1}, 191 {"matrix": [1, 7], "x": 7.5, "y": 1},
192 {"x": 8.5, "y": 1}, 192 {"matrix": [1, 8], "x": 8.5, "y": 1},
193 {"x": 9.5, "y": 1}, 193 {"matrix": [1, 9], "x": 9.5, "y": 1},
194 {"x": 10.5, "y": 1}, 194 {"matrix": [1, 10], "x": 10.5, "y": 1},
195 {"x": 11.5, "y": 1}, 195 {"matrix": [1, 11], "x": 11.5, "y": 1},
196 {"x": 12.5, "y": 1}, 196 {"matrix": [1, 12], "x": 12.5, "y": 1},
197 {"x": 13.5, "y": 1, "w": 1.5}, 197 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
198 198
199 {"x": 0, "y": 2, "w": 1.75}, 199 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
200 {"x": 1.75, "y": 2}, 200 {"matrix": [2, 1], "x": 1.75, "y": 2},
201 {"x": 2.75, "y": 2}, 201 {"matrix": [2, 2], "x": 2.75, "y": 2},
202 {"x": 3.75, "y": 2}, 202 {"matrix": [2, 3], "x": 3.75, "y": 2},
203 {"x": 4.75, "y": 2}, 203 {"matrix": [2, 4], "x": 4.75, "y": 2},
204 {"x": 5.75, "y": 2}, 204 {"matrix": [2, 5], "x": 5.75, "y": 2},
205 {"x": 6.75, "y": 2}, 205 {"matrix": [2, 6], "x": 6.75, "y": 2},
206 {"x": 7.75, "y": 2}, 206 {"matrix": [2, 7], "x": 7.75, "y": 2},
207 {"x": 8.75, "y": 2}, 207 {"matrix": [2, 8], "x": 8.75, "y": 2},
208 {"x": 9.75, "y": 2}, 208 {"matrix": [2, 9], "x": 9.75, "y": 2},
209 {"x": 10.75, "y": 2}, 209 {"matrix": [2, 10], "x": 10.75, "y": 2},
210 {"x": 11.75, "y": 2}, 210 {"matrix": [2, 11], "x": 11.75, "y": 2},
211 {"x": 12.75, "y": 2, "w": 2.25}, 211 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
212 212
213 {"x": 0, "y": 3, "w": 2.25}, 213 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
214 {"x": 2.25, "y": 3}, 214 {"matrix": [3, 2], "x": 2.25, "y": 3},
215 {"x": 3.25, "y": 3}, 215 {"matrix": [3, 3], "x": 3.25, "y": 3},
216 {"x": 4.25, "y": 3}, 216 {"matrix": [3, 4], "x": 4.25, "y": 3},
217 {"x": 5.25, "y": 3}, 217 {"matrix": [3, 5], "x": 5.25, "y": 3},
218 {"x": 6.25, "y": 3}, 218 {"matrix": [3, 6], "x": 6.25, "y": 3},
219 {"x": 7.25, "y": 3}, 219 {"matrix": [3, 7], "x": 7.25, "y": 3},
220 {"x": 8.25, "y": 3}, 220 {"matrix": [3, 8], "x": 8.25, "y": 3},
221 {"x": 9.25, "y": 3}, 221 {"matrix": [3, 9], "x": 9.25, "y": 3},
222 {"x": 10.25, "y": 3}, 222 {"matrix": [3, 10], "x": 10.25, "y": 3},
223 {"x": 11.25, "y": 3}, 223 {"matrix": [3, 11], "x": 11.25, "y": 3},
224 {"x": 12.25, "y": 3, "w": 1.75}, 224 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
225 {"x": 14, "y": 3}, 225 {"matrix": [3, 13], "x": 14, "y": 3},
226 226
227 {"x": 0, "y": 4, "w": 1.25}, 227 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
228 {"x": 1.25, "y": 4, "w": 1.25}, 228 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
229 {"x": 2.5, "y": 4, "w": 1.25}, 229 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
230 {"x": 3.75, "y": 4, "w": 6.25}, 230 {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
231 {"x": 10, "y": 4, "w": 1.25}, 231 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
232 {"x": 11.25, "y": 4, "w": 1.25}, 232 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
233 {"x": 12.5, "y": 4, "w": 1.25}, 233 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
234 {"x": 13.75, "y": 4, "w": 1.25} 234 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
235 ] 235 ]
236 }, 236 },
237 "LAYOUT_60_hhkb": { 237 "LAYOUT_60_hhkb": {
238 "layout": [ 238 "layout": [
239 {"x": 0, "y": 0}, 239 {"matrix": [0, 0], "x": 0, "y": 0},
240 {"x": 1, "y": 0}, 240 {"matrix": [0, 1], "x": 1, "y": 0},
241 {"x": 2, "y": 0}, 241 {"matrix": [0, 2], "x": 2, "y": 0},
242 {"x": 3, "y": 0}, 242 {"matrix": [0, 3], "x": 3, "y": 0},
243 {"x": 4, "y": 0}, 243 {"matrix": [0, 4], "x": 4, "y": 0},
244 {"x": 5, "y": 0}, 244 {"matrix": [0, 5], "x": 5, "y": 0},
245 {"x": 6, "y": 0}, 245 {"matrix": [0, 6], "x": 6, "y": 0},
246 {"x": 7, "y": 0}, 246 {"matrix": [0, 7], "x": 7, "y": 0},
247 {"x": 8, "y": 0}, 247 {"matrix": [0, 8], "x": 8, "y": 0},
248 {"x": 9, "y": 0}, 248 {"matrix": [0, 9], "x": 9, "y": 0},
249 {"x": 10, "y": 0}, 249 {"matrix": [0, 10], "x": 10, "y": 0},
250 {"x": 11, "y": 0}, 250 {"matrix": [0, 11], "x": 11, "y": 0},
251 {"x": 12, "y": 0}, 251 {"matrix": [0, 12], "x": 12, "y": 0},
252 {"x": 13, "y": 0}, 252 {"matrix": [0, 13], "x": 13, "y": 0},
253 {"x": 14, "y": 0}, 253 {"matrix": [0, 14], "x": 14, "y": 0},
254 254
255 {"x": 0, "y": 1, "w": 1.5}, 255 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
256 {"x": 1.5, "y": 1}, 256 {"matrix": [1, 1], "x": 1.5, "y": 1},
257 {"x": 2.5, "y": 1}, 257 {"matrix": [1, 2], "x": 2.5, "y": 1},
258 {"x": 3.5, "y": 1}, 258 {"matrix": [1, 3], "x": 3.5, "y": 1},
259 {"x": 4.5, "y": 1}, 259 {"matrix": [1, 4], "x": 4.5, "y": 1},
260 {"x": 5.5, "y": 1}, 260 {"matrix": [1, 5], "x": 5.5, "y": 1},
261 {"x": 6.5, "y": 1}, 261 {"matrix": [1, 6], "x": 6.5, "y": 1},
262 {"x": 7.5, "y": 1}, 262 {"matrix": [1, 7], "x": 7.5, "y": 1},
263 {"x": 8.5, "y": 1}, 263 {"matrix": [1, 8], "x": 8.5, "y": 1},
264 {"x": 9.5, "y": 1}, 264 {"matrix": [1, 9], "x": 9.5, "y": 1},
265 {"x": 10.5, "y": 1}, 265 {"matrix": [1, 10], "x": 10.5, "y": 1},
266 {"x": 11.5, "y": 1}, 266 {"matrix": [1, 11], "x": 11.5, "y": 1},
267 {"x": 12.5, "y": 1}, 267 {"matrix": [1, 12], "x": 12.5, "y": 1},
268 {"x": 13.5, "y": 1, "w": 1.5}, 268 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
269 269
270 {"x": 0, "y": 2, "w": 1.75}, 270 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
271 {"x": 1.75, "y": 2}, 271 {"matrix": [2, 1], "x": 1.75, "y": 2},
272 {"x": 2.75, "y": 2}, 272 {"matrix": [2, 2], "x": 2.75, "y": 2},
273 {"x": 3.75, "y": 2}, 273 {"matrix": [2, 3], "x": 3.75, "y": 2},
274 {"x": 4.75, "y": 2}, 274 {"matrix": [2, 4], "x": 4.75, "y": 2},
275 {"x": 5.75, "y": 2}, 275 {"matrix": [2, 5], "x": 5.75, "y": 2},
276 {"x": 6.75, "y": 2}, 276 {"matrix": [2, 6], "x": 6.75, "y": 2},
277 {"x": 7.75, "y": 2}, 277 {"matrix": [2, 7], "x": 7.75, "y": 2},
278 {"x": 8.75, "y": 2}, 278 {"matrix": [2, 8], "x": 8.75, "y": 2},
279 {"x": 9.75, "y": 2}, 279 {"matrix": [2, 9], "x": 9.75, "y": 2},
280 {"x": 10.75, "y": 2}, 280 {"matrix": [2, 10], "x": 10.75, "y": 2},
281 {"x": 11.75, "y": 2}, 281 {"matrix": [2, 11], "x": 11.75, "y": 2},
282 {"x": 12.75, "y": 2, "w": 2.25}, 282 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
283 283
284 {"x": 0, "y": 3, "w": 2.25}, 284 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
285 {"x": 2.25, "y": 3}, 285 {"matrix": [3, 2], "x": 2.25, "y": 3},
286 {"x": 3.25, "y": 3}, 286 {"matrix": [3, 3], "x": 3.25, "y": 3},
287 {"x": 4.25, "y": 3}, 287 {"matrix": [3, 4], "x": 4.25, "y": 3},
288 {"x": 5.25, "y": 3}, 288 {"matrix": [3, 5], "x": 5.25, "y": 3},
289 {"x": 6.25, "y": 3}, 289 {"matrix": [3, 6], "x": 6.25, "y": 3},
290 {"x": 7.25, "y": 3}, 290 {"matrix": [3, 7], "x": 7.25, "y": 3},
291 {"x": 8.25, "y": 3}, 291 {"matrix": [3, 8], "x": 8.25, "y": 3},
292 {"x": 9.25, "y": 3}, 292 {"matrix": [3, 9], "x": 9.25, "y": 3},
293 {"x": 10.25, "y": 3}, 293 {"matrix": [3, 10], "x": 10.25, "y": 3},
294 {"x": 11.25, "y": 3}, 294 {"matrix": [3, 11], "x": 11.25, "y": 3},
295 {"x": 12.25, "y": 3, "w": 1.75}, 295 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
296 {"x": 14, "y": 3}, 296 {"matrix": [3, 13], "x": 14, "y": 3},
297 297
298 {"x": 1.5, "y": 4}, 298 {"matrix": [4, 1], "x": 1.5, "y": 4},
299 {"x": 2.5, "y": 4, "w": 1.5}, 299 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
300 {"x": 4, "y": 4, "w": 7}, 300 {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
301 {"x": 11, "y": 4, "w": 1.5}, 301 {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
302 {"x": 12.5, "y": 4} 302 {"matrix": [4, 12], "x": 12.5, "y": 4}
303 ] 303 ]
304 }, 304 },
305 "LAYOUT_60_iso": { 305 "LAYOUT_60_iso": {
306 "layout": [ 306 "layout": [
307 {"x": 0, "y": 0}, 307 {"matrix": [0, 0], "x": 0, "y": 0},
308 {"x": 1, "y": 0}, 308 {"matrix": [0, 1], "x": 1, "y": 0},
309 {"x": 2, "y": 0}, 309 {"matrix": [0, 2], "x": 2, "y": 0},
310 {"x": 3, "y": 0}, 310 {"matrix": [0, 3], "x": 3, "y": 0},
311 {"x": 4, "y": 0}, 311 {"matrix": [0, 4], "x": 4, "y": 0},
312 {"x": 5, "y": 0}, 312 {"matrix": [0, 5], "x": 5, "y": 0},
313 {"x": 6, "y": 0}, 313 {"matrix": [0, 6], "x": 6, "y": 0},
314 {"x": 7, "y": 0}, 314 {"matrix": [0, 7], "x": 7, "y": 0},
315 {"x": 8, "y": 0}, 315 {"matrix": [0, 8], "x": 8, "y": 0},
316 {"x": 9, "y": 0}, 316 {"matrix": [0, 9], "x": 9, "y": 0},
317 {"x": 10, "y": 0}, 317 {"matrix": [0, 10], "x": 10, "y": 0},
318 {"x": 11, "y": 0}, 318 {"matrix": [0, 11], "x": 11, "y": 0},
319 {"x": 12, "y": 0}, 319 {"matrix": [0, 12], "x": 12, "y": 0},
320 {"x": 13, "y": 0, "w": 2}, 320 {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
321 321
322 {"x": 0, "y": 1, "w": 1.5}, 322 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
323 {"x": 1.5, "y": 1}, 323 {"matrix": [1, 1], "x": 1.5, "y": 1},
324 {"x": 2.5, "y": 1}, 324 {"matrix": [1, 2], "x": 2.5, "y": 1},
325 {"x": 3.5, "y": 1}, 325 {"matrix": [1, 3], "x": 3.5, "y": 1},
326 {"x": 4.5, "y": 1}, 326 {"matrix": [1, 4], "x": 4.5, "y": 1},
327 {"x": 5.5, "y": 1}, 327 {"matrix": [1, 5], "x": 5.5, "y": 1},
328 {"x": 6.5, "y": 1}, 328 {"matrix": [1, 6], "x": 6.5, "y": 1},
329 {"x": 7.5, "y": 1}, 329 {"matrix": [1, 7], "x": 7.5, "y": 1},
330 {"x": 8.5, "y": 1}, 330 {"matrix": [1, 8], "x": 8.5, "y": 1},
331 {"x": 9.5, "y": 1}, 331 {"matrix": [1, 9], "x": 9.5, "y": 1},
332 {"x": 10.5, "y": 1}, 332 {"matrix": [1, 10], "x": 10.5, "y": 1},
333 {"x": 11.5, "y": 1}, 333 {"matrix": [1, 11], "x": 11.5, "y": 1},
334 {"x": 12.5, "y": 1}, 334 {"matrix": [1, 12], "x": 12.5, "y": 1},
335 335
336 {"x": 0, "y": 2, "w": 1.75}, 336 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
337 {"x": 1.75, "y": 2}, 337 {"matrix": [2, 1], "x": 1.75, "y": 2},
338 {"x": 2.75, "y": 2}, 338 {"matrix": [2, 2], "x": 2.75, "y": 2},
339 {"x": 3.75, "y": 2}, 339 {"matrix": [2, 3], "x": 3.75, "y": 2},
340 {"x": 4.75, "y": 2}, 340 {"matrix": [2, 4], "x": 4.75, "y": 2},
341 {"x": 5.75, "y": 2}, 341 {"matrix": [2, 5], "x": 5.75, "y": 2},
342 {"x": 6.75, "y": 2}, 342 {"matrix": [2, 6], "x": 6.75, "y": 2},
343 {"x": 7.75, "y": 2}, 343 {"matrix": [2, 7], "x": 7.75, "y": 2},
344 {"x": 8.75, "y": 2}, 344 {"matrix": [2, 8], "x": 8.75, "y": 2},
345 {"x": 9.75, "y": 2}, 345 {"matrix": [2, 9], "x": 9.75, "y": 2},
346 {"x": 10.75, "y": 2}, 346 {"matrix": [2, 10], "x": 10.75, "y": 2},
347 {"x": 11.75, "y": 2}, 347 {"matrix": [2, 11], "x": 11.75, "y": 2},
348 {"x": 12.75, "y": 2}, 348 {"matrix": [2, 12], "x": 12.75, "y": 2},
349 {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, 349 {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
350 350
351 {"x": 0, "y": 3, "w": 1.25}, 351 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
352 {"x": 1.25, "y": 3}, 352 {"matrix": [3, 1], "x": 1.25, "y": 3},
353 {"x": 2.25, "y": 3}, 353 {"matrix": [3, 2], "x": 2.25, "y": 3},
354 {"x": 3.25, "y": 3}, 354 {"matrix": [3, 3], "x": 3.25, "y": 3},
355 {"x": 4.25, "y": 3}, 355 {"matrix": [3, 4], "x": 4.25, "y": 3},
356 {"x": 5.25, "y": 3}, 356 {"matrix": [3, 5], "x": 5.25, "y": 3},
357 {"x": 6.25, "y": 3}, 357 {"matrix": [3, 6], "x": 6.25, "y": 3},
358 {"x": 7.25, "y": 3}, 358 {"matrix": [3, 7], "x": 7.25, "y": 3},
359 {"x": 8.25, "y": 3}, 359 {"matrix": [3, 8], "x": 8.25, "y": 3},
360 {"x": 9.25, "y": 3}, 360 {"matrix": [3, 9], "x": 9.25, "y": 3},
361 {"x": 10.25, "y": 3}, 361 {"matrix": [3, 10], "x": 10.25, "y": 3},
362 {"x": 11.25, "y": 3}, 362 {"matrix": [3, 11], "x": 11.25, "y": 3},
363 {"x": 12.25, "y": 3, "w": 2.75}, 363 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
364 364
365 {"x": 0, "y": 4, "w": 1.25}, 365 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
366 {"x": 1.25, "y": 4, "w": 1.25}, 366 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
367 {"x": 2.5, "y": 4, "w": 1.25}, 367 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
368 {"x": 3.75, "y": 4, "w": 6.25}, 368 {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
369 {"x": 10, "y": 4, "w": 1.25}, 369 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
370 {"x": 11.25, "y": 4, "w": 1.25}, 370 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
371 {"x": 12.5, "y": 4, "w": 1.25}, 371 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
372 {"x": 13.75, "y": 4, "w": 1.25} 372 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
373 ] 373 ]
374 }, 374 },
375 "LAYOUT_60_iso_split_bs_rshift": { 375 "LAYOUT_60_iso_split_bs_rshift": {
376 "layout": [ 376 "layout": [
377 {"x": 0, "y": 0}, 377 {"matrix": [0, 0], "x": 0, "y": 0},
378 {"x": 1, "y": 0}, 378 {"matrix": [0, 1], "x": 1, "y": 0},
379 {"x": 2, "y": 0}, 379 {"matrix": [0, 2], "x": 2, "y": 0},
380 {"x": 3, "y": 0}, 380 {"matrix": [0, 3], "x": 3, "y": 0},
381 {"x": 4, "y": 0}, 381 {"matrix": [0, 4], "x": 4, "y": 0},
382 {"x": 5, "y": 0}, 382 {"matrix": [0, 5], "x": 5, "y": 0},
383 {"x": 6, "y": 0}, 383 {"matrix": [0, 6], "x": 6, "y": 0},
384 {"x": 7, "y": 0}, 384 {"matrix": [0, 7], "x": 7, "y": 0},
385 {"x": 8, "y": 0}, 385 {"matrix": [0, 8], "x": 8, "y": 0},
386 {"x": 9, "y": 0}, 386 {"matrix": [0, 9], "x": 9, "y": 0},
387 {"x": 10, "y": 0}, 387 {"matrix": [0, 10], "x": 10, "y": 0},
388 {"x": 11, "y": 0}, 388 {"matrix": [0, 11], "x": 11, "y": 0},
389 {"x": 12, "y": 0}, 389 {"matrix": [0, 12], "x": 12, "y": 0},
390 {"x": 13, "y": 0}, 390 {"matrix": [0, 13], "x": 13, "y": 0},
391 {"x": 14, "y": 0}, 391 {"matrix": [0, 14], "x": 14, "y": 0},
392 392
393 {"x": 0, "y": 1, "w": 1.5}, 393 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
394 {"x": 1.5, "y": 1}, 394 {"matrix": [1, 1], "x": 1.5, "y": 1},
395 {"x": 2.5, "y": 1}, 395 {"matrix": [1, 2], "x": 2.5, "y": 1},
396 {"x": 3.5, "y": 1}, 396 {"matrix": [1, 3], "x": 3.5, "y": 1},
397 {"x": 4.5, "y": 1}, 397 {"matrix": [1, 4], "x": 4.5, "y": 1},
398 {"x": 5.5, "y": 1}, 398 {"matrix": [1, 5], "x": 5.5, "y": 1},
399 {"x": 6.5, "y": 1}, 399 {"matrix": [1, 6], "x": 6.5, "y": 1},
400 {"x": 7.5, "y": 1}, 400 {"matrix": [1, 7], "x": 7.5, "y": 1},
401 {"x": 8.5, "y": 1}, 401 {"matrix": [1, 8], "x": 8.5, "y": 1},
402 {"x": 9.5, "y": 1}, 402 {"matrix": [1, 9], "x": 9.5, "y": 1},
403 {"x": 10.5, "y": 1}, 403 {"matrix": [1, 10], "x": 10.5, "y": 1},
404 {"x": 11.5, "y": 1}, 404 {"matrix": [1, 11], "x": 11.5, "y": 1},
405 {"x": 12.5, "y": 1}, 405 {"matrix": [1, 12], "x": 12.5, "y": 1},
406 406
407 {"x": 0, "y": 2, "w": 1.75}, 407 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
408 {"x": 1.75, "y": 2}, 408 {"matrix": [2, 1], "x": 1.75, "y": 2},
409 {"x": 2.75, "y": 2}, 409 {"matrix": [2, 2], "x": 2.75, "y": 2},
410 {"x": 3.75, "y": 2}, 410 {"matrix": [2, 3], "x": 3.75, "y": 2},
411 {"x": 4.75, "y": 2}, 411 {"matrix": [2, 4], "x": 4.75, "y": 2},
412 {"x": 5.75, "y": 2}, 412 {"matrix": [2, 5], "x": 5.75, "y": 2},
413 {"x": 6.75, "y": 2}, 413 {"matrix": [2, 6], "x": 6.75, "y": 2},
414 {"x": 7.75, "y": 2}, 414 {"matrix": [2, 7], "x": 7.75, "y": 2},
415 {"x": 8.75, "y": 2}, 415 {"matrix": [2, 8], "x": 8.75, "y": 2},
416 {"x": 9.75, "y": 2}, 416 {"matrix": [2, 9], "x": 9.75, "y": 2},
417 {"x": 10.75, "y": 2}, 417 {"matrix": [2, 10], "x": 10.75, "y": 2},
418 {"x": 11.75, "y": 2}, 418 {"matrix": [2, 11], "x": 11.75, "y": 2},
419 {"x": 12.75, "y": 2}, 419 {"matrix": [2, 12], "x": 12.75, "y": 2},
420 {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, 420 {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
421 421
422 {"x": 0, "y": 3, "w": 1.25}, 422 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
423 {"x": 1.25, "y": 3}, 423 {"matrix": [3, 1], "x": 1.25, "y": 3},
424 {"x": 2.25, "y": 3}, 424 {"matrix": [3, 2], "x": 2.25, "y": 3},
425 {"x": 3.25, "y": 3}, 425 {"matrix": [3, 3], "x": 3.25, "y": 3},
426 {"x": 4.25, "y": 3}, 426 {"matrix": [3, 4], "x": 4.25, "y": 3},
427 {"x": 5.25, "y": 3}, 427 {"matrix": [3, 5], "x": 5.25, "y": 3},
428 {"x": 6.25, "y": 3}, 428 {"matrix": [3, 6], "x": 6.25, "y": 3},
429 {"x": 7.25, "y": 3}, 429 {"matrix": [3, 7], "x": 7.25, "y": 3},
430 {"x": 8.25, "y": 3}, 430 {"matrix": [3, 8], "x": 8.25, "y": 3},
431 {"x": 9.25, "y": 3}, 431 {"matrix": [3, 9], "x": 9.25, "y": 3},
432 {"x": 10.25, "y": 3}, 432 {"matrix": [3, 10], "x": 10.25, "y": 3},
433 {"x": 11.25, "y": 3}, 433 {"matrix": [3, 11], "x": 11.25, "y": 3},
434 {"x": 12.25, "y": 3, "w": 1.75}, 434 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
435 {"x": 14, "y": 3}, 435 {"matrix": [3, 13], "x": 14, "y": 3},
436 436
437 {"x": 0, "y": 4, "w": 1.25}, 437 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
438 {"x": 1.25, "y": 4, "w": 1.25}, 438 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
439 {"x": 2.5, "y": 4, "w": 1.25}, 439 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
440 {"x": 3.75, "y": 4, "w": 6.25}, 440 {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
441 {"x": 10, "y": 4, "w": 1.25}, 441 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
442 {"x": 11.25, "y": 4, "w": 1.25}, 442 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
443 {"x": 12.5, "y": 4, "w": 1.25}, 443 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
444 {"x": 13.75, "y": 4, "w": 1.25} 444 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
445 ] 445 ]
446 }, 446 },
447 "LAYOUT_60_tsangan_hhkb": { 447 "LAYOUT_60_tsangan_hhkb": {
448 "layout": [ 448 "layout": [
449 {"x": 0, "y": 0}, 449 {"matrix": [0, 0], "x": 0, "y": 0},
450 {"x": 1, "y": 0}, 450 {"matrix": [0, 1], "x": 1, "y": 0},
451 {"x": 2, "y": 0}, 451 {"matrix": [0, 2], "x": 2, "y": 0},
452 {"x": 3, "y": 0}, 452 {"matrix": [0, 3], "x": 3, "y": 0},
453 {"x": 4, "y": 0}, 453 {"matrix": [0, 4], "x": 4, "y": 0},
454 {"x": 5, "y": 0}, 454 {"matrix": [0, 5], "x": 5, "y": 0},
455 {"x": 6, "y": 0}, 455 {"matrix": [0, 6], "x": 6, "y": 0},
456 {"x": 7, "y": 0}, 456 {"matrix": [0, 7], "x": 7, "y": 0},
457 {"x": 8, "y": 0}, 457 {"matrix": [0, 8], "x": 8, "y": 0},
458 {"x": 9, "y": 0}, 458 {"matrix": [0, 9], "x": 9, "y": 0},
459 {"x": 10, "y": 0}, 459 {"matrix": [0, 10], "x": 10, "y": 0},
460 {"x": 11, "y": 0}, 460 {"matrix": [0, 11], "x": 11, "y": 0},
461 {"x": 12, "y": 0}, 461 {"matrix": [0, 12], "x": 12, "y": 0},
462 {"x": 13, "y": 0}, 462 {"matrix": [0, 13], "x": 13, "y": 0},
463 {"x": 14, "y": 0}, 463 {"matrix": [0, 14], "x": 14, "y": 0},
464 464
465 {"x": 0, "y": 1, "w": 1.5}, 465 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
466 {"x": 1.5, "y": 1}, 466 {"matrix": [1, 1], "x": 1.5, "y": 1},
467 {"x": 2.5, "y": 1}, 467 {"matrix": [1, 2], "x": 2.5, "y": 1},
468 {"x": 3.5, "y": 1}, 468 {"matrix": [1, 3], "x": 3.5, "y": 1},
469 {"x": 4.5, "y": 1}, 469 {"matrix": [1, 4], "x": 4.5, "y": 1},
470 {"x": 5.5, "y": 1}, 470 {"matrix": [1, 5], "x": 5.5, "y": 1},
471 {"x": 6.5, "y": 1}, 471 {"matrix": [1, 6], "x": 6.5, "y": 1},
472 {"x": 7.5, "y": 1}, 472 {"matrix": [1, 7], "x": 7.5, "y": 1},
473 {"x": 8.5, "y": 1}, 473 {"matrix": [1, 8], "x": 8.5, "y": 1},
474 {"x": 9.5, "y": 1}, 474 {"matrix": [1, 9], "x": 9.5, "y": 1},
475 {"x": 10.5, "y": 1}, 475 {"matrix": [1, 10], "x": 10.5, "y": 1},
476 {"x": 11.5, "y": 1}, 476 {"matrix": [1, 11], "x": 11.5, "y": 1},
477 {"x": 12.5, "y": 1}, 477 {"matrix": [1, 12], "x": 12.5, "y": 1},
478 {"x": 13.5, "y": 1, "w": 1.5}, 478 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
479 479
480 {"x": 0, "y": 2, "w": 1.75}, 480 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
481 {"x": 1.75, "y": 2}, 481 {"matrix": [2, 1], "x": 1.75, "y": 2},
482 {"x": 2.75, "y": 2}, 482 {"matrix": [2, 2], "x": 2.75, "y": 2},
483 {"x": 3.75, "y": 2}, 483 {"matrix": [2, 3], "x": 3.75, "y": 2},
484 {"x": 4.75, "y": 2}, 484 {"matrix": [2, 4], "x": 4.75, "y": 2},
485 {"x": 5.75, "y": 2}, 485 {"matrix": [2, 5], "x": 5.75, "y": 2},
486 {"x": 6.75, "y": 2}, 486 {"matrix": [2, 6], "x": 6.75, "y": 2},
487 {"x": 7.75, "y": 2}, 487 {"matrix": [2, 7], "x": 7.75, "y": 2},
488 {"x": 8.75, "y": 2}, 488 {"matrix": [2, 8], "x": 8.75, "y": 2},
489 {"x": 9.75, "y": 2}, 489 {"matrix": [2, 9], "x": 9.75, "y": 2},
490 {"x": 10.75, "y": 2}, 490 {"matrix": [2, 10], "x": 10.75, "y": 2},
491 {"x": 11.75, "y": 2}, 491 {"matrix": [2, 11], "x": 11.75, "y": 2},
492 {"x": 12.75, "y": 2, "w": 2.25}, 492 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
493 493
494 {"x": 0, "y": 3, "w": 2.25}, 494 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
495 {"x": 2.25, "y": 3}, 495 {"matrix": [3, 2], "x": 2.25, "y": 3},
496 {"x": 3.25, "y": 3}, 496 {"matrix": [3, 3], "x": 3.25, "y": 3},
497 {"x": 4.25, "y": 3}, 497 {"matrix": [3, 4], "x": 4.25, "y": 3},
498 {"x": 5.25, "y": 3}, 498 {"matrix": [3, 5], "x": 5.25, "y": 3},
499 {"x": 6.25, "y": 3}, 499 {"matrix": [3, 6], "x": 6.25, "y": 3},
500 {"x": 7.25, "y": 3}, 500 {"matrix": [3, 7], "x": 7.25, "y": 3},
501 {"x": 8.25, "y": 3}, 501 {"matrix": [3, 8], "x": 8.25, "y": 3},
502 {"x": 9.25, "y": 3}, 502 {"matrix": [3, 9], "x": 9.25, "y": 3},
503 {"x": 10.25, "y": 3}, 503 {"matrix": [3, 10], "x": 10.25, "y": 3},
504 {"x": 11.25, "y": 3}, 504 {"matrix": [3, 11], "x": 11.25, "y": 3},
505 {"x": 12.25, "y": 3, "w": 1.75}, 505 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
506 {"x": 14, "y": 3}, 506 {"matrix": [3, 13], "x": 14, "y": 3},
507 507
508 {"x": 0, "y": 4, "w": 1.5}, 508 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
509 {"x": 1.5, "y": 4}, 509 {"matrix": [4, 1], "x": 1.5, "y": 4},
510 {"x": 2.5, "y": 4, "w": 1.5}, 510 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
511 {"x": 4, "y": 4, "w": 7}, 511 {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
512 {"x": 11, "y": 4, "w": 1.5}, 512 {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
513 {"x": 12.5, "y": 4}, 513 {"matrix": [4, 12], "x": 12.5, "y": 4},
514 {"x": 13.5, "y": 4, "w": 1.5} 514 {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
515 ] 515 ]
516 } 516 }
517 } 517 }
diff --git a/keyboards/evyd13/plain60/plain60.h b/keyboards/evyd13/plain60/plain60.h
deleted file mode 100644
index 87688e9ede..0000000000
--- a/keyboards/evyd13/plain60/plain60.h
+++ /dev/null
@@ -1,114 +0,0 @@
1#pragma once
2
3#include "quantum.h"
4
5// readability
6#define XXX KC_NO
7
8#define LAYOUT( \
9 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
10 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
11 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
12 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
13 k40, k41, k42, k46, k4a, k4b, k4c, k4d \
14) \
15{ \
16 {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
17 {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX}, \
18 {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX}, \
19 {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX}, \
20 {k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX} \
21}
22
23#define LAYOUT_60_ansi( \
24 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, \
25 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
26 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
27 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \
28 k40, k41, k42, k46, k4a, k4b, k4c, k4d \
29) \
30{ \
31 {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e}, \
32 {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX}, \
33 {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX}, \
34 {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, XXX}, \
35 {k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX} \
36}
37
38#define LAYOUT_60_ansi_split_bs_rshift( \
39 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
40 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
41 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
42 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
43 k40, k41, k42, k46, k4a, k4b, k4c, k4d \
44) \
45{ \
46 {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
47 {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX}, \
48 {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX}, \
49 {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX}, \
50 {k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX} \
51}
52
53#define LAYOUT_60_hhkb( \
54 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
55 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
56 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
57 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
58 k41, k42, k46, k4b, k4c \
59) \
60{ \
61 {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
62 {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX}, \
63 {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX}, \
64 {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX}, \
65 {XXX, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4b, k4c, XXX, XXX} \
66}
67
68#define LAYOUT_60_tsangan_hhkb( \
69 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
70 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
71 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
72 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
73 k40, k41, k42, k46, k4b, k4c, k4d \
74) \
75{ \
76 {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
77 {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX}, \
78 {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX}, \
79 {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX}, \
80 {k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4b, k4c, k4d, XXX} \
81}
82
83#define LAYOUT_60_iso( \
84 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, \
85 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \
86 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
87 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \
88 k40, k41, k42, k46, k4a, k4b, k4c, k4d \
89) \
90{ \
91 {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e}, \
92 {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX}, \
93 {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX}, \
94 {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, XXX}, \
95 {k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX} \
96}
97
98#define LAYOUT_60_iso_split_bs_rshift( \
99 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
100 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \
101 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
102 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
103 k40, k41, k42, k46, k4a, k4b, k4c, k4d \
104) \
105{ \
106 {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
107 {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX}, \
108 {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX}, \
109 {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX}, \
110 {k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX} \
111}
112
113void matrix_init_user(void);
114void matrix_scan_user(void);
diff --git a/keyboards/exclusive/e6v2/le/info.json b/keyboards/exclusive/e6v2/le/info.json
index de3d009057..43ad89747d 100644
--- a/keyboards/exclusive/e6v2/le/info.json
+++ b/keyboards/exclusive/e6v2/le/info.json
@@ -31,13 +31,217 @@
31 "community_layouts": ["60_ansi"], 31 "community_layouts": ["60_ansi"],
32 "layouts": { 32 "layouts": {
33 "LAYOUT": { 33 "LAYOUT": {
34 "layout": [{"label":"~", "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}, {"x":13, "y":0}, {"x":14, "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":"Caps Lock", "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}, {"x":0, "y":3}, {"x":1, "y":3}, {"label":"Z", "x":2, "y":3}, {"label":"X", "x":3, "y":3}, {"label":"C", "x":4, "y":3}, {"label":"V", "x":5, "y":3}, {"label":"B", "x":6, "y":3}, {"label":"N", "x":7, "y":3}, {"label":"M", "x":8, "y":3}, {"label":"<", "x":9, "y":3}, {"label":">", "x":10, "y":3}, {"label":"?", "x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.75}, {"label":"Ctrl", "x":1.75, "y":4, "w":1.25}, {"label":"Win", "x":3, "y":4, "w":1.25}, {"label":"Alt", "x":4.25, "y":4, "w":1.25}, {"x":5.5, "y":4, "w":2.75}, {"x":8.25, "y":4, "w":1.75}, {"x":10, "y":4}, {"label":"Alt", "x":11, "y":4}, {"label":"Win", "x":12, "y":4}, {"label":"Menu", "x":13, "y":4}, {"label":"Ctrl", "x":14, "y":4}] 34 "layout": [
35 {"matrix": [0, 0], "x": 0, "y": 0},
36 {"matrix": [0, 1], "x": 1, "y": 0},
37 {"matrix": [0, 2], "x": 2, "y": 0},
38 {"matrix": [0, 3], "x": 3, "y": 0},
39 {"matrix": [0, 4], "x": 4, "y": 0},
40 {"matrix": [0, 5], "x": 5, "y": 0},
41 {"matrix": [0, 6], "x": 6, "y": 0},
42 {"matrix": [0, 7], "x": 7, "y": 0},
43 {"matrix": [0, 8], "x": 8, "y": 0},
44 {"matrix": [0, 9], "x": 9, "y": 0},
45 {"matrix": [0, 10], "x": 10, "y": 0},
46 {"matrix": [0, 11], "x": 11, "y": 0},
47 {"matrix": [0, 12], "x": 12, "y": 0},
48 {"matrix": [0, 14], "x": 13, "y": 0},
49 {"matrix": [0, 13], "x": 14, "y": 0},
50
51 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
52 {"matrix": [1, 2], "x": 1.5, "y": 1},
53 {"matrix": [1, 3], "x": 2.5, "y": 1},
54 {"matrix": [1, 4], "x": 3.5, "y": 1},
55 {"matrix": [1, 5], "x": 4.5, "y": 1},
56 {"matrix": [1, 6], "x": 5.5, "y": 1},
57 {"matrix": [1, 7], "x": 6.5, "y": 1},
58 {"matrix": [1, 8], "x": 7.5, "y": 1},
59 {"matrix": [1, 9], "x": 8.5, "y": 1},
60 {"matrix": [1, 10], "x": 9.5, "y": 1},
61 {"matrix": [1, 11], "x": 10.5, "y": 1},
62 {"matrix": [1, 12], "x": 11.5, "y": 1},
63 {"matrix": [1, 13], "x": 12.5, "y": 1},
64 {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
65
66 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
67 {"matrix": [2, 2], "x": 1.75, "y": 2},
68 {"matrix": [2, 3], "x": 2.75, "y": 2},
69 {"matrix": [2, 4], "x": 3.75, "y": 2},
70 {"matrix": [2, 5], "x": 4.75, "y": 2},
71 {"matrix": [2, 6], "x": 5.75, "y": 2},
72 {"matrix": [2, 7], "x": 6.75, "y": 2},
73 {"matrix": [2, 8], "x": 7.75, "y": 2},
74 {"matrix": [2, 9], "x": 8.75, "y": 2},
75 {"matrix": [2, 10], "x": 9.75, "y": 2},
76 {"matrix": [2, 11], "x": 10.75, "y": 2},
77 {"matrix": [2, 12], "x": 11.75, "y": 2},
78 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
79
80 {"matrix": [3, 0], "x": 0, "y": 3},
81 {"matrix": [3, 1], "x": 1, "y": 3},
82 {"matrix": [3, 2], "x": 2, "y": 3},
83 {"matrix": [3, 3], "x": 3, "y": 3},
84 {"matrix": [3, 4], "x": 4, "y": 3},
85 {"matrix": [3, 5], "x": 5, "y": 3},
86 {"matrix": [3, 6], "x": 6, "y": 3},
87 {"matrix": [3, 7], "x": 7, "y": 3},
88 {"matrix": [3, 8], "x": 8, "y": 3},
89 {"matrix": [3, 9], "x": 9, "y": 3},
90 {"matrix": [3, 10], "x": 10, "y": 3},
91 {"matrix": [3, 11], "x": 11, "y": 3},
92 {"matrix": [3, 12], "x": 12, "y": 3},
93 {"matrix": [3, 13], "x": 13, "y": 3},
94 {"matrix": [3, 14], "x": 14, "y": 3},
95
96 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.75},
97 {"matrix": [4, 2], "x": 1.75, "y": 4, "w": 1.25},
98 {"matrix": [4, 3], "x": 3, "y": 4, "w": 1.25},
99 {"matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.25},
100 {"matrix": [4, 7], "x": 5.5, "y": 4, "w": 2.75},
101 {"matrix": [4, 9], "x": 8.25, "y": 4, "w": 1.75},
102 {"matrix": [4, 10], "x": 10, "y": 4},
103 {"matrix": [4, 11], "x": 11, "y": 4},
104 {"matrix": [4, 12], "x": 12, "y": 4},
105 {"matrix": [4, 13], "x": 13, "y": 4},
106 {"matrix": [4, 14], "x": 14, "y": 4}
107 ]
35 }, 108 },
36 "LAYOUT_60_ansi": { 109 "LAYOUT_60_ansi": {
37 "layout": [{"label":"~", "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":"Backspace", "x":13, "y":0, "w":2}, {"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":"Caps Lock", "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":"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":2.75}, {"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, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] 110 "layout": [
111 {"matrix": [0, 0], "x": 0, "y": 0},
112 {"matrix": [0, 1], "x": 1, "y": 0},
113 {"matrix": [0, 2], "x": 2, "y": 0},
114 {"matrix": [0, 3], "x": 3, "y": 0},
115 {"matrix": [0, 4], "x": 4, "y": 0},
116 {"matrix": [0, 5], "x": 5, "y": 0},
117 {"matrix": [0, 6], "x": 6, "y": 0},
118 {"matrix": [0, 7], "x": 7, "y": 0},
119 {"matrix": [0, 8], "x": 8, "y": 0},
120 {"matrix": [0, 9], "x": 9, "y": 0},
121 {"matrix": [0, 10], "x": 10, "y": 0},
122 {"matrix": [0, 11], "x": 11, "y": 0},
123 {"matrix": [0, 12], "x": 12, "y": 0},
124 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
125
126 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
127 {"matrix": [1, 2], "x": 1.5, "y": 1},
128 {"matrix": [1, 3], "x": 2.5, "y": 1},
129 {"matrix": [1, 4], "x": 3.5, "y": 1},
130 {"matrix": [1, 5], "x": 4.5, "y": 1},
131 {"matrix": [1, 6], "x": 5.5, "y": 1},
132 {"matrix": [1, 7], "x": 6.5, "y": 1},
133 {"matrix": [1, 8], "x": 7.5, "y": 1},
134 {"matrix": [1, 9], "x": 8.5, "y": 1},
135 {"matrix": [1, 10], "x": 9.5, "y": 1},
136 {"matrix": [1, 11], "x": 10.5, "y": 1},
137 {"matrix": [1, 12], "x": 11.5, "y": 1},
138 {"matrix": [1, 13], "x": 12.5, "y": 1},
139 {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
140
141 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
142 {"matrix": [2, 2], "x": 1.75, "y": 2},
143 {"matrix": [2, 3], "x": 2.75, "y": 2},
144 {"matrix": [2, 4], "x": 3.75, "y": 2},
145 {"matrix": [2, 5], "x": 4.75, "y": 2},
146 {"matrix": [2, 6], "x": 5.75, "y": 2},
147 {"matrix": [2, 7], "x": 6.75, "y": 2},
148 {"matrix": [2, 8], "x": 7.75, "y": 2},
149 {"matrix": [2, 9], "x": 8.75, "y": 2},
150 {"matrix": [2, 10], "x": 9.75, "y": 2},
151 {"matrix": [2, 11], "x": 10.75, "y": 2},
152 {"matrix": [2, 12], "x": 11.75, "y": 2},
153 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
154
155 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
156 {"matrix": [3, 2], "x": 2.25, "y": 3},
157 {"matrix": [3, 3], "x": 3.25, "y": 3},
158 {"matrix": [3, 4], "x": 4.25, "y": 3},
159 {"matrix": [3, 5], "x": 5.25, "y": 3},
160 {"matrix": [3, 6], "x": 6.25, "y": 3},
161 {"matrix": [3, 7], "x": 7.25, "y": 3},
162 {"matrix": [3, 8], "x": 8.25, "y": 3},
163 {"matrix": [3, 9], "x": 9.25, "y": 3},
164 {"matrix": [3, 10], "x": 10.25, "y": 3},
165 {"matrix": [3, 11], "x": 11.25, "y": 3},
166 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
167
168 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
169 {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
170 {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
171 {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
172 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
173 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
174 {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
175 {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
176 ]
38 }, 177 },
39 "LAYOUT_60_hhkb": { 178 "LAYOUT_60_hhkb": {
40 "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":"\\", "x":13, "y":0}, {"label":"`", "x":14, "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":"Backspace", "x":13.5, "y":1, "w":1.5}, {"label":"Control", "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":"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":"Fn", "x":14, "y":3}, {"label":"Os", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Os", "x":12.5, "y":4}] 179 "layout": [
180 {"matrix": [0, 0], "x": 0, "y": 0},
181 {"matrix": [0, 1], "x": 1, "y": 0},
182 {"matrix": [0, 2], "x": 2, "y": 0},
183 {"matrix": [0, 3], "x": 3, "y": 0},
184 {"matrix": [0, 4], "x": 4, "y": 0},
185 {"matrix": [0, 5], "x": 5, "y": 0},
186 {"matrix": [0, 6], "x": 6, "y": 0},
187 {"matrix": [0, 7], "x": 7, "y": 0},
188 {"matrix": [0, 8], "x": 8, "y": 0},
189 {"matrix": [0, 9], "x": 9, "y": 0},
190 {"matrix": [0, 10], "x": 10, "y": 0},
191 {"matrix": [0, 11], "x": 11, "y": 0},
192 {"matrix": [0, 12], "x": 12, "y": 0},
193 {"matrix": [0, 14], "x": 13, "y": 0},
194 {"matrix": [0, 13], "x": 14, "y": 0},
195
196 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
197 {"matrix": [1, 2], "x": 1.5, "y": 1},
198 {"matrix": [1, 3], "x": 2.5, "y": 1},
199 {"matrix": [1, 4], "x": 3.5, "y": 1},
200 {"matrix": [1, 5], "x": 4.5, "y": 1},
201 {"matrix": [1, 6], "x": 5.5, "y": 1},
202 {"matrix": [1, 7], "x": 6.5, "y": 1},
203 {"matrix": [1, 8], "x": 7.5, "y": 1},
204 {"matrix": [1, 9], "x": 8.5, "y": 1},
205 {"matrix": [1, 10], "x": 9.5, "y": 1},
206 {"matrix": [1, 11], "x": 10.5, "y": 1},
207 {"matrix": [1, 12], "x": 11.5, "y": 1},
208 {"matrix": [1, 13], "x": 12.5, "y": 1},
209 {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
210
211 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
212 {"matrix": [2, 2], "x": 1.75, "y": 2},
213 {"matrix": [2, 3], "x": 2.75, "y": 2},
214 {"matrix": [2, 4], "x": 3.75, "y": 2},
215 {"matrix": [2, 5], "x": 4.75, "y": 2},
216 {"matrix": [2, 6], "x": 5.75, "y": 2},
217 {"matrix": [2, 7], "x": 6.75, "y": 2},
218 {"matrix": [2, 8], "x": 7.75, "y": 2},
219 {"matrix": [2, 9], "x": 8.75, "y": 2},
220 {"matrix": [2, 10], "x": 9.75, "y": 2},
221 {"matrix": [2, 11], "x": 10.75, "y": 2},
222 {"matrix": [2, 12], "x": 11.75, "y": 2},
223 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
224
225 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
226 {"matrix": [3, 2], "x": 2.25, "y": 3},
227 {"matrix": [3, 3], "x": 3.25, "y": 3},
228 {"matrix": [3, 4], "x": 4.25, "y": 3},
229 {"matrix": [3, 5], "x": 5.25, "y": 3},
230 {"matrix": [3, 6], "x": 6.25, "y": 3},
231 {"matrix": [3, 7], "x": 7.25, "y": 3},
232 {"matrix": [3, 8], "x": 8.25, "y": 3},
233 {"matrix": [3, 9], "x": 9.25, "y": 3},
234 {"matrix": [3, 10], "x": 10.25, "y": 3},
235 {"matrix": [3, 11], "x": 11.25, "y": 3},
236 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
237 {"matrix": [3, 14], "x": 14, "y": 3},
238
239 {"matrix": [4, 2], "x": 1.5, "y": 4},
240 {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
241 {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
242 {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
243 {"matrix": [4, 13], "x": 12.5, "y": 4}
244 ]
41 } 245 }
42 } 246 }
43} 247}
diff --git a/keyboards/exclusive/e6v2/le/le.h b/keyboards/exclusive/e6v2/le/le.h
deleted file mode 100644
index 41992a185e..0000000000
--- a/keyboards/exclusive/e6v2/le/le.h
+++ /dev/null
@@ -1,60 +0,0 @@
1#pragma once
2
3#include "quantum.h"
4
5#define XXX KC_NO
6
7#define LAYOUT( \
8 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0D, \
9 k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
10 k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \
11 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
12 k40, k42, k43, k44, k47, k49, k4A, k4B, k4C, k4D, k4E \
13) { \
14 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
15 { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
16 { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX }, \
17 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
18 { k40, XXX, k42, k43, k44, XXX, XXX, k47, XXX, k49, k4A, k4B, k4C, k4D, k4E } \
19}
20
21#define LAYOUT_60_ansi( \
22 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
23 k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
24 k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \
25 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, \
26 k40, k42, k43, k47, k4A, k4B, k4D, k4E \
27) { \
28 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, XXX }, \
29 { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
30 { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX }, \
31 { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX }, \
32 { k40, XXX, k42, k43, XXX, XXX, XXX, k47, XXX, XXX, k4A, k4B, XXX, k4D, k4E } \
33}
34
35/* LAYOUT_60_hhkb
36 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
37 * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e │0d │
38 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
39 * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │
40 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
41 * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │
42 * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
43 * │30 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │3e │
44 * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴──────┬┴───┴┬───┬─┴───┤
45 * │▓▓▓▓▓│42 │43 │47 (7u) │4b │4d │▓▓▓▓▓│
46 * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
47*/
48#define LAYOUT_60_hhkb( \
49 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0D, \
50 k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
51 k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \
52 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3E, \
53 k42, k43, k47, k4B, k4D \
54) { \
55 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
56 { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
57 { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX }, \
58 { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, XXX, k3E }, \
59 { XXX, XXX, k42, k43, XXX, XXX, XXX, k47, XXX, XXX, XXX, k4B, XXX, k4D, XXX } \
60}
diff --git a/keyboards/exclusive/e6v2/oe/info.json b/keyboards/exclusive/e6v2/oe/info.json
index cb5b0e95fb..eef3f67847 100644
--- a/keyboards/exclusive/e6v2/oe/info.json
+++ b/keyboards/exclusive/e6v2/oe/info.json
@@ -27,19 +27,282 @@
27 "community_layouts": ["60_ansi"], 27 "community_layouts": ["60_ansi"],
28 "layouts": { 28 "layouts": {
29 "LAYOUT": { 29 "LAYOUT": {
30 "layout": [{"label":"~", "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}, {"x":13, "y":0}, {"x":14, "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":"Caps Lock", "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}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"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}, {"x":14, "y":3}, {"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, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] 30 "layout": [
31 }, 31 {"matrix": [0, 0], "x": 0, "y": 0},
32 {"matrix": [0, 1], "x": 1, "y": 0},
33 {"matrix": [0, 2], "x": 2, "y": 0},
34 {"matrix": [0, 3], "x": 3, "y": 0},
35 {"matrix": [0, 4], "x": 4, "y": 0},
36 {"matrix": [0, 5], "x": 5, "y": 0},
37 {"matrix": [0, 6], "x": 6, "y": 0},
38 {"matrix": [0, 7], "x": 7, "y": 0},
39 {"matrix": [0, 8], "x": 8, "y": 0},
40 {"matrix": [0, 9], "x": 9, "y": 0},
41 {"matrix": [0, 10], "x": 10, "y": 0},
42 {"matrix": [0, 11], "x": 11, "y": 0},
43 {"matrix": [0, 12], "x": 12, "y": 0},
44 {"matrix": [0, 13], "x": 13, "y": 0},
45 {"matrix": [0, 14], "x": 14, "y": 0},
32 46
33 "LAYOUT_60_ansi": { 47 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
34 "layout": [{"label":"~", "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":"Backspace", "x":13, "y":0, "w":2}, {"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":"Caps Lock", "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":"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":2.75}, {"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, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] 48 {"matrix": [1, 1], "x": 1.5, "y": 1},
49 {"matrix": [1, 2], "x": 2.5, "y": 1},
50 {"matrix": [1, 3], "x": 3.5, "y": 1},
51 {"matrix": [1, 4], "x": 4.5, "y": 1},
52 {"matrix": [1, 5], "x": 5.5, "y": 1},
53 {"matrix": [1, 6], "x": 6.5, "y": 1},
54 {"matrix": [1, 7], "x": 7.5, "y": 1},
55 {"matrix": [1, 8], "x": 8.5, "y": 1},
56 {"matrix": [1, 9], "x": 9.5, "y": 1},
57 {"matrix": [1, 10], "x": 10.5, "y": 1},
58 {"matrix": [1, 11], "x": 11.5, "y": 1},
59 {"matrix": [1, 12], "x": 12.5, "y": 1},
60 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
61
62 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
63 {"matrix": [2, 1], "x": 1.75, "y": 2},
64 {"matrix": [2, 2], "x": 2.75, "y": 2},
65 {"matrix": [2, 3], "x": 3.75, "y": 2},
66 {"matrix": [2, 4], "x": 4.75, "y": 2},
67 {"matrix": [2, 5], "x": 5.75, "y": 2},
68 {"matrix": [2, 6], "x": 6.75, "y": 2},
69 {"matrix": [2, 7], "x": 7.75, "y": 2},
70 {"matrix": [2, 8], "x": 8.75, "y": 2},
71 {"matrix": [2, 9], "x": 9.75, "y": 2},
72 {"matrix": [2, 10], "x": 10.75, "y": 2},
73 {"matrix": [2, 11], "x": 11.75, "y": 2},
74 {"matrix": [2, 12], "x": 12.75, "y": 2},
75 {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
76
77 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
78 {"matrix": [3, 1], "x": 1.25, "y": 3},
79 {"matrix": [3, 2], "x": 2.25, "y": 3},
80 {"matrix": [3, 3], "x": 3.25, "y": 3},
81 {"matrix": [3, 4], "x": 4.25, "y": 3},
82 {"matrix": [3, 5], "x": 5.25, "y": 3},
83 {"matrix": [3, 6], "x": 6.25, "y": 3},
84 {"matrix": [3, 7], "x": 7.25, "y": 3},
85 {"matrix": [3, 8], "x": 8.25, "y": 3},
86 {"matrix": [3, 9], "x": 9.25, "y": 3},
87 {"matrix": [3, 10], "x": 10.25, "y": 3},
88 {"matrix": [3, 11], "x": 11.25, "y": 3},
89 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
90 {"matrix": [3, 13], "x": 14, "y": 3},
91
92 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
93 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
94 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
95 {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
96 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
97 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
98 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
99 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
100 ]
35 }, 101 },
102 "LAYOUT_60_ansi": {
103 "layout": [
104 {"matrix": [0, 0], "x": 0, "y": 0},
105 {"matrix": [0, 1], "x": 1, "y": 0},
106 {"matrix": [0, 2], "x": 2, "y": 0},
107 {"matrix": [0, 3], "x": 3, "y": 0},
108 {"matrix": [0, 4], "x": 4, "y": 0},
109 {"matrix": [0, 5], "x": 5, "y": 0},
110 {"matrix": [0, 6], "x": 6, "y": 0},
111 {"matrix": [0, 7], "x": 7, "y": 0},
112 {"matrix": [0, 8], "x": 8, "y": 0},
113 {"matrix": [0, 9], "x": 9, "y": 0},
114 {"matrix": [0, 10], "x": 10, "y": 0},
115 {"matrix": [0, 11], "x": 11, "y": 0},
116 {"matrix": [0, 12], "x": 12, "y": 0},
117 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
36 118
37 "LAYOUT_hhkb": { 119 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
38 "layout": [{"label":"~", "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":"Backspace", "x":13, "y":0, "w":2}, {"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":"Caps Lock", "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":"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}, {"x":14, "y":3}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Win", "x":12.5, "y":4}] 120 {"matrix": [1, 1], "x": 1.5, "y": 1},
121 {"matrix": [1, 2], "x": 2.5, "y": 1},
122 {"matrix": [1, 3], "x": 3.5, "y": 1},
123 {"matrix": [1, 4], "x": 4.5, "y": 1},
124 {"matrix": [1, 5], "x": 5.5, "y": 1},
125 {"matrix": [1, 6], "x": 6.5, "y": 1},
126 {"matrix": [1, 7], "x": 7.5, "y": 1},
127 {"matrix": [1, 8], "x": 8.5, "y": 1},
128 {"matrix": [1, 9], "x": 9.5, "y": 1},
129 {"matrix": [1, 10], "x": 10.5, "y": 1},
130 {"matrix": [1, 11], "x": 11.5, "y": 1},
131 {"matrix": [1, 12], "x": 12.5, "y": 1},
132 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
133
134 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
135 {"matrix": [2, 1], "x": 1.75, "y": 2},
136 {"matrix": [2, 2], "x": 2.75, "y": 2},
137 {"matrix": [2, 3], "x": 3.75, "y": 2},
138 {"matrix": [2, 4], "x": 4.75, "y": 2},
139 {"matrix": [2, 5], "x": 5.75, "y": 2},
140 {"matrix": [2, 6], "x": 6.75, "y": 2},
141 {"matrix": [2, 7], "x": 7.75, "y": 2},
142 {"matrix": [2, 8], "x": 8.75, "y": 2},
143 {"matrix": [2, 9], "x": 9.75, "y": 2},
144 {"matrix": [2, 10], "x": 10.75, "y": 2},
145 {"matrix": [2, 11], "x": 11.75, "y": 2},
146 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
147
148 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
149 {"matrix": [3, 2], "x": 2.25, "y": 3},
150 {"matrix": [3, 3], "x": 3.25, "y": 3},
151 {"matrix": [3, 4], "x": 4.25, "y": 3},
152 {"matrix": [3, 5], "x": 5.25, "y": 3},
153 {"matrix": [3, 6], "x": 6.25, "y": 3},
154 {"matrix": [3, 7], "x": 7.25, "y": 3},
155 {"matrix": [3, 8], "x": 8.25, "y": 3},
156 {"matrix": [3, 9], "x": 9.25, "y": 3},
157 {"matrix": [3, 10], "x": 10.25, "y": 3},
158 {"matrix": [3, 11], "x": 11.25, "y": 3},
159 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
160
161 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
162 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
163 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
164 {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
165 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
166 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
167 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
168 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
169 ]
39 }, 170 },
171 "LAYOUT_hhkb": {
172 "layout": [
173 {"matrix": [0, 0], "x": 0, "y": 0},
174 {"matrix": [0, 1], "x": 1, "y": 0},
175 {"matrix": [0, 2], "x": 2, "y": 0},
176 {"matrix": [0, 3], "x": 3, "y": 0},
177 {"matrix": [0, 4], "x": 4, "y": 0},
178 {"matrix": [0, 5], "x": 5, "y": 0},
179 {"matrix": [0, 6], "x": 6, "y": 0},
180 {"matrix": [0, 7], "x": 7, "y": 0},
181 {"matrix": [0, 8], "x": 8, "y": 0},
182 {"matrix": [0, 9], "x": 9, "y": 0},
183 {"matrix": [0, 10], "x": 10, "y": 0},
184 {"matrix": [0, 11], "x": 11, "y": 0},
185 {"matrix": [0, 12], "x": 12, "y": 0},
186 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
187
188 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
189 {"matrix": [1, 1], "x": 1.5, "y": 1},
190 {"matrix": [1, 2], "x": 2.5, "y": 1},
191 {"matrix": [1, 3], "x": 3.5, "y": 1},
192 {"matrix": [1, 4], "x": 4.5, "y": 1},
193 {"matrix": [1, 5], "x": 5.5, "y": 1},
194 {"matrix": [1, 6], "x": 6.5, "y": 1},
195 {"matrix": [1, 7], "x": 7.5, "y": 1},
196 {"matrix": [1, 8], "x": 8.5, "y": 1},
197 {"matrix": [1, 9], "x": 9.5, "y": 1},
198 {"matrix": [1, 10], "x": 10.5, "y": 1},
199 {"matrix": [1, 11], "x": 11.5, "y": 1},
200 {"matrix": [1, 12], "x": 12.5, "y": 1},
201 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
202
203 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
204 {"matrix": [2, 1], "x": 1.75, "y": 2},
205 {"matrix": [2, 2], "x": 2.75, "y": 2},
206 {"matrix": [2, 3], "x": 3.75, "y": 2},
207 {"matrix": [2, 4], "x": 4.75, "y": 2},
208 {"matrix": [2, 5], "x": 5.75, "y": 2},
209 {"matrix": [2, 6], "x": 6.75, "y": 2},
210 {"matrix": [2, 7], "x": 7.75, "y": 2},
211 {"matrix": [2, 8], "x": 8.75, "y": 2},
212 {"matrix": [2, 9], "x": 9.75, "y": 2},
213 {"matrix": [2, 10], "x": 10.75, "y": 2},
214 {"matrix": [2, 11], "x": 11.75, "y": 2},
215 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
40 216
217 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
218 {"matrix": [3, 2], "x": 2.25, "y": 3},
219 {"matrix": [3, 3], "x": 3.25, "y": 3},
220 {"matrix": [3, 4], "x": 4.25, "y": 3},
221 {"matrix": [3, 5], "x": 5.25, "y": 3},
222 {"matrix": [3, 6], "x": 6.25, "y": 3},
223 {"matrix": [3, 7], "x": 7.25, "y": 3},
224 {"matrix": [3, 8], "x": 8.25, "y": 3},
225 {"matrix": [3, 9], "x": 9.25, "y": 3},
226 {"matrix": [3, 10], "x": 10.25, "y": 3},
227 {"matrix": [3, 11], "x": 11.25, "y": 3},
228 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
229 {"matrix": [3, 13], "x": 14, "y": 3},
230
231 {"matrix": [4, 1], "x": 1.5, "y": 4},
232 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
233 {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
234 {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
235 {"matrix": [4, 12], "x": 12.5, "y": 4}
236 ]
237 },
41 "LAYOUT_hhkb_splits": { 238 "LAYOUT_hhkb_splits": {
42 "layout": [{"label":"~", "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}, {"x":13, "y":0}, {"x":14, "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":"Caps Lock", "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":"Shift", "x":0, "y":3, "w":1.25}, {"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}, {"x":14, "y":3}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Win", "x":12.5, "y":4}] 239 "layout": [
240 {"matrix": [0, 0], "x": 0, "y": 0},
241 {"matrix": [0, 1], "x": 1, "y": 0},
242 {"matrix": [0, 2], "x": 2, "y": 0},
243 {"matrix": [0, 3], "x": 3, "y": 0},
244 {"matrix": [0, 4], "x": 4, "y": 0},
245 {"matrix": [0, 5], "x": 5, "y": 0},
246 {"matrix": [0, 6], "x": 6, "y": 0},
247 {"matrix": [0, 7], "x": 7, "y": 0},
248 {"matrix": [0, 8], "x": 8, "y": 0},
249 {"matrix": [0, 9], "x": 9, "y": 0},
250 {"matrix": [0, 10], "x": 10, "y": 0},
251 {"matrix": [0, 11], "x": 11, "y": 0},
252 {"matrix": [0, 12], "x": 12, "y": 0},
253 {"matrix": [0, 13], "x": 13, "y": 0},
254 {"matrix": [0, 14], "x": 14, "y": 0},
255
256 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
257 {"matrix": [1, 1], "x": 1.5, "y": 1},
258 {"matrix": [1, 2], "x": 2.5, "y": 1},
259 {"matrix": [1, 3], "x": 3.5, "y": 1},
260 {"matrix": [1, 4], "x": 4.5, "y": 1},
261 {"matrix": [1, 5], "x": 5.5, "y": 1},
262 {"matrix": [1, 6], "x": 6.5, "y": 1},
263 {"matrix": [1, 7], "x": 7.5, "y": 1},
264 {"matrix": [1, 8], "x": 8.5, "y": 1},
265 {"matrix": [1, 9], "x": 9.5, "y": 1},
266 {"matrix": [1, 10], "x": 10.5, "y": 1},
267 {"matrix": [1, 11], "x": 11.5, "y": 1},
268 {"matrix": [1, 12], "x": 12.5, "y": 1},
269 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
270
271 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
272 {"matrix": [2, 1], "x": 1.75, "y": 2},
273 {"matrix": [2, 2], "x": 2.75, "y": 2},
274 {"matrix": [2, 3], "x": 3.75, "y": 2},
275 {"matrix": [2, 4], "x": 4.75, "y": 2},
276 {"matrix": [2, 5], "x": 5.75, "y": 2},
277 {"matrix": [2, 6], "x": 6.75, "y": 2},
278 {"matrix": [2, 7], "x": 7.75, "y": 2},
279 {"matrix": [2, 8], "x": 8.75, "y": 2},
280 {"matrix": [2, 9], "x": 9.75, "y": 2},
281 {"matrix": [2, 10], "x": 10.75, "y": 2},
282 {"matrix": [2, 11], "x": 11.75, "y": 2},
283 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
284
285 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
286 {"matrix": [3, 1], "x": 1.25, "y": 3},
287 {"matrix": [3, 2], "x": 2.25, "y": 3},
288 {"matrix": [3, 3], "x": 3.25, "y": 3},
289 {"matrix": [3, 4], "x": 4.25, "y": 3},
290 {"matrix": [3, 5], "x": 5.25, "y": 3},
291 {"matrix": [3, 6], "x": 6.25, "y": 3},
292 {"matrix": [3, 7], "x": 7.25, "y": 3},
293 {"matrix": [3, 8], "x": 8.25, "y": 3},
294 {"matrix": [3, 9], "x": 9.25, "y": 3},
295 {"matrix": [3, 10], "x": 10.25, "y": 3},
296 {"matrix": [3, 11], "x": 11.25, "y": 3},
297 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
298 {"matrix": [3, 13], "x": 14, "y": 3},
299
300 {"matrix": [4, 1], "x": 1.5, "y": 4},
301 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
302 {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
303 {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
304 {"matrix": [4, 12], "x": 12.5, "y": 4}
305 ]
43 } 306 }
44 } 307 }
45} 308}
diff --git a/keyboards/exclusive/e6v2/oe/oe.c b/keyboards/exclusive/e6v2/oe/oe.c
index abff40c0b2..6869a52c97 100644
--- a/keyboards/exclusive/e6v2/oe/oe.c
+++ b/keyboards/exclusive/e6v2/oe/oe.c
@@ -1,4 +1,4 @@
1#include "oe.h" 1#include "quantum.h"
2 2
3void led_init_ports(void) { 3void led_init_ports(void) {
4 setPinOutput(B2); 4 setPinOutput(B2);
diff --git a/keyboards/exclusive/e6v2/oe/oe.h b/keyboards/exclusive/e6v2/oe/oe.h
deleted file mode 100644
index 21daaa2aa9..0000000000
--- a/keyboards/exclusive/e6v2/oe/oe.h
+++ /dev/null
@@ -1,61 +0,0 @@
1#pragma once
2
3#include "quantum.h"
4
5#define XXX KC_NO
6
7#define LAYOUT( \
8 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
9 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
10 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \
11 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, \
12 k40, k41, k42, k46, k4A, k4B, k4C, k4D \
13) { \
14 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
15 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX }, \
16 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX }, \
17 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX }, \
18 { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D, XXX } \
19}
20
21#define LAYOUT_60_ansi( \
22 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
23 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
24 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, \
25 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, \
26 k40, k41, k42, k46, k4A, k4B, k4C, k4D \
27) { \
28 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, XXX }, \
29 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX }, \
30 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX }, \
31 { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, XXX, XXX }, \
32 { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D, XXX } \
33}
34
35#define LAYOUT_hhkb( \
36 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
37 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
38 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, \
39 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, \
40 k41, k42, k46, k4B, k4C \
41) { \
42 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, XXX }, \
43 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX }, \
44 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX }, \
45 { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX }, \
46 { XXX, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4B, k4C, XXX, XXX } \
47}
48
49#define LAYOUT_hhkb_splits( \
50 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
51 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
52 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, \
53 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, \
54 k41, k42, k46, k4B, k4C \
55) { \
56 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
57 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX }, \
58 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX }, \
59 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX }, \
60 { XXX, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4B, k4C, XXX, XXX } \
61}
diff --git a/keyboards/gh60/revc/info.json b/keyboards/gh60/revc/info.json
index 9db9441171..c8b881841b 100644
--- a/keyboards/gh60/revc/info.json
+++ b/keyboards/gh60/revc/info.json
@@ -23,572 +23,569 @@
23 "layouts": { 23 "layouts": {
24 "LAYOUT_all": { 24 "LAYOUT_all": {
25 "layout": [ 25 "layout": [
26 {"x": 0, "y": 0}, 26 {"matrix": [0, 0], "x": 0, "y": 0},
27 {"x": 1, "y": 0}, 27 {"matrix": [0, 1], "x": 1, "y": 0},
28 {"x": 2, "y": 0}, 28 {"matrix": [0, 2], "x": 2, "y": 0},
29 {"x": 3, "y": 0}, 29 {"matrix": [0, 3], "x": 3, "y": 0},
30 {"x": 4, "y": 0}, 30 {"matrix": [0, 4], "x": 4, "y": 0},
31 {"x": 5, "y": 0}, 31 {"matrix": [0, 5], "x": 5, "y": 0},
32 {"x": 6, "y": 0}, 32 {"matrix": [0, 6], "x": 6, "y": 0},
33 {"x": 7, "y": 0}, 33 {"matrix": [0, 7], "x": 7, "y": 0},
34 {"x": 8, "y": 0}, 34 {"matrix": [0, 8], "x": 8, "y": 0},
35 {"x": 9, "y": 0}, 35 {"matrix": [0, 9], "x": 9, "y": 0},
36 {"x": 10, "y": 0}, 36 {"matrix": [0, 10], "x": 10, "y": 0},
37 {"x": 11, "y": 0}, 37 {"matrix": [0, 11], "x": 11, "y": 0},
38 {"x": 12, "y": 0}, 38 {"matrix": [0, 12], "x": 12, "y": 0},
39 {"x": 13, "y": 0}, 39 {"matrix": [0, 13], "x": 13, "y": 0},
40 {"x": 14, "y": 0}, 40 {"matrix": [4, 9], "x": 14, "y": 0},
41 41
42 {"x": 0, "y": 1, "w": 1.5}, 42 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
43 {"x": 1.5, "y": 1}, 43 {"matrix": [1, 1], "x": 1.5, "y": 1},
44 {"x": 2.5, "y": 1}, 44 {"matrix": [1, 2], "x": 2.5, "y": 1},
45 {"x": 3.5, "y": 1}, 45 {"matrix": [1, 3], "x": 3.5, "y": 1},
46 {"x": 4.5, "y": 1}, 46 {"matrix": [1, 4], "x": 4.5, "y": 1},
47 {"x": 5.5, "y": 1}, 47 {"matrix": [1, 5], "x": 5.5, "y": 1},
48 {"x": 6.5, "y": 1}, 48 {"matrix": [1, 6], "x": 6.5, "y": 1},
49 {"x": 7.5, "y": 1}, 49 {"matrix": [1, 7], "x": 7.5, "y": 1},
50 {"x": 8.5, "y": 1}, 50 {"matrix": [1, 8], "x": 8.5, "y": 1},
51 {"x": 9.5, "y": 1}, 51 {"matrix": [1, 9], "x": 9.5, "y": 1},
52 {"x": 10.5, "y": 1}, 52 {"matrix": [1, 10], "x": 10.5, "y": 1},
53 {"x": 11.5, "y": 1}, 53 {"matrix": [1, 11], "x": 11.5, "y": 1},
54 {"x": 12.5, "y": 1}, 54 {"matrix": [1, 12], "x": 12.5, "y": 1},
55 {"x": 13.5, "y": 1, "w": 1.5}, 55 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
56 56
57 {"x": 0, "y": 2, "w": 1.75}, 57 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
58 {"x": 1.75, "y": 2}, 58 {"matrix": [2, 1], "x": 1.75, "y": 2},
59 {"x": 2.75, "y": 2}, 59 {"matrix": [2, 2], "x": 2.75, "y": 2},
60 {"x": 3.75, "y": 2}, 60 {"matrix": [2, 3], "x": 3.75, "y": 2},
61 {"x": 4.75, "y": 2}, 61 {"matrix": [2, 4], "x": 4.75, "y": 2},
62 {"x": 5.75, "y": 2}, 62 {"matrix": [2, 5], "x": 5.75, "y": 2},
63 {"x": 6.75, "y": 2}, 63 {"matrix": [2, 6], "x": 6.75, "y": 2},
64 {"x": 7.75, "y": 2}, 64 {"matrix": [2, 7], "x": 7.75, "y": 2},
65 {"x": 8.75, "y": 2}, 65 {"matrix": [2, 8], "x": 8.75, "y": 2},
66 {"x": 9.75, "y": 2}, 66 {"matrix": [2, 9], "x": 9.75, "y": 2},
67 {"x": 10.75, "y": 2}, 67 {"matrix": [2, 10], "x": 10.75, "y": 2},
68 {"x": 11.75, "y": 2}, 68 {"matrix": [2, 11], "x": 11.75, "y": 2},
69 {"x": 12.75, "y": 2}, 69 {"matrix": [2, 12], "x": 12.75, "y": 2},
70 {"x": 13.75, "y": 2, "w": 1.25}, 70 {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
71 71
72 {"x": 0, "y": 3, "w": 1.25}, 72 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
73 {"x": 1.25, "y": 3}, 73 {"matrix": [3, 1], "x": 1.25, "y": 3},
74 {"x": 2.25, "y": 3}, 74 {"matrix": [3, 2], "x": 2.25, "y": 3},
75 {"x": 3.25, "y": 3}, 75 {"matrix": [3, 3], "x": 3.25, "y": 3},
76 {"x": 4.25, "y": 3}, 76 {"matrix": [3, 4], "x": 4.25, "y": 3},
77 {"x": 5.25, "y": 3}, 77 {"matrix": [3, 5], "x": 5.25, "y": 3},
78 {"x": 6.25, "y": 3}, 78 {"matrix": [3, 6], "x": 6.25, "y": 3},
79 {"x": 7.25, "y": 3}, 79 {"matrix": [3, 7], "x": 7.25, "y": 3},
80 {"x": 8.25, "y": 3}, 80 {"matrix": [3, 8], "x": 8.25, "y": 3},
81 {"x": 9.25, "y": 3}, 81 {"matrix": [3, 9], "x": 9.25, "y": 3},
82 {"x": 10.25, "y": 3}, 82 {"matrix": [3, 10], "x": 10.25, "y": 3},
83 {"x": 11.25, "y": 3}, 83 {"matrix": [3, 11], "x": 11.25, "y": 3},
84 {"x": 12.25, "y": 3, "w": 1.75}, 84 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
85 {"x": 14, "y": 3}, 85 {"matrix": [3, 12], "x": 14, "y": 3},
86 86
87 {"x": 0, "y": 4, "w": 1.25}, 87 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
88 {"x": 1.25, "y": 4, "w": 1.25}, 88 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
89 {"x": 2.5, "y": 4, "w": 1.25}, 89 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
90 {"x": 3.75, "y": 4, "w": 6.25}, 90 {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
91 {"x": 10, "y": 4, "w": 1.25}, 91 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
92 {"x": 11.25, "y": 4, "w": 1.25}, 92 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
93 {"x": 12.5, "y": 4, "w": 1.25}, 93 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
94 {"x": 13.75, "y": 4, "w": 1.25} 94 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
95 ] 95 ]
96 }, 96 },
97 "LAYOUT": { 97 "LAYOUT": {
98 "layout": [ 98 "layout": [
99 {"x": 0, "y": 0}, 99 {"matrix": [0, 0], "x": 0, "y": 0},
100 {"x": 1, "y": 0}, 100 {"matrix": [0, 1], "x": 1, "y": 0},
101 {"x": 2, "y": 0}, 101 {"matrix": [0, 2], "x": 2, "y": 0},
102 {"x": 3, "y": 0}, 102 {"matrix": [0, 3], "x": 3, "y": 0},
103 {"x": 4, "y": 0}, 103 {"matrix": [0, 4], "x": 4, "y": 0},
104 {"x": 5, "y": 0}, 104 {"matrix": [0, 5], "x": 5, "y": 0},
105 {"x": 6, "y": 0}, 105 {"matrix": [0, 6], "x": 6, "y": 0},
106 {"x": 7, "y": 0}, 106 {"matrix": [0, 7], "x": 7, "y": 0},
107 {"x": 8, "y": 0}, 107 {"matrix": [0, 8], "x": 8, "y": 0},
108 {"x": 9, "y": 0}, 108 {"matrix": [0, 9], "x": 9, "y": 0},
109 {"x": 10, "y": 0}, 109 {"matrix": [0, 10], "x": 10, "y": 0},
110 {"x": 11, "y": 0}, 110 {"matrix": [0, 11], "x": 11, "y": 0},
111 {"x": 12, "y": 0}, 111 {"matrix": [0, 12], "x": 12, "y": 0},
112 {"x": 13, "y": 0}, 112 {"matrix": [0, 13], "x": 13, "y": 0},
113 113
114 {"x": 0, "y": 1, "w": 1.5}, 114 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
115 {"x": 1.5, "y": 1}, 115 {"matrix": [1, 1], "x": 1.5, "y": 1},
116 {"x": 2.5, "y": 1}, 116 {"matrix": [1, 2], "x": 2.5, "y": 1},
117 {"x": 3.5, "y": 1}, 117 {"matrix": [1, 3], "x": 3.5, "y": 1},
118 {"x": 4.5, "y": 1}, 118 {"matrix": [1, 4], "x": 4.5, "y": 1},
119 {"x": 5.5, "y": 1}, 119 {"matrix": [1, 5], "x": 5.5, "y": 1},
120 {"x": 6.5, "y": 1}, 120 {"matrix": [1, 6], "x": 6.5, "y": 1},
121 {"x": 7.5, "y": 1}, 121 {"matrix": [1, 7], "x": 7.5, "y": 1},
122 {"x": 8.5, "y": 1}, 122 {"matrix": [1, 8], "x": 8.5, "y": 1},
123 {"x": 9.5, "y": 1}, 123 {"matrix": [1, 9], "x": 9.5, "y": 1},
124 {"x": 10.5, "y": 1}, 124 {"matrix": [1, 10], "x": 10.5, "y": 1},
125 {"x": 11.5, "y": 1}, 125 {"matrix": [1, 11], "x": 11.5, "y": 1},
126 {"x": 12.5, "y": 1}, 126 {"matrix": [1, 12], "x": 12.5, "y": 1},
127 {"x": 13.5, "y": 1, "w": 1.5}, 127 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
128 128
129 {"x": 0, "y": 2, "w": 1.75}, 129 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
130 {"x": 1.75, "y": 2}, 130 {"matrix": [2, 1], "x": 1.75, "y": 2},
131 {"x": 2.75, "y": 2}, 131 {"matrix": [2, 2], "x": 2.75, "y": 2},
132 {"x": 3.75, "y": 2}, 132 {"matrix": [2, 3], "x": 3.75, "y": 2},
133 {"x": 4.75, "y": 2}, 133 {"matrix": [2, 4], "x": 4.75, "y": 2},
134 {"x": 5.75, "y": 2}, 134 {"matrix": [2, 5], "x": 5.75, "y": 2},
135 {"x": 6.75, "y": 2}, 135 {"matrix": [2, 6], "x": 6.75, "y": 2},
136 {"x": 7.75, "y": 2}, 136 {"matrix": [2, 7], "x": 7.75, "y": 2},
137 {"x": 8.75, "y": 2}, 137 {"matrix": [2, 8], "x": 8.75, "y": 2},
138 {"x": 9.75, "y": 2}, 138 {"matrix": [2, 9], "x": 9.75, "y": 2},
139 {"x": 10.75, "y": 2}, 139 {"matrix": [2, 10], "x": 10.75, "y": 2},
140 {"x": 11.75, "y": 2}, 140 {"matrix": [2, 11], "x": 11.75, "y": 2},
141 {"x": 12.75, "y": 2}, 141 {"matrix": [2, 12], "x": 12.75, "y": 2},
142 {"x": 13.75, "y": 2, "w": 1.25}, 142 {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
143 {"x": 0, "y": 3, "w": 1.25}, 143
144 144 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
145 {"x": 1.25, "y": 3}, 145 {"matrix": [3, 1], "x": 1.25, "y": 3},
146 {"x": 2.25, "y": 3}, 146 {"matrix": [3, 2], "x": 2.25, "y": 3},
147 {"x": 3.25, "y": 3}, 147 {"matrix": [3, 3], "x": 3.25, "y": 3},
148 {"x": 4.25, "y": 3}, 148 {"matrix": [3, 4], "x": 4.25, "y": 3},
149 {"x": 5.25, "y": 3}, 149 {"matrix": [3, 5], "x": 5.25, "y": 3},
150 {"x": 6.25, "y": 3}, 150 {"matrix": [3, 6], "x": 6.25, "y": 3},
151 {"x": 7.25, "y": 3}, 151 {"matrix": [3, 7], "x": 7.25, "y": 3},
152 {"x": 8.25, "y": 3}, 152 {"matrix": [3, 8], "x": 8.25, "y": 3},
153 {"x": 9.25, "y": 3}, 153 {"matrix": [3, 9], "x": 9.25, "y": 3},
154 {"x": 10.25, "y": 3}, 154 {"matrix": [3, 10], "x": 10.25, "y": 3},
155 {"x": 11.25, "y": 3}, 155 {"matrix": [3, 11], "x": 11.25, "y": 3},
156 {"x": 12.25, "y": 3, "w": 1.75}, 156 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
157 {"x": 14, "y": 3}, 157 {"matrix": [3, 13], "x": 14, "y": 3},
158 158
159 {"x": 0, "y": 4, "w": 1.25}, 159 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
160 {"x": 1.25, "y": 4, "w": 1.25}, 160 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
161 {"x": 2.5, "y": 4, "w": 1.25}, 161 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
162 {"x": 3.75, "y": 4, "w": 6.25}, 162 {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
163 {"x": 14, "y": 0}, 163 {"matrix": [4, 9], "x": 14, "y": 0},
164 {"x": 10, "y": 4, "w": 1.25}, 164 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
165 {"x": 11.25, "y": 4, "w": 1.25}, 165 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
166 {"x": 12.5, "y": 4, "w": 1.25}, 166 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
167 {"x": 13.75, "y": 4, "w": 1.25} 167 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
168 ] 168 ]
169 }, 169 },
170
171 "LAYOUT_60_ansi": { 170 "LAYOUT_60_ansi": {
172 "layout": [ 171 "layout": [
173 {"x": 0, "y": 0}, 172 {"matrix": [0, 0], "x": 0, "y": 0},
174 {"x": 1, "y": 0}, 173 {"matrix": [0, 1], "x": 1, "y": 0},
175 {"x": 2, "y": 0}, 174 {"matrix": [0, 2], "x": 2, "y": 0},
176 {"x": 3, "y": 0}, 175 {"matrix": [0, 3], "x": 3, "y": 0},
177 {"x": 4, "y": 0}, 176 {"matrix": [0, 4], "x": 4, "y": 0},
178 {"x": 5, "y": 0}, 177 {"matrix": [0, 5], "x": 5, "y": 0},
179 {"x": 6, "y": 0}, 178 {"matrix": [0, 6], "x": 6, "y": 0},
180 {"x": 7, "y": 0}, 179 {"matrix": [0, 7], "x": 7, "y": 0},
181 {"x": 8, "y": 0}, 180 {"matrix": [0, 8], "x": 8, "y": 0},
182 {"x": 9, "y": 0}, 181 {"matrix": [0, 9], "x": 9, "y": 0},
183 {"x": 10, "y": 0}, 182 {"matrix": [0, 10], "x": 10, "y": 0},
184 {"x": 11, "y": 0}, 183 {"matrix": [0, 11], "x": 11, "y": 0},
185 {"x": 12, "y": 0}, 184 {"matrix": [0, 12], "x": 12, "y": 0},
186 {"x": 13, "y": 0, "w": 2}, 185 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
187 186
188 {"x": 0, "y": 1, "w": 1.5}, 187 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
189 {"x": 1.5, "y": 1}, 188 {"matrix": [1, 1], "x": 1.5, "y": 1},
190 {"x": 2.5, "y": 1}, 189 {"matrix": [1, 2], "x": 2.5, "y": 1},
191 {"x": 3.5, "y": 1}, 190 {"matrix": [1, 3], "x": 3.5, "y": 1},
192 {"x": 4.5, "y": 1}, 191 {"matrix": [1, 4], "x": 4.5, "y": 1},
193 {"x": 5.5, "y": 1}, 192 {"matrix": [1, 5], "x": 5.5, "y": 1},
194 {"x": 6.5, "y": 1}, 193 {"matrix": [1, 6], "x": 6.5, "y": 1},
195 {"x": 7.5, "y": 1}, 194 {"matrix": [1, 7], "x": 7.5, "y": 1},
196 {"x": 8.5, "y": 1}, 195 {"matrix": [1, 8], "x": 8.5, "y": 1},
197 {"x": 9.5, "y": 1}, 196 {"matrix": [1, 9], "x": 9.5, "y": 1},
198 {"x": 10.5, "y": 1}, 197 {"matrix": [1, 10], "x": 10.5, "y": 1},
199 {"x": 11.5, "y": 1}, 198 {"matrix": [1, 11], "x": 11.5, "y": 1},
200 {"x": 12.5, "y": 1}, 199 {"matrix": [1, 12], "x": 12.5, "y": 1},
201 {"x": 13.5, "y": 1, "w": 1.5}, 200 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
202 201
203 {"x": 0, "y": 2, "w": 1.75}, 202 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
204 {"x": 1.75, "y": 2}, 203 {"matrix": [2, 1], "x": 1.75, "y": 2},
205 {"x": 2.75, "y": 2}, 204 {"matrix": [2, 2], "x": 2.75, "y": 2},
206 {"x": 3.75, "y": 2}, 205 {"matrix": [2, 3], "x": 3.75, "y": 2},
207 {"x": 4.75, "y": 2}, 206 {"matrix": [2, 4], "x": 4.75, "y": 2},
208 {"x": 5.75, "y": 2}, 207 {"matrix": [2, 5], "x": 5.75, "y": 2},
209 {"x": 6.75, "y": 2}, 208 {"matrix": [2, 6], "x": 6.75, "y": 2},
210 {"x": 7.75, "y": 2}, 209 {"matrix": [2, 7], "x": 7.75, "y": 2},
211 {"x": 8.75, "y": 2}, 210 {"matrix": [2, 8], "x": 8.75, "y": 2},
212 {"x": 9.75, "y": 2}, 211 {"matrix": [2, 9], "x": 9.75, "y": 2},
213 {"x": 10.75, "y": 2}, 212 {"matrix": [2, 10], "x": 10.75, "y": 2},
214 {"x": 11.75, "y": 2}, 213 {"matrix": [2, 11], "x": 11.75, "y": 2},
215 {"x": 12.75, "y": 2, "w": 2.25}, 214 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
216 215
217 {"x": 0, "y": 3, "w": 2.25}, 216 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
218 {"x": 2.25, "y": 3}, 217 {"matrix": [3, 2], "x": 2.25, "y": 3},
219 {"x": 3.25, "y": 3}, 218 {"matrix": [3, 3], "x": 3.25, "y": 3},
220 {"x": 4.25, "y": 3}, 219 {"matrix": [3, 4], "x": 4.25, "y": 3},
221 {"x": 5.25, "y": 3}, 220 {"matrix": [3, 5], "x": 5.25, "y": 3},
222 {"x": 6.25, "y": 3}, 221 {"matrix": [3, 6], "x": 6.25, "y": 3},
223 {"x": 7.25, "y": 3}, 222 {"matrix": [3, 7], "x": 7.25, "y": 3},
224 {"x": 8.25, "y": 3}, 223 {"matrix": [3, 8], "x": 8.25, "y": 3},
225 {"x": 9.25, "y": 3}, 224 {"matrix": [3, 9], "x": 9.25, "y": 3},
226 {"x": 10.25, "y": 3}, 225 {"matrix": [3, 10], "x": 10.25, "y": 3},
227 {"x": 11.25, "y": 3}, 226 {"matrix": [3, 11], "x": 11.25, "y": 3},
228 227 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
229 {"x": 12.25, "y": 3, "w": 2.75}, 228
230 {"x": 0, "y": 4, "w": 1.25}, 229 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
231 {"x": 1.25, "y": 4, "w": 1.25}, 230 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
232 {"x": 2.5, "y": 4, "w": 1.25}, 231 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
233 {"x": 3.75, "y": 4, "w": 6.25}, 232 {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
234 {"x": 10, "y": 4, "w": 1.25}, 233 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
235 {"x": 11.25, "y": 4, "w": 1.25}, 234 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
236 {"x": 12.5, "y": 4, "w": 1.25}, 235 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
237 {"x": 13.75, "y": 4, "w": 1.25} 236 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
238 ] 237 ]
239 }, 238 },
240
241 "LAYOUT_60_iso": { 239 "LAYOUT_60_iso": {
242 "layout": [ 240 "layout": [
243 {"x": 0, "y": 0}, 241 {"matrix": [0, 0], "x": 0, "y": 0},
244 {"x": 1, "y": 0}, 242 {"matrix": [0, 1], "x": 1, "y": 0},
245 {"x": 2, "y": 0}, 243 {"matrix": [0, 2], "x": 2, "y": 0},
246 {"x": 3, "y": 0}, 244 {"matrix": [0, 3], "x": 3, "y": 0},
247 {"x": 4, "y": 0}, 245 {"matrix": [0, 4], "x": 4, "y": 0},
248 {"x": 5, "y": 0}, 246 {"matrix": [0, 5], "x": 5, "y": 0},
249 {"x": 6, "y": 0}, 247 {"matrix": [0, 6], "x": 6, "y": 0},
250 {"x": 7, "y": 0}, 248 {"matrix": [0, 7], "x": 7, "y": 0},
251 {"x": 8, "y": 0}, 249 {"matrix": [0, 8], "x": 8, "y": 0},
252 {"x": 9, "y": 0}, 250 {"matrix": [0, 9], "x": 9, "y": 0},
253 {"x": 10, "y": 0}, 251 {"matrix": [0, 10], "x": 10, "y": 0},
254 {"x": 11, "y": 0}, 252 {"matrix": [0, 11], "x": 11, "y": 0},
255 {"x": 12, "y": 0}, 253 {"matrix": [0, 12], "x": 12, "y": 0},
256 {"x": 13, "y": 0, "w": 2}, 254 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
257 255
258 {"x": 0, "y": 1, "w": 1.5}, 256 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
259 {"x": 1.5, "y": 1}, 257 {"matrix": [1, 1], "x": 1.5, "y": 1},
260 {"x": 2.5, "y": 1}, 258 {"matrix": [1, 2], "x": 2.5, "y": 1},
261 {"x": 3.5, "y": 1}, 259 {"matrix": [1, 3], "x": 3.5, "y": 1},
262 {"x": 4.5, "y": 1}, 260 {"matrix": [1, 4], "x": 4.5, "y": 1},
263 {"x": 5.5, "y": 1}, 261 {"matrix": [1, 5], "x": 5.5, "y": 1},
264 {"x": 6.5, "y": 1}, 262 {"matrix": [1, 6], "x": 6.5, "y": 1},
265 {"x": 7.5, "y": 1}, 263 {"matrix": [1, 7], "x": 7.5, "y": 1},
266 {"x": 8.5, "y": 1}, 264 {"matrix": [1, 8], "x": 8.5, "y": 1},
267 {"x": 9.5, "y": 1}, 265 {"matrix": [1, 9], "x": 9.5, "y": 1},
268 {"x": 10.5, "y": 1}, 266 {"matrix": [1, 10], "x": 10.5, "y": 1},
269 {"x": 11.5, "y": 1}, 267 {"matrix": [1, 11], "x": 11.5, "y": 1},
270 {"x": 12.5, "y": 1}, 268 {"matrix": [1, 12], "x": 12.5, "y": 1},
271 269
272 {"x": 0, "y": 2, "w": 1.75}, 270 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
273 {"x": 1.75, "y": 2}, 271 {"matrix": [2, 1], "x": 1.75, "y": 2},
274 {"x": 2.75, "y": 2}, 272 {"matrix": [2, 2], "x": 2.75, "y": 2},
275 {"x": 3.75, "y": 2}, 273 {"matrix": [2, 3], "x": 3.75, "y": 2},
276 {"x": 4.75, "y": 2}, 274 {"matrix": [2, 4], "x": 4.75, "y": 2},
277 {"x": 5.75, "y": 2}, 275 {"matrix": [2, 5], "x": 5.75, "y": 2},
278 {"x": 6.75, "y": 2}, 276 {"matrix": [2, 6], "x": 6.75, "y": 2},
279 {"x": 7.75, "y": 2}, 277 {"matrix": [2, 7], "x": 7.75, "y": 2},
280 {"x": 8.75, "y": 2}, 278 {"matrix": [2, 8], "x": 8.75, "y": 2},
281 {"x": 9.75, "y": 2}, 279 {"matrix": [2, 9], "x": 9.75, "y": 2},
282 {"x": 10.75, "y": 2}, 280 {"matrix": [2, 10], "x": 10.75, "y": 2},
283 {"x": 11.75, "y": 2}, 281 {"matrix": [2, 11], "x": 11.75, "y": 2},
284 {"x": 12.75, "y": 2}, 282 {"matrix": [2, 12], "x": 12.75, "y": 2},
285 {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, 283 {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
286 284
287 {"x": 0, "y": 3, "w": 1.25}, 285 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
288 {"x": 1.25, "y": 3}, 286 {"matrix": [3, 1], "x": 1.25, "y": 3},
289 {"x": 2.25, "y": 3}, 287 {"matrix": [3, 2], "x": 2.25, "y": 3},
290 {"x": 3.25, "y": 3}, 288 {"matrix": [3, 3], "x": 3.25, "y": 3},
291 {"x": 4.25, "y": 3}, 289 {"matrix": [3, 4], "x": 4.25, "y": 3},
292 {"x": 5.25, "y": 3}, 290 {"matrix": [3, 5], "x": 5.25, "y": 3},
293 {"x": 6.25, "y": 3}, 291 {"matrix": [3, 6], "x": 6.25, "y": 3},
294 {"x": 7.25, "y": 3}, 292 {"matrix": [3, 7], "x": 7.25, "y": 3},
295 {"x": 8.25, "y": 3}, 293 {"matrix": [3, 8], "x": 8.25, "y": 3},
296 {"x": 9.25, "y": 3}, 294 {"matrix": [3, 9], "x": 9.25, "y": 3},
297 {"x": 10.25, "y": 3}, 295 {"matrix": [3, 10], "x": 10.25, "y": 3},
298 {"x": 11.25, "y": 3}, 296 {"matrix": [3, 11], "x": 11.25, "y": 3},
299 {"x": 12.25, "y": 3, "w": 2.75}, 297 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
300 298
301 {"x": 0, "y": 4, "w": 1.25}, 299 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
302 {"x": 1.25, "y": 4, "w": 1.25}, 300 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
303 {"x": 2.5, "y": 4, "w": 1.25}, 301 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
304 {"x": 3.75, "y": 4, "w": 6.25}, 302 {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
305 {"x": 10, "y": 4, "w": 1.25}, 303 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
306 {"x": 11.25, "y": 4, "w": 1.25}, 304 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
307 {"x": 12.5, "y": 4, "w": 1.25}, 305 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
308 {"x": 13.75, "y": 4, "w": 1.25} 306 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
309 ] 307 ]
310 }, 308 },
311
312 "LAYOUT_60_ansi_split_bs_rshift": { 309 "LAYOUT_60_ansi_split_bs_rshift": {
313 "layout": [ 310 "layout": [
314 {"x": 0, "y": 0}, 311 {"matrix": [0, 0], "x": 0, "y": 0},
315 {"x": 1, "y": 0}, 312 {"matrix": [0, 1], "x": 1, "y": 0},
316 {"x": 2, "y": 0}, 313 {"matrix": [0, 2], "x": 2, "y": 0},
317 {"x": 3, "y": 0}, 314 {"matrix": [0, 3], "x": 3, "y": 0},
318 {"x": 4, "y": 0}, 315 {"matrix": [0, 4], "x": 4, "y": 0},
319 {"x": 5, "y": 0}, 316 {"matrix": [0, 5], "x": 5, "y": 0},
320 {"x": 6, "y": 0}, 317 {"matrix": [0, 6], "x": 6, "y": 0},
321 {"x": 7, "y": 0}, 318 {"matrix": [0, 7], "x": 7, "y": 0},
322 {"x": 8, "y": 0}, 319 {"matrix": [0, 8], "x": 8, "y": 0},
323 {"x": 9, "y": 0}, 320 {"matrix": [0, 9], "x": 9, "y": 0},
324 {"x": 10, "y": 0}, 321 {"matrix": [0, 10], "x": 10, "y": 0},
325 {"x": 11, "y": 0}, 322 {"matrix": [0, 11], "x": 11, "y": 0},
326 {"x": 12, "y": 0}, 323 {"matrix": [0, 12], "x": 12, "y": 0},
327 {"x": 13, "y": 0}, 324 {"matrix": [0, 13], "x": 13, "y": 0},
328 {"x": 14, "y": 0}, 325 {"matrix": [4, 9], "x": 14, "y": 0},
329 326
330 {"x": 0, "y": 1, "w": 1.5}, 327 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
331 {"x": 1.5, "y": 1}, 328 {"matrix": [1, 1], "x": 1.5, "y": 1},
332 {"x": 2.5, "y": 1}, 329 {"matrix": [1, 2], "x": 2.5, "y": 1},
333 {"x": 3.5, "y": 1}, 330 {"matrix": [1, 3], "x": 3.5, "y": 1},
334 {"x": 4.5, "y": 1}, 331 {"matrix": [1, 4], "x": 4.5, "y": 1},
335 {"x": 5.5, "y": 1}, 332 {"matrix": [1, 5], "x": 5.5, "y": 1},
336 {"x": 6.5, "y": 1}, 333 {"matrix": [1, 6], "x": 6.5, "y": 1},
337 {"x": 7.5, "y": 1}, 334 {"matrix": [1, 7], "x": 7.5, "y": 1},
338 {"x": 8.5, "y": 1}, 335 {"matrix": [1, 8], "x": 8.5, "y": 1},
339 {"x": 9.5, "y": 1}, 336 {"matrix": [1, 9], "x": 9.5, "y": 1},
340 {"x": 10.5, "y": 1}, 337 {"matrix": [1, 10], "x": 10.5, "y": 1},
341 {"x": 11.5, "y": 1}, 338 {"matrix": [1, 11], "x": 11.5, "y": 1},
342 {"x": 12.5, "y": 1}, 339 {"matrix": [1, 12], "x": 12.5, "y": 1},
343 {"x": 13.5, "y": 1, "w": 1.5}, 340 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
344 341
345 {"x": 0, "y": 2, "w": 1.75}, 342 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
346 {"x": 1.75, "y": 2}, 343 {"matrix": [2, 1], "x": 1.75, "y": 2},
347 {"x": 2.75, "y": 2}, 344 {"matrix": [2, 2], "x": 2.75, "y": 2},
348 {"x": 3.75, "y": 2}, 345 {"matrix": [2, 3], "x": 3.75, "y": 2},
349 {"x": 4.75, "y": 2}, 346 {"matrix": [2, 4], "x": 4.75, "y": 2},
350 {"x": 5.75, "y": 2}, 347 {"matrix": [2, 5], "x": 5.75, "y": 2},
351 {"x": 6.75, "y": 2}, 348 {"matrix": [2, 6], "x": 6.75, "y": 2},
352 {"x": 7.75, "y": 2}, 349 {"matrix": [2, 7], "x": 7.75, "y": 2},
353 {"x": 8.75, "y": 2}, 350 {"matrix": [2, 8], "x": 8.75, "y": 2},
354 {"x": 9.75, "y": 2}, 351 {"matrix": [2, 9], "x": 9.75, "y": 2},
355 {"x": 10.75, "y": 2}, 352 {"matrix": [2, 10], "x": 10.75, "y": 2},
356 {"x": 11.75, "y": 2}, 353 {"matrix": [2, 11], "x": 11.75, "y": 2},
357 {"x": 12.75, "y": 2, "w": 2.25}, 354 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
358 355
359 {"x": 0, "y": 3, "w": 2.25}, 356 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
360 {"x": 2.25, "y": 3}, 357 {"matrix": [3, 2], "x": 2.25, "y": 3},
361 {"x": 3.25, "y": 3}, 358 {"matrix": [3, 3], "x": 3.25, "y": 3},
362 {"x": 4.25, "y": 3}, 359 {"matrix": [3, 4], "x": 4.25, "y": 3},
363 {"x": 5.25, "y": 3}, 360 {"matrix": [3, 5], "x": 5.25, "y": 3},
364 {"x": 6.25, "y": 3}, 361 {"matrix": [3, 6], "x": 6.25, "y": 3},
365 {"x": 7.25, "y": 3}, 362 {"matrix": [3, 7], "x": 7.25, "y": 3},
366 {"x": 8.25, "y": 3}, 363 {"matrix": [3, 8], "x": 8.25, "y": 3},
367 {"x": 9.25, "y": 3}, 364 {"matrix": [3, 9], "x": 9.25, "y": 3},
368 {"x": 10.25, "y": 3}, 365 {"matrix": [3, 10], "x": 10.25, "y": 3},
369 {"x": 11.25, "y": 3}, 366 {"matrix": [3, 11], "x": 11.25, "y": 3},
370 {"x": 12.25, "y": 3, "w": 1.75}, 367 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
371 {"x": 14, "y": 3}, 368 {"matrix": [3, 12], "x": 14, "y": 3},
372 369
373 {"x": 0, "y": 4, "w": 1.5}, 370 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
374 {"x": 1.5, "y": 4}, 371 {"matrix": [4, 1], "x": 1.5, "y": 4},
375 {"x": 2.5, "y": 4, "w": 1.5}, 372 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
376 {"x": 4, "y": 4, "w": 6}, 373 {"matrix": [4, 5], "x": 4, "y": 4, "w": 6},
377 {"x": 10, "y": 4, "w": 1.5}, 374 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
378 {"x": 11.5, "y": 4}, 375 {"matrix": [4, 11], "x": 11.5, "y": 4},
379 {"x": 12.5, "y": 4}, 376 {"matrix": [4, 12], "x": 12.5, "y": 4},
380 {"x": 13.5, "y": 4, "w": 1.5} 377 {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
381 ] 378 ]
382 }, 379 },
383 "LAYOUT_60_ansi_split_rshift": { 380 "LAYOUT_60_ansi_split_rshift": {
384 "layout": [ 381 "layout": [
385 {"x": 0, "y": 0}, 382 {"matrix": [0, 0], "x": 0, "y": 0},
386 {"x": 1, "y": 0}, 383 {"matrix": [0, 1], "x": 1, "y": 0},
387 {"x": 2, "y": 0}, 384 {"matrix": [0, 2], "x": 2, "y": 0},
388 {"x": 3, "y": 0}, 385 {"matrix": [0, 3], "x": 3, "y": 0},
389 {"x": 4, "y": 0}, 386 {"matrix": [0, 4], "x": 4, "y": 0},
390 {"x": 5, "y": 0}, 387 {"matrix": [0, 5], "x": 5, "y": 0},
391 {"x": 6, "y": 0}, 388 {"matrix": [0, 6], "x": 6, "y": 0},
392 {"x": 7, "y": 0}, 389 {"matrix": [0, 7], "x": 7, "y": 0},
393 {"x": 8, "y": 0}, 390 {"matrix": [0, 8], "x": 8, "y": 0},
394 {"x": 9, "y": 0}, 391 {"matrix": [0, 9], "x": 9, "y": 0},
395 {"x": 10, "y": 0}, 392 {"matrix": [0, 10], "x": 10, "y": 0},
396 {"x": 11, "y": 0}, 393 {"matrix": [0, 11], "x": 11, "y": 0},
397 {"x": 12, "y": 0}, 394 {"matrix": [0, 12], "x": 12, "y": 0},
398 {"x": 13, "y": 0, "w": 2}, 395 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
399 396
400 {"x": 0, "y": 1, "w": 1.5}, 397 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
401 {"x": 1.5, "y": 1}, 398 {"matrix": [1, 1], "x": 1.5, "y": 1},
402 {"x": 2.5, "y": 1}, 399 {"matrix": [1, 2], "x": 2.5, "y": 1},
403 {"x": 3.5, "y": 1}, 400 {"matrix": [1, 3], "x": 3.5, "y": 1},
404 {"x": 4.5, "y": 1}, 401 {"matrix": [1, 4], "x": 4.5, "y": 1},
405 {"x": 5.5, "y": 1}, 402 {"matrix": [1, 5], "x": 5.5, "y": 1},
406 {"x": 6.5, "y": 1}, 403 {"matrix": [1, 6], "x": 6.5, "y": 1},
407 {"x": 7.5, "y": 1}, 404 {"matrix": [1, 7], "x": 7.5, "y": 1},
408 {"x": 8.5, "y": 1}, 405 {"matrix": [1, 8], "x": 8.5, "y": 1},
409 {"x": 9.5, "y": 1}, 406 {"matrix": [1, 9], "x": 9.5, "y": 1},
410 {"x": 10.5, "y": 1}, 407 {"matrix": [1, 10], "x": 10.5, "y": 1},
411 {"x": 11.5, "y": 1}, 408 {"matrix": [1, 11], "x": 11.5, "y": 1},
412 {"x": 12.5, "y": 1}, 409 {"matrix": [1, 12], "x": 12.5, "y": 1},
413 {"x": 13.5, "y": 1, "w": 1.5}, 410 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
414 411
415 {"x": 0, "y": 2, "w": 1.75}, 412 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
416 {"x": 1.75, "y": 2}, 413 {"matrix": [2, 1], "x": 1.75, "y": 2},
417 {"x": 2.75, "y": 2}, 414 {"matrix": [2, 2], "x": 2.75, "y": 2},
418 {"x": 3.75, "y": 2}, 415 {"matrix": [2, 3], "x": 3.75, "y": 2},
419 {"x": 4.75, "y": 2}, 416 {"matrix": [2, 4], "x": 4.75, "y": 2},
420 {"x": 5.75, "y": 2}, 417 {"matrix": [2, 5], "x": 5.75, "y": 2},
421 {"x": 6.75, "y": 2}, 418 {"matrix": [2, 6], "x": 6.75, "y": 2},
422 {"x": 7.75, "y": 2}, 419 {"matrix": [2, 7], "x": 7.75, "y": 2},
423 {"x": 8.75, "y": 2}, 420 {"matrix": [2, 8], "x": 8.75, "y": 2},
424 {"x": 9.75, "y": 2}, 421 {"matrix": [2, 9], "x": 9.75, "y": 2},
425 {"x": 10.75, "y": 2}, 422 {"matrix": [2, 10], "x": 10.75, "y": 2},
426 {"x": 11.75, "y": 2}, 423 {"matrix": [2, 11], "x": 11.75, "y": 2},
427 {"x": 12.75, "y": 2, "w": 2.25}, 424 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
428 425
429 {"x": 0, "y": 3, "w": 2.25}, 426 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
430 {"x": 2.25, "y": 3}, 427 {"matrix": [3, 2], "x": 2.25, "y": 3},
431 {"x": 3.25, "y": 3}, 428 {"matrix": [3, 3], "x": 3.25, "y": 3},
432 {"x": 4.25, "y": 3}, 429 {"matrix": [3, 4], "x": 4.25, "y": 3},
433 {"x": 5.25, "y": 3}, 430 {"matrix": [3, 5], "x": 5.25, "y": 3},
434 {"x": 6.25, "y": 3}, 431 {"matrix": [3, 6], "x": 6.25, "y": 3},
435 {"x": 7.25, "y": 3}, 432 {"matrix": [3, 7], "x": 7.25, "y": 3},
436 {"x": 8.25, "y": 3}, 433 {"matrix": [3, 8], "x": 8.25, "y": 3},
437 {"x": 9.25, "y": 3}, 434 {"matrix": [3, 9], "x": 9.25, "y": 3},
438 {"x": 10.25, "y": 3}, 435 {"matrix": [3, 10], "x": 10.25, "y": 3},
439 {"x": 11.25, "y": 3}, 436 {"matrix": [3, 11], "x": 11.25, "y": 3},
440 {"x": 12.25, "y": 3, "w": 1.75}, 437 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
441 {"x": 14, "y": 3}, 438 {"matrix": [3, 12], "x": 14, "y": 3},
442 439
443 {"x": 0, "y": 4, "w": 1.25}, 440 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
444 {"x": 1.25, "y": 4, "w": 1.25}, 441 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
445 {"x": 2.5, "y": 4, "w": 1.25}, 442 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
446 {"x": 3.75, "y": 4, "w": 6.25}, 443 {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
447 {"x": 10, "y": 4, "w": 1.25}, 444 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
448 {"x": 11.25, "y": 4, "w": 1.25}, 445 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
449 {"x": 12.5, "y": 4, "w": 1.25}, 446 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
450 {"x": 13.75, "y": 4, "w": 1.25} 447 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
451 ] 448 ]
452 }, 449 },
453 "LAYOUT_60_abnt2": { 450 "LAYOUT_60_abnt2": {
454 "layout": [ 451 "layout": [
455 {"x": 0, "y": 0}, 452 {"matrix": [0, 0], "x": 0, "y": 0},
456 {"x": 1, "y": 0}, 453 {"matrix": [0, 1], "x": 1, "y": 0},
457 {"x": 2, "y": 0}, 454 {"matrix": [0, 2], "x": 2, "y": 0},
458 {"x": 3, "y": 0}, 455 {"matrix": [0, 3], "x": 3, "y": 0},
459 {"x": 4, "y": 0}, 456 {"matrix": [0, 4], "x": 4, "y": 0},
460 {"x": 5, "y": 0}, 457 {"matrix": [0, 5], "x": 5, "y": 0},
461 {"x": 6, "y": 0}, 458 {"matrix": [0, 6], "x": 6, "y": 0},
462 {"x": 7, "y": 0}, 459 {"matrix": [0, 7], "x": 7, "y": 0},
463 {"x": 8, "y": 0}, 460 {"matrix": [0, 8], "x": 8, "y": 0},
464 {"x": 9, "y": 0}, 461 {"matrix": [0, 9], "x": 9, "y": 0},
465 {"x": 10, "y": 0}, 462 {"matrix": [0, 10], "x": 10, "y": 0},
466 {"x": 11, "y": 0}, 463 {"matrix": [0, 11], "x": 11, "y": 0},
467 {"x": 12, "y": 0}, 464 {"matrix": [0, 12], "x": 12, "y": 0},
468 {"x": 13, "y": 0, "w": 2}, 465 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
469 466
470 {"x": 0, "y": 1, "w": 1.5}, 467 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
471 {"x": 1.5, "y": 1}, 468 {"matrix": [1, 1], "x": 1.5, "y": 1},
472 {"x": 2.5, "y": 1}, 469 {"matrix": [1, 2], "x": 2.5, "y": 1},
473 {"x": 3.5, "y": 1}, 470 {"matrix": [1, 3], "x": 3.5, "y": 1},
474 {"x": 4.5, "y": 1}, 471 {"matrix": [1, 4], "x": 4.5, "y": 1},
475 {"x": 5.5, "y": 1}, 472 {"matrix": [1, 5], "x": 5.5, "y": 1},
476 {"x": 6.5, "y": 1}, 473 {"matrix": [1, 6], "x": 6.5, "y": 1},
477 {"x": 7.5, "y": 1}, 474 {"matrix": [1, 7], "x": 7.5, "y": 1},
478 {"x": 8.5, "y": 1}, 475 {"matrix": [1, 8], "x": 8.5, "y": 1},
479 {"x": 9.5, "y": 1}, 476 {"matrix": [1, 9], "x": 9.5, "y": 1},
480 {"x": 10.5, "y": 1}, 477 {"matrix": [1, 10], "x": 10.5, "y": 1},
481 {"x": 11.5, "y": 1}, 478 {"matrix": [1, 11], "x": 11.5, "y": 1},
482 {"x": 12.5, "y": 1}, 479 {"matrix": [1, 12], "x": 12.5, "y": 1},
483 480
484 {"x": 0, "y": 2, "w": 1.75}, 481 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
485 {"x": 1.75, "y": 2}, 482 {"matrix": [2, 1], "x": 1.75, "y": 2},
486 {"x": 2.75, "y": 2}, 483 {"matrix": [2, 2], "x": 2.75, "y": 2},
487 {"x": 3.75, "y": 2}, 484 {"matrix": [2, 3], "x": 3.75, "y": 2},
488 {"x": 4.75, "y": 2}, 485 {"matrix": [2, 4], "x": 4.75, "y": 2},
489 {"x": 5.75, "y": 2}, 486 {"matrix": [2, 5], "x": 5.75, "y": 2},
490 {"x": 6.75, "y": 2}, 487 {"matrix": [2, 6], "x": 6.75, "y": 2},
491 {"x": 7.75, "y": 2}, 488 {"matrix": [2, 7], "x": 7.75, "y": 2},
492 {"x": 8.75, "y": 2}, 489 {"matrix": [2, 8], "x": 8.75, "y": 2},
493 {"x": 9.75, "y": 2}, 490 {"matrix": [2, 9], "x": 9.75, "y": 2},
494 {"x": 10.75, "y": 2}, 491 {"matrix": [2, 10], "x": 10.75, "y": 2},
495 {"x": 11.75, "y": 2}, 492 {"matrix": [2, 11], "x": 11.75, "y": 2},
496 {"x": 12.75, "y": 2}, 493 {"matrix": [2, 12], "x": 12.75, "y": 2},
497 {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, 494 {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
498 495
499 {"x": 0, "y": 3, "w": 1.25}, 496 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
500 {"x": 1.25, "y": 3}, 497 {"matrix": [3, 1], "x": 1.25, "y": 3},
501 {"x": 2.25, "y": 3}, 498 {"matrix": [3, 2], "x": 2.25, "y": 3},
502 {"x": 3.25, "y": 3}, 499 {"matrix": [3, 3], "x": 3.25, "y": 3},
503 {"x": 4.25, "y": 3}, 500 {"matrix": [3, 4], "x": 4.25, "y": 3},
504 {"x": 5.25, "y": 3}, 501 {"matrix": [3, 5], "x": 5.25, "y": 3},
505 {"x": 6.25, "y": 3}, 502 {"matrix": [3, 6], "x": 6.25, "y": 3},
506 {"x": 7.25, "y": 3}, 503 {"matrix": [3, 7], "x": 7.25, "y": 3},
507 {"x": 8.25, "y": 3}, 504 {"matrix": [3, 8], "x": 8.25, "y": 3},
508 {"x": 9.25, "y": 3}, 505 {"matrix": [3, 9], "x": 9.25, "y": 3},
509 {"x": 10.25, "y": 3}, 506 {"matrix": [3, 10], "x": 10.25, "y": 3},
510 {"x": 11.25, "y": 3}, 507 {"matrix": [3, 11], "x": 11.25, "y": 3},
511 {"x": 12.25, "y": 3}, 508 {"matrix": [3, 12], "x": 12.25, "y": 3},
512 {"x": 13.25, "y": 3, "w": 1.75}, 509 {"matrix": [3, 13], "x": 13.25, "y": 3, "w": 1.75},
513 510
514 {"x": 0, "y": 4, "w": 1.25}, 511 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
515 {"x": 1.25, "y": 4, "w": 1.25}, 512 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
516 {"x": 2.5, "y": 4, "w": 1.25}, 513 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
517 {"x": 3.75, "y": 4, "w": 6.25}, 514 {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
518 {"x": 10, "y": 4, "w": 1.25}, 515 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
519 {"x": 11.25, "y": 4, "w": 1.25}, 516 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
520 {"x": 12.5, "y": 4, "w": 1.25}, 517 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
521 {"x": 13.75, "y": 4, "w": 1.25} 518 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
522 ] 519 ]
523 }, 520 },
524 "LAYOUT_60_tsangan_hhkb": { 521 "LAYOUT_60_tsangan_hhkb": {
525 "layout": [ 522 "layout": [
526 {"x": 0, "y": 0}, 523 {"matrix": [0, 0], "x": 0, "y": 0},
527 {"x": 1, "y": 0}, 524 {"matrix": [0, 1], "x": 1, "y": 0},
528 {"x": 2, "y": 0}, 525 {"matrix": [0, 2], "x": 2, "y": 0},
529 {"x": 3, "y": 0}, 526 {"matrix": [0, 3], "x": 3, "y": 0},
530 {"x": 4, "y": 0}, 527 {"matrix": [0, 4], "x": 4, "y": 0},
531 {"x": 5, "y": 0}, 528 {"matrix": [0, 5], "x": 5, "y": 0},
532 {"x": 6, "y": 0}, 529 {"matrix": [0, 6], "x": 6, "y": 0},
533 {"x": 7, "y": 0}, 530 {"matrix": [0, 7], "x": 7, "y": 0},
534 {"x": 8, "y": 0}, 531 {"matrix": [0, 8], "x": 8, "y": 0},
535 {"x": 9, "y": 0}, 532 {"matrix": [0, 9], "x": 9, "y": 0},
536 {"x": 10, "y": 0}, 533 {"matrix": [0, 10], "x": 10, "y": 0},
537 {"x": 11, "y": 0}, 534 {"matrix": [0, 11], "x": 11, "y": 0},
538 {"x": 12, "y": 0}, 535 {"matrix": [0, 12], "x": 12, "y": 0},
539 {"x": 13, "y": 0}, 536 {"matrix": [0, 13], "x": 13, "y": 0},
540 {"x": 14, "y": 0}, 537 {"matrix": [4, 9], "x": 14, "y": 0},
541 538
542 {"x": 0, "y": 1, "w": 1.5}, 539 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
543 {"x": 1.5, "y": 1}, 540 {"matrix": [1, 1], "x": 1.5, "y": 1},
544 {"x": 2.5, "y": 1}, 541 {"matrix": [1, 2], "x": 2.5, "y": 1},
545 {"x": 3.5, "y": 1}, 542 {"matrix": [1, 3], "x": 3.5, "y": 1},
546 {"x": 4.5, "y": 1}, 543 {"matrix": [1, 4], "x": 4.5, "y": 1},
547 {"x": 5.5, "y": 1}, 544 {"matrix": [1, 5], "x": 5.5, "y": 1},
548 {"x": 6.5, "y": 1}, 545 {"matrix": [1, 6], "x": 6.5, "y": 1},
549 {"x": 7.5, "y": 1}, 546 {"matrix": [1, 7], "x": 7.5, "y": 1},
550 {"x": 8.5, "y": 1}, 547 {"matrix": [1, 8], "x": 8.5, "y": 1},
551 {"x": 9.5, "y": 1}, 548 {"matrix": [1, 9], "x": 9.5, "y": 1},
552 {"x": 10.5, "y": 1}, 549 {"matrix": [1, 10], "x": 10.5, "y": 1},
553 {"x": 11.5, "y": 1}, 550 {"matrix": [1, 11], "x": 11.5, "y": 1},
554 {"x": 12.5, "y": 1}, 551 {"matrix": [1, 12], "x": 12.5, "y": 1},
555 {"x": 13.5, "y": 1, "w": 1.5}, 552 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
556 553
557 {"x": 0, "y": 2, "w": 1.75}, 554 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
558 {"x": 1.75, "y": 2}, 555 {"matrix": [2, 1], "x": 1.75, "y": 2},
559 {"x": 2.75, "y": 2}, 556 {"matrix": [2, 2], "x": 2.75, "y": 2},
560 {"x": 3.75, "y": 2}, 557 {"matrix": [2, 3], "x": 3.75, "y": 2},
561 {"x": 4.75, "y": 2}, 558 {"matrix": [2, 4], "x": 4.75, "y": 2},
562 {"x": 5.75, "y": 2}, 559 {"matrix": [2, 5], "x": 5.75, "y": 2},
563 {"x": 6.75, "y": 2}, 560 {"matrix": [2, 6], "x": 6.75, "y": 2},
564 {"x": 7.75, "y": 2}, 561 {"matrix": [2, 7], "x": 7.75, "y": 2},
565 {"x": 8.75, "y": 2}, 562 {"matrix": [2, 8], "x": 8.75, "y": 2},
566 {"x": 9.75, "y": 2}, 563 {"matrix": [2, 9], "x": 9.75, "y": 2},
567 {"x": 10.75, "y": 2}, 564 {"matrix": [2, 10], "x": 10.75, "y": 2},
568 {"x": 11.75, "y": 2}, 565 {"matrix": [2, 11], "x": 11.75, "y": 2},
569 {"x": 12.75, "y": 2, "w": 2.25}, 566 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
570 567
571 {"x": 0, "y": 3, "w": 2.25}, 568 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
572 {"x": 2.25, "y": 3}, 569 {"matrix": [3, 2], "x": 2.25, "y": 3},
573 {"x": 3.25, "y": 3}, 570 {"matrix": [3, 3], "x": 3.25, "y": 3},
574 {"x": 4.25, "y": 3}, 571 {"matrix": [3, 4], "x": 4.25, "y": 3},
575 {"x": 5.25, "y": 3}, 572 {"matrix": [3, 5], "x": 5.25, "y": 3},
576 {"x": 6.25, "y": 3}, 573 {"matrix": [3, 6], "x": 6.25, "y": 3},
577 {"x": 7.25, "y": 3}, 574 {"matrix": [3, 7], "x": 7.25, "y": 3},
578 {"x": 8.25, "y": 3}, 575 {"matrix": [3, 8], "x": 8.25, "y": 3},
579 {"x": 9.25, "y": 3}, 576 {"matrix": [3, 9], "x": 9.25, "y": 3},
580 {"x": 10.25, "y": 3}, 577 {"matrix": [3, 10], "x": 10.25, "y": 3},
581 {"x": 11.25, "y": 3}, 578 {"matrix": [3, 11], "x": 11.25, "y": 3},
582 {"x": 12.25, "y": 3, "w": 1.75}, 579 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
583 {"x": 14, "y": 3}, 580 {"matrix": [3, 12], "x": 14, "y": 3},
584 581
585 {"x": 0, "y": 4, "w": 1.5}, 582 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
586 {"x": 1.5, "y": 4}, 583 {"matrix": [4, 1], "x": 1.5, "y": 4},
587 {"x": 2.5, "y": 4, "w": 1.5}, 584 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
588 {"x": 4, "y": 4, "w": 7}, 585 {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
589 {"x": 11, "y": 4, "w": 1.5}, 586 {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
590 {"x": 12.5, "y": 4}, 587 {"matrix": [4, 12], "x": 12.5, "y": 4},
591 {"x": 13.5, "y": 4, "w": 1.5} 588 {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
592 ] 589 ]
593 } 590 }
594 } 591 }
diff --git a/keyboards/gh60/revc/revc.h b/keyboards/gh60/revc/revc.h
index a94322ad72..0ddc9aa344 100644
--- a/keyboards/gh60/revc/revc.h
+++ b/keyboards/gh60/revc/revc.h
@@ -23,136 +23,3 @@ static inline void gh60_poker_leds_off(void) { setPinInput(F4); }
23static inline void gh60_fn_led_off(void) { setPinInput(F5); } 23static inline void gh60_fn_led_off(void) { setPinInput(F5); }
24static inline void gh60_esc_led_off(void) { setPinInput(F6); } 24static inline void gh60_esc_led_off(void) { setPinInput(F6); }
25static inline void gh60_wasd_leds_off(void) { setPinInput(F7); } 25static inline void gh60_wasd_leds_off(void) { setPinInput(F7); }
26
27/* GH60 keymap definition macro
28 * K2C, K31 and K3C are extra keys for ISO
29 */
30#define LAYOUT_all( \
31 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K49, \
32 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
33 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
34 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \
35 K40, K41, K42, K45, K4A, K4B, K4C, K4D \
36) { \
37 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
38 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
39 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
40 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
41 { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, K4B, K4C, K4D } \
42}
43
44#define LAYOUT( \
45 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
46 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
47 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
48 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
49 K40, K41, K42, K45, K49, K4A, K4B, K4C, K4D \
50) { \
51 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
52 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
53 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
54 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
55 { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, K4B, K4C, K4D } \
56}
57
58/* ANSI variant. No extra keys for ISO */
59#define LAYOUT_60_ansi( \
60 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
61 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
62 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
63 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
64 K40, K41, K42, K45, K4A, K4B, K4C, K4D \
65) { \
66 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
67 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
68 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D }, \
69 { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D }, \
70 { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D } \
71}
72
73/* ISO variant. Remove useless ANSI keys */
74#define LAYOUT_60_iso( \
75 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
76 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
77 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
78 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
79 K40, K41, K42, K45, K4A, K4B, K4C, K4D \
80) { \
81 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
82 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO }, \
83 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
84 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D }, \
85 { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D } \
86}
87
88
89/* HHKB Variant */
90#define LAYOUT_60_ansi_split_bs_rshift( \
91 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K49,\
92 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
93 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
94 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \
95 K40, K41, K42, K45, K4A, K4B, K4C, K4D \
96) { \
97 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
98 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
99 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D }, \
100 { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
101 { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, K4B, K4C, K4D } \
102}
103
104/* ANSI with split Right Shift. No extra keys for ISO */
105#define LAYOUT_60_ansi_split_rshift( \
106 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
107 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
108 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
109 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \
110 K40, K41, K42, K45, K4A, K4B, K4C, K4D \
111) { \
112 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
113 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
114 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D }, \
115 { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
116 { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D } \
117}
118
119/* LAYOUT_60_abnt2
120 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
121 * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │
122 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
123 * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │ │
124 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐2d │
125 * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │ │
126 * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤
127 * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │ 3d │
128 * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬──┴─┬────┤
129 * │40 │41 │42 │45 │4a │4b │4c │4d │
130 * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
131*/
132#define LAYOUT_60_abnt2( \
133 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
134 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
135 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
136 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
137 K40, K41, K42, K45, K4A, K4B,K4C, K4D \
138) { \
139 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
140 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO }, \
141 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
142 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
143 { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D } \
144}
145
146#define LAYOUT_60_tsangan_hhkb( \
147 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K49,\
148 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
149 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
150 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \
151 K40, K41, K42, K45, K4B, K4C, K4D \
152) { \
153 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
154 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
155 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D }, \
156 { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
157 { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, KC_NO, K4B, K4C, K4D } \
158}
diff --git a/keyboards/giabalanai/giabalanai.h b/keyboards/giabalanai/giabalanai.h
index df4759f00f..199dac37d9 100644
--- a/keyboards/giabalanai/giabalanai.h
+++ b/keyboards/giabalanai/giabalanai.h
@@ -18,70 +18,6 @@
18 18
19#include "quantum.h" 19#include "quantum.h"
20 20
21/* This is a shortcut to help you visually see your layout.
22 *
23 * The first section contains all of the arguments representing the physical
24 * layout of the board and position of the keys.
25 *
26 * The second converts the arguments into a two-dimensional array which
27 * represents the switch matrix.
28 */
29#define LAYOUT( \
30 l00, l01, l02, l03, l04, l05, l06, l07, l08, l09, l0a, l0b, \
31 l10, l11, l12, l13, l14, l15, l16, l17, l18, l19, l1a, l1b, \
32 l20, l21, l22, l23, l24, l25, l26, l27, l28, l29, l2a, l2b, \
33 l30, l31, l32, l33, l34, l35, l36, l37, l38, l39, l3a, l3b, \
34 l40, l41, l42, l43, l44, l45, l46, l47, l48, l49, l4a, l4b, \
35 \
36 r20, \
37 r00, r01, r02, r03, r04, r05, r06, r07, r08, r09, r0a, r0b, renc, \
38 r10, r11, r12, r13, r14, r15, r16, r17, r18, r19, r1a, r1b, r1c, \
39 r21, r22, r23, r24, r25, r26, r27, r28, r29, r2a, r2b, r2c \
40) { \
41 { l00, l10, l20, l30, l40, l0b, l1b, l2b, l3b, l4b }, \
42 { l01, l11, l21, l31, l41, l0a, l1a, l2a, l3a, l4a }, \
43 { l02, l12, l22, l32, l42, l09, l19, l29, l39, l49 }, \
44 { l03, l13, l23, l33, l43, l08, l18, l28, l38, l48 }, \
45 { l04, l14, l24, l34, l44, l07, l17, l27, l37, l47 }, \
46 { l05, l15, l25, l35, l45, l06, l16, l26, l36, l46 }, \
47 \
48 { r00, r01, r02, r03, r04, r05, r06, KC_NO, KC_NO, KC_NO }, \
49 { r10, r11, r12, r13, r14, r15, r16, KC_NO, KC_NO, KC_NO }, \
50 { r20, r21, r22, r23, r24, r25, r26, KC_NO, KC_NO, KC_NO }, \
51 { KC_NO, renc, r0b, r0a, r09, r08, r07, KC_NO, KC_NO, KC_NO }, \
52 { KC_NO, r1c, r1b, r1a, r19, r18, r17, KC_NO, KC_NO, KC_NO }, \
53 { KC_NO, r2c, r2b, r2a, r29, r28, r27, KC_NO, KC_NO, KC_NO } \
54}
55
56#define LAYOUT_giabarinaix2( \
57 l00, l01, l02, l03, l04, l05, l06, l07, l08, l09, l0a, l0b, \
58 l10, l11, l12, l13, l14, l15, l16, l17, l18, l19, l1a, l1b, \
59 l20, l21, l22, l23, l24, l25, l26, l27, l28, l29, l2a, l2b, \
60 l30, l31, l32, l33, l34, l35, l36, l37, l38, l39, l3a, l3b, \
61 l40, l41, l42, l43, l44, l45, l46, l47, l48, l49, l4a, l4b, \
62 \
63 r00, r01, r02, r03, r04, r05, r06, r07, r08, r09, r0a, r0b, \
64 r10, r11, r12, r13, r14, r15, r16, r17, r18, r19, r1a, r1b, \
65 r20, r21, r22, r23, r24, r25, r26, r27, r28, r29, r2a, r2b, \
66 r30, r31, r32, r33, r34, r35, r36, r37, r38, r39, r3a, r3b, \
67 r40, r41, r42, r43, r44, r45, r46, r47, r48, r49, r4a, r4b \
68) { \
69 { l00, l10, l20, l30, l40, l0b, l1b, l2b, l3b, l4b }, \
70 { l01, l11, l21, l31, l41, l0a, l1a, l2a, l3a, l4a }, \
71 { l02, l12, l22, l32, l42, l09, l19, l29, l39, l49 }, \
72 { l03, l13, l23, l33, l43, l08, l18, l28, l38, l48 }, \
73 { l04, l14, l24, l34, l44, l07, l17, l27, l37, l47 }, \
74 { l05, l15, l25, l35, l45, l06, l16, l26, l36, l46 }, \
75 \
76 { r4b, r3b, r2b, r1b, r0b, r40, r30, r20, r10, r00 }, \
77 { r4a, r3a, r2a, r1a, r0a, r41, r31, r21, r11, r01 }, \
78 { r49, r39, r29, r19, r09, r42, r32, r22, r12, r02 }, \
79 { r48, r38, r28, r18, r08, r43, r33, r23, r13, r03 }, \
80 { r47, r37, r27, r17, r07, r44, r34, r24, r14, r04 }, \
81 { r46, r36, r26, r16, r06, r45, r35, r25, r15, r05 } \
82}
83
84
85#define _________________QWERTY_L1_________________ KC_Q, KC_W, KC_E, KC_R, KC_T 21#define _________________QWERTY_L1_________________ KC_Q, KC_W, KC_E, KC_R, KC_T
86#define _________________QWERTY_L2_________________ KC_A, KC_S, KC_D, KC_F, KC_G 22#define _________________QWERTY_L2_________________ KC_A, KC_S, KC_D, KC_F, KC_G
87#define _________________QWERTY_L3_________________ KC_Z, KC_X, KC_C, KC_V, KC_B 23#define _________________QWERTY_L3_________________ KC_Z, KC_X, KC_C, KC_V, KC_B
diff --git a/keyboards/giabalanai/info.json b/keyboards/giabalanai/info.json
index f8962415cb..e572e8f36d 100644
--- a/keyboards/giabalanai/info.json
+++ b/keyboards/giabalanai/info.json
@@ -54,115 +54,239 @@
54 "bootloader": "caterina", 54 "bootloader": "caterina",
55 "layouts": { 55 "layouts": {
56 "LAYOUT": { 56 "LAYOUT": {
57 "layout": [ 57 "layout": [
58 {"label": "l00", "x": 0, "y": 0}, 58 {"matrix": [0, 0], "x": 0, "y": 0},
59 {"label": "l01", "x": 1, "y": 0}, 59 {"matrix": [1, 0], "x": 1, "y": 0},
60 {"label": "l02", "x": 2, "y": 0}, 60 {"matrix": [2, 0], "x": 2, "y": 0},
61 {"label": "l03", "x": 3, "y": 0}, 61 {"matrix": [3, 0], "x": 3, "y": 0},
62 {"label": "l04", "x": 4, "y": 0}, 62 {"matrix": [4, 0], "x": 4, "y": 0},
63 {"label": "l05", "x": 5, "y": 0}, 63 {"matrix": [5, 0], "x": 5, "y": 0},
64 {"label": "l06", "x": 6, "y": 0}, 64 {"matrix": [5, 5], "x": 6, "y": 0},
65 {"label": "l07", "x": 7, "y": 0}, 65 {"matrix": [4, 5], "x": 7, "y": 0},
66 {"label": "l08", "x": 8, "y": 0}, 66 {"matrix": [3, 5], "x": 8, "y": 0},
67 {"label": "l09", "x": 9, "y": 0}, 67 {"matrix": [2, 5], "x": 9, "y": 0},
68 {"label": "l0a", "x": 10, "y": 0}, 68 {"matrix": [1, 5], "x": 10, "y": 0},
69 {"label": "l0b", "x": 11, "y": 0}, 69 {"matrix": [0, 5], "x": 11, "y": 0},
70 70
71 {"label": "l10", "x": 0.5, "y": 1}, 71 {"matrix": [0, 1], "x": 0.5, "y": 1},
72 {"label": "l11", "x": 1.5, "y": 1}, 72 {"matrix": [1, 1], "x": 1.5, "y": 1},
73 {"label": "l12", "x": 2.5, "y": 1}, 73 {"matrix": [2, 1], "x": 2.5, "y": 1},
74 {"label": "l13", "x": 3.5, "y": 1}, 74 {"matrix": [3, 1], "x": 3.5, "y": 1},
75 {"label": "l14", "x": 4.5, "y": 1}, 75 {"matrix": [4, 1], "x": 4.5, "y": 1},
76 {"label": "l15", "x": 5.5, "y": 1}, 76 {"matrix": [5, 1], "x": 5.5, "y": 1},
77 {"label": "l16", "x": 6.5, "y": 1}, 77 {"matrix": [5, 6], "x": 6.5, "y": 1},
78 {"label": "l17", "x": 7.5, "y": 1}, 78 {"matrix": [4, 6], "x": 7.5, "y": 1},
79 {"label": "l18", "x": 8.5, "y": 1}, 79 {"matrix": [3, 6], "x": 8.5, "y": 1},
80 {"label": "l19", "x": 9.5, "y": 1}, 80 {"matrix": [2, 6], "x": 9.5, "y": 1},
81 {"label": "l1a", "x": 10.5, "y": 1}, 81 {"matrix": [1, 6], "x": 10.5, "y": 1},
82 {"label": "l1b", "x": 11.5, "y": 1}, 82 {"matrix": [0, 6], "x": 11.5, "y": 1},
83 83
84 {"label": "r20", "x": 14.5, "y": 1}, 84 {"matrix": [0, 2], "x": 14.5, "y": 1},
85 85
86 {"label": "l20", "x": 1, "y": 2}, 86 {"matrix": [1, 2], "x": 1, "y": 2},
87 {"label": "l21", "x": 2, "y": 2}, 87 {"matrix": [2, 2], "x": 2, "y": 2},
88 {"label": "l22", "x": 3, "y": 2}, 88 {"matrix": [3, 2], "x": 3, "y": 2},
89 {"label": "l23", "x": 4, "y": 2}, 89 {"matrix": [4, 2], "x": 4, "y": 2},
90 {"label": "l24", "x": 5, "y": 2}, 90 {"matrix": [5, 2], "x": 5, "y": 2},
91 {"label": "l25", "x": 6, "y": 2}, 91 {"matrix": [5, 7], "x": 6, "y": 2},
92 {"label": "l26", "x": 7, "y": 2}, 92 {"matrix": [4, 7], "x": 7, "y": 2},
93 {"label": "l27", "x": 8, "y": 2}, 93 {"matrix": [3, 7], "x": 8, "y": 2},
94 {"label": "l28", "x": 9, "y": 2}, 94 {"matrix": [2, 7], "x": 9, "y": 2},
95 {"label": "l29", "x": 10, "y": 2}, 95 {"matrix": [1, 7], "x": 10, "y": 2},
96 {"label": "l2a", "x": 11, "y": 2}, 96 {"matrix": [0, 7], "x": 11, "y": 2},
97 {"label": "l2b", "x": 12, "y": 2}, 97 {"matrix": [0, 3], "x": 12, "y": 2},
98 98
99 {"label": "r00", "x": 15, "y": 2}, 99 {"matrix": [1, 3], "x": 15, "y": 2},
100 {"label": "r01", "x": 16, "y": 2}, 100 {"matrix": [2, 3], "x": 16, "y": 2},
101 {"label": "r02", "x": 17, "y": 2}, 101 {"matrix": [3, 3], "x": 17, "y": 2},
102 {"label": "r03", "x": 18, "y": 2}, 102 {"matrix": [4, 3], "x": 18, "y": 2},
103 {"label": "r04", "x": 19, "y": 2}, 103 {"matrix": [5, 3], "x": 19, "y": 2},
104 {"label": "r05", "x": 20, "y": 2}, 104 {"matrix": [5, 8], "x": 20, "y": 2},
105 {"label": "r06", "x": 21, "y": 2}, 105 {"matrix": [4, 8], "x": 21, "y": 2},
106 {"label": "r07", "x": 22, "y": 2}, 106 {"matrix": [3, 8], "x": 22, "y": 2},
107 {"label": "r08", "x": 23, "y": 2}, 107 {"matrix": [2, 8], "x": 23, "y": 2},
108 {"label": "r09", "x": 24, "y": 2}, 108 {"matrix": [1, 8], "x": 24, "y": 2},
109 {"label": "r0a", "x": 25, "y": 2}, 109 {"matrix": [0, 8], "x": 25, "y": 2},
110 {"label": "r0b", "x": 26, "y": 2}, 110 {"matrix": [0, 4], "x": 26, "y": 2},
111 111
112 {"label": "renc", "x": 27.5, "y": 2}, 112 {"matrix": [1, 4], "x": 27.5, "y": 2},
113 113
114 {"label": "l30", "x": 1.5, "y": 3}, 114 {"matrix": [2, 4], "x": 1.5, "y": 3},
115 {"label": "l31", "x": 2.5, "y": 3}, 115 {"matrix": [3, 4], "x": 2.5, "y": 3},
116 {"label": "l32", "x": 3.5, "y": 3}, 116 {"matrix": [4, 4], "x": 3.5, "y": 3},
117 {"label": "l33", "x": 4.5, "y": 3}, 117 {"matrix": [5, 4], "x": 4.5, "y": 3},
118 {"label": "l34", "x": 5.5, "y": 3}, 118 {"matrix": [5, 9], "x": 5.5, "y": 3},
119 {"label": "l35", "x": 6.5, "y": 3}, 119 {"matrix": [4, 9], "x": 6.5, "y": 3},
120 {"label": "l36", "x": 7.5, "y": 3}, 120 {"matrix": [3, 9], "x": 7.5, "y": 3},
121 {"label": "l37", "x": 8.5, "y": 3}, 121 {"matrix": [2, 9], "x": 8.5, "y": 3},
122 {"label": "l38", "x": 9.5, "y": 3}, 122 {"matrix": [1, 9], "x": 9.5, "y": 3},
123 {"label": "l39", "x": 10.5, "y": 3}, 123 {"matrix": [0, 9], "x": 10.5, "y": 3},
124 {"label": "l3a", "x": 11.5, "y": 3}, 124 {"matrix": [8, 0], "x": 11.5, "y": 3},
125 {"label": "l3b", "x": 12.5, "y": 3}, 125 {"matrix": [6, 0], "x": 12.5, "y": 3},
126 126
127 {"label": "r10", "x": 14.5, "y": 3}, 127 {"matrix": [6, 1], "x": 14.5, "y": 3},
128 {"label": "r11", "x": 15.5, "y": 3}, 128 {"matrix": [6, 2], "x": 15.5, "y": 3},
129 {"label": "r12", "x": 16.5, "y": 3}, 129 {"matrix": [6, 3], "x": 16.5, "y": 3},
130 {"label": "r13", "x": 17.5, "y": 3}, 130 {"matrix": [6, 4], "x": 17.5, "y": 3},
131 {"label": "r14", "x": 18.5, "y": 3}, 131 {"matrix": [6, 5], "x": 18.5, "y": 3},
132 {"label": "r15", "x": 19.5, "y": 3}, 132 {"matrix": [6, 6], "x": 19.5, "y": 3},
133 {"label": "r16", "x": 20.5, "y": 3}, 133 {"matrix": [9, 6], "x": 20.5, "y": 3},
134 {"label": "r17", "x": 21.5, "y": 3}, 134 {"matrix": [9, 5], "x": 21.5, "y": 3},
135 {"label": "r18", "x": 22.5, "y": 3}, 135 {"matrix": [9, 4], "x": 22.5, "y": 3},
136 {"label": "r19", "x": 23.5, "y": 3}, 136 {"matrix": [9, 3], "x": 23.5, "y": 3},
137 {"label": "r1a", "x": 24.5, "y": 3}, 137 {"matrix": [9, 2], "x": 24.5, "y": 3},
138 {"label": "r1b", "x": 25.5, "y": 3}, 138 {"matrix": [9, 1], "x": 25.5, "y": 3},
139 {"label": "r1c", "x": 26.5, "y": 3}, 139 {"matrix": [7, 0], "x": 26.5, "y": 3},
140 140
141 {"label": "l40", "x": 2, "y": 4}, 141 {"matrix": [7, 1], "x": 2, "y": 4},
142 {"label": "l41", "x": 3, "y": 4}, 142 {"matrix": [7, 2], "x": 3, "y": 4},
143 {"label": "l42", "x": 4, "y": 4}, 143 {"matrix": [7, 3], "x": 4, "y": 4},
144 {"label": "l43", "x": 5, "y": 4}, 144 {"matrix": [7, 4], "x": 5, "y": 4},
145 {"label": "l44", "x": 6, "y": 4}, 145 {"matrix": [7, 5], "x": 6, "y": 4},
146 {"label": "l45", "x": 7, "y": 4}, 146 {"matrix": [7, 6], "x": 7, "y": 4},
147 {"label": "l46", "x": 8, "y": 4}, 147 {"matrix": [10, 6], "x": 8, "y": 4},
148 {"label": "l47", "x": 9, "y": 4}, 148 {"matrix": [10, 5], "x": 9, "y": 4},
149 {"label": "l48", "x": 10, "y": 4}, 149 {"matrix": [10, 4], "x": 10, "y": 4},
150 {"label": "l49", "x": 11, "y": 4}, 150 {"matrix": [10, 3], "x": 11, "y": 4},
151 {"label": "l4a", "x": 12, "y": 4}, 151 {"matrix": [10, 2], "x": 12, "y": 4},
152 {"label": "l4b", "x": 13, "y": 4}, 152 {"matrix": [10, 1], "x": 13, "y": 4},
153 153
154 {"label": "r21", "x": 15, "y": 4}, 154 {"matrix": [8, 1], "x": 15, "y": 4},
155 {"label": "r22", "x": 16, "y": 4}, 155 {"matrix": [8, 2], "x": 16, "y": 4},
156 {"label": "r23", "x": 17, "y": 4}, 156 {"matrix": [8, 3], "x": 17, "y": 4},
157 {"label": "r24", "x": 18, "y": 4}, 157 {"matrix": [8, 4], "x": 18, "y": 4},
158 {"label": "r25", "x": 19, "y": 4}, 158 {"matrix": [8, 5], "x": 19, "y": 4},
159 {"label": "r26", "x": 20, "y": 4}, 159 {"matrix": [8, 6], "x": 20, "y": 4},
160 {"label": "r27", "x": 21, "y": 4}, 160 {"matrix": [11, 6], "x": 21, "y": 4},
161 {"label": "r28", "x": 22, "y": 4}, 161 {"matrix": [11, 5], "x": 22, "y": 4},
162 {"label": "r29", "x": 23, "y": 4}, 162 {"matrix": [11, 4], "x": 23, "y": 4},
163 {"label": "r2a", "x": 24, "y": 4}, 163 {"matrix": [11, 3], "x": 24, "y": 4},
164 {"label": "r2b", "x": 25, "y": 4}, 164 {"matrix": [11, 2], "x": 25, "y": 4},
165 {"label": "r2c", "x": 26, "y": 4} 165 {"matrix": [11, 1], "x": 26, "y": 4}
166 ]
167 },
168 "LAYOUT_giabarinaix2": {
169 "layout": [
170 {"matrix": [0, 0], "x": 0, "y": 0},
171 {"matrix": [1, 0], "x": 1, "y": 0},
172 {"matrix": [2, 0], "x": 2, "y": 0},
173 {"matrix": [3, 0], "x": 3, "y": 0},
174 {"matrix": [4, 0], "x": 4, "y": 0},
175 {"matrix": [5, 0], "x": 5, "y": 0},
176 {"matrix": [5, 5], "x": 6, "y": 0},
177 {"matrix": [4, 5], "x": 7, "y": 0},
178 {"matrix": [3, 5], "x": 8, "y": 0},
179 {"matrix": [2, 5], "x": 9, "y": 0},
180 {"matrix": [1, 5], "x": 10, "y": 0},
181 {"matrix": [0, 5], "x": 11, "y": 0},
182 {"matrix": [0, 1], "x": 12, "y": 0},
183 {"matrix": [1, 1], "x": 13, "y": 0},
184 {"matrix": [2, 1], "x": 14, "y": 0},
185 {"matrix": [3, 1], "x": 15, "y": 0},
186 {"matrix": [4, 1], "x": 16, "y": 0},
187 {"matrix": [5, 1], "x": 17, "y": 0},
188 {"matrix": [5, 6], "x": 18, "y": 0},
189 {"matrix": [4, 6], "x": 19, "y": 0},
190 {"matrix": [3, 6], "x": 20, "y": 0},
191 {"matrix": [2, 6], "x": 21, "y": 0},
192 {"matrix": [1, 6], "x": 22, "y": 0},
193 {"matrix": [0, 6], "x": 23, "y": 0},
194 {"matrix": [0, 2], "x": 24, "y": 0},
195 {"matrix": [1, 2], "x": 25, "y": 0},
196 {"matrix": [2, 2], "x": 26, "y": 0},
197 {"matrix": [3, 2], "x": 27, "y": 0},
198 {"matrix": [4, 2], "x": 28, "y": 0},
199 {"matrix": [5, 2], "x": 29, "y": 0},
200 {"matrix": [5, 7], "x": 30, "y": 0},
201 {"matrix": [4, 7], "x": 31, "y": 0},
202 {"matrix": [3, 7], "x": 32, "y": 0},
203 {"matrix": [2, 7], "x": 33, "y": 0},
204 {"matrix": [1, 7], "x": 34, "y": 0},
205 {"matrix": [0, 7], "x": 35, "y": 0},
206 {"matrix": [0, 3], "x": 36, "y": 0},
207 {"matrix": [1, 3], "x": 37, "y": 0},
208 {"matrix": [2, 3], "x": 38, "y": 0},
209 {"matrix": [3, 3], "x": 39, "y": 0},
210 {"matrix": [4, 3], "x": 40, "y": 0},
211 {"matrix": [5, 3], "x": 41, "y": 0},
212 {"matrix": [5, 8], "x": 42, "y": 0},
213 {"matrix": [4, 8], "x": 43, "y": 0},
214 {"matrix": [3, 8], "x": 44, "y": 0},
215 {"matrix": [2, 8], "x": 45, "y": 0},
216 {"matrix": [1, 8], "x": 46, "y": 0},
217 {"matrix": [0, 8], "x": 47, "y": 0},
218 {"matrix": [0, 4], "x": 48, "y": 0},
219 {"matrix": [1, 4], "x": 49, "y": 0},
220 {"matrix": [2, 4], "x": 50, "y": 0},
221 {"matrix": [3, 4], "x": 51, "y": 0},
222 {"matrix": [4, 4], "x": 52, "y": 0},
223 {"matrix": [5, 4], "x": 53, "y": 0},
224 {"matrix": [5, 9], "x": 54, "y": 0},
225 {"matrix": [4, 9], "x": 55, "y": 0},
226 {"matrix": [3, 9], "x": 56, "y": 0},
227 {"matrix": [2, 9], "x": 57, "y": 0},
228 {"matrix": [1, 9], "x": 58, "y": 0},
229 {"matrix": [0, 9], "x": 59, "y": 0},
230 {"matrix": [6, 9], "x": 60, "y": 0},
231 {"matrix": [7, 9], "x": 61, "y": 0},
232 {"matrix": [8, 9], "x": 62, "y": 0},
233 {"matrix": [9, 9], "x": 63, "y": 0},
234 {"matrix": [10, 9], "x": 64, "y": 0},
235 {"matrix": [11, 9], "x": 65, "y": 0},
236 {"matrix": [11, 4], "x": 66, "y": 0},
237 {"matrix": [10, 4], "x": 67, "y": 0},
238 {"matrix": [9, 4], "x": 68, "y": 0},
239 {"matrix": [8, 4], "x": 69, "y": 0},
240 {"matrix": [7, 4], "x": 70, "y": 0},
241 {"matrix": [6, 4], "x": 71, "y": 0},
242 {"matrix": [6, 8], "x": 72, "y": 0},
243 {"matrix": [7, 8], "x": 73, "y": 0},
244 {"matrix": [8, 8], "x": 74, "y": 0},
245 {"matrix": [9, 8], "x": 75, "y": 0},
246 {"matrix": [10, 8], "x": 76, "y": 0},
247 {"matrix": [11, 8], "x": 77, "y": 0},
248 {"matrix": [11, 3], "x": 78, "y": 0},
249 {"matrix": [10, 3], "x": 79, "y": 0},
250 {"matrix": [9, 3], "x": 80, "y": 0},
251 {"matrix": [8, 3], "x": 81, "y": 0},
252 {"matrix": [7, 3], "x": 82, "y": 0},
253 {"matrix": [6, 3], "x": 83, "y": 0},
254 {"matrix": [6, 7], "x": 84, "y": 0},
255 {"matrix": [7, 7], "x": 85, "y": 0},
256 {"matrix": [8, 7], "x": 86, "y": 0},
257 {"matrix": [9, 7], "x": 87, "y": 0},
258 {"matrix": [10, 7], "x": 88, "y": 0},
259 {"matrix": [11, 7], "x": 89, "y": 0},
260 {"matrix": [11, 2], "x": 90, "y": 0},
261 {"matrix": [10, 2], "x": 91, "y": 0},
262 {"matrix": [9, 2], "x": 92, "y": 0},
263 {"matrix": [8, 2], "x": 93, "y": 0},
264 {"matrix": [7, 2], "x": 94, "y": 0},
265 {"matrix": [6, 2], "x": 95, "y": 0},
266 {"matrix": [6, 6], "x": 96, "y": 0},
267 {"matrix": [7, 6], "x": 97, "y": 0},
268 {"matrix": [8, 6], "x": 98, "y": 0},
269 {"matrix": [9, 6], "x": 99, "y": 0},
270 {"matrix": [10, 6], "x": 100, "y": 0},
271 {"matrix": [11, 6], "x": 101, "y": 0},
272 {"matrix": [11, 1], "x": 102, "y": 0},
273 {"matrix": [10, 1], "x": 103, "y": 0},
274 {"matrix": [9, 1], "x": 104, "y": 0},
275 {"matrix": [8, 1], "x": 105, "y": 0},
276 {"matrix": [7, 1], "x": 106, "y": 0},
277 {"matrix": [6, 1], "x": 107, "y": 0},
278 {"matrix": [6, 5], "x": 108, "y": 0},
279 {"matrix": [7, 5], "x": 109, "y": 0},
280 {"matrix": [8, 5], "x": 110, "y": 0},
281 {"matrix": [9, 5], "x": 111, "y": 0},
282 {"matrix": [10, 5], "x": 112, "y": 0},
283 {"matrix": [11, 5], "x": 113, "y": 0},
284 {"matrix": [11, 0], "x": 114, "y": 0},
285 {"matrix": [10, 0], "x": 115, "y": 0},
286 {"matrix": [9, 0], "x": 116, "y": 0},
287 {"matrix": [8, 0], "x": 117, "y": 0},
288 {"matrix": [7, 0], "x": 118, "y": 0},
289 {"matrix": [6, 0], "x": 119, "y": 0}
166 ] 290 ]
167 } 291 }
168 } 292 }
diff --git a/keyboards/gl516/n51gl/info.json b/keyboards/gl516/n51gl/info.json
index bb42d48981..bcf466cea4 100644
--- a/keyboards/gl516/n51gl/info.json
+++ b/keyboards/gl516/n51gl/info.json
@@ -21,61 +21,125 @@
21 "layouts": { 21 "layouts": {
22 "LAYOUT": { 22 "LAYOUT": {
23 "layout": [ 23 "layout": [
24 {"label":"L00", "x":0.25, "y":0}, 24 {"matrix": [0, 0], "x": 0.25, "y": 0},
25 {"label":"L01", "x":1.25, "y":0}, 25 {"matrix": [0, 1], "x": 1.25, "y": 0},
26 {"label":"L02", "x":2.25, "y":0}, 26 {"matrix": [0, 2], "x": 2.25, "y": 0},
27 {"label":"L03", "x":3.25, "y":0}, 27 {"matrix": [0, 3], "x": 3.25, "y": 0},
28 {"label":"L04", "x":4.25, "y":0}, 28 {"matrix": [0, 4], "x": 4.25, "y": 0},
29 {"label":"L05", "x":5.25, "y":0}, 29 {"matrix": [0, 5], "x": 5.25, "y": 0},
30 {"label":"L06", "x":6.25, "y":0}, 30 {"matrix": [0, 6], "x": 6.25, "y": 0},
31 {"label":"R00", "x":9.25, "y":0},
32 {"label":"R01", "x":10.25, "y":0},
33 {"label":"R02", "x":11.25, "y":0},
34 {"label":"R03", "x":12.25, "y":0},
35 {"label":"R04", "x":13.25, "y":0},
36 {"label":"R05", "x":14.25, "y":0},
37 {"label":"R06", "x":15.25, "y":0},
38 31
39 {"label":"L11", "x":0.25, "y":1, "w":1.75}, 32 {"matrix": [4, 0], "x": 9.25, "y": 0},
40 {"label":"L12", "x":2, "y":1}, 33 {"matrix": [4, 1], "x": 10.25, "y": 0},
41 {"label":"L13", "x":3.25, "y":1}, 34 {"matrix": [4, 2], "x": 11.25, "y": 0},
42 {"label":"L14", "x":4.25, "y":1}, 35 {"matrix": [4, 3], "x": 12.25, "y": 0},
43 {"label":"L15", "x":5.25, "y":1}, 36 {"matrix": [4, 4], "x": 13.25, "y": 0},
44 {"label":"L16", "x":6.25, "y":1}, 37 {"matrix": [4, 5], "x": 14.25, "y": 0},
45 {"label":"R10", "x":9.25, "y":1}, 38 {"matrix": [4, 6], "x": 15.25, "y": 0},
46 {"label":"R11", "x":10.25, "y":1},
47 {"label":"R12", "x":11.25, "y":1},
48 {"label":"R13", "x":12.25, "y":1},
49 {"label":"R14", "x":13.5, "y":1},
50 {"label":"R15", "x":14.5, "y":1},
51 {"label":"R16", "x":15.5, "y":1},
52 39
53 {"label":"L21", "x":0, "y":2, "w":1.75}, 40 {"matrix": [1, 1], "x": 0.25, "y": 1, "w": 1.75},
54 {"label":"L22", "x":1.75, "y":2}, 41 {"matrix": [1, 2], "x": 2, "y": 1},
55 {"label":"L23", "x":3.25, "y":2}, 42 {"matrix": [1, 3], "x": 3.25, "y": 1},
56 {"label":"L24", "x":4.25, "y":2}, 43 {"matrix": [1, 4], "x": 4.25, "y": 1},
57 {"label":"L25", "x":5.25, "y":2}, 44 {"matrix": [1, 5], "x": 5.25, "y": 1},
58 {"label":"L26", "x":6.25, "y":2}, 45 {"matrix": [1, 6], "x": 6.25, "y": 1},
59 {"label":"L20", "x":7.75, "y":2},
60 {"label":"R20", "x":9.25, "y":2},
61 {"label":"R21", "x":10.25, "y":2},
62 {"label":"R22", "x":11.25, "y":2},
63 {"label":"R23", "x":12.25, "y":2},
64 {"label":"R24", "x":13.75, "y":2},
65 {"label":"R25", "x":14.75, "y":2},
66 {"label":"R26", "x":15.75, "y":2},
67 46
68 {"label":"L31", "x":0.25, "y":3, "w":1.25}, 47 {"matrix": [5, 0], "x": 9.25, "y": 1},
69 {"label":"L32", "x":1.5, "y":3, "w":1.25}, 48 {"matrix": [5, 1], "x": 10.25, "y": 1},
70 {"label":"L34", "x":4.125, "y":3, "w":1.25}, 49 {"matrix": [5, 2], "x": 11.25, "y": 1},
71 {"label":"L35", "x":5.375, "y":3, "w":1.25}, 50 {"matrix": [5, 3], "x": 12.25, "y": 1},
72 {"label":"L36", "x":6.625, "y":3}, 51 {"matrix": [5, 4], "x": 13.5, "y": 1},
73 {"label":"R30", "x":8.875, "y":3}, 52 {"matrix": [5, 5], "x": 14.5, "y": 1},
74 {"label":"R31", "x":9.875, "y":3, "w":1.25}, 53 {"matrix": [5, 6], "x": 15.5, "y": 1},
75 {"label":"R32", "x":11.125, "y":3, "w":1.25}, 54
76 {"label":"R34", "x":13.75, "y":3}, 55 {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
77 {"label":"R35", "x":14.75, "y":3}, 56 {"matrix": [2, 2], "x": 1.75, "y": 2},
78 {"label":"R36", "x":15.75, "y":3} 57 {"matrix": [2, 3], "x": 3.25, "y": 2},
58 {"matrix": [2, 4], "x": 4.25, "y": 2},
59 {"matrix": [2, 5], "x": 5.25, "y": 2},
60 {"matrix": [2, 6], "x": 6.25, "y": 2},
61
62 {"matrix": [2, 0], "x": 7.75, "y": 2},
63
64 {"matrix": [6, 0], "x": 9.25, "y": 2},
65 {"matrix": [6, 1], "x": 10.25, "y": 2},
66 {"matrix": [6, 2], "x": 11.25, "y": 2},
67 {"matrix": [6, 3], "x": 12.25, "y": 2},
68 {"matrix": [6, 4], "x": 13.75, "y": 2},
69 {"matrix": [6, 5], "x": 14.75, "y": 2},
70 {"matrix": [6, 6], "x": 15.75, "y": 2},
71
72 {"matrix": [3, 1], "x": 0.25, "y": 3, "w": 1.25},
73 {"matrix": [3, 2], "x": 1.5, "y": 3, "w": 1.25},
74 {"matrix": [3, 4], "x": 4.125, "y": 3, "w": 1.25},
75 {"matrix": [3, 5], "x": 5.375, "y": 3, "w": 1.25},
76 {"matrix": [3, 6], "x": 6.625, "y": 3},
77
78 {"matrix": [7, 0], "x": 8.875, "y": 3},
79 {"matrix": [7, 1], "x": 9.875, "y": 3, "w": 1.25},
80 {"matrix": [7, 2], "x": 11.125, "y": 3, "w": 1.25},
81
82 {"matrix": [7, 4], "x": 13.75, "y": 3},
83 {"matrix": [7, 5], "x": 14.75, "y": 3},
84 {"matrix": [7, 6], "x": 15.75, "y": 3}
85 ]
86 },
87 "LAYOUT_rotary_layer": {
88 "layout": [
89 {"matrix": [0, 0], "x": 0, "y": 0},
90 {"matrix": [0, 1], "x": 1, "y": 0},
91 {"matrix": [0, 2], "x": 2, "y": 0},
92 {"matrix": [0, 3], "x": 3, "y": 0},
93 {"matrix": [0, 4], "x": 4, "y": 0},
94 {"matrix": [0, 5], "x": 5, "y": 0},
95 {"matrix": [0, 6], "x": 6, "y": 0},
96 {"matrix": [4, 0], "x": 7, "y": 0},
97 {"matrix": [4, 1], "x": 8, "y": 0},
98 {"matrix": [4, 2], "x": 9, "y": 0},
99 {"matrix": [4, 3], "x": 10, "y": 0},
100 {"matrix": [4, 4], "x": 11, "y": 0},
101 {"matrix": [4, 5], "x": 12, "y": 0},
102 {"matrix": [4, 6], "x": 13, "y": 0},
103 {"matrix": [1, 1], "x": 14, "y": 0},
104 {"matrix": [1, 2], "x": 15, "y": 0},
105 {"matrix": [1, 3], "x": 16, "y": 0},
106 {"matrix": [1, 4], "x": 17, "y": 0},
107 {"matrix": [1, 5], "x": 18, "y": 0},
108 {"matrix": [1, 6], "x": 19, "y": 0},
109 {"matrix": [1, 0], "x": 20, "y": 0},
110 {"matrix": [5, 0], "x": 21, "y": 0},
111 {"matrix": [5, 1], "x": 22, "y": 0},
112 {"matrix": [5, 2], "x": 23, "y": 0},
113 {"matrix": [5, 3], "x": 24, "y": 0},
114 {"matrix": [5, 4], "x": 25, "y": 0},
115 {"matrix": [5, 5], "x": 26, "y": 0},
116 {"matrix": [5, 6], "x": 27, "y": 0},
117 {"matrix": [2, 1], "x": 28, "y": 0},
118 {"matrix": [2, 2], "x": 29, "y": 0},
119 {"matrix": [2, 3], "x": 30, "y": 0},
120 {"matrix": [2, 4], "x": 31, "y": 0},
121 {"matrix": [2, 5], "x": 32, "y": 0},
122 {"matrix": [2, 6], "x": 33, "y": 0},
123 {"matrix": [2, 0], "x": 34, "y": 0},
124 {"matrix": [6, 0], "x": 35, "y": 0},
125 {"matrix": [6, 1], "x": 36, "y": 0},
126 {"matrix": [6, 2], "x": 37, "y": 0},
127 {"matrix": [6, 3], "x": 38, "y": 0},
128 {"matrix": [6, 4], "x": 39, "y": 0},
129 {"matrix": [6, 5], "x": 40, "y": 0},
130 {"matrix": [6, 6], "x": 41, "y": 0},
131 {"matrix": [3, 1], "x": 42, "y": 0},
132 {"matrix": [3, 2], "x": 43, "y": 0},
133 {"matrix": [3, 4], "x": 44, "y": 0},
134 {"matrix": [3, 5], "x": 45, "y": 0},
135 {"matrix": [3, 6], "x": 46, "y": 0},
136 {"matrix": [3, 0], "x": 47, "y": 0},
137 {"matrix": [7, 0], "x": 48, "y": 0},
138 {"matrix": [7, 1], "x": 49, "y": 0},
139 {"matrix": [7, 2], "x": 50, "y": 0},
140 {"matrix": [7, 4], "x": 51, "y": 0},
141 {"matrix": [7, 5], "x": 52, "y": 0},
142 {"matrix": [7, 6], "x": 53, "y": 0}
79 ] 143 ]
80 } 144 }
81 } 145 }
diff --git a/keyboards/gl516/n51gl/n51gl.h b/keyboards/gl516/n51gl/n51gl.h
deleted file mode 100644
index 6429b78fd0..0000000000
--- a/keyboards/gl516/n51gl/n51gl.h
+++ /dev/null
@@ -1,54 +0,0 @@
1/*
2Copyright 2021 Salicylic_Acid
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
19
20#include "quantum.h"
21
22#define LAYOUT( \
23 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
24 L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
25 L21, L22, L23, L24, L25, L26, L20, R20, R21, R22, R23, R24, R25, R26, \
26 L31, L32, L34, L35, L36, R30, R31, R32, R34, R35, R36 \
27 ) \
28 { \
29 { L00, L01, L02, L03, L04, L05, L06 }, \
30 { KC_NO, L11, L12, L13, L14, L15, L16 }, \
31 { L20, L21, L22, L23, L24, L25, L26 }, \
32 { KC_NO, L31, L32, KC_NO, L34, L35, L36 }, \
33 { R00, R01, R02, R03, R04, R05, R06 }, \
34 { R10, R11, R12, R13, R14, R15, R16 }, \
35 { R20, R21, R22, R23, R24, R25, R26 }, \
36 { R30, R31, R32, KC_NO, R34, R35, R36 } \
37 }
38
39#define LAYOUT_rotary_layer( \
40 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
41 L11, L12, L13, L14, L15, L16, L10, R10, R11, R12, R13, R14, R15, R16, \
42 L21, L22, L23, L24, L25, L26, L20, R20, R21, R22, R23, R24, R25, R26, \
43 L31, L32, L34, L35, L36, L30, R30, R31, R32, R34, R35, R36 \
44 ) \
45 { \
46 { L00, L01, L02, L03, L04, L05, L06 }, \
47 { L10, L11, L12, L13, L14, L15, L16 }, \
48 { L20, L21, L22, L23, L24, L25, L26 }, \
49 { L30, L31, L32, KC_NO, L34, L35, L36 }, \
50 { R00, R01, R02, R03, R04, R05, R06 }, \
51 { R10, R11, R12, R13, R14, R15, R16 }, \
52 { R20, R21, R22, R23, R24, R25, R26 }, \
53 { R30, R31, R32, KC_NO, R34, R35, R36 } \
54 }
diff --git a/keyboards/gvalchca/spaccboard/info.json b/keyboards/gvalchca/spaccboard/info.json
index 31c752537f..71c88a0db0 100644
--- a/keyboards/gvalchca/spaccboard/info.json
+++ b/keyboards/gvalchca/spaccboard/info.json
@@ -22,207 +22,207 @@
22 "layouts": { 22 "layouts": {
23 "LAYOUT": { 23 "LAYOUT": {
24 "layout": [ 24 "layout": [
25 {"x": 0, "y": 0}, 25 {"matrix": [0, 0], "x": 0, "y": 0},
26 {"x": 1, "y": 0}, 26 {"matrix": [0, 1], "x": 1, "y": 0},
27 {"x": 2, "y": 0}, 27 {"matrix": [0, 2], "x": 2, "y": 0},
28 {"x": 3, "y": 0}, 28 {"matrix": [0, 3], "x": 3, "y": 0},
29 {"x": 4, "y": 0}, 29 {"matrix": [0, 4], "x": 4, "y": 0},
30 {"x": 5, "y": 0}, 30 {"matrix": [0, 5], "x": 5, "y": 0},
31 {"x": 6, "y": 0}, 31 {"matrix": [0, 6], "x": 6, "y": 0},
32 {"x": 7, "y": 0}, 32 {"matrix": [0, 7], "x": 7, "y": 0},
33 {"x": 8, "y": 0}, 33 {"matrix": [0, 8], "x": 8, "y": 0},
34 {"x": 9, "y": 0}, 34 {"matrix": [0, 9], "x": 9, "y": 0},
35 {"x": 10, "y": 0}, 35 {"matrix": [0, 10], "x": 10, "y": 0},
36 {"x": 11, "y": 0}, 36 {"matrix": [0, 11], "x": 11, "y": 0},
37 {"x": 12, "y": 0}, 37 {"matrix": [0, 12], "x": 12, "y": 0},
38 {"x": 13, "y": 0}, 38 {"matrix": [0, 13], "x": 13, "y": 0},
39 {"x": 14, "y": 0}, 39 {"matrix": [0, 14], "x": 14, "y": 0},
40 40
41 {"x": 0, "y": 1, "w": 1.5}, 41 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
42 {"x": 1.5, "y": 1}, 42 {"matrix": [1, 1], "x": 1.5, "y": 1},
43 {"x": 2.5, "y": 1}, 43 {"matrix": [1, 2], "x": 2.5, "y": 1},
44 {"x": 3.5, "y": 1}, 44 {"matrix": [1, 3], "x": 3.5, "y": 1},
45 {"x": 4.5, "y": 1}, 45 {"matrix": [1, 4], "x": 4.5, "y": 1},
46 {"x": 5.5, "y": 1}, 46 {"matrix": [1, 5], "x": 5.5, "y": 1},
47 {"x": 6.5, "y": 1}, 47 {"matrix": [1, 6], "x": 6.5, "y": 1},
48 {"x": 7.5, "y": 1}, 48 {"matrix": [1, 7], "x": 7.5, "y": 1},
49 {"x": 8.5, "y": 1}, 49 {"matrix": [1, 8], "x": 8.5, "y": 1},
50 {"x": 9.5, "y": 1}, 50 {"matrix": [1, 9], "x": 9.5, "y": 1},
51 {"x": 10.5, "y": 1}, 51 {"matrix": [1, 10], "x": 10.5, "y": 1},
52 {"x": 11.5, "y": 1}, 52 {"matrix": [1, 11], "x": 11.5, "y": 1},
53 {"x": 12.5, "y": 1}, 53 {"matrix": [1, 12], "x": 12.5, "y": 1},
54 {"x": 13.5, "y": 1, "w": 1.5}, 54 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
55 55
56 {"x": 0, "y": 2, "w": 1.75}, 56 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
57 {"x": 1.75, "y": 2}, 57 {"matrix": [2, 1], "x": 1.75, "y": 2},
58 {"x": 2.75, "y": 2}, 58 {"matrix": [2, 2], "x": 2.75, "y": 2},
59 {"x": 3.75, "y": 2}, 59 {"matrix": [2, 3], "x": 3.75, "y": 2},
60 {"x": 4.75, "y": 2}, 60 {"matrix": [2, 4], "x": 4.75, "y": 2},
61 {"x": 5.75, "y": 2}, 61 {"matrix": [2, 5], "x": 5.75, "y": 2},
62 {"x": 6.75, "y": 2}, 62 {"matrix": [2, 6], "x": 6.75, "y": 2},
63 {"x": 7.75, "y": 2}, 63 {"matrix": [2, 7], "x": 7.75, "y": 2},
64 {"x": 8.75, "y": 2}, 64 {"matrix": [2, 8], "x": 8.75, "y": 2},
65 {"x": 9.75, "y": 2}, 65 {"matrix": [2, 9], "x": 9.75, "y": 2},
66 {"x": 10.75, "y": 2}, 66 {"matrix": [2, 10], "x": 10.75, "y": 2},
67 {"x": 11.75, "y": 2}, 67 {"matrix": [2, 11], "x": 11.75, "y": 2},
68 {"x": 12.75, "y": 2, "w": 2.25}, 68 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
69 69
70 {"x": 0, "y": 3, "w": 2.25}, 70 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
71 {"x": 2.25, "y": 3}, 71 {"matrix": [3, 2], "x": 2.25, "y": 3},
72 {"x": 3.25, "y": 3}, 72 {"matrix": [3, 3], "x": 3.25, "y": 3},
73 {"x": 4.25, "y": 3}, 73 {"matrix": [3, 4], "x": 4.25, "y": 3},
74 {"x": 5.25, "y": 3}, 74 {"matrix": [3, 5], "x": 5.25, "y": 3},
75 {"x": 6.25, "y": 3}, 75 {"matrix": [3, 6], "x": 6.25, "y": 3},
76 {"x": 7.25, "y": 3}, 76 {"matrix": [3, 7], "x": 7.25, "y": 3},
77 {"x": 8.25, "y": 3}, 77 {"matrix": [3, 8], "x": 8.25, "y": 3},
78 {"x": 9.25, "y": 3}, 78 {"matrix": [3, 9], "x": 9.25, "y": 3},
79 {"x": 10.25, "y": 3}, 79 {"matrix": [3, 10], "x": 10.25, "y": 3},
80 {"x": 11.25, "y": 3}, 80 {"matrix": [3, 11], "x": 11.25, "y": 3},
81 {"x": 12.25, "y": 3, "w": 2.75}, 81 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
82 82
83 {"x": 0, "y": 4, "w": 1.5}, 83 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
84 {"x": 1.5, "y": 4}, 84 {"matrix": [4, 2], "x": 1.5, "y": 4},
85 {"x": 2.5, "y": 4, "w": 1.5}, 85 {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
86 {"x": 4, "y": 4, "w": 7}, 86 {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
87 {"x": 11, "y": 4, "w": 1.5}, 87 {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
88 {"x": 12.5, "y": 4}, 88 {"matrix": [4, 12], "x": 12.5, "y": 4},
89 {"x": 13.5, "y": 4, "w": 1.5} 89 {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
90 ] 90 ]
91 }, 91 },
92 "LAYOUT_ansi": { 92 "LAYOUT_ansi": {
93 "layout": [ 93 "layout": [
94 {"x": 0, "y": 0}, 94 {"matrix": [0, 0], "x": 0, "y": 0},
95 {"x": 1, "y": 0}, 95 {"matrix": [0, 1], "x": 1, "y": 0},
96 {"x": 2, "y": 0}, 96 {"matrix": [0, 2], "x": 2, "y": 0},
97 {"x": 3, "y": 0}, 97 {"matrix": [0, 3], "x": 3, "y": 0},
98 {"x": 4, "y": 0}, 98 {"matrix": [0, 4], "x": 4, "y": 0},
99 {"x": 5, "y": 0}, 99 {"matrix": [0, 5], "x": 5, "y": 0},
100 {"x": 6, "y": 0}, 100 {"matrix": [0, 6], "x": 6, "y": 0},
101 {"x": 7, "y": 0}, 101 {"matrix": [0, 7], "x": 7, "y": 0},
102 {"x": 8, "y": 0}, 102 {"matrix": [0, 8], "x": 8, "y": 0},
103 {"x": 9, "y": 0}, 103 {"matrix": [0, 9], "x": 9, "y": 0},
104 {"x": 10, "y": 0}, 104 {"matrix": [0, 10], "x": 10, "y": 0},
105 {"x": 11, "y": 0}, 105 {"matrix": [0, 11], "x": 11, "y": 0},
106 {"x": 12, "y": 0}, 106 {"matrix": [0, 12], "x": 12, "y": 0},
107 {"x": 13, "y": 0, "w": 2}, 107 {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
108 108
109 {"x": 0, "y": 1, "w": 1.5}, 109 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
110 {"x": 1.5, "y": 1}, 110 {"matrix": [1, 1], "x": 1.5, "y": 1},
111 {"x": 2.5, "y": 1}, 111 {"matrix": [1, 2], "x": 2.5, "y": 1},
112 {"x": 3.5, "y": 1}, 112 {"matrix": [1, 3], "x": 3.5, "y": 1},
113 {"x": 4.5, "y": 1}, 113 {"matrix": [1, 4], "x": 4.5, "y": 1},
114 {"x": 5.5, "y": 1}, 114 {"matrix": [1, 5], "x": 5.5, "y": 1},
115 {"x": 6.5, "y": 1}, 115 {"matrix": [1, 6], "x": 6.5, "y": 1},
116 {"x": 7.5, "y": 1}, 116 {"matrix": [1, 7], "x": 7.5, "y": 1},
117 {"x": 8.5, "y": 1}, 117 {"matrix": [1, 8], "x": 8.5, "y": 1},
118 {"x": 9.5, "y": 1}, 118 {"matrix": [1, 9], "x": 9.5, "y": 1},
119 {"x": 10.5, "y": 1}, 119 {"matrix": [1, 10], "x": 10.5, "y": 1},
120 {"x": 11.5, "y": 1}, 120 {"matrix": [1, 11], "x": 11.5, "y": 1},
121 {"x": 12.5, "y": 1}, 121 {"matrix": [1, 12], "x": 12.5, "y": 1},
122 {"x": 13.5, "y": 1, "w": 1.5}, 122 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
123 123
124 {"x": 0, "y": 2, "w": 1.75}, 124 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
125 {"x": 1.75, "y": 2}, 125 {"matrix": [2, 1], "x": 1.75, "y": 2},
126 {"x": 2.75, "y": 2}, 126 {"matrix": [2, 2], "x": 2.75, "y": 2},
127 {"x": 3.75, "y": 2}, 127 {"matrix": [2, 3], "x": 3.75, "y": 2},
128 {"x": 4.75, "y": 2}, 128 {"matrix": [2, 4], "x": 4.75, "y": 2},
129 {"x": 5.75, "y": 2}, 129 {"matrix": [2, 5], "x": 5.75, "y": 2},
130 {"x": 6.75, "y": 2}, 130 {"matrix": [2, 6], "x": 6.75, "y": 2},
131 {"x": 7.75, "y": 2}, 131 {"matrix": [2, 7], "x": 7.75, "y": 2},
132 {"x": 8.75, "y": 2}, 132 {"matrix": [2, 8], "x": 8.75, "y": 2},
133 {"x": 9.75, "y": 2}, 133 {"matrix": [2, 9], "x": 9.75, "y": 2},
134 {"x": 10.75, "y": 2}, 134 {"matrix": [2, 10], "x": 10.75, "y": 2},
135 {"x": 11.75, "y": 2}, 135 {"matrix": [2, 11], "x": 11.75, "y": 2},
136 {"x": 12.75, "y": 2, "w": 2.25}, 136 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
137 137
138 {"x": 0, "y": 3, "w": 2.25}, 138 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
139 {"x": 2.25, "y": 3}, 139 {"matrix": [3, 2], "x": 2.25, "y": 3},
140 {"x": 3.25, "y": 3}, 140 {"matrix": [3, 3], "x": 3.25, "y": 3},
141 {"x": 4.25, "y": 3}, 141 {"matrix": [3, 4], "x": 4.25, "y": 3},
142 {"x": 5.25, "y": 3}, 142 {"matrix": [3, 5], "x": 5.25, "y": 3},
143 {"x": 6.25, "y": 3}, 143 {"matrix": [3, 6], "x": 6.25, "y": 3},
144 {"x": 7.25, "y": 3}, 144 {"matrix": [3, 7], "x": 7.25, "y": 3},
145 {"x": 8.25, "y": 3}, 145 {"matrix": [3, 8], "x": 8.25, "y": 3},
146 {"x": 9.25, "y": 3}, 146 {"matrix": [3, 9], "x": 9.25, "y": 3},
147 {"x": 10.25, "y": 3}, 147 {"matrix": [3, 10], "x": 10.25, "y": 3},
148 {"x": 11.25, "y": 3}, 148 {"matrix": [3, 11], "x": 11.25, "y": 3},
149 {"x": 12.25, "y": 3, "w": 2.75}, 149 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
150 150
151 {"x": 0, "y": 4, "w": 1.5}, 151 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
152 {"x": 1.5, "y": 4}, 152 {"matrix": [4, 2], "x": 1.5, "y": 4},
153 {"x": 2.5, "y": 4, "w": 1.5}, 153 {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
154 {"x": 4, "y": 4, "w": 7}, 154 {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
155 {"x": 11, "y": 4, "w": 1.5}, 155 {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
156 {"x": 12.5, "y": 4}, 156 {"matrix": [4, 12], "x": 12.5, "y": 4},
157 {"x": 13.5, "y": 4, "w": 1.5} 157 {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
158 ] 158 ]
159 }, 159 },
160 "LAYOUT_bae": { 160 "LAYOUT_bae": {
161 "layout": [ 161 "layout": [
162 {"x": 0, "y": 0}, 162 {"matrix": [0, 0], "x": 0, "y": 0},
163 {"x": 1, "y": 0}, 163 {"matrix": [0, 1], "x": 1, "y": 0},
164 {"x": 2, "y": 0}, 164 {"matrix": [0, 2], "x": 2, "y": 0},
165 {"x": 3, "y": 0}, 165 {"matrix": [0, 3], "x": 3, "y": 0},
166 {"x": 4, "y": 0}, 166 {"matrix": [0, 4], "x": 4, "y": 0},
167 {"x": 5, "y": 0}, 167 {"matrix": [0, 5], "x": 5, "y": 0},
168 {"x": 6, "y": 0}, 168 {"matrix": [0, 6], "x": 6, "y": 0},
169 {"x": 7, "y": 0}, 169 {"matrix": [0, 7], "x": 7, "y": 0},
170 {"x": 8, "y": 0}, 170 {"matrix": [0, 8], "x": 8, "y": 0},
171 {"x": 9, "y": 0}, 171 {"matrix": [0, 9], "x": 9, "y": 0},
172 {"x": 10, "y": 0}, 172 {"matrix": [0, 10], "x": 10, "y": 0},
173 {"x": 11, "y": 0}, 173 {"matrix": [0, 11], "x": 11, "y": 0},
174 {"x": 12, "y": 0}, 174 {"matrix": [0, 12], "x": 12, "y": 0},
175 {"x": 13, "y": 0}, 175 {"matrix": [0, 13], "x": 13, "y": 0},
176 {"x": 14, "y": 0}, 176 {"matrix": [0, 14], "x": 14, "y": 0},
177 177
178 {"x": 0, "y": 1, "w": 1.5}, 178 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
179 {"x": 1.5, "y": 1}, 179 {"matrix": [1, 1], "x": 1.5, "y": 1},
180 {"x": 2.5, "y": 1}, 180 {"matrix": [1, 2], "x": 2.5, "y": 1},
181 {"x": 3.5, "y": 1}, 181 {"matrix": [1, 3], "x": 3.5, "y": 1},
182 {"x": 4.5, "y": 1}, 182 {"matrix": [1, 4], "x": 4.5, "y": 1},
183 {"x": 5.5, "y": 1}, 183 {"matrix": [1, 5], "x": 5.5, "y": 1},
184 {"x": 6.5, "y": 1}, 184 {"matrix": [1, 6], "x": 6.5, "y": 1},
185 {"x": 7.5, "y": 1}, 185 {"matrix": [1, 7], "x": 7.5, "y": 1},
186 {"x": 8.5, "y": 1}, 186 {"matrix": [1, 8], "x": 8.5, "y": 1},
187 {"x": 9.5, "y": 1}, 187 {"matrix": [1, 9], "x": 9.5, "y": 1},
188 {"x": 10.5, "y": 1}, 188 {"matrix": [1, 10], "x": 10.5, "y": 1},
189 {"x": 11.5, "y": 1}, 189 {"matrix": [1, 11], "x": 11.5, "y": 1},
190 {"x": 12.5, "y": 1}, 190 {"matrix": [1, 12], "x": 12.5, "y": 1},
191 191
192 {"x": 0, "y": 2, "w": 1.75}, 192 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
193 {"x": 1.75, "y": 2}, 193 {"matrix": [2, 1], "x": 1.75, "y": 2},
194 {"x": 2.75, "y": 2}, 194 {"matrix": [2, 2], "x": 2.75, "y": 2},
195 {"x": 3.75, "y": 2}, 195 {"matrix": [2, 3], "x": 3.75, "y": 2},
196 {"x": 4.75, "y": 2}, 196 {"matrix": [2, 4], "x": 4.75, "y": 2},
197 {"x": 5.75, "y": 2}, 197 {"matrix": [2, 5], "x": 5.75, "y": 2},
198 {"x": 6.75, "y": 2}, 198 {"matrix": [2, 6], "x": 6.75, "y": 2},
199 {"x": 7.75, "y": 2}, 199 {"matrix": [2, 7], "x": 7.75, "y": 2},
200 {"x": 8.75, "y": 2}, 200 {"matrix": [2, 8], "x": 8.75, "y": 2},
201 {"x": 9.75, "y": 2}, 201 {"matrix": [2, 9], "x": 9.75, "y": 2},
202 {"x": 10.75, "y": 2}, 202 {"matrix": [2, 10], "x": 10.75, "y": 2},
203 {"x": 11.75, "y": 2}, 203 {"matrix": [2, 11], "x": 11.75, "y": 2},
204 {"x": 12.75, "y": 1, "w": 2.25, "h": 2}, 204 {"matrix": [2, 13], "x": 12.75, "y": 1, "w": 2.25, "h": 2},
205 205
206 {"x": 0, "y": 3, "w": 2.25}, 206 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
207 {"x": 2.25, "y": 3}, 207 {"matrix": [3, 2], "x": 2.25, "y": 3},
208 {"x": 3.25, "y": 3}, 208 {"matrix": [3, 3], "x": 3.25, "y": 3},
209 {"x": 4.25, "y": 3}, 209 {"matrix": [3, 4], "x": 4.25, "y": 3},
210 {"x": 5.25, "y": 3}, 210 {"matrix": [3, 5], "x": 5.25, "y": 3},
211 {"x": 6.25, "y": 3}, 211 {"matrix": [3, 6], "x": 6.25, "y": 3},
212 {"x": 7.25, "y": 3}, 212 {"matrix": [3, 7], "x": 7.25, "y": 3},
213 {"x": 8.25, "y": 3}, 213 {"matrix": [3, 8], "x": 8.25, "y": 3},
214 {"x": 9.25, "y": 3}, 214 {"matrix": [3, 9], "x": 9.25, "y": 3},
215 {"x": 10.25, "y": 3}, 215 {"matrix": [3, 10], "x": 10.25, "y": 3},
216 {"x": 11.25, "y": 3}, 216 {"matrix": [3, 11], "x": 11.25, "y": 3},
217 {"x": 12.25, "y": 3, "w": 2.75}, 217 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
218 218
219 {"x": 0, "y": 4, "w": 1.5}, 219 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
220 {"x": 1.5, "y": 4}, 220 {"matrix": [4, 2], "x": 1.5, "y": 4},
221 {"x": 2.5, "y": 4, "w": 1.5}, 221 {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
222 {"x": 4, "y": 4, "w": 7}, 222 {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
223 {"x": 11, "y": 4, "w": 1.5}, 223 {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
224 {"x": 12.5, "y": 4}, 224 {"matrix": [4, 12], "x": 12.5, "y": 4},
225 {"x": 13.5, "y": 4, "w": 1.5} 225 {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
226 ] 226 ]
227 } 227 }
228 } 228 }
diff --git a/keyboards/gvalchca/spaccboard/spaccboard.h b/keyboards/gvalchca/spaccboard/spaccboard.h
deleted file mode 100644
index 49afca436e..0000000000
--- a/keyboards/gvalchca/spaccboard/spaccboard.h
+++ /dev/null
@@ -1,66 +0,0 @@
1 /* Copyright 2021 Kirill Shkuretskiy
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#include "quantum.h"
20
21#define ___ KC_NO
22
23#define LAYOUT( \
24 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
25 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
26 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
27 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \
28 k40, k42, k43, k47, k4b, k4c, k4d \
29) \
30{ \
31 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
32 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, ___ }, \
33 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, ___, k2d, ___ }, \
34 { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, ___, ___ }, \
35 { k40, ___, k42, k43, ___, ___, ___, k47, ___, ___, ___, k4b, k4c, k4d, ___ } \
36}
37
38#define LAYOUT_ansi( \
39 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, \
40 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
41 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
42 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \
43 k40, k42, k43, k47, k4b, k4c, k4d \
44) \
45{ \
46 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, ___, k0e }, \
47 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, ___ }, \
48 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, ___, k2d, ___ }, \
49 { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, ___, ___ }, \
50 { k40, ___, k42, k43, ___, ___, ___, k47, ___, ___, ___, k4b, k4c, k4d, ___ } \
51}
52
53#define LAYOUT_bae( \
54 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
55 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \
56 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
57 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \
58 k40, k42, k43, k47, k4b, k4c, k4d \
59) \
60{ \
61 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
62 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, ___, ___ }, \
63 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, ___, k2d, ___ }, \
64 { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, ___, ___ }, \
65 { k40, ___, k42, k43, ___, ___, ___, k47, ___, ___, ___, k4b, k4c, k4d, ___ } \
66}
diff --git a/keyboards/handwired/jn68m/info.json b/keyboards/handwired/jn68m/info.json
index c7934968dc..6c83157843 100644
--- a/keyboards/handwired/jn68m/info.json
+++ b/keyboards/handwired/jn68m/info.json
@@ -16,11 +16,166 @@
16 "processor": "atmega32u4", 16 "processor": "atmega32u4",
17 "bootloader": "atmel-dfu", 17 "bootloader": "atmel-dfu",
18 "layouts": { 18 "layouts": {
19 "LAYOUT": { 19 "LAYOUT": {
20 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15.25, "y":1}, {"x":16.25, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":2.75}, {"x":15.25, "y":3}, {"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.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":14.25, "y":4}, {"x":15.25, "y":4}, {"x":16.25, "y":4}] 20 "layout": [
21 }, 21 {"matrix": [0, 0], "x": 0, "y": 0},
22 "LAYOUT_splitbs": { 22 {"matrix": [0, 1], "x": 1, "y": 0},
23 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15.25, "y":1}, {"x":16.25, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":2.75}, {"x":15.25, "y":3}, {"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.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":14.25, "y":4}, {"x":15.25, "y":4}, {"x":16.25, "y":4}] 23 {"matrix": [0, 2], "x": 2, "y": 0},
24 {"matrix": [0, 3], "x": 3, "y": 0},
25 {"matrix": [0, 4], "x": 4, "y": 0},
26 {"matrix": [0, 5], "x": 5, "y": 0},
27 {"matrix": [0, 6], "x": 6, "y": 0},
28 {"matrix": [0, 7], "x": 7, "y": 0},
29 {"matrix": [0, 8], "x": 8, "y": 0},
30 {"matrix": [0, 9], "x": 9, "y": 0},
31 {"matrix": [0, 10], "x": 10, "y": 0},
32 {"matrix": [0, 11], "x": 11, "y": 0},
33 {"matrix": [0, 12], "x": 12, "y": 0},
34 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
35
36 {"matrix": [0, 14], "x": 15.25, "y": 0},
37 {"matrix": [0, 15], "x": 16.25, "y": 0},
38
39 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
40 {"matrix": [1, 1], "x": 1.5, "y": 1},
41 {"matrix": [1, 2], "x": 2.5, "y": 1},
42 {"matrix": [1, 3], "x": 3.5, "y": 1},
43 {"matrix": [1, 4], "x": 4.5, "y": 1},
44 {"matrix": [1, 5], "x": 5.5, "y": 1},
45 {"matrix": [1, 6], "x": 6.5, "y": 1},
46 {"matrix": [1, 7], "x": 7.5, "y": 1},
47 {"matrix": [1, 8], "x": 8.5, "y": 1},
48 {"matrix": [1, 9], "x": 9.5, "y": 1},
49 {"matrix": [1, 10], "x": 10.5, "y": 1},
50 {"matrix": [1, 11], "x": 11.5, "y": 1},
51 {"matrix": [1, 12], "x": 12.5, "y": 1},
52 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
53
54 {"matrix": [1, 14], "x": 15.25, "y": 1},
55 {"matrix": [1, 15], "x": 16.25, "y": 1},
56
57 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
58 {"matrix": [2, 1], "x": 1.75, "y": 2},
59 {"matrix": [2, 2], "x": 2.75, "y": 2},
60 {"matrix": [2, 3], "x": 3.75, "y": 2},
61 {"matrix": [2, 4], "x": 4.75, "y": 2},
62 {"matrix": [2, 5], "x": 5.75, "y": 2},
63 {"matrix": [2, 6], "x": 6.75, "y": 2},
64 {"matrix": [2, 7], "x": 7.75, "y": 2},
65 {"matrix": [2, 8], "x": 8.75, "y": 2},
66 {"matrix": [2, 9], "x": 9.75, "y": 2},
67 {"matrix": [2, 10], "x": 10.75, "y": 2},
68 {"matrix": [2, 11], "x": 11.75, "y": 2},
69 {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
70
71 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
72 {"matrix": [3, 1], "x": 2.25, "y": 3},
73 {"matrix": [3, 2], "x": 3.25, "y": 3},
74 {"matrix": [3, 3], "x": 4.25, "y": 3},
75 {"matrix": [3, 4], "x": 5.25, "y": 3},
76 {"matrix": [3, 5], "x": 6.25, "y": 3},
77 {"matrix": [3, 6], "x": 7.25, "y": 3},
78 {"matrix": [3, 7], "x": 8.25, "y": 3},
79 {"matrix": [3, 8], "x": 9.25, "y": 3},
80 {"matrix": [3, 9], "x": 10.25, "y": 3},
81 {"matrix": [3, 11], "x": 11.25, "y": 3},
82 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
83
84 {"matrix": [3, 14], "x": 15.25, "y": 3},
85
86 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
87 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
88 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
89 {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
90 {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
91 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
92 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
93
94 {"matrix": [4, 13], "x": 14.25, "y": 4},
95 {"matrix": [4, 14], "x": 15.25, "y": 4},
96 {"matrix": [4, 15], "x": 16.25, "y": 4}
97 ]
98 },
99 "LAYOUT_splitbs": {
100 "layout": [
101 {"matrix": [0, 0], "x": 0, "y": 0},
102 {"matrix": [0, 1], "x": 1, "y": 0},
103 {"matrix": [0, 2], "x": 2, "y": 0},
104 {"matrix": [0, 3], "x": 3, "y": 0},
105 {"matrix": [0, 4], "x": 4, "y": 0},
106 {"matrix": [0, 5], "x": 5, "y": 0},
107 {"matrix": [0, 6], "x": 6, "y": 0},
108 {"matrix": [0, 7], "x": 7, "y": 0},
109 {"matrix": [0, 8], "x": 8, "y": 0},
110 {"matrix": [0, 9], "x": 9, "y": 0},
111 {"matrix": [0, 10], "x": 10, "y": 0},
112 {"matrix": [0, 11], "x": 11, "y": 0},
113 {"matrix": [0, 12], "x": 12, "y": 0},
114 {"matrix": [0, 13], "x": 13, "y": 0},
115 {"matrix": [2, 13], "x": 14, "y": 0},
116
117 {"matrix": [0, 14], "x": 15.25, "y": 0},
118 {"matrix": [0, 15], "x": 16.25, "y": 0},
119
120 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
121 {"matrix": [1, 1], "x": 1.5, "y": 1},
122 {"matrix": [1, 2], "x": 2.5, "y": 1},
123 {"matrix": [1, 3], "x": 3.5, "y": 1},
124 {"matrix": [1, 4], "x": 4.5, "y": 1},
125 {"matrix": [1, 5], "x": 5.5, "y": 1},
126 {"matrix": [1, 6], "x": 6.5, "y": 1},
127 {"matrix": [1, 7], "x": 7.5, "y": 1},
128 {"matrix": [1, 8], "x": 8.5, "y": 1},
129 {"matrix": [1, 9], "x": 9.5, "y": 1},
130 {"matrix": [1, 10], "x": 10.5, "y": 1},
131 {"matrix": [1, 11], "x": 11.5, "y": 1},
132 {"matrix": [1, 12], "x": 12.5, "y": 1},
133 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
134
135 {"matrix": [1, 14], "x": 15.25, "y": 1},
136 {"matrix": [1, 15], "x": 16.25, "y": 1},
137
138 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
139 {"matrix": [2, 1], "x": 1.75, "y": 2},
140 {"matrix": [2, 2], "x": 2.75, "y": 2},
141 {"matrix": [2, 3], "x": 3.75, "y": 2},
142 {"matrix": [2, 4], "x": 4.75, "y": 2},
143 {"matrix": [2, 5], "x": 5.75, "y": 2},
144 {"matrix": [2, 6], "x": 6.75, "y": 2},
145 {"matrix": [2, 7], "x": 7.75, "y": 2},
146 {"matrix": [2, 8], "x": 8.75, "y": 2},
147 {"matrix": [2, 9], "x": 9.75, "y": 2},
148 {"matrix": [2, 10], "x": 10.75, "y": 2},
149 {"matrix": [2, 11], "x": 11.75, "y": 2},
150 {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
151
152 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
153 {"matrix": [3, 1], "x": 2.25, "y": 3},
154 {"matrix": [3, 2], "x": 3.25, "y": 3},
155 {"matrix": [3, 3], "x": 4.25, "y": 3},
156 {"matrix": [3, 4], "x": 5.25, "y": 3},
157 {"matrix": [3, 5], "x": 6.25, "y": 3},
158 {"matrix": [3, 6], "x": 7.25, "y": 3},
159 {"matrix": [3, 7], "x": 8.25, "y": 3},
160 {"matrix": [3, 8], "x": 9.25, "y": 3},
161 {"matrix": [3, 9], "x": 10.25, "y": 3},
162 {"matrix": [3, 11], "x": 11.25, "y": 3},
163 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
164
165 {"matrix": [3, 14], "x": 15.25, "y": 3},
166
167 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
168 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
169 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
170 {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
171 {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
172 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
173 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
174
175 {"matrix": [4, 13], "x": 14.25, "y": 4},
176 {"matrix": [4, 14], "x": 15.25, "y": 4},
177 {"matrix": [4, 15], "x": 16.25, "y": 4}
178 ]
24 } 179 }
25 } 180 }
26} 181}
diff --git a/keyboards/handwired/jn68m/jn68m.h b/keyboards/handwired/jn68m/jn68m.h
deleted file mode 100644
index a5500824bb..0000000000
--- a/keyboards/handwired/jn68m/jn68m.h
+++ /dev/null
@@ -1,49 +0,0 @@
1/* Copyright 2018 Jumail Mundekkat / MxBlue
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#include "quantum.h"
20
21#define XXX KC_NO
22
23#define LAYOUT( \
24 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
25 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \
26 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \
27 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3B, k3C, k3E, \
28 k40, k41, k42, k45, k49, k4B, k4C, k4D, k4E, k4F \
29) { \
30 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
31 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
32 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, XXX, XXX, XXX }, \
33 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, XXX, k3B, k3C, XXX, k3E, XXX }, \
34 { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, XXX, k4B, k4C, k4D, k4E, k4F } \
35}
36
37#define LAYOUT_splitbs( \
38 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k2D, k0E, k0F, \
39 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \
40 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \
41 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3B, k3C, k3E, \
42 k40, k41, k42, k45, k49, k4B, k4C, k4D, k4E, k4F \
43) { \
44 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
45 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
46 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX }, \
47 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, XXX, k3B, k3C, XXX, k3E, XXX }, \
48 { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, XXX, k4B, k4C, k4D, k4E, k4F } \
49}
diff --git a/keyboards/handwired/ms_sculpt_mobile/info.json b/keyboards/handwired/ms_sculpt_mobile/info.json
index a66f43fadc..8ef1cb0a84 100644
--- a/keyboards/handwired/ms_sculpt_mobile/info.json
+++ b/keyboards/handwired/ms_sculpt_mobile/info.json
@@ -10,94 +10,94 @@
10 "layouts": { 10 "layouts": {
11 "LAYOUT": { 11 "LAYOUT": {
12 "layout": [ 12 "layout": [
13 {"x": 0, "y": 0}, 13 {"matrix": [7, 16], "x": 0, "y": 0},
14 {"x": 1, "y": 0}, 14 {"matrix": [6, 14], "x": 1, "y": 0},
15 {"x": 2, "y": 0}, 15 {"matrix": [6, 15], "x": 2, "y": 0},
16 {"x": 3, "y": 0}, 16 {"matrix": [6, 16], "x": 3, "y": 0},
17 {"x": 4, "y": 0}, 17 {"matrix": [5, 14], "x": 4, "y": 0},
18 {"x": 5, "y": 0}, 18 {"matrix": [5, 15], "x": 5, "y": 0},
19 {"x": 6, "y": 0}, 19 {"matrix": [5, 16], "x": 6, "y": 0},
20 {"x": 7, "y": 0}, 20 {"matrix": [7, 0], "x": 7, "y": 0},
21 {"x": 8, "y": 0}, 21 {"matrix": [7, 1], "x": 8, "y": 0},
22 {"x": 9, "y": 0}, 22 {"matrix": [7, 2], "x": 9, "y": 0},
23 {"x": 10, "y": 0}, 23 {"matrix": [7, 3], "x": 10, "y": 0},
24 {"x": 11, "y": 0}, 24 {"matrix": [7, 4], "x": 11, "y": 0},
25 {"x": 12, "y": 0}, 25 {"matrix": [7, 5], "x": 12, "y": 0},
26 {"x": 13, "y": 0}, 26 {"matrix": [1, 14], "x": 13, "y": 0},
27 {"x": 14, "y": 0}, 27 {"matrix": [1, 10], "x": 14, "y": 0},
28 {"x": 15, "y": 0}, 28 {"matrix": [1, 11], "x": 15, "y": 0},
29 29
30 {"x": 0, "y": 1}, 30 {"matrix": [5, 0], "x": 0, "y": 1},
31 {"x": 1, "y": 1}, 31 {"matrix": [5, 10], "x": 1, "y": 1},
32 {"x": 2, "y": 1}, 32 {"matrix": [5, 11], "x": 2, "y": 1},
33 {"x": 3, "y": 1}, 33 {"matrix": [5, 12], "x": 3, "y": 1},
34 {"x": 4, "y": 1}, 34 {"matrix": [5, 13], "x": 4, "y": 1},
35 {"x": 5, "y": 1}, 35 {"matrix": [5, 7], "x": 5, "y": 1},
36 {"x": 6, "y": 1}, 36 {"matrix": [5, 8], "x": 6, "y": 1},
37 {"x": 7, "y": 1}, 37 {"matrix": [2, 0], "x": 7, "y": 1},
38 {"x": 8, "y": 1}, 38 {"matrix": [2, 1], "x": 8, "y": 1},
39 {"x": 9, "y": 1}, 39 {"matrix": [2, 2], "x": 9, "y": 1},
40 {"x": 10, "y": 1}, 40 {"matrix": [2, 3], "x": 10, "y": 1},
41 {"x": 11, "y": 1}, 41 {"matrix": [5, 1], "x": 11, "y": 1},
42 {"x": 12, "y": 1}, 42 {"matrix": [5, 2], "x": 12, "y": 1},
43 {"x": 13, "y": 1, "w": 2}, 43 {"matrix": [5, 9], "x": 13, "y": 1, "w": 2},
44 {"x": 15, "y": 1, "h": 1.6}, 44 {"matrix": [2, 4], "x": 15, "y": 1, "h": 1.6},
45 45
46 {"x": 0, "y": 2, "w": 1.5}, 46 {"matrix": [6, 17], "x": 0, "y": 2, "w": 1.5},
47 {"x": 1.5, "y": 2}, 47 {"matrix": [6, 3], "x": 1.5, "y": 2},
48 {"x": 2.5, "y": 2}, 48 {"matrix": [6, 4], "x": 2.5, "y": 2},
49 {"x": 3.5, "y": 2}, 49 {"matrix": [6, 5], "x": 3.5, "y": 2},
50 {"x": 4.5, "y": 2}, 50 {"matrix": [7, 8], "x": 4.5, "y": 2},
51 {"x": 5.5, "y": 2}, 51 {"matrix": [7, 9], "x": 5.5, "y": 2},
52 {"x": 6.5, "y": 2}, 52 {"matrix": [4, 0], "x": 6.5, "y": 2},
53 {"x": 7.5, "y": 2}, 53 {"matrix": [4, 1], "x": 7.5, "y": 2},
54 {"x": 8.5, "y": 2}, 54 {"matrix": [4, 2], "x": 8.5, "y": 2},
55 {"x": 9.5, "y": 2}, 55 {"matrix": [4, 3], "x": 9.5, "y": 2},
56 {"x": 10.5, "y": 2}, 56 {"matrix": [3, 0], "x": 10.5, "y": 2},
57 {"x": 11.5, "y": 2}, 57 {"matrix": [3, 1], "x": 11.5, "y": 2},
58 {"x": 12.5, "y": 2}, 58 {"matrix": [3, 2], "x": 12.5, "y": 2},
59 {"x": 13.5, "y": 2, "w": 1.5}, 59 {"matrix": [3, 3], "x": 13.5, "y": 2, "w": 1.5},
60 60
61 {"x": 0, "y": 3, "w": 1.75}, 61 {"matrix": [0, 9], "x": 0, "y": 3, "w": 1.75},
62 {"x": 1.75, "y": 3}, 62 {"matrix": [6, 0], "x": 1.75, "y": 3},
63 {"x": 2.75, "y": 3}, 63 {"matrix": [6, 1], "x": 2.75, "y": 3},
64 {"x": 3.75, "y": 3}, 64 {"matrix": [6, 2], "x": 3.75, "y": 3},
65 {"x": 4.75, "y": 3}, 65 {"matrix": [7, 7], "x": 4.75, "y": 3},
66 {"x": 5.75, "y": 3}, 66 {"matrix": [1, 0], "x": 5.75, "y": 3},
67 {"x": 6.75, "y": 3}, 67 {"matrix": [1, 1], "x": 6.75, "y": 3},
68 {"x": 7.75, "y": 3}, 68 {"matrix": [5, 3], "x": 7.75, "y": 3},
69 {"x": 8.75, "y": 3}, 69 {"matrix": [5, 4], "x": 8.75, "y": 3},
70 {"x": 9.75, "y": 3}, 70 {"matrix": [5, 5], "x": 9.75, "y": 3},
71 {"x": 10.75, "y": 3}, 71 {"matrix": [5, 6], "x": 10.75, "y": 3},
72 {"x": 11.75, "y": 3}, 72 {"matrix": [1, 2], "x": 11.75, "y": 3},
73 {"x": 12.75, "y": 3, "w": 2.25}, 73 {"matrix": [7, 15], "x": 12.75, "y": 3, "w": 2.25},
74 {"x": 15, "y": 2.6, "h": 1.2}, 74 {"matrix": [2, 6], "x": 15, "y": 2.6, "h": 1.2},
75 75
76 {"x": 0, "y": 4, "w": 2.25}, 76 {"matrix": [2, 15], "x": 0, "y": 4, "w": 2.25},
77 {"x": 2.25, "y": 4}, 77 {"matrix": [7, 10], "x": 2.25, "y": 4},
78 {"x": 3.25, "y": 4}, 78 {"matrix": [7, 11], "x": 3.25, "y": 4},
79 {"x": 4.25, "y": 4}, 79 {"matrix": [7, 12], "x": 4.25, "y": 4},
80 {"x": 5.25, "y": 4}, 80 {"matrix": [7, 14], "x": 5.25, "y": 4},
81 {"x": 6.25, "y": 4}, 81 {"matrix": [0, 0], "x": 6.25, "y": 4},
82 {"x": 7.25, "y": 4}, 82 {"matrix": [0, 1], "x": 7.25, "y": 4},
83 {"x": 8.25, "y": 4}, 83 {"matrix": [0, 2], "x": 8.25, "y": 4},
84 {"x": 9.25, "y": 4}, 84 {"matrix": [0, 3], "x": 9.25, "y": 4},
85 {"x": 10.25, "y": 4}, 85 {"matrix": [0, 4], "x": 10.25, "y": 4},
86 {"x": 11.25, "y": 4}, 86 {"matrix": [0, 5], "x": 11.25, "y": 4},
87 {"x": 12.25, "y": 4, "w": 1.75}, 87 {"matrix": [2, 11], "x": 12.25, "y": 4, "w": 1.75},
88 {"x": 14, "y": 4}, 88 {"matrix": [6, 6], "x": 14, "y": 4},
89 {"x": 15, "y": 3.8, "h": 1.2}, 89 {"matrix": [1, 15], "x": 15, "y": 3.8, "h": 1.2},
90 90
91 {"x": 0, "y": 5, "w": 1.25}, 91 {"matrix": [1, 16], "x": 0, "y": 5, "w": 1.25},
92 {"x": 1.25, "y": 5, "w": 1.25}, 92 {"matrix": [4, 13], "x": 1.25, "y": 5, "w": 1.25},
93 {"x": 2.5, "y": 5, "w": 1.25}, 93 {"matrix": [3, 14], "x": 2.5, "y": 5, "w": 1.25},
94 {"x": 3.75, "y": 5, "w": 5.5}, 94 {"matrix": [6, 13], "x": 3.75, "y": 5, "w": 5.5},
95 {"x": 9.25, "y": 5, "w": 1.25}, 95 {"matrix": [3, 10], "x": 9.25, "y": 5, "w": 1.25},
96 {"x": 10.5, "y": 5, "w": 1.25}, 96 {"matrix": [0, 17], "x": 10.5, "y": 5, "w": 1.25},
97 {"x": 11.75, "y": 5, "w": 1.25}, 97 {"matrix": [1, 12], "x": 11.75, "y": 5, "w": 1.25},
98 {"x": 13, "y": 5}, 98 {"matrix": [6, 7], "x": 13, "y": 5},
99 {"x": 14, "y": 5}, 99 {"matrix": [6, 8], "x": 14, "y": 5},
100 {"x": 15, "y": 5} 100 {"matrix": [6, 9], "x": 15, "y": 5}
101 ] 101 ]
102 } 102 }
103 } 103 }
diff --git a/keyboards/handwired/ms_sculpt_mobile/ms_sculpt_mobile.h b/keyboards/handwired/ms_sculpt_mobile/ms_sculpt_mobile.h
deleted file mode 100644
index 64d4f7bbc4..0000000000
--- a/keyboards/handwired/ms_sculpt_mobile/ms_sculpt_mobile.h
+++ /dev/null
@@ -1,43 +0,0 @@
1#pragma once
2
3#include "quantum.h"
4
5#define XXX KC_NO
6
7#define LAYOUT( \
8 k7G, k6E, k6F, k6G, k5E, k5F, k5G, k70, k71, k72, k73, k74, k75, k1E, k1A, k1B, \
9 k50, k5A, k5B, k5C, k5D, k57, k58, k20, k21, k22, k23, k51, k52, k59, k24, \
10 k6H, k63, k64, k65, k78, k79, k40, k41, k42, k43, k30, k31, k32, k33, \
11 k09, k60, k61, k62, k77, k10, k11, k53, k54, k55, k56, k12, k7F, k26, \
12 k2F, k7A, k7B, k7C, k7E, k00, k01, k02, k03, k04, k05, k2B, k66, k1F, \
13 k1G, k4D, k3E, k6D, k3A, k0H, k1C, k67, k68, k69 \
14) { \
15 { k00, k01, k02, k03, k04, k05, XXX, XXX, XXX, k09, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k0H }, \
16 { k10, k11, k12, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k1A, k1B, k1C, XXX, k1E, k1F, k1G, XXX }, \
17 { k20, k21, k22, k23, k24, XXX, k26, XXX, XXX, XXX, XXX, k2B, XXX, XXX, XXX, k2F, XXX, XXX }, \
18 { k30, k31, k32, k33, XXX, XXX, XXX, XXX, XXX, XXX, k3A, XXX, XXX, XXX, k3E, XXX, XXX, XXX }, \
19 { k40, k41, k42, k43, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k4D, XXX, XXX, XXX, XXX }, \
20 { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F, k5G, XXX }, \
21 { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, XXX, XXX, XXX, k6D, k6E, k6F, k6G, k6H }, \
22 { k70, k71, k72, k73, k74, k75, XXX, k77, k78, k79, k7A, k7B, k7C, XXX, k7E, k7F, k7G, XXX } \
23}
24
25#define MATRIX_TESTING_LAYOUT( \
26 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, \
27 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, \
28 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, \
29 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G, k3H, \
30 k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, \
31 k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F, k5G, k5H, \
32 k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E, k6F, k6G, k6H, \
33 k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A, k7B, k7C, k7D, k7E, k7F, k7G, k7H \
34) { \
35 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H }, \
36 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \
37 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H }, \
38 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G, k3H }, \
39 { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H }, \
40 { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F, k5G, k5H }, \
41 { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E, k6F, k6G, k6H }, \
42 { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A, k7B, k7C, k7D, k7E, k7F, k7G, k7H } \
43}
diff --git a/keyboards/handwired/qc60/info.json b/keyboards/handwired/qc60/info.json
index 735c811451..b78ca3c807 100644
--- a/keyboards/handwired/qc60/info.json
+++ b/keyboards/handwired/qc60/info.json
@@ -24,624 +24,617 @@
24 "layouts": { 24 "layouts": {
25 "LAYOUT": { 25 "LAYOUT": {
26 "layout": [ 26 "layout": [
27 {"label":"L00", "x":0, "y":0}, 27 {"matrix": [0, 0], "x": 0, "y": 0},
28 {"label":"L01", "x":1, "y":0}, 28 {"matrix": [0, 1], "x": 1, "y": 0},
29 {"label":"L02", "x":2, "y":0}, 29 {"matrix": [0, 2], "x": 2, "y": 0},
30 {"label":"L03", "x":3, "y":0}, 30 {"matrix": [0, 3], "x": 3, "y": 0},
31 {"label":"L04", "x":4, "y":0}, 31 {"matrix": [0, 4], "x": 4, "y": 0},
32 {"label":"L05", "x":5, "y":0}, 32 {"matrix": [0, 5], "x": 5, "y": 0},
33 {"label":"L06", "x":6, "y":0}, 33 {"matrix": [0, 6], "x": 6, "y": 0},
34 34
35 {"label":"R00", "x":8, "y":0}, 35 {"matrix": [5, 7], "x": 8, "y": 0},
36 {"label":"R01", "x":9, "y":0}, 36 {"matrix": [5, 6], "x": 9, "y": 0},
37 {"label":"R02", "x":10, "y":0}, 37 {"matrix": [5, 5], "x": 10, "y": 0},
38 {"label":"R03", "x":11, "y":0}, 38 {"matrix": [5, 4], "x": 11, "y": 0},
39 {"label":"R04", "x":12, "y":0}, 39 {"matrix": [5, 3], "x": 12, "y": 0},
40 {"label":"R05", "x":13, "y":0}, 40 {"matrix": [5, 2], "x": 13, "y": 0},
41 {"label":"R06", "x":14, "y":0}, 41 {"matrix": [5, 1], "x": 14, "y": 0},
42 {"label":"R07", "x":15, "y":0}, 42 {"matrix": [5, 0], "x": 15, "y": 0},
43 43
44 {"label":"L10", "x":0, "y":1, "w":1.5}, 44 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
45 {"label":"L11", "x":1.5, "y":1}, 45 {"matrix": [1, 1], "x": 1.5, "y": 1},
46 {"label":"L12", "x":2.5, "y":1}, 46 {"matrix": [1, 2], "x": 2.5, "y": 1},
47 {"label":"L13", "x":3.5, "y":1}, 47 {"matrix": [1, 3], "x": 3.5, "y": 1},
48 {"label":"L14", "x":4.5, "y":1}, 48 {"matrix": [1, 4], "x": 4.5, "y": 1},
49 {"label":"L15", "x":5.5, "y":1}, 49 {"matrix": [1, 5], "x": 5.5, "y": 1},
50 50
51 {"label":"R10", "x":7.5, "y":1}, 51 {"matrix": [6, 7], "x": 7.5, "y": 1},
52 {"label":"R11", "x":8.5, "y":1}, 52 {"matrix": [6, 6], "x": 8.5, "y": 1},
53 {"label":"R12", "x":9.5, "y":1}, 53 {"matrix": [6, 5], "x": 9.5, "y": 1},
54 {"label":"R13", "x":10.5, "y":1}, 54 {"matrix": [6, 4], "x": 10.5, "y": 1},
55 {"label":"R14", "x":11.5, "y":1}, 55 {"matrix": [6, 3], "x": 11.5, "y": 1},
56 {"label":"R15", "x":12.5, "y":1}, 56 {"matrix": [6, 2], "x": 12.5, "y": 1},
57 {"label":"R16", "x":13.5, "y":1}, 57 {"matrix": [6, 1], "x": 13.5, "y": 1},
58 {"label":"R17", "x":14.5, "y":1, "w":1.5}, 58 {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5},
59 59
60 {"label":"L20", "x":0, "y":2, "w":1.75}, 60 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
61 {"label":"L21", "x":1.75, "y":2}, 61 {"matrix": [2, 1], "x": 1.75, "y": 2},
62 {"label":"L22", "x":2.75, "y":2}, 62 {"matrix": [2, 2], "x": 2.75, "y": 2},
63 {"label":"L23", "x":3.75, "y":2}, 63 {"matrix": [2, 3], "x": 3.75, "y": 2},
64 {"label":"L24", "x":4.75, "y":2}, 64 {"matrix": [2, 4], "x": 4.75, "y": 2},
65 {"label":"L25", "x":5.75, "y":2}, 65 {"matrix": [2, 5], "x": 5.75, "y": 2},
66 66
67 {"label":"R21", "x":7.75, "y":2}, 67 {"matrix": [7, 6], "x": 7.75, "y": 2},
68 {"label":"R22", "x":8.75, "y":2}, 68 {"matrix": [7, 5], "x": 8.75, "y": 2},
69 {"label":"R23", "x":9.75, "y":2}, 69 {"matrix": [7, 4], "x": 9.75, "y": 2},
70 {"label":"R24", "x":10.75, "y":2}, 70 {"matrix": [7, 3], "x": 10.75, "y": 2},
71 {"label":"R25", "x":11.75, "y":2}, 71 {"matrix": [7, 2], "x": 11.75, "y": 2},
72 {"label":"R26", "x":12.75, "y":2}, 72 {"matrix": [7, 1], "x": 12.75, "y": 2},
73 {"label":"R27", "x":13.75, "y":2, "w":2.25}, 73 {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25},
74 74
75 {"label":"L30", "x":0, "y":3, "w":1.25}, 75 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
76 {"label":"L31", "x":1.25, "y":3}, 76 {"matrix": [3, 1], "x": 1.25, "y": 3},
77 {"label":"L32", "x":2.25, "y":3}, 77 {"matrix": [3, 2], "x": 2.25, "y": 3},
78 {"label":"L33", "x":3.25, "y":3}, 78 {"matrix": [3, 3], "x": 3.25, "y": 3},
79 {"label":"L34", "x":4.25, "y":3}, 79 {"matrix": [3, 4], "x": 4.25, "y": 3},
80 {"label":"L35", "x":5.25, "y":3}, 80 {"matrix": [3, 5], "x": 5.25, "y": 3},
81 {"label":"L36", "x":6.25, "y":3}, 81 {"matrix": [3, 6], "x": 6.25, "y": 3},
82 82
83 {"label":"R31", "x":8.25, "y":3}, 83 {"matrix": [8, 6], "x": 8.25, "y": 3},
84 {"label":"R32", "x":9.25, "y":3}, 84 {"matrix": [8, 5], "x": 9.25, "y": 3},
85 {"label":"R33", "x":10.25, "y":3}, 85 {"matrix": [8, 4], "x": 10.25, "y": 3},
86 {"label":"R34", "x":11.25, "y":3}, 86 {"matrix": [8, 3], "x": 11.25, "y": 3},
87 {"label":"R35", "x":12.25, "y":3}, 87 {"matrix": [8, 2], "x": 12.25, "y": 3},
88 {"label":"R36", "x":13.25, "y":3, "w":1.75}, 88 {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 1.75},
89 {"label":"R37", "x":15, "y":3}, 89 {"matrix": [8, 0], "x": 15, "y": 3},
90 90
91 {"label":"L40", "x":0, "y":4, "w":1.25}, 91 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
92 {"label":"L41", "x":1.25, "y":4, "w":1.25}, 92 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
93 {"label":"L42", "x":2.5, "y":4, "w":1.25}, 93 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
94 {"label":"L43", "x":3.75, "y":4, "w":2.75}, 94 {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.75},
95 {"label":"L44", "x":6.5, "y":4, "w":1.25}, 95 {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 1.25},
96 96
97 {"label":"R43", "x":8.75, "y":4, "w":1.25}, 97 {"matrix": [9, 4], "x": 8.75, "y": 4, "w": 1.25},
98 {"label":"R44", "x":10, "y":4, "w":2}, 98 {"matrix": [9, 3], "x": 10, "y": 4, "w": 2},
99 {"label":"R42", "x":12, "y":4}, 99 {"matrix": [9, 5], "x": 12, "y": 4},
100 {"label":"R45", "x":13, "y":4}, 100 {"matrix": [9, 2], "x": 13, "y": 4},
101 {"label":"R46", "x":14, "y":4}, 101 {"matrix": [9, 1], "x": 14, "y": 4},
102 {"label":"R47", "x":15, "y":4} 102 {"matrix": [9, 0], "x": 15, "y": 4}
103 ] 103 ]
104 }, 104 },
105
106 "LAYOUT_ansi_default": { 105 "LAYOUT_ansi_default": {
107 "layout": [ 106 "layout": [
108 {"label":"Esc", "x":0, "y":0}, 107 {"matrix": [0, 0], "x": 0, "y": 0},
109 {"label":"1", "x":1, "y":0}, 108 {"matrix": [0, 1], "x": 1, "y": 0},
110 {"label":"2", "x":2, "y":0}, 109 {"matrix": [0, 2], "x": 2, "y": 0},
111 {"label":"3", "x":3, "y":0}, 110 {"matrix": [0, 3], "x": 3, "y": 0},
112 {"label":"4", "x":4, "y":0}, 111 {"matrix": [0, 4], "x": 4, "y": 0},
113 {"label":"5", "x":5, "y":0}, 112 {"matrix": [0, 5], "x": 5, "y": 0},
114 {"label":"6", "x":6, "y":0}, 113 {"matrix": [0, 6], "x": 6, "y": 0},
115 114
116 {"label":"7", "x":8, "y":0}, 115 {"matrix": [5, 7], "x": 8, "y": 0},
117 {"label":"8", "x":9, "y":0}, 116 {"matrix": [5, 6], "x": 9, "y": 0},
118 {"label":"9", "x":10, "y":0}, 117 {"matrix": [5, 5], "x": 10, "y": 0},
119 {"label":"0", "x":11, "y":0}, 118 {"matrix": [5, 4], "x": 11, "y": 0},
120 {"label":"-", "x":12, "y":0}, 119 {"matrix": [5, 3], "x": 12, "y": 0},
121 {"label":"=", "x":13, "y":0}, 120 {"matrix": [5, 2], "x": 13, "y": 0},
122 {"label":"Backspace", "x":14, "y":0, "w":2}, 121 {"matrix": [5, 0], "x": 14, "y": 0, "w": 2},
123 122
124 {"label":"Tab", "x":0, "y":1, "w":1.5}, 123 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
125 {"label":"Q", "x":1.5, "y":1}, 124 {"matrix": [1, 1], "x": 1.5, "y": 1},
126 {"label":"W", "x":2.5, "y":1}, 125 {"matrix": [1, 2], "x": 2.5, "y": 1},
127 {"label":"E", "x":3.5, "y":1}, 126 {"matrix": [1, 3], "x": 3.5, "y": 1},
128 {"label":"R", "x":4.5, "y":1}, 127 {"matrix": [1, 4], "x": 4.5, "y": 1},
129 {"label":"T", "x":5.5, "y":1}, 128 {"matrix": [1, 5], "x": 5.5, "y": 1},
130 129
131 {"label":"Y", "x":7.5, "y":1}, 130 {"matrix": [6, 7], "x": 7.5, "y": 1},
132 {"label":"U", "x":8.5, "y":1}, 131 {"matrix": [6, 6], "x": 8.5, "y": 1},
133 {"label":"I", "x":9.5, "y":1}, 132 {"matrix": [6, 5], "x": 9.5, "y": 1},
134 {"label":"O", "x":10.5, "y":1}, 133 {"matrix": [6, 4], "x": 10.5, "y": 1},
135 {"label":"P", "x":11.5, "y":1}, 134 {"matrix": [6, 3], "x": 11.5, "y": 1},
136 {"label":"[", "x":12.5, "y":1}, 135 {"matrix": [6, 2], "x": 12.5, "y": 1},
137 {"label":"]", "x":13.5, "y":1}, 136 {"matrix": [6, 1], "x": 13.5, "y": 1},
138 {"label":"\\", "x":14.5, "y":1, "w":1.5}, 137 {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5},
139 138
140 {"label":"CapsLock", "x":0, "y":2, "w":1.75}, 139 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
141 {"label":"A", "x":1.75, "y":2}, 140 {"matrix": [2, 1], "x": 1.75, "y": 2},
142 {"label":"S", "x":2.75, "y":2}, 141 {"matrix": [2, 2], "x": 2.75, "y": 2},
143 {"label":"D", "x":3.75, "y":2}, 142 {"matrix": [2, 3], "x": 3.75, "y": 2},
144 {"label":"F", "x":4.75, "y":2}, 143 {"matrix": [2, 4], "x": 4.75, "y": 2},
145 {"label":"G", "x":5.75, "y":2}, 144 {"matrix": [2, 5], "x": 5.75, "y": 2},
146 145
147 {"label":"H", "x":7.75, "y":2}, 146 {"matrix": [7, 6], "x": 7.75, "y": 2},
148 {"label":"J", "x":8.75, "y":2}, 147 {"matrix": [7, 5], "x": 8.75, "y": 2},
149 {"label":"K", "x":9.75, "y":2}, 148 {"matrix": [7, 4], "x": 9.75, "y": 2},
150 {"label":"L", "x":10.75, "y":2}, 149 {"matrix": [7, 3], "x": 10.75, "y": 2},
151 {"label":";", "x":11.75, "y":2}, 150 {"matrix": [7, 2], "x": 11.75, "y": 2},
152 {"label":"'", "x":12.75, "y":2}, 151 {"matrix": [7, 1], "x": 12.75, "y": 2},
153 {"label":"Enter", "x":13.75, "y":2, "w":2.25}, 152 {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25},
154 153
155 {"label":"Shift", "x":0, "y":3, "w":2.25}, 154 {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
156 {"label":"Z", "x":2.25, "y":3}, 155 {"matrix": [3, 2], "x": 2.25, "y": 3},
157 {"label":"X", "x":3.25, "y":3}, 156 {"matrix": [3, 3], "x": 3.25, "y": 3},
158 {"label":"C", "x":4.25, "y":3}, 157 {"matrix": [3, 4], "x": 4.25, "y": 3},
159 {"label":"V", "x":5.25, "y":3}, 158 {"matrix": [3, 5], "x": 5.25, "y": 3},
160 {"label":"B", "x":6.25, "y":3}, 159 {"matrix": [3, 6], "x": 6.25, "y": 3},
161 160
162 {"label":"N", "x":8.25, "y":3}, 161 {"matrix": [8, 6], "x": 8.25, "y": 3},
163 {"label":"M", "x":9.25, "y":3}, 162 {"matrix": [8, 5], "x": 9.25, "y": 3},
164 {"label":",", "x":10.25, "y":3}, 163 {"matrix": [8, 4], "x": 10.25, "y": 3},
165 {"label":".", "x":11.25, "y":3}, 164 {"matrix": [8, 3], "x": 11.25, "y": 3},
166 {"label":"/", "x":12.25, "y":3}, 165 {"matrix": [8, 2], "x": 12.25, "y": 3},
167 {"label":"Shift", "x":13.25, "y":3, "w":2.75}, 166 {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 2.75},
168 167
169 {"label":"Ctrl", "x":0, "y":4, "w":1.25}, 168 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
170 {"label":"Win", "x":1.25, "y":4, "w":1.25}, 169 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
171 {"label":"Alt", "x":2.5, "y":4, "w":1.25}, 170 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
172 {"x":3.75, "y":4, "w":2.75}, 171 {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.75},
173 {"x":6.5, "y":4, "w":1.25}, 172 {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 1.25},
174 173
175 {"x":8.75, "y":4, "w":1.25}, 174 {"matrix": [9, 4], "x": 8.75, "y": 4, "w": 1.25},
176 {"x":10, "y":4, "w":2}, 175 {"matrix": [9, 3], "x": 10, "y": 4, "w": 2},
177 {"label":"Alt", "x":12, "y":4}, 176 {"matrix": [9, 5], "x": 12, "y": 4},
178 {"label":"Win", "x":13, "y":4}, 177 {"matrix": [9, 2], "x": 13, "y": 4},
179 {"label":"Menu", "x":14, "y":4}, 178 {"matrix": [9, 1], "x": 14, "y": 4},
180 {"label":"Ctrl", "x":15, "y":4} 179 {"matrix": [9, 0], "x": 15, "y": 4}
181 ] 180 ]
182 }, 181 },
183
184 "LAYOUT_ansi_alt": { 182 "LAYOUT_ansi_alt": {
185 "layout": [ 183 "layout": [
186 {"label":"L00", "x":0, "y":0}, 184 {"matrix": [0, 0], "x": 0, "y": 0},
187 {"label":"L01", "x":1, "y":0}, 185 {"matrix": [0, 1], "x": 1, "y": 0},
188 {"label":"L02", "x":2, "y":0}, 186 {"matrix": [0, 2], "x": 2, "y": 0},
189 {"label":"L03", "x":3, "y":0}, 187 {"matrix": [0, 3], "x": 3, "y": 0},
190 {"label":"L04", "x":4, "y":0}, 188 {"matrix": [0, 4], "x": 4, "y": 0},
191 {"label":"L05", "x":5, "y":0}, 189 {"matrix": [0, 5], "x": 5, "y": 0},
192 {"label":"L06", "x":6, "y":0}, 190 {"matrix": [0, 6], "x": 6, "y": 0},
193 191
194 {"label":"R00", "x":8, "y":0}, 192 {"matrix": [5, 7], "x": 8, "y": 0},
195 {"label":"R01", "x":9, "y":0}, 193 {"matrix": [5, 6], "x": 9, "y": 0},
196 {"label":"R02", "x":10, "y":0}, 194 {"matrix": [5, 5], "x": 10, "y": 0},
197 {"label":"R03", "x":11, "y":0}, 195 {"matrix": [5, 4], "x": 11, "y": 0},
198 {"label":"R04", "x":12, "y":0}, 196 {"matrix": [5, 3], "x": 12, "y": 0},
199 {"label":"R05", "x":13, "y":0}, 197 {"matrix": [5, 2], "x": 13, "y": 0},
200 {"label":"R07", "x":14, "y":0, "w":2}, 198 {"matrix": [5, 0], "x": 14, "y": 0, "w": 2},
201 199
202 {"label":"L10", "x":0, "y":1, "w":1.5}, 200 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
203 {"label":"L11", "x":1.5, "y":1}, 201 {"matrix": [1, 1], "x": 1.5, "y": 1},
204 {"label":"L12", "x":2.5, "y":1}, 202 {"matrix": [1, 2], "x": 2.5, "y": 1},
205 {"label":"L13", "x":3.5, "y":1}, 203 {"matrix": [1, 3], "x": 3.5, "y": 1},
206 {"label":"L14", "x":4.5, "y":1}, 204 {"matrix": [1, 4], "x": 4.5, "y": 1},
207 {"label":"L15", "x":5.5, "y":1}, 205 {"matrix": [1, 5], "x": 5.5, "y": 1},
208 206
209 {"label":"R10", "x":7.5, "y":1}, 207 {"matrix": [6, 7], "x": 7.5, "y": 1},
210 {"label":"R11", "x":8.5, "y":1}, 208 {"matrix": [6, 6], "x": 8.5, "y": 1},
211 {"label":"R12", "x":9.5, "y":1}, 209 {"matrix": [6, 5], "x": 9.5, "y": 1},
212 {"label":"R13", "x":10.5, "y":1}, 210 {"matrix": [6, 4], "x": 10.5, "y": 1},
213 {"label":"R14", "x":11.5, "y":1}, 211 {"matrix": [6, 3], "x": 11.5, "y": 1},
214 {"label":"R15", "x":12.5, "y":1}, 212 {"matrix": [6, 2], "x": 12.5, "y": 1},
215 {"label":"R16", "x":13.5, "y":1}, 213 {"matrix": [6, 1], "x": 13.5, "y": 1},
216 {"label":"R17", "x":14.5, "y":1, "w":1.5}, 214 {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5},
217 215
218 {"label":"L20", "x":0, "y":2, "w":1.75}, 216 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
219 {"label":"L21", "x":1.75, "y":2}, 217 {"matrix": [2, 1], "x": 1.75, "y": 2},
220 {"label":"L22", "x":2.75, "y":2}, 218 {"matrix": [2, 2], "x": 2.75, "y": 2},
221 {"label":"L23", "x":3.75, "y":2}, 219 {"matrix": [2, 3], "x": 3.75, "y": 2},
222 {"label":"L24", "x":4.75, "y":2}, 220 {"matrix": [2, 4], "x": 4.75, "y": 2},
223 {"label":"L25", "x":5.75, "y":2}, 221 {"matrix": [2, 5], "x": 5.75, "y": 2},
224 222
225 {"label":"R21", "x":7.75, "y":2}, 223 {"matrix": [7, 6], "x": 7.75, "y": 2},
226 {"label":"R22", "x":8.75, "y":2}, 224 {"matrix": [7, 5], "x": 8.75, "y": 2},
227 {"label":"R23", "x":9.75, "y":2}, 225 {"matrix": [7, 4], "x": 9.75, "y": 2},
228 {"label":"R24", "x":10.75, "y":2}, 226 {"matrix": [7, 3], "x": 10.75, "y": 2},
229 {"label":"R25", "x":11.75, "y":2}, 227 {"matrix": [7, 2], "x": 11.75, "y": 2},
230 {"label":"R26", "x":12.75, "y":2}, 228 {"matrix": [7, 1], "x": 12.75, "y": 2},
231 {"label":"R27", "x":13.75, "y":2, "w":2.25}, 229 {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25},
232 230
233 {"label":"L31", "x":0, "y":3, "w":2.25}, 231 {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
234 {"label":"L32", "x":2.25, "y":3}, 232 {"matrix": [3, 2], "x": 2.25, "y": 3},
235 {"label":"L33", "x":3.25, "y":3}, 233 {"matrix": [3, 3], "x": 3.25, "y": 3},
236 {"label":"L34", "x":4.25, "y":3}, 234 {"matrix": [3, 4], "x": 4.25, "y": 3},
237 {"label":"L35", "x":5.25, "y":3}, 235 {"matrix": [3, 5], "x": 5.25, "y": 3},
238 {"label":"L36", "x":6.25, "y":3}, 236 {"matrix": [3, 6], "x": 6.25, "y": 3},
239 237
240 {"label":"R31", "x":8.25, "y":3}, 238 {"matrix": [8, 6], "x": 8.25, "y": 3},
241 {"label":"R32", "x":9.25, "y":3}, 239 {"matrix": [8, 5], "x": 9.25, "y": 3},
242 {"label":"R33", "x":10.25, "y":3}, 240 {"matrix": [8, 4], "x": 10.25, "y": 3},
243 {"label":"R34", "x":11.25, "y":3}, 241 {"matrix": [8, 3], "x": 11.25, "y": 3},
244 {"label":"R35", "x":12.25, "y":3}, 242 {"matrix": [8, 2], "x": 12.25, "y": 3},
245 {"label":"R36", "x":13.25, "y":3, "w":2.75}, 243 {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 2.75},
246 244
247 {"label":"L40", "x":0, "y":4, "w":1.5}, 245 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
248 {"label":"L41", "x":1.5, "y":4}, 246 {"matrix": [4, 1], "x": 1.5, "y": 4},
249 {"label":"L42", "x":2.5, "y":4, "w":1.5}, 247 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
250 {"label":"L43", "x":4, "y":4, "w":2.75}, 248 {"matrix": [4, 3], "x": 4, "y": 4, "w": 2.75},
251 {"label":"L44", "x":6.75, "y":4}, 249 {"matrix": [4, 4], "x": 6.75, "y": 4},
252 250
253 {"label":"R43", "x":8.75, "y":4}, 251 {"matrix": [9, 4], "x": 8.75, "y": 4},
254 {"label":"R44", "x":9.75, "y":4, "w":2.25}, 252 {"matrix": [9, 3], "x": 9.75, "y": 4, "w": 2.25},
255 {"label":"R45", "x":12, "y":4, "w":1.5}, 253 {"matrix": [9, 2], "x": 12, "y": 4, "w": 1.5},
256 {"label":"R46", "x":13.5, "y":4}, 254 {"matrix": [9, 1], "x": 13.5, "y": 4},
257 {"label":"R47", "x":14.5, "y":4, "w":1.5} 255 {"matrix": [9, 0], "x": 14.5, "y": 4, "w": 1.5}
258 ] 256 ]
259 }, 257 },
260
261 "LAYOUT_iso_default": { 258 "LAYOUT_iso_default": {
262 "layout": [ 259 "layout": [
263 {"label":"L00", "x":0, "y":0}, 260 {"matrix": [0, 0], "x": 0, "y": 0},
264 {"label":"L01", "x":1, "y":0}, 261 {"matrix": [0, 1], "x": 1, "y": 0},
265 {"label":"L02", "x":2, "y":0}, 262 {"matrix": [0, 2], "x": 2, "y": 0},
266 {"label":"L03", "x":3, "y":0}, 263 {"matrix": [0, 3], "x": 3, "y": 0},
267 {"label":"L04", "x":4, "y":0}, 264 {"matrix": [0, 4], "x": 4, "y": 0},
268 {"label":"L05", "x":5, "y":0}, 265 {"matrix": [0, 5], "x": 5, "y": 0},
269 {"label":"L06", "x":6, "y":0}, 266 {"matrix": [0, 6], "x": 6, "y": 0},
270 267
271 {"label":"R00", "x":8, "y":0}, 268 {"matrix": [5, 7], "x": 8, "y": 0},
272 {"label":"R01", "x":9, "y":0}, 269 {"matrix": [5, 6], "x": 9, "y": 0},
273 {"label":"R02", "x":10, "y":0}, 270 {"matrix": [5, 5], "x": 10, "y": 0},
274 {"label":"R03", "x":11, "y":0}, 271 {"matrix": [5, 4], "x": 11, "y": 0},
275 {"label":"R04", "x":12, "y":0}, 272 {"matrix": [5, 3], "x": 12, "y": 0},
276 {"label":"R05", "x":13, "y":0}, 273 {"matrix": [5, 2], "x": 13, "y": 0},
277 {"label":"R07", "x":14, "y":0, "w":2}, 274 {"matrix": [5, 0], "x": 14, "y": 0, "w": 2},
278 275
279 {"label":"L10", "x":0, "y":1, "w":1.5}, 276 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
280 {"label":"L11", "x":1.5, "y":1}, 277 {"matrix": [1, 1], "x": 1.5, "y": 1},
281 {"label":"L12", "x":2.5, "y":1}, 278 {"matrix": [1, 2], "x": 2.5, "y": 1},
282 {"label":"L13", "x":3.5, "y":1}, 279 {"matrix": [1, 3], "x": 3.5, "y": 1},
283 {"label":"L14", "x":4.5, "y":1}, 280 {"matrix": [1, 4], "x": 4.5, "y": 1},
284 {"label":"L15", "x":5.5, "y":1}, 281 {"matrix": [1, 5], "x": 5.5, "y": 1},
285 282
286 {"label":"R10", "x":7.5, "y":1}, 283 {"matrix": [6, 7], "x": 7.5, "y": 1},
287 {"label":"R11", "x":8.5, "y":1}, 284 {"matrix": [6, 6], "x": 8.5, "y": 1},
288 {"label":"R12", "x":9.5, "y":1}, 285 {"matrix": [6, 5], "x": 9.5, "y": 1},
289 {"label":"R13", "x":10.5, "y":1}, 286 {"matrix": [6, 4], "x": 10.5, "y": 1},
290 {"label":"R14", "x":11.5, "y":1}, 287 {"matrix": [6, 3], "x": 11.5, "y": 1},
291 {"label":"R15", "x":12.5, "y":1}, 288 {"matrix": [6, 2], "x": 12.5, "y": 1},
292 {"label":"R16", "x":13.5, "y":1}, 289 {"matrix": [6, 1], "x": 13.5, "y": 1},
293 290
294 {"label":"L20", "x":0, "y":2, "w":1.75}, 291 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
295 {"label":"L21", "x":1.75, "y":2}, 292 {"matrix": [2, 1], "x": 1.75, "y": 2},
296 {"label":"L22", "x":2.75, "y":2}, 293 {"matrix": [2, 2], "x": 2.75, "y": 2},
297 {"label":"L23", "x":3.75, "y":2}, 294 {"matrix": [2, 3], "x": 3.75, "y": 2},
298 {"label":"L24", "x":4.75, "y":2}, 295 {"matrix": [2, 4], "x": 4.75, "y": 2},
299 {"label":"L25", "x":5.75, "y":2}, 296 {"matrix": [2, 5], "x": 5.75, "y": 2},
300 297
301 {"label":"R21", "x":7.75, "y":2}, 298 {"matrix": [7, 6], "x": 7.75, "y": 2},
302 {"label":"R22", "x":8.75, "y":2}, 299 {"matrix": [7, 5], "x": 8.75, "y": 2},
303 {"label":"R23", "x":9.75, "y":2}, 300 {"matrix": [7, 4], "x": 9.75, "y": 2},
304 {"label":"R24", "x":10.75, "y":2}, 301 {"matrix": [7, 3], "x": 10.75, "y": 2},
305 {"label":"R25", "x":11.75, "y":2}, 302 {"matrix": [7, 2], "x": 11.75, "y": 2},
306 {"label":"R26", "x":12.75, "y":2}, 303 {"matrix": [7, 1], "x": 12.75, "y": 2},
307 {"label":"R17", "x":13.75, "y":2}, 304 {"matrix": [6, 0], "x": 13.75, "y": 2},
308 {"label":"R27", "x":14.75, "y":1, "w":1.25, "h":2}, 305 {"matrix": [7, 0], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
309 306
310 {"label":"L30", "x":0, "y":3, "w":1.25}, 307 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
311 {"label":"L31", "x":1.25, "y":3}, 308 {"matrix": [3, 1], "x": 1.25, "y": 3},
312 {"label":"L32", "x":2.25, "y":3}, 309 {"matrix": [3, 2], "x": 2.25, "y": 3},
313 {"label":"L33", "x":3.25, "y":3}, 310 {"matrix": [3, 3], "x": 3.25, "y": 3},
314 {"label":"L34", "x":4.25, "y":3}, 311 {"matrix": [3, 4], "x": 4.25, "y": 3},
315 {"label":"L35", "x":5.25, "y":3}, 312 {"matrix": [3, 5], "x": 5.25, "y": 3},
316 {"label":"L36", "x":6.25, "y":3}, 313 {"matrix": [3, 6], "x": 6.25, "y": 3},
317 314
318 {"label":"R31", "x":8.25, "y":3}, 315 {"matrix": [8, 6], "x": 8.25, "y": 3},
319 {"label":"R32", "x":9.25, "y":3}, 316 {"matrix": [8, 5], "x": 9.25, "y": 3},
320 {"label":"R33", "x":10.25, "y":3}, 317 {"matrix": [8, 4], "x": 10.25, "y": 3},
321 {"label":"R34", "x":11.25, "y":3}, 318 {"matrix": [8, 3], "x": 11.25, "y": 3},
322 {"label":"R35", "x":12.25, "y":3}, 319 {"matrix": [8, 2], "x": 12.25, "y": 3},
323 {"label":"R36", "x":13.25, "y":3, "w":2.75}, 320 {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 2.75},
324 321
325 {"label":"L40", "x":0, "y":4, "w":1.25}, 322 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
326 {"label":"L41", "x":1.25, "y":4, "w":1.25}, 323 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
327 {"label":"L42", "x":2.5, "y":4, "w":1.25}, 324 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
328 {"label":"L43", "x":3.75, "y":4, "w":2.75}, 325 {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.75},
329 {"label":"L44", "x":6.5, "y":4, "w":1.25}, 326 {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 1.25},
330 327
331 {"label":"R43", "x":8.75, "y":4, "w":1.25}, 328 {"matrix": [9, 4], "x": 8.75, "y": 4, "w": 1.25},
332 {"label":"R44", "x":10, "y":4, "w":2}, 329 {"matrix": [9, 3], "x": 10, "y": 4, "w": 2},
333 {"label":"R42", "x":12, "y":4}, 330 {"matrix": [9, 5], "x": 12, "y": 4},
334 {"label":"R45", "x":13, "y":4}, 331 {"matrix": [9, 2], "x": 13, "y": 4},
335 {"label":"R46", "x":14, "y":4}, 332 {"matrix": [9, 1], "x": 14, "y": 4},
336 {"label":"R47", "x":15, "y":4} 333 {"matrix": [9, 0], "x": 15, "y": 4}
337 ] 334 ]
338 }, 335 },
339
340 "LAYOUT_iso_alt": { 336 "LAYOUT_iso_alt": {
341 "layout": [ 337 "layout": [
342 {"label":"L00", "x":0, "y":0}, 338 {"matrix": [0, 0], "x": 0, "y": 0},
343 {"label":"L01", "x":1, "y":0}, 339 {"matrix": [0, 1], "x": 1, "y": 0},
344 {"label":"L02", "x":2, "y":0}, 340 {"matrix": [0, 2], "x": 2, "y": 0},
345 {"label":"L03", "x":3, "y":0}, 341 {"matrix": [0, 3], "x": 3, "y": 0},
346 {"label":"L04", "x":4, "y":0}, 342 {"matrix": [0, 4], "x": 4, "y": 0},
347 {"label":"L05", "x":5, "y":0}, 343 {"matrix": [0, 5], "x": 5, "y": 0},
348 {"label":"L06", "x":6, "y":0}, 344 {"matrix": [0, 6], "x": 6, "y": 0},
349 345
350 {"label":"R00", "x":8, "y":0}, 346 {"matrix": [5, 7], "x": 8, "y": 0},
351 {"label":"R01", "x":9, "y":0}, 347 {"matrix": [5, 6], "x": 9, "y": 0},
352 {"label":"R02", "x":10, "y":0}, 348 {"matrix": [5, 5], "x": 10, "y": 0},
353 {"label":"R03", "x":11, "y":0}, 349 {"matrix": [5, 4], "x": 11, "y": 0},
354 {"label":"R04", "x":12, "y":0}, 350 {"matrix": [5, 3], "x": 12, "y": 0},
355 {"label":"R05", "x":13, "y":0}, 351 {"matrix": [5, 2], "x": 13, "y": 0},
356 {"label":"R07", "x":14, "y":0, "w":2}, 352 {"matrix": [5, 0], "x": 14, "y": 0, "w": 2},
357 353
358 {"label":"L10", "x":0, "y":1, "w":1.5}, 354 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
359 {"label":"L11", "x":1.5, "y":1}, 355 {"matrix": [1, 1], "x": 1.5, "y": 1},
360 {"label":"L12", "x":2.5, "y":1}, 356 {"matrix": [1, 2], "x": 2.5, "y": 1},
361 {"label":"L13", "x":3.5, "y":1}, 357 {"matrix": [1, 3], "x": 3.5, "y": 1},
362 {"label":"L14", "x":4.5, "y":1}, 358 {"matrix": [1, 4], "x": 4.5, "y": 1},
363 {"label":"L15", "x":5.5, "y":1}, 359 {"matrix": [1, 5], "x": 5.5, "y": 1},
364 360
365 {"label":"R10", "x":7.5, "y":1}, 361 {"matrix": [6, 7], "x": 7.5, "y": 1},
366 {"label":"R11", "x":8.5, "y":1}, 362 {"matrix": [6, 6], "x": 8.5, "y": 1},
367 {"label":"R12", "x":9.5, "y":1}, 363 {"matrix": [6, 5], "x": 9.5, "y": 1},
368 {"label":"R13", "x":10.5, "y":1}, 364 {"matrix": [6, 4], "x": 10.5, "y": 1},
369 {"label":"R14", "x":11.5, "y":1}, 365 {"matrix": [6, 3], "x": 11.5, "y": 1},
370 {"label":"R15", "x":12.5, "y":1}, 366 {"matrix": [6, 2], "x": 12.5, "y": 1},
371 {"label":"R16", "x":13.5, "y":1}, 367 {"matrix": [6, 1], "x": 13.5, "y": 1},
372 368
373 {"label":"L20", "x":0, "y":2, "w":1.75}, 369 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
374 {"label":"L21", "x":1.75, "y":2}, 370 {"matrix": [2, 1], "x": 1.75, "y": 2},
375 {"label":"L22", "x":2.75, "y":2}, 371 {"matrix": [2, 2], "x": 2.75, "y": 2},
376 {"label":"L23", "x":3.75, "y":2}, 372 {"matrix": [2, 3], "x": 3.75, "y": 2},
377 {"label":"L24", "x":4.75, "y":2}, 373 {"matrix": [2, 4], "x": 4.75, "y": 2},
378 {"label":"L25", "x":5.75, "y":2}, 374 {"matrix": [2, 5], "x": 5.75, "y": 2},
379 375
380 {"label":"R21", "x":7.75, "y":2}, 376 {"matrix": [7, 6], "x": 7.75, "y": 2},
381 {"label":"R22", "x":8.75, "y":2}, 377 {"matrix": [7, 5], "x": 8.75, "y": 2},
382 {"label":"R23", "x":9.75, "y":2}, 378 {"matrix": [7, 4], "x": 9.75, "y": 2},
383 {"label":"R24", "x":10.75, "y":2}, 379 {"matrix": [7, 3], "x": 10.75, "y": 2},
384 {"label":"R25", "x":11.75, "y":2}, 380 {"matrix": [7, 2], "x": 11.75, "y": 2},
385 {"label":"R26", "x":12.75, "y":2}, 381 {"matrix": [7, 1], "x": 12.75, "y": 2},
386 {"label":"R17", "x":13.75, "y":2}, 382 {"matrix": [6, 0], "x": 13.75, "y": 2},
387 {"label":"R27", "x":14.75, "y":1, "w":1.25, "h":2}, 383 {"matrix": [7, 0], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
388 384
389 {"label":"L30", "x":0, "y":3, "w":1.25}, 385 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
390 {"label":"L31", "x":1.25, "y":3}, 386 {"matrix": [3, 1], "x": 1.25, "y": 3},
391 {"label":"L32", "x":2.25, "y":3}, 387 {"matrix": [3, 2], "x": 2.25, "y": 3},
392 {"label":"L33", "x":3.25, "y":3}, 388 {"matrix": [3, 3], "x": 3.25, "y": 3},
393 {"label":"L34", "x":4.25, "y":3}, 389 {"matrix": [3, 4], "x": 4.25, "y": 3},
394 {"label":"L35", "x":5.25, "y":3}, 390 {"matrix": [3, 5], "x": 5.25, "y": 3},
395 {"label":"L36", "x":6.25, "y":3}, 391 {"matrix": [3, 6], "x": 6.25, "y": 3},
396 392
397 {"label":"R31", "x":8.25, "y":3}, 393 {"matrix": [8, 6], "x": 8.25, "y": 3},
398 {"label":"R32", "x":9.25, "y":3}, 394 {"matrix": [8, 5], "x": 9.25, "y": 3},
399 {"label":"R33", "x":10.25, "y":3}, 395 {"matrix": [8, 4], "x": 10.25, "y": 3},
400 {"label":"R34", "x":11.25, "y":3}, 396 {"matrix": [8, 3], "x": 11.25, "y": 3},
401 {"label":"R35", "x":12.25, "y":3}, 397 {"matrix": [8, 2], "x": 12.25, "y": 3},
402 {"label":"R36", "x":13.25, "y":3, "w":2.75}, 398 {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 2.75},
403 399
404 {"label":"L40", "x":0, "y":4, "w":1.5}, 400 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
405 {"label":"L41", "x":1.5, "y":4}, 401 {"matrix": [4, 1], "x": 1.5, "y": 4},
406 {"label":"L42", "x":2.5, "y":4, "w":1.5}, 402 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
407 {"label":"L43", "x":4, "y":4, "w":2.75}, 403 {"matrix": [4, 3], "x": 4, "y": 4, "w": 2.75},
408 {"label":"L44", "x":6.75, "y":4}, 404 {"matrix": [4, 4], "x": 6.75, "y": 4},
409 405
410 {"label":"R43", "x":8.75, "y":4}, 406 {"matrix": [9, 4], "x": 8.75, "y": 4},
411 {"label":"R44", "x":9.75, "y":4, "w":2.25}, 407 {"matrix": [9, 3], "x": 9.75, "y": 4, "w": 2.25},
412 {"label":"R45", "x":12, "y":4, "w":1.5}, 408 {"matrix": [9, 2], "x": 12, "y": 4, "w": 1.5},
413 {"label":"R46", "x":13.5, "y":4}, 409 {"matrix": [9, 1], "x": 13.5, "y": 4},
414 {"label":"R47", "x":14.5, "y":4, "w":1.5} 410 {"matrix": [9, 0], "x": 14.5, "y": 4, "w": 1.5}
415 ] 411 ]
416 }, 412 },
417
418 "LAYOUT_hhkb_default": { 413 "LAYOUT_hhkb_default": {
419 "layout": [ 414 "layout": [
420 {"label":"L00", "x":0, "y":0}, 415 {"matrix": [0, 0], "x": 0, "y": 0},
421 {"label":"L01", "x":1, "y":0}, 416 {"matrix": [0, 1], "x": 1, "y": 0},
422 {"label":"L02", "x":2, "y":0}, 417 {"matrix": [0, 2], "x": 2, "y": 0},
423 {"label":"L03", "x":3, "y":0}, 418 {"matrix": [0, 3], "x": 3, "y": 0},
424 {"label":"L04", "x":4, "y":0}, 419 {"matrix": [0, 4], "x": 4, "y": 0},
425 {"label":"L05", "x":5, "y":0}, 420 {"matrix": [0, 5], "x": 5, "y": 0},
426 {"label":"L06", "x":6, "y":0}, 421 {"matrix": [0, 6], "x": 6, "y": 0},
427 422
428 {"label":"R00", "x":8, "y":0}, 423 {"matrix": [5, 7], "x": 8, "y": 0},
429 {"label":"R01", "x":9, "y":0}, 424 {"matrix": [5, 6], "x": 9, "y": 0},
430 {"label":"R02", "x":10, "y":0}, 425 {"matrix": [5, 5], "x": 10, "y": 0},
431 {"label":"R03", "x":11, "y":0}, 426 {"matrix": [5, 4], "x": 11, "y": 0},
432 {"label":"R04", "x":12, "y":0}, 427 {"matrix": [5, 3], "x": 12, "y": 0},
433 {"label":"R05", "x":13, "y":0}, 428 {"matrix": [5, 2], "x": 13, "y": 0},
434 {"label":"R06", "x":14, "y":0}, 429 {"matrix": [5, 1], "x": 14, "y": 0},
435 {"label":"R07", "x":15, "y":0}, 430 {"matrix": [5, 0], "x": 15, "y": 0},
436 431
437 {"label":"L10", "x":0, "y":1, "w":1.5}, 432 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
438 {"label":"L11", "x":1.5, "y":1}, 433 {"matrix": [1, 1], "x": 1.5, "y": 1},
439 {"label":"L12", "x":2.5, "y":1}, 434 {"matrix": [1, 2], "x": 2.5, "y": 1},
440 {"label":"L13", "x":3.5, "y":1}, 435 {"matrix": [1, 3], "x": 3.5, "y": 1},
441 {"label":"L14", "x":4.5, "y":1}, 436 {"matrix": [1, 4], "x": 4.5, "y": 1},
442 {"label":"L15", "x":5.5, "y":1}, 437 {"matrix": [1, 5], "x": 5.5, "y": 1},
443 438
444 {"label":"R10", "x":7.5, "y":1}, 439 {"matrix": [6, 7], "x": 7.5, "y": 1},
445 {"label":"R11", "x":8.5, "y":1}, 440 {"matrix": [6, 6], "x": 8.5, "y": 1},
446 {"label":"R12", "x":9.5, "y":1}, 441 {"matrix": [6, 5], "x": 9.5, "y": 1},
447 {"label":"R13", "x":10.5, "y":1}, 442 {"matrix": [6, 4], "x": 10.5, "y": 1},
448 {"label":"R14", "x":11.5, "y":1}, 443 {"matrix": [6, 3], "x": 11.5, "y": 1},
449 {"label":"R15", "x":12.5, "y":1}, 444 {"matrix": [6, 2], "x": 12.5, "y": 1},
450 {"label":"R16", "x":13.5, "y":1}, 445 {"matrix": [6, 1], "x": 13.5, "y": 1},
451 {"label":"R17", "x":14.5, "y":1, "w":1.5}, 446 {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5},
452 447
453 {"label":"L20", "x":0, "y":2, "w":1.75}, 448 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
454 {"label":"L21", "x":1.75, "y":2}, 449 {"matrix": [2, 1], "x": 1.75, "y": 2},
455 {"label":"L22", "x":2.75, "y":2}, 450 {"matrix": [2, 2], "x": 2.75, "y": 2},
456 {"label":"L23", "x":3.75, "y":2}, 451 {"matrix": [2, 3], "x": 3.75, "y": 2},
457 {"label":"L24", "x":4.75, "y":2}, 452 {"matrix": [2, 4], "x": 4.75, "y": 2},
458 {"label":"L25", "x":5.75, "y":2}, 453 {"matrix": [2, 5], "x": 5.75, "y": 2},
459 454
460 {"label":"R21", "x":7.75, "y":2}, 455 {"matrix": [7, 6], "x": 7.75, "y": 2},
461 {"label":"R22", "x":8.75, "y":2}, 456 {"matrix": [7, 5], "x": 8.75, "y": 2},
462 {"label":"R23", "x":9.75, "y":2}, 457 {"matrix": [7, 4], "x": 9.75, "y": 2},
463 {"label":"R24", "x":10.75, "y":2}, 458 {"matrix": [7, 3], "x": 10.75, "y": 2},
464 {"label":"R25", "x":11.75, "y":2}, 459 {"matrix": [7, 2], "x": 11.75, "y": 2},
465 {"label":"R26", "x":12.75, "y":2}, 460 {"matrix": [7, 1], "x": 12.75, "y": 2},
466 {"label":"R27", "x":13.75, "y":2, "w":2.25}, 461 {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25},
467 462
468 {"label":"L31", "x":0, "y":3, "w":2.25}, 463 {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
469 {"label":"L32", "x":2.25, "y":3}, 464 {"matrix": [3, 2], "x": 2.25, "y": 3},
470 {"label":"L33", "x":3.25, "y":3}, 465 {"matrix": [3, 3], "x": 3.25, "y": 3},
471 {"label":"L34", "x":4.25, "y":3}, 466 {"matrix": [3, 4], "x": 4.25, "y": 3},
472 {"label":"L35", "x":5.25, "y":3}, 467 {"matrix": [3, 5], "x": 5.25, "y": 3},
473 {"label":"L36", "x":6.25, "y":3}, 468 {"matrix": [3, 6], "x": 6.25, "y": 3},
474 469
475 {"label":"R31", "x":8.25, "y":3}, 470 {"matrix": [8, 6], "x": 8.25, "y": 3},
476 {"label":"R32", "x":9.25, "y":3}, 471 {"matrix": [8, 5], "x": 9.25, "y": 3},
477 {"label":"R33", "x":10.25, "y":3}, 472 {"matrix": [8, 4], "x": 10.25, "y": 3},
478 {"label":"R34", "x":11.25, "y":3}, 473 {"matrix": [8, 3], "x": 11.25, "y": 3},
479 {"label":"R35", "x":12.25, "y":3}, 474 {"matrix": [8, 2], "x": 12.25, "y": 3},
480 {"label":"R36", "x":13.25, "y":3, "w":1.75}, 475 {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 1.75},
481 {"label":"R37", "x":15, "y":3}, 476 {"matrix": [8, 0], "x": 15, "y": 3},
482 477
483 {"label":"L41", "x":1.5, "y":4}, 478 {"matrix": [4, 1], "x": 1.5, "y": 4},
484 {"label":"L42", "x":2.5, "y":4, "w":1.5}, 479 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
485 {"label":"L43", "x":4, "y":4, "w":2.75}, 480 {"matrix": [4, 3], "x": 4, "y": 4, "w": 2.75},
486 {"label":"L44", "x":6.75, "y":4}, 481 {"matrix": [4, 4], "x": 6.75, "y": 4},
487 482
488 {"label":"R43", "x":8.75, "y":4}, 483 {"matrix": [9, 4], "x": 8.75, "y": 4},
489 {"label":"R44", "x":9.75, "y":4, "w":2.25}, 484 {"matrix": [9, 3], "x": 9.75, "y": 4, "w": 2.25},
490 {"label":"R45", "x":12, "y":4, "w":1.5}, 485 {"matrix": [9, 2], "x": 12, "y": 4, "w": 1.5},
491 {"label":"R46", "x":13.5, "y":4} 486 {"matrix": [9, 1], "x": 13.5, "y": 4}
492 ] 487 ]
493 }, 488 },
494
495 "LAYOUT_hhkb_split_lshift": { 489 "LAYOUT_hhkb_split_lshift": {
496 "layout": [ 490 "layout": [
497 {"label":"L00", "x":0, "y":0}, 491 {"matrix": [0, 0], "x": 0, "y": 0},
498 {"label":"L01", "x":1, "y":0}, 492 {"matrix": [0, 1], "x": 1, "y": 0},
499 {"label":"L02", "x":2, "y":0}, 493 {"matrix": [0, 2], "x": 2, "y": 0},
500 {"label":"L03", "x":3, "y":0}, 494 {"matrix": [0, 3], "x": 3, "y": 0},
501 {"label":"L04", "x":4, "y":0}, 495 {"matrix": [0, 4], "x": 4, "y": 0},
502 {"label":"L05", "x":5, "y":0}, 496 {"matrix": [0, 5], "x": 5, "y": 0},
503 {"label":"L06", "x":6, "y":0}, 497 {"matrix": [0, 6], "x": 6, "y": 0},
504 498
505 {"label":"R00", "x":8, "y":0}, 499 {"matrix": [5, 7], "x": 8, "y": 0},
506 {"label":"R01", "x":9, "y":0}, 500 {"matrix": [5, 6], "x": 9, "y": 0},
507 {"label":"R02", "x":10, "y":0}, 501 {"matrix": [5, 5], "x": 10, "y": 0},
508 {"label":"R03", "x":11, "y":0}, 502 {"matrix": [5, 4], "x": 11, "y": 0},
509 {"label":"R04", "x":12, "y":0}, 503 {"matrix": [5, 3], "x": 12, "y": 0},
510 {"label":"R05", "x":13, "y":0}, 504 {"matrix": [5, 2], "x": 13, "y": 0},
511 {"label":"R06", "x":14, "y":0}, 505 {"matrix": [5, 1], "x": 14, "y": 0},
512 {"label":"R07", "x":15, "y":0}, 506 {"matrix": [5, 0], "x": 15, "y": 0},
513 507
514 {"label":"L10", "x":0, "y":1, "w":1.5}, 508 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
515 {"label":"L11", "x":1.5, "y":1}, 509 {"matrix": [1, 1], "x": 1.5, "y": 1},
516 {"label":"L12", "x":2.5, "y":1}, 510 {"matrix": [1, 2], "x": 2.5, "y": 1},
517 {"label":"L13", "x":3.5, "y":1}, 511 {"matrix": [1, 3], "x": 3.5, "y": 1},
518 {"label":"L14", "x":4.5, "y":1}, 512 {"matrix": [1, 4], "x": 4.5, "y": 1},
519 {"label":"L15", "x":5.5, "y":1}, 513 {"matrix": [1, 5], "x": 5.5, "y": 1},
520 514
521 {"label":"R10", "x":7.5, "y":1}, 515 {"matrix": [6, 7], "x": 7.5, "y": 1},
522 {"label":"R11", "x":8.5, "y":1}, 516 {"matrix": [6, 6], "x": 8.5, "y": 1},
523 {"label":"R12", "x":9.5, "y":1}, 517 {"matrix": [6, 5], "x": 9.5, "y": 1},
524 {"label":"R13", "x":10.5, "y":1}, 518 {"matrix": [6, 4], "x": 10.5, "y": 1},
525 {"label":"R14", "x":11.5, "y":1}, 519 {"matrix": [6, 3], "x": 11.5, "y": 1},
526 {"label":"R15", "x":12.5, "y":1}, 520 {"matrix": [6, 2], "x": 12.5, "y": 1},
527 {"label":"R16", "x":13.5, "y":1}, 521 {"matrix": [6, 1], "x": 13.5, "y": 1},
528 {"label":"R17", "x":14.5, "y":1, "w":1.5}, 522 {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5},
529 523
530 {"label":"L20", "x":0, "y":2, "w":1.75}, 524 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
531 {"label":"L21", "x":1.75, "y":2}, 525 {"matrix": [2, 1], "x": 1.75, "y": 2},
532 {"label":"L22", "x":2.75, "y":2}, 526 {"matrix": [2, 2], "x": 2.75, "y": 2},
533 {"label":"L23", "x":3.75, "y":2}, 527 {"matrix": [2, 3], "x": 3.75, "y": 2},
534 {"label":"L24", "x":4.75, "y":2}, 528 {"matrix": [2, 4], "x": 4.75, "y": 2},
535 {"label":"L25", "x":5.75, "y":2}, 529 {"matrix": [2, 5], "x": 5.75, "y": 2},
536 530
537 {"label":"R21", "x":7.75, "y":2}, 531 {"matrix": [7, 6], "x": 7.75, "y": 2},
538 {"label":"R22", "x":8.75, "y":2}, 532 {"matrix": [7, 5], "x": 8.75, "y": 2},
539 {"label":"R23", "x":9.75, "y":2}, 533 {"matrix": [7, 4], "x": 9.75, "y": 2},
540 {"label":"R24", "x":10.75, "y":2}, 534 {"matrix": [7, 3], "x": 10.75, "y": 2},
541 {"label":"R25", "x":11.75, "y":2}, 535 {"matrix": [7, 2], "x": 11.75, "y": 2},
542 {"label":"R26", "x":12.75, "y":2}, 536 {"matrix": [7, 1], "x": 12.75, "y": 2},
543 {"label":"R27", "x":13.75, "y":2, "w":2.25}, 537 {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25},
544 538
545 {"label":"L30", "x":0, "y":3, "w":1.25}, 539 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
546 {"label":"L31", "x":1.25, "y":3}, 540 {"matrix": [3, 1], "x": 1.25, "y": 3},
547 {"label":"L32", "x":2.25, "y":3}, 541 {"matrix": [3, 2], "x": 2.25, "y": 3},
548 {"label":"L33", "x":3.25, "y":3}, 542 {"matrix": [3, 3], "x": 3.25, "y": 3},
549 {"label":"L34", "x":4.25, "y":3}, 543 {"matrix": [3, 4], "x": 4.25, "y": 3},
550 {"label":"L35", "x":5.25, "y":3}, 544 {"matrix": [3, 5], "x": 5.25, "y": 3},
551 {"label":"L36", "x":6.25, "y":3}, 545 {"matrix": [3, 6], "x": 6.25, "y": 3},
552 546
553 {"label":"R31", "x":8.25, "y":3}, 547 {"matrix": [8, 6], "x": 8.25, "y": 3},
554 {"label":"R32", "x":9.25, "y":3}, 548 {"matrix": [8, 5], "x": 9.25, "y": 3},
555 {"label":"R33", "x":10.25, "y":3}, 549 {"matrix": [8, 4], "x": 10.25, "y": 3},
556 {"label":"R34", "x":11.25, "y":3}, 550 {"matrix": [8, 3], "x": 11.25, "y": 3},
557 {"label":"R35", "x":12.25, "y":3}, 551 {"matrix": [8, 2], "x": 12.25, "y": 3},
558 {"label":"R36", "x":13.25, "y":3, "w":1.75}, 552 {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 1.75},
559 {"label":"R37", "x":15, "y":3}, 553 {"matrix": [8, 0], "x": 15, "y": 3},
560 554
561 {"label":"L41", "x":1.5, "y":4}, 555 {"matrix": [4, 1], "x": 1.5, "y": 4},
562 {"label":"L42", "x":2.5, "y":4, "w":1.5}, 556 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
563 {"label":"L43", "x":4, "y":4, "w":2.75}, 557 {"matrix": [4, 3], "x": 4, "y": 4, "w": 2.75},
564 {"label":"L44", "x":6.75, "y":4}, 558 {"matrix": [4, 4], "x": 6.75, "y": 4},
565 559
566 {"label":"R43", "x":8.75, "y":4}, 560 {"matrix": [9, 4], "x": 8.75, "y": 4},
567 {"label":"R44", "x":9.75, "y":4, "w":2.25}, 561 {"matrix": [9, 3], "x": 9.75, "y": 4, "w": 2.25},
568 {"label":"R45", "x":12, "y":4, "w":1.5}, 562 {"matrix": [9, 2], "x": 12, "y": 4, "w": 1.5},
569 {"label":"R46", "x":13.5, "y":4} 563 {"matrix": [9, 1], "x": 13.5, "y": 4}
570 ] 564 ]
571 }, 565 },
572
573 "LAYOUT_wkl_default": { 566 "LAYOUT_wkl_default": {
574 "layout": [ 567 "layout": [
575 {"label":"L00", "x":0, "y":0}, 568 {"matrix": [0, 0], "x": 0, "y": 0},
576 {"label":"L01", "x":1, "y":0}, 569 {"matrix": [0, 1], "x": 1, "y": 0},
577 {"label":"L02", "x":2, "y":0}, 570 {"matrix": [0, 2], "x": 2, "y": 0},
578 {"label":"L03", "x":3, "y":0}, 571 {"matrix": [0, 3], "x": 3, "y": 0},
579 {"label":"L04", "x":4, "y":0}, 572 {"matrix": [0, 4], "x": 4, "y": 0},
580 {"label":"L05", "x":5, "y":0}, 573 {"matrix": [0, 5], "x": 5, "y": 0},
581 {"label":"L06", "x":6, "y":0}, 574 {"matrix": [0, 6], "x": 6, "y": 0},
582 575
583 {"label":"R00", "x":8, "y":0}, 576 {"matrix": [5, 7], "x": 8, "y": 0},
584 {"label":"R01", "x":9, "y":0}, 577 {"matrix": [5, 6], "x": 9, "y": 0},
585 {"label":"R02", "x":10, "y":0}, 578 {"matrix": [5, 5], "x": 10, "y": 0},
586 {"label":"R03", "x":11, "y":0}, 579 {"matrix": [5, 4], "x": 11, "y": 0},
587 {"label":"R04", "x":12, "y":0}, 580 {"matrix": [5, 3], "x": 12, "y": 0},
588 {"label":"R05", "x":13, "y":0}, 581 {"matrix": [5, 2], "x": 13, "y": 0},
589 {"label":"R07", "x":14, "y":0, "w":2}, 582 {"matrix": [5, 0], "x": 14, "y": 0, "w": 2},
590 583
591 {"label":"L10", "x":0, "y":1, "w":1.5}, 584 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
592 {"label":"L11", "x":1.5, "y":1}, 585 {"matrix": [1, 1], "x": 1.5, "y": 1},
593 {"label":"L12", "x":2.5, "y":1}, 586 {"matrix": [1, 2], "x": 2.5, "y": 1},
594 {"label":"L13", "x":3.5, "y":1}, 587 {"matrix": [1, 3], "x": 3.5, "y": 1},
595 {"label":"L14", "x":4.5, "y":1}, 588 {"matrix": [1, 4], "x": 4.5, "y": 1},
596 {"label":"L15", "x":5.5, "y":1}, 589 {"matrix": [1, 5], "x": 5.5, "y": 1},
597 590
598 {"label":"R10", "x":7.5, "y":1}, 591 {"matrix": [6, 7], "x": 7.5, "y": 1},
599 {"label":"R11", "x":8.5, "y":1}, 592 {"matrix": [6, 6], "x": 8.5, "y": 1},
600 {"label":"R12", "x":9.5, "y":1}, 593 {"matrix": [6, 5], "x": 9.5, "y": 1},
601 {"label":"R13", "x":10.5, "y":1}, 594 {"matrix": [6, 4], "x": 10.5, "y": 1},
602 {"label":"R14", "x":11.5, "y":1}, 595 {"matrix": [6, 3], "x": 11.5, "y": 1},
603 {"label":"R15", "x":12.5, "y":1}, 596 {"matrix": [6, 2], "x": 12.5, "y": 1},
604 {"label":"R16", "x":13.5, "y":1}, 597 {"matrix": [6, 1], "x": 13.5, "y": 1},
605 {"label":"R17", "x":14.5, "y":1, "w":1.5}, 598 {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5},
606 599
607 {"label":"L20", "x":0, "y":2, "w":1.75}, 600 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
608 {"label":"L21", "x":1.75, "y":2}, 601 {"matrix": [2, 1], "x": 1.75, "y": 2},
609 {"label":"L22", "x":2.75, "y":2}, 602 {"matrix": [2, 2], "x": 2.75, "y": 2},
610 {"label":"L23", "x":3.75, "y":2}, 603 {"matrix": [2, 3], "x": 3.75, "y": 2},
611 {"label":"L24", "x":4.75, "y":2}, 604 {"matrix": [2, 4], "x": 4.75, "y": 2},
612 {"label":"L25", "x":5.75, "y":2}, 605 {"matrix": [2, 5], "x": 5.75, "y": 2},
613 606
614 {"label":"R21", "x":7.75, "y":2}, 607 {"matrix": [7, 6], "x": 7.75, "y": 2},
615 {"label":"R22", "x":8.75, "y":2}, 608 {"matrix": [7, 5], "x": 8.75, "y": 2},
616 {"label":"R23", "x":9.75, "y":2}, 609 {"matrix": [7, 4], "x": 9.75, "y": 2},
617 {"label":"R24", "x":10.75, "y":2}, 610 {"matrix": [7, 3], "x": 10.75, "y": 2},
618 {"label":"R25", "x":11.75, "y":2}, 611 {"matrix": [7, 2], "x": 11.75, "y": 2},
619 {"label":"R26", "x":12.75, "y":2}, 612 {"matrix": [7, 1], "x": 12.75, "y": 2},
620 {"label":"R27", "x":13.75, "y":2, "w":2.25}, 613 {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25},
621 614
622 {"label":"L31", "x":0, "y":3, "w":2.25}, 615 {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
623 {"label":"L32", "x":2.25, "y":3}, 616 {"matrix": [3, 2], "x": 2.25, "y": 3},
624 {"label":"L33", "x":3.25, "y":3}, 617 {"matrix": [3, 3], "x": 3.25, "y": 3},
625 {"label":"L34", "x":4.25, "y":3}, 618 {"matrix": [3, 4], "x": 4.25, "y": 3},
626 {"label":"L35", "x":5.25, "y":3}, 619 {"matrix": [3, 5], "x": 5.25, "y": 3},
627 {"label":"L36", "x":6.25, "y":3}, 620 {"matrix": [3, 6], "x": 6.25, "y": 3},
628 621
629 {"label":"R31", "x":8.25, "y":3}, 622 {"matrix": [8, 6], "x": 8.25, "y": 3},
630 {"label":"R32", "x":9.25, "y":3}, 623 {"matrix": [8, 5], "x": 9.25, "y": 3},
631 {"label":"R33", "x":10.25, "y":3}, 624 {"matrix": [8, 4], "x": 10.25, "y": 3},
632 {"label":"R34", "x":11.25, "y":3}, 625 {"matrix": [8, 3], "x": 11.25, "y": 3},
633 {"label":"R35", "x":12.25, "y":3}, 626 {"matrix": [8, 2], "x": 12.25, "y": 3},
634 {"label":"R36", "x":13.25, "y":3, "w":2.75}, 627 {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 2.75},
635 628
636 {"label":"L40", "x":0, "y":4, "w":1.5}, 629 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
637 {"label":"L42", "x":2.5, "y":4, "w":1.5}, 630 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
638 {"label":"L43", "x":4, "y":4, "w":2.75}, 631 {"matrix": [4, 3], "x": 4, "y": 4, "w": 2.75},
639 {"label":"L44", "x":6.75, "y":4}, 632 {"matrix": [4, 4], "x": 6.75, "y": 4},
640 633
641 {"label":"R43", "x":8.75, "y":4}, 634 {"matrix": [9, 4], "x": 8.75, "y": 4},
642 {"label":"R44", "x":9.75, "y":4, "w":2.25}, 635 {"matrix": [9, 3], "x": 9.75, "y": 4, "w": 2.25},
643 {"label":"R45", "x":12, "y":4, "w":1.5}, 636 {"matrix": [9, 2], "x": 12, "y": 4, "w": 1.5},
644 {"label":"R47", "x":14.5, "y":4, "w":1.5} 637 {"matrix": [9, 0], "x": 14.5, "y": 4, "w": 1.5}
645 ] 638 ]
646 } 639 }
647 } 640 }
diff --git a/keyboards/handwired/qc60/proto/proto.h b/keyboards/handwired/qc60/proto/proto.h
deleted file mode 100644
index 8ba28c7250..0000000000
--- a/keyboards/handwired/qc60/proto/proto.h
+++ /dev/null
@@ -1,195 +0,0 @@
1/* Copyright 2018 Michael Pio Mayol <mfmayol@up.edu.ph>
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#include "quantum.h"
20
21// readability
22#define XXX KC_NO
23
24/* Split Backspace
25 * {R07, XXX, R05, R04, R03, R02, R01, R00}
26 *
27 * Split Right Shift
28 * {R37, R36, R35, R34, R33, R32, R31, XXX}
29 *
30 * Split Left Shift
31 * {L30, L31, L32, L33, L34, L35, L36, XXX}
32 *
33 * 6-key Bottom-left row
34 * {R47, R46, R45, R44, R43, R42, XXX, XXX}
35 */
36
37#define LAYOUT( \
38 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, \
39 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, \
40 L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, R27, \
41 L30, L31, L32, L33, L34, L35, L36, R31, R32, R33, R34, R35, R36, R37, \
42 L40, L41, L42, L43, L44, R43, R44, R42, R45, R46, R47 \
43) \
44{ \
45 {L00, L01, L02, L03, L04, L05, L06, XXX}, \
46 {L10, L11, L12, L13, L14, L15, XXX, XXX}, \
47 {L20, L21, L22, L23, L24, L25, XXX, XXX}, \
48 {L30, L31, L32, L33, L34, L35, L36, XXX}, \
49 {L40, L41, L42, L43, L44, XXX, XXX, XXX}, \
50 {R07, R06, R05, R04, R03, R02, R01, R00}, \
51 {R17, R16, R15, R14, R13, R12, R11, R10}, \
52 {R27, R26, R25, R24, R23, R22, R21, XXX}, \
53 {R37, R36, R35, R34, R33, R32, R31, XXX}, \
54 {R47, R46, R45, R44, R43, R42, XXX, XXX}, \
55}
56
57#define LAYOUT_ansi_default( \
58 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R07, \
59 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, \
60 L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, R27, \
61 L31, L32, L33, L34, L35, L36, R31, R32, R33, R34, R35, R36, \
62 L40, L41, L42, L43, L44, R43, R44, R42, R45, R46, R47 \
63) \
64{ \
65 {L00, L01, L02, L03, L04, L05, L06, XXX}, \
66 {L10, L11, L12, L13, L14, L15, XXX, XXX}, \
67 {L20, L21, L22, L23, L24, L25, XXX, XXX}, \
68 {XXX, L31, L32, L33, L34, L35, L36, XXX}, \
69 {L40, L41, L42, L43, L44, XXX, XXX, XXX}, \
70 {R07, XXX, R05, R04, R03, R02, R01, R00}, \
71 {R17, R16, R15, R14, R13, R12, R11, R10}, \
72 {R27, R26, R25, R24, R23, R22, R21, XXX}, \
73 {XXX, R36, R35, R34, R33, R32, R31, XXX}, \
74 {R47, R46, R45, R44, R43, R42, XXX, XXX}, \
75}
76
77#define LAYOUT_ansi_alt( \
78 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R07, \
79 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, \
80 L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, R27, \
81 L31, L32, L33, L34, L35, L36, R31, R32, R33, R34, R35, R36, \
82 L40, L41, L42, L43, L44, R43, R44, R45, R46, R47 \
83) \
84{ \
85 {L00, L01, L02, L03, L04, L05, L06, XXX}, \
86 {L10, L11, L12, L13, L14, L15, XXX, XXX}, \
87 {L20, L21, L22, L23, L24, L25, XXX, XXX}, \
88 {XXX, L31, L32, L33, L34, L35, L36, XXX}, \
89 {L40, L41, L42, L43, L44, XXX, XXX, XXX}, \
90 {R07, XXX, R05, R04, R03, R02, R01, R00}, \
91 {R17, R16, R15, R14, R13, R12, R11, R10}, \
92 {R27, R26, R25, R24, R23, R22, R21, XXX}, \
93 {XXX, R36, R35, R34, R33, R32, R31, XXX}, \
94 {R47, R46, R45, R44, R43, XXX, XXX, XXX}, \
95}
96
97#define LAYOUT_iso_default( \
98 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R07, \
99 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, \
100 L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, R17, R27, \
101 L30, L31, L32, L33, L34, L35, L36, R31, R32, R33, R34, R35, R36, \
102 L40, L41, L42, L43, L44, R43, R44, R42, R45, R46, R47 \
103) \
104{ \
105 {L00, L01, L02, L03, L04, L05, L06, XXX}, \
106 {L10, L11, L12, L13, L14, L15, XXX, XXX}, \
107 {L20, L21, L22, L23, L24, L25, XXX, XXX}, \
108 {L30, L31, L32, L33, L34, L35, L36, XXX}, \
109 {L40, L41, L42, L43, L44, XXX, XXX, XXX}, \
110 {R07, XXX, R05, R04, R03, R02, R01, R00}, \
111 {R17, R16, R15, R14, R13, R12, R11, R10}, \
112 {R27, R26, R25, R24, R23, R22, R21, XXX}, \
113 {XXX, R36, R35, R34, R33, R32, R31, XXX}, \
114 {R47, R46, R45, R44, R43, R42, XXX, XXX}, \
115}
116
117#define LAYOUT_iso_alt( \
118 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R07, \
119 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, \
120 L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, R17, R27, \
121 L30, L31, L32, L33, L34, L35, L36, R31, R32, R33, R34, R35, R36, \
122 L40, L41, L42, L43, L44, R43, R44, R45, R46, R47 \
123) \
124{ \
125 {L00, L01, L02, L03, L04, L05, L06, XXX}, \
126 {L10, L11, L12, L13, L14, L15, XXX, XXX}, \
127 {L20, L21, L22, L23, L24, L25, XXX, XXX}, \
128 {L30, L31, L32, L33, L34, L35, L36, XXX}, \
129 {L40, L41, L42, L43, L44, XXX, XXX, XXX}, \
130 {R07, XXX, R05, R04, R03, R02, R01, R00}, \
131 {R17, R16, R15, R14, R13, R12, R11, R10}, \
132 {R27, R26, R25, R24, R23, R22, R21, XXX}, \
133 {XXX, R36, R35, R34, R33, R32, R31, XXX}, \
134 {R47, R46, R45, R44, R43, XXX, XXX, XXX}, \
135}
136
137#define LAYOUT_hhkb_default( \
138 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, \
139 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, \
140 L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, R27, \
141 L31, L32, L33, L34, L35, L36, R31, R32, R33, R34, R35, R36, R37, \
142 L41, L42, L43, L44, R43, R44, R45, R46 \
143) \
144{ \
145 {L00, L01, L02, L03, L04, L05, L06, XXX}, \
146 {L10, L11, L12, L13, L14, L15, XXX, XXX}, \
147 {L20, L21, L22, L23, L24, L25, XXX, XXX}, \
148 {XXX, L31, L32, L33, L34, L35, L36, XXX}, \
149 {XXX, L41, L42, L43, L44, XXX, XXX, XXX}, \
150 {R07, R06, R05, R04, R03, R02, R01, R00}, \
151 {R17, R16, R15, R14, R13, R12, R11, R10}, \
152 {R27, R26, R25, R24, R23, R22, R21, XXX}, \
153 {R37, R36, R35, R34, R33, R32, R31, XXX}, \
154 {XXX, R46, R45, R44, R43, XXX, XXX, XXX}, \
155}
156
157#define LAYOUT_hhkb_split_lshift( \
158 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, \
159 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, \
160 L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, R27, \
161 L30, L31, L32, L33, L34, L35, L36, R31, R32, R33, R34, R35, R36, R37, \
162 L41, L42, L43, L44, R43, R44, R45, R46 \
163) \
164{ \
165 {L00, L01, L02, L03, L04, L05, L06, XXX}, \
166 {L10, L11, L12, L13, L14, L15, XXX, XXX}, \
167 {L20, L21, L22, L23, L24, L25, XXX, XXX}, \
168 {L30, L31, L32, L33, L34, L35, L36, XXX}, \
169 {XXX, L41, L42, L43, L44, XXX, XXX, XXX}, \
170 {R07, R06, R05, R04, R03, R02, R01, R00}, \
171 {R17, R16, R15, R14, R13, R12, R11, R10}, \
172 {R27, R26, R25, R24, R23, R22, R21, XXX}, \
173 {R37, R36, R35, R34, R33, R32, R31, XXX}, \
174 {XXX, R46, R45, R44, R43, XXX, XXX, XXX}, \
175}
176
177#define LAYOUT_wkl_default( \
178 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R07, \
179 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, \
180 L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, R27, \
181 L31, L32, L33, L34, L35, L36, R31, R32, R33, R34, R35, R36, \
182 L40, L42, L43, L44, R43, R44, R45, R47 \
183) \
184{ \
185 {L00, L01, L02, L03, L04, L05, L06, XXX}, \
186 {L10, L11, L12, L13, L14, L15, XXX, XXX}, \
187 {L20, L21, L22, L23, L24, L25, XXX, XXX}, \
188 {XXX, L31, L32, L33, L34, L35, L36, XXX}, \
189 {L40, XXX, L42, L43, L44, XXX, XXX, XXX}, \
190 {R07, XXX, R05, R04, R03, R02, R01, R00}, \
191 {R17, R16, R15, R14, R13, R12, R11, R10}, \
192 {R27, R26, R25, R24, R23, R22, R21, XXX}, \
193 {XXX, R36, R35, R34, R33, R32, R31, XXX}, \
194 {R47, XXX, R45, R44, R43, XXX, XXX, XXX}, \
195}
diff --git a/keyboards/handwired/sejin_eat1010r2/info.json b/keyboards/handwired/sejin_eat1010r2/info.json
index e913412a9f..1d39802cf8 100644
--- a/keyboards/handwired/sejin_eat1010r2/info.json
+++ b/keyboards/handwired/sejin_eat1010r2/info.json
@@ -33,7 +33,127 @@
33 }, 33 },
34 "layouts": { 34 "layouts": {
35 "LAYOUT": { 35 "LAYOUT": {
36 "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"|", "x":13, "y":1.5}, {"label":"\u2190", "x":14, "y":1.5}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Num Lock", "x":18.5, "y":1.5}, {"label":"/", "x":19.5, "y":1.5}, {"label":"*", "x":20.5, "y":1.5}, {"label":"-", "x":21.5, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"Enter", "x":13.5, "y":2.5, "w":1.5, "h":2}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"7", "x":18.5, "y":2.5}, {"label":"8", "x":19.5, "y":2.5}, {"label":"9", "x":20.5, "y":2.5}, {"label":"+", "x":21.5, "y":2.5, "h":2}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, {"label":"6", "x":20.5, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"1", "x":18.5, "y":4.5}, {"label":"2", "x":19.5, "y":4.5}, {"label":"3", "x":20.5, "y":4.5}, {"label":"Enter", "x":21.5, "y":4.5, "h":2}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Alt", "x":11, "y":5.5, "w":1.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}] 36 "layout": [
37 {"matrix": [1, 0], "x": 0, "y": 0},
38
39 {"matrix": [1, 11], "x": 2, "y": 0},
40 {"matrix": [2, 11], "x": 3, "y": 0},
41 {"matrix": [2, 7], "x": 4, "y": 0},
42 {"matrix": [1, 7], "x": 5, "y": 0},
43
44 {"matrix": [1, 5], "x": 6.5, "y": 0},
45 {"matrix": [2, 5], "x": 7.5, "y": 0},
46 {"matrix": [1, 4], "x": 8.5, "y": 0},
47 {"matrix": [1, 3], "x": 9.5, "y": 0},
48
49 {"matrix": [2, 4], "x": 11, "y": 0},
50 {"matrix": [3, 5], "x": 12, "y": 0},
51 {"matrix": [2, 6], "x": 13, "y": 0},
52 {"matrix": [1, 6], "x": 14, "y": 0},
53
54 {"matrix": [1, 12], "x": 15.25, "y": 0},
55 {"matrix": [2, 12], "x": 16.25, "y": 0},
56 {"matrix": [1, 13], "x": 17.25, "y": 0},
57
58 {"matrix": [2, 0], "x": 0, "y": 1.5},
59 {"matrix": [3, 0], "x": 1, "y": 1.5},
60 {"matrix": [3, 11], "x": 2, "y": 1.5},
61 {"matrix": [3, 7], "x": 3, "y": 1.5},
62 {"matrix": [2, 1], "x": 4, "y": 1.5},
63 {"matrix": [1, 1], "x": 5, "y": 1.5},
64 {"matrix": [1, 2], "x": 6, "y": 1.5},
65 {"matrix": [2, 2], "x": 7, "y": 1.5},
66 {"matrix": [4, 5], "x": 8, "y": 1.5},
67 {"matrix": [3, 4], "x": 9, "y": 1.5},
68 {"matrix": [2, 3], "x": 10, "y": 1.5},
69 {"matrix": [3, 3], "x": 11, "y": 1.5},
70 {"matrix": [4, 4], "x": 12, "y": 1.5},
71 {"matrix": [0, 6], "x": 13, "y": 1.5},
72 {"matrix": [4, 6], "x": 14, "y": 1.5},
73
74 {"matrix": [3, 6], "x": 15.25, "y": 1.5},
75 {"matrix": [3, 12], "x": 16.25, "y": 1.5},
76 {"matrix": [3, 13], "x": 17.25, "y": 1.5},
77
78 {"matrix": [2, 13], "x": 18.5, "y": 1.5},
79 {"matrix": [3, 14], "x": 19.5, "y": 1.5},
80 {"matrix": [4, 14], "x": 20.5, "y": 1.5},
81 {"matrix": [3, 15], "x": 21.5, "y": 1.5},
82
83 {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
84 {"matrix": [0, 0], "x": 1.5, "y": 2.5},
85 {"matrix": [4, 11], "x": 2.5, "y": 2.5},
86 {"matrix": [4, 7], "x": 3.5, "y": 2.5},
87 {"matrix": [4, 1], "x": 4.5, "y": 2.5},
88 {"matrix": [3, 1], "x": 5.5, "y": 2.5},
89 {"matrix": [3, 2], "x": 6.5, "y": 2.5},
90 {"matrix": [4, 2], "x": 7.5, "y": 2.5},
91 {"matrix": [5, 5], "x": 8.5, "y": 2.5},
92 {"matrix": [0, 4], "x": 9.5, "y": 2.5},
93 {"matrix": [4, 3], "x": 10.5, "y": 2.5},
94 {"matrix": [0, 3], "x": 11.5, "y": 2.5},
95 {"matrix": [5, 4], "x": 12.5, "y": 2.5},
96 {"matrix": [0, 7], "x": 13.5, "y": 2.5, "w": 1.5, "h": 2},
97
98 {"matrix": [0, 5], "x": 15.25, "y": 2.5},
99 {"matrix": [4, 12], "x": 16.25, "y": 2.5},
100 {"matrix": [0, 12], "x": 17.25, "y": 2.5},
101
102 {"matrix": [0, 13], "x": 18.5, "y": 2.5},
103 {"matrix": [4, 13], "x": 19.5, "y": 2.5},
104 {"matrix": [0, 14], "x": 20.5, "y": 2.5},
105 {"matrix": [4, 15], "x": 21.5, "y": 2.5, "h": 2},
106
107 {"matrix": [7, 0], "x": 0, "y": 3.5, "w": 1.75},
108 {"matrix": [5, 0], "x": 1.75, "y": 3.5},
109 {"matrix": [0, 11], "x": 2.75, "y": 3.5},
110 {"matrix": [6, 7], "x": 3.75, "y": 3.5},
111 {"matrix": [5, 1], "x": 4.75, "y": 3.5},
112 {"matrix": [0, 1], "x": 5.75, "y": 3.5},
113 {"matrix": [0, 2], "x": 6.75, "y": 3.5},
114 {"matrix": [5, 2], "x": 7.75, "y": 3.5},
115 {"matrix": [6, 5], "x": 8.75, "y": 3.5},
116 {"matrix": [6, 4], "x": 9.75, "y": 3.5},
117 {"matrix": [5, 3], "x": 10.75, "y": 3.5},
118 {"matrix": [6, 3], "x": 11.75, "y": 3.5},
119
120 {"matrix": [5, 12], "x": 18.5, "y": 3.5},
121 {"matrix": [5, 13], "x": 19.5, "y": 3.5},
122 {"matrix": [5, 14], "x": 20.5, "y": 3.5},
123
124 {"matrix": [7, 10], "x": 0, "y": 4.5, "w": 2.25},
125 {"matrix": [6, 11], "x": 2.25, "y": 4.5},
126 {"matrix": [5, 11], "x": 3.25, "y": 4.5},
127 {"matrix": [7, 7], "x": 4.25, "y": 4.5},
128 {"matrix": [7, 1], "x": 5.25, "y": 4.5},
129 {"matrix": [6, 1], "x": 6.25, "y": 4.5},
130 {"matrix": [6, 2], "x": 7.25, "y": 4.5},
131 {"matrix": [7, 2], "x": 8.25, "y": 4.5},
132 {"matrix": [7, 5], "x": 9.25, "y": 4.5},
133 {"matrix": [7, 4], "x": 10.25, "y": 4.5},
134 {"matrix": [7, 3], "x": 11.25, "y": 4.5},
135 {"matrix": [6, 10], "x": 12.25, "y": 4.5, "w": 2.75},
136
137 {"matrix": [5, 6], "x": 16.25, "y": 4.5},
138
139 {"matrix": [6, 12], "x": 18.5, "y": 4.5},
140 {"matrix": [6, 13], "x": 19.5, "y": 4.5},
141 {"matrix": [6, 14], "x": 20.5, "y": 4.5},
142 {"matrix": [5, 15], "x": 21.5, "y": 4.5, "h": 2},
143
144 {"matrix": [7, 9], "x": 0, "y": 5.5, "w": 1.5},
145 {"matrix": [7, 8], "x": 2.5, "y": 5.5, "w": 1.5},
146 {"matrix": [7, 11], "x": 4, "y": 5.5, "w": 7},
147 {"matrix": [6, 8], "x": 11, "y": 5.5, "w": 1.5},
148 {"matrix": [6, 9], "x": 13.5, "y": 5.5, "w": 1.5},
149
150 {"matrix": [6, 6], "x": 15.25, "y": 5.5},
151 {"matrix": [7, 6], "x": 16.25, "y": 5.5},
152 {"matrix": [7, 12], "x": 17.25, "y": 5.5},
153
154 {"matrix": [7, 14], "x": 18.5, "y": 5.5, "w": 2},
155 {"matrix": [7, 15], "x": 20.5, "y": 5.5}
156 ]
37 } 157 }
38 } 158 }
39} 159}
diff --git a/keyboards/handwired/sejin_eat1010r2/keymaps/debug/keymap.c b/keyboards/handwired/sejin_eat1010r2/keymaps/debug/keymap.c
index 67691cd542..6032779422 100644
--- a/keyboards/handwired/sejin_eat1010r2/keymaps/debug/keymap.c
+++ b/keyboards/handwired/sejin_eat1010r2/keymaps/debug/keymap.c
@@ -15,6 +15,26 @@
15 */ 15 */
16#include QMK_KEYBOARD_H 16#include QMK_KEYBOARD_H
17 17
18#define LAYOUT_debug( \
19 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
20 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
21 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
22 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \
23 K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, \
24 K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F, \
25 K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K6F, \
26 K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, K7D, K7E, K7F \
27) { \
28 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
29 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
30 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
31 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
32 { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
33 { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F }, \
34 { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K6F }, \
35 { K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, K7D, K7E, K7F } \
36}
37
18const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 38const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
19 /* Base */ 39 /* Base */
20 [0] = LAYOUT_debug( 40 [0] = LAYOUT_debug(
diff --git a/keyboards/handwired/sejin_eat1010r2/sejin_eat1010r2.h b/keyboards/handwired/sejin_eat1010r2/sejin_eat1010r2.h
deleted file mode 100644
index 9618ed6b64..0000000000
--- a/keyboards/handwired/sejin_eat1010r2/sejin_eat1010r2.h
+++ /dev/null
@@ -1,74 +0,0 @@
1/* Copyright 2023 DmNosachev
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#include "quantum.h"
20
21/* readability */
22#define XXX KC_NO
23
24/* This is a shortcut to help you visually see your layout.
25 *
26 * The first section contains all of the arguments representing the physical
27 * layout of the board and position of the keys.
28 *
29 * The second converts the arguments into a two-dimensional array which
30 * represents the switch matrix.
31 */
32
33#define LAYOUT( \
34 K10, K1B, K2B, K27, K17, K15, K25, K14, K13, K24, K35, K26, K16, K1C, K2C, K1D, \
35 K20, K30, K3B, K37, K21, K11, K12, K22, K45, K34, K23, K33, K44, K06, K46, K36, K3C, K3D, K2D, K3E, K4E, K3F, \
36 K40, K00, K4B, K47, K41, K31, K32, K42, K55, K04, K43, K03, K54, K07, K05, K4C, K0C, K0D, K4D, K0E, K4F, \
37 K70, K50, K0B, K67, K51, K01, K02, K52, K65, K64, K53, K63, K5C, K5D, K5E, \
38 K7A, K6B, K5B, K77, K71, K61, K62, K72, K75, K74, K73, K6A, K56, K6C, K6D, K6E, K5F, \
39 K79, K78, K7B, K68, K69, K66, K76, K7C, K7E, K7F \
40) \
41{ \
42/* 0 */ { K00, K01, K02, K03, K04, K05, K06, K07, XXX, XXX, XXX, K0B, K0C, K0D, K0E, XXX }, \
43/* 1 */ { K10, K11, K12, K13, K14, K15, K16, K17, XXX, XXX, XXX, K1B, K1C, K1D, XXX, XXX }, \
44/* 2 */ { K20, K21, K22, K23, K24, K25, K26, K27, XXX, XXX, XXX, K2B, K2C, K2D, XXX, XXX }, \
45/* 3 */ { K30, K31, K32, K33, K34, K35, K36, K37, XXX, XXX, XXX, K3B, K3C, K3D, K3E, K3F }, \
46/* 4 */ { K40, K41, K42, K43, K44, K45, K46, K47, XXX, XXX, XXX, K4B, K4C, K4D, K4E, K4F }, \
47/* 5 */ { K50, K51, K52, K53, K54, K55, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F }, \
48/* 6 */ { XXX, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, XXX }, \
49/* 7 */ { K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, XXX, K7E, K7F } \
50}
51/* 0 1 2 3 4 5 6 7 8 9 A B C D E F */
52
53#define LAYOUT_debug( \
54 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
55 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
56 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
57 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \
58 K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, \
59 K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F, \
60 K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K6F, \
61 K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, K7D, K7E, K7F \
62) \
63{ \
64/* 0 */ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
65/* 1 */ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
66/* 2 */ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
67/* 3 */ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
68/* 4 */ { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
69/* 5 */ { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F }, \
70/* 6 */ { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K6F }, \
71/* 7 */ { K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, K7D, K7E, K7F } \
72}
73/* 0 1 2 3 4 5 6 7 8 9 A B C D E F */
74
diff --git a/keyboards/handwired/sono1/info.json b/keyboards/handwired/sono1/info.json
index 519ed121ed..e9424105a1 100644
--- a/keyboards/handwired/sono1/info.json
+++ b/keyboards/handwired/sono1/info.json
@@ -10,119 +10,135 @@
10 "layouts": { 10 "layouts": {
11 "LAYOUT": { 11 "LAYOUT": {
12 "layout": [ 12 "layout": [
13 {"label":"F11", "x":0, "y":0}, 13 {"matrix": [0, 0], "x": 0, "y": 0},
14 {"label":"F12", "x":1.25, "y":0}, 14
15 {"label":"F1", "x":2.75, "y":0, "w":1.25}, 15 {"matrix": [0, 1], "x": 1.25, "y": 0},
16 {"label":"F2", "x":4, "y":0, "w":1.25}, 16
17 {"label":"F3", "x":5.25, "y":0, "w":1.25}, 17 {"matrix": [0, 2], "x": 2.75, "y": 0, "w": 1.25},
18 {"label":"F4", "x":6.5, "y":0, "w":1.25}, 18 {"matrix": [0, 3], "x": 4, "y": 0, "w": 1.25},
19 {"label":"F5", "x":7.75, "y":0, "w":1.25}, 19 {"matrix": [0, 4], "x": 5.25, "y": 0, "w": 1.25},
20 {"label":"F6", "x":9.25, "y":0, "w":1.25}, 20 {"matrix": [0, 5], "x": 6.5, "y": 0, "w": 1.25},
21 {"label":"F7", "x":10.5, "y":0, "w":1.25}, 21 {"matrix": [0, 6], "x": 7.75, "y": 0, "w": 1.25},
22 {"label":"F8", "x":11.75, "y":0, "w":1.25}, 22
23 {"label":"F9", "x":13, "y":0, "w":1.25}, 23 {"matrix": [0, 7], "x": 9.25, "y": 0, "w": 1.25},
24 {"label":"F10", "x":14.25, "y":0, "w":1.25}, 24 {"matrix": [1, 0], "x": 10.5, "y": 0, "w": 1.25},
25 {"label":"PgUp", "x":16, "y":0}, 25 {"matrix": [1, 1], "x": 11.75, "y": 0, "w": 1.25},
26 {"label":"PgDn", "x":17, "y":0}, 26 {"matrix": [1, 2], "x": 13, "y": 0, "w": 1.25},
27 {"label":"LOCK", "x":18.5, "y":0.5}, 27 {"matrix": [1, 3], "x": 14.25, "y": 0, "w": 1.25},
28 28
29 {"label":"Esc", "x":0, "y":1.5, "w":1.25}, 29 {"matrix": [9, 7], "x": 16, "y": 0},
30 {"label":"!", "x":1.25, "y":1.5}, 30 {"matrix": [10, 0], "x": 17, "y": 0},
31 {"label":"@", "x":2.25, "y":1.5}, 31
32 {"label":"#", "x":3.25, "y":1.5}, 32 {"matrix": [13, 6], "x": 18.5, "y": 0.5},
33 {"label":"$", "x":4.25, "y":1.5}, 33
34 {"label":"%", "x":5.25, "y":1.5}, 34 {"matrix": [1, 4], "x": 0, "y": 1.5, "w": 1.25},
35 {"label":"^", "x":6.25, "y":1.5}, 35 {"matrix": [1, 5], "x": 1.25, "y": 1.5},
36 {"label":"&", "x":7.25, "y":1.5}, 36 {"matrix": [1, 6], "x": 2.25, "y": 1.5},
37 {"label":"*", "x":8.25, "y":1.5}, 37 {"matrix": [1, 7], "x": 3.25, "y": 1.5},
38 {"label":"(", "x":9.25, "y":1.5}, 38 {"matrix": [2, 0], "x": 4.25, "y": 1.5},
39 {"label":")", "x":10.25, "y":1.5}, 39 {"matrix": [2, 1], "x": 5.25, "y": 1.5},
40 {"label":"_", "x":11.25, "y":1.5}, 40 {"matrix": [2, 2], "x": 6.25, "y": 1.5},
41 {"label":"+", "x":12.25, "y":1.5}, 41 {"matrix": [2, 3], "x": 7.25, "y": 1.5},
42 {"label":"~", "x":13.25, "y":1.5}, 42 {"matrix": [2, 4], "x": 8.25, "y": 1.5},
43 {"label":"BksSpc", "x":14.25, "y":1.5, "w":1.25}, 43 {"matrix": [2, 5], "x": 9.25, "y": 1.5},
44 {"label":"Home", "x":16, "y":1}, 44 {"matrix": [2, 6], "x": 10.25, "y": 1.5},
45 {"label":"End", "x":17, "y":1}, 45 {"matrix": [2, 7], "x": 11.25, "y": 1.5},
46 {"label":"/", "x":18.5, "y":1.5}, 46 {"matrix": [3, 0], "x": 12.25, "y": 1.5},
47 {"label":"*", "x":19.5, "y":1.5}, 47 {"matrix": [3, 1], "x": 13.25, "y": 1.5},
48 {"label":"-", "x":20.5, "y":1.5}, 48 {"matrix": [7, 4], "x": 14.25, "y": 1.5, "w": 1.25},
49 {"label":"+", "x":21.5, "y":1.5}, 49
50 50 {"matrix": [10, 1], "x": 16, "y": 1},
51 {"label":"Tab", "x":0, "y":2.5, "w":1.5}, 51 {"matrix": [10, 2], "x": 17, "y": 1},
52 {"label":"Q", "x":1.5, "y":2.5}, 52
53 {"label":"W", "x":2.5, "y":2.5}, 53 {"matrix": [12, 0], "x": 18.5, "y": 1.5},
54 {"label":"E", "x":3.5, "y":2.5}, 54 {"matrix": [13, 0], "x": 19.5, "y": 1.5},
55 {"label":"R", "x":4.5, "y":2.5}, 55 {"matrix": [14, 0], "x": 20.5, "y": 1.5},
56 {"label":"T", "x":5.5, "y":2.5}, 56 {"matrix": [12, 1], "x": 21.5, "y": 1.5},
57 {"label":"Y", "x":6.5, "y":2.5}, 57
58 {"label":"U", "x":7.5, "y":2.5}, 58 {"matrix": [7, 5], "x": 0, "y": 2.5, "w": 1.5},
59 {"label":"I", "x":8.5, "y":2.5}, 59 {"matrix": [3, 2], "x": 1.5, "y": 2.5},
60 {"label":"O", "x":9.5, "y":2.5}, 60 {"matrix": [3, 3], "x": 2.5, "y": 2.5},
61 {"label":"P", "x":10.5, "y":2.5}, 61 {"matrix": [3, 4], "x": 3.5, "y": 2.5},
62 {"label":"{", "x":11.5, "y":2.5}, 62 {"matrix": [3, 5], "x": 4.5, "y": 2.5},
63 {"label":"}", "x":12.5, "y":2.5}, 63 {"matrix": [3, 6], "x": 5.5, "y": 2.5},
64 {"label":"Enter", "x":13.75, "y":2.5, "w":1.75, "h":2}, 64 {"matrix": [3, 7], "x": 6.5, "y": 2.5},
65 {"label":"Ins", "x":16, "y":2}, 65 {"matrix": [4, 0], "x": 7.5, "y": 2.5},
66 {"label":"Del", "x":17, "y":2}, 66 {"matrix": [4, 1], "x": 8.5, "y": 2.5},
67 {"label":"7", "x":18.5, "y":2.5}, 67 {"matrix": [4, 2], "x": 9.5, "y": 2.5},
68 {"label":"8", "x":19.5, "y":2.5}, 68 {"matrix": [4, 3], "x": 10.5, "y": 2.5},
69 {"label":"9", "x":20.5, "y":2.5}, 69 {"matrix": [4, 4], "x": 11.5, "y": 2.5},
70 {"label":"+=", "x":21.5, "y":2.5}, 70 {"matrix": [4, 5], "x": 12.5, "y": 2.5},
71 71 {"matrix": [7, 6], "x": 13.75, "y": 2.5, "w": 1.75, "h": 2},
72 {"label":"Ctrl", "x":0, "y":3.5, "w":1.75}, 72
73 {"label":"A", "x":1.75, "y":3.5}, 73 {"matrix": [10, 3], "x": 16, "y": 2},
74 {"label":"S", "x":2.75, "y":3.5}, 74 {"matrix": [10, 4], "x": 17, "y": 2},
75 {"label":"D", "x":3.75, "y":3.5}, 75
76 {"label":"F", "x":4.75, "y":3.5}, 76 {"matrix": [13, 1], "x": 18.5, "y": 2.5},
77 {"label":"G", "x":5.75, "y":3.5}, 77 {"matrix": [14, 1], "x": 19.5, "y": 2.5},
78 {"label":"H", "x":6.75, "y":3.5}, 78 {"matrix": [12, 2], "x": 20.5, "y": 2.5},
79 {"label":"J", "x":7.75, "y":3.5}, 79 {"matrix": [13, 2], "x": 21.5, "y": 2.5},
80 {"label":"K", "x":8.75, "y":3.5}, 80
81 {"label":"L", "x":9.75, "y":3.5}, 81 {"matrix": [7, 7], "x": 0, "y": 3.5, "w": 1.75},
82 {"label":":", "x":10.75, "y":3.5}, 82 {"matrix": [4, 7], "x": 1.75, "y": 3.5},
83 {"label":"\"", "x":11.75, "y":3.5}, 83 {"matrix": [5, 0], "x": 2.75, "y": 3.5},
84 {"label":"|", "x":12.75, "y":3.5}, 84 {"matrix": [5, 1], "x": 3.75, "y": 3.5},
85 {"label":"Up", "x":16, "y":3.5, "w":2}, 85 {"matrix": [5, 2], "x": 4.75, "y": 3.5},
86 {"label":"4", "x":18.5, "y":3.5}, 86 {"matrix": [5, 3], "x": 5.75, "y": 3.5},
87 {"label":"5", "x":19.5, "y":3.5}, 87 {"matrix": [5, 4], "x": 6.75, "y": 3.5},
88 {"label":"6", "x":20.5, "y":3.5}, 88 {"matrix": [5, 5], "x": 7.75, "y": 3.5},
89 {"label":".", "x":21.5, "y":3.5}, 89 {"matrix": [5, 6], "x": 8.75, "y": 3.5},
90 90 {"matrix": [5, 7], "x": 9.75, "y": 3.5},
91 {"label":"Shift", "x":0, "y":4.5, "w":2.5}, 91 {"matrix": [6, 0], "x": 10.75, "y": 3.5},
92 {"label":"Z", "x":2.5, "y":4.5}, 92 {"matrix": [8, 0], "x": 11.75, "y": 3.5},
93 {"label":"X", "x":3.5, "y":4.5}, 93 {"matrix": [8, 1], "x": 12.75, "y": 3.5},
94 {"label":"C", "x":4.5, "y":4.5}, 94
95 {"label":"V", "x":5.5, "y":4.5}, 95 {"matrix": [11, 0], "x": 16, "y": 3.5, "w": 2},
96 {"label":"B", "x":6.5, "y":4.5}, 96
97 {"label":"N", "x":7.5, "y":4.5}, 97 {"matrix": [14, 2], "x": 18.5, "y": 3.5},
98 {"label":"M", "x":8.5, "y":4.5}, 98 {"matrix": [12, 3], "x": 19.5, "y": 3.5},
99 {"label":"<", "x":9.5, "y":4.5}, 99 {"matrix": [13, 3], "x": 20.5, "y": 3.5},
100 {"label":">", "x":10.5, "y":4.5}, 100 {"matrix": [14, 3], "x": 21.5, "y": 3.5},
101 {"label":"?", "x":11.5, "y":4.5}, 101
102 {"label":"MUS", "x":12.5, "y":4.5}, 102 {"matrix": [8, 2], "x": 0, "y": 4.5, "w": 2.5},
103 {"label":"Shift", "x":13.5, "y":4.5, "w":2}, 103 {"matrix": [6, 1], "x": 2.5, "y": 4.5},
104 {"label":"Left", "x":16, "y":4.5}, 104 {"matrix": [6, 2], "x": 3.5, "y": 4.5},
105 {"label":"Right", "x":17, "y":4.5}, 105 {"matrix": [6, 3], "x": 4.5, "y": 4.5},
106 {"label":"1", "x":18.5, "y":4.5}, 106 {"matrix": [6, 4], "x": 5.5, "y": 4.5},
107 {"label":"2", "x":19.5, "y":4.5}, 107 {"matrix": [6, 5], "x": 6.5, "y": 4.5},
108 {"label":"3", "x":20.5, "y":4.5}, 108 {"matrix": [6, 6], "x": 7.5, "y": 4.5},
109 {"label":"<", "x":21.5, "y":4.5}, 109 {"matrix": [6, 7], "x": 8.5, "y": 4.5},
110 110 {"matrix": [7, 0], "x": 9.5, "y": 4.5},
111 {"label":"Caps", "x":0, "y":5.5}, 111 {"matrix": [7, 1], "x": 10.5, "y": 4.5},
112 {"label":"Alt", "x":1, "y":5.5}, 112 {"matrix": [7, 2], "x": 11.5, "y": 4.5},
113 {"label":"App", "x":2, "y":5.5, "w":1.25}, 113 {"matrix": [7, 3], "x": 12.5, "y": 4.5},
114 {"label":"GUI", "x":3.25, "y":5.5, "w":1.5}, 114 {"matrix": [8, 3], "x": 13.5, "y": 4.5, "w": 2},
115 {"label":"Space", "x":4.75, "y":5.5, "w":2.25}, 115
116 {"label":"Space", "x":7, "y":5.5, "w":2.25}, 116 {"matrix": [11, 1], "x": 16, "y": 4.5},
117 {"label":"Enter", "x":9.25, "y":5.5, "w":3}, 117 {"matrix": [11, 2], "x": 17, "y": 4.5},
118 {"label":"Ctrl", "x":12.25, "y":5.5, "w":1.5}, 118
119 {"label":"Alt", "x":14.5, "y":5.5}, 119 {"matrix": [12, 4], "x": 18.5, "y": 4.5},
120 {"label":"Down", "x":16, "y":5.5, "w":2}, 120 {"matrix": [13, 4], "x": 19.5, "y": 4.5},
121 {"label":"0", "x":18.5, "y":5.5}, 121 {"matrix": [14, 4], "x": 20.5, "y": 4.5},
122 {"label":"000", "x":19.5, "y":5.5}, 122 {"matrix": [12, 5], "x": 21.5, "y": 4.5},
123 {"label":"Enter", "x":20.5, "y":5.5, "w":2}, 123
124 {"label":"Fn", "x":5.75, "y":6.5, "w":1.25}, 124 {"matrix": [8, 4], "x": 0, "y": 5.5},
125 {"label":"BkSpc", "x":7, "y":6.5, "w":1.25} 125 {"matrix": [8, 5], "x": 1, "y": 5.5},
126 {"matrix": [8, 6], "x": 2, "y": 5.5, "w": 1.25},
127 {"matrix": [8, 7], "x": 3.25, "y": 5.5, "w": 1.5},
128 {"matrix": [9, 0], "x": 4.75, "y": 5.5, "w": 2.25},
129 {"matrix": [9, 1], "x": 7, "y": 5.5, "w": 2.25},
130 {"matrix": [9, 2], "x": 9.25, "y": 5.5, "w": 3},
131 {"matrix": [9, 3], "x": 12.25, "y": 5.5, "w": 1.5},
132 {"matrix": [9, 4], "x": 14.5, "y": 5.5},
133
134 {"matrix": [11, 3], "x": 16, "y": 5.5, "w": 2},
135
136 {"matrix": [13, 5], "x": 18.5, "y": 5.5},
137 {"matrix": [14, 5], "x": 19.5, "y": 5.5},
138 {"matrix": [12, 6], "x": 20.5, "y": 5.5, "w": 2},
139
140 {"matrix": [9, 5], "x": 5.75, "y": 6.5, "w": 1.25},
141 {"matrix": [9, 6], "x": 7, "y": 6.5, "w": 1.25}
126 ] 142 ]
127 } 143 }
128 } 144 }
diff --git a/keyboards/handwired/sono1/keymaps/debug/keymap.c b/keyboards/handwired/sono1/keymaps/debug/keymap.c
index 3e4eb6eae3..77f2f52d1e 100644
--- a/keyboards/handwired/sono1/keymaps/debug/keymap.c
+++ b/keyboards/handwired/sono1/keymaps/debug/keymap.c
@@ -15,6 +15,40 @@
15 */ 15 */
16#include QMK_KEYBOARD_H 16#include QMK_KEYBOARD_H
17 17
18#define LAYOUT_debug( \
19 K00, K01, K02, K03, K04, K05, K06, K07, \
20 K10, K11, K12, K13, K14, K15, K16, K17, \
21 K20, K21, K22, K23, K24, K25, K26, K27, \
22 K30, K31, K32, K33, K34, K35, K36, K37, \
23 K40, K41, K42, K43, K44, K45, K46, K47, \
24 K50, K51, K52, K53, K54, K55, K56, K57, \
25 K60, K61, K62, K63, K64, K65, K66, K67, \
26 K70, K71, K72, K73, K74, K75, K76, K77, \
27 K80, K81, K82, K83, K84, K85, K86, K87, \
28 K90, K91, K92, K93, K94, K95, K96, K97, \
29 KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7, \
30 KB0, KB1, KB2, KB3, KB4, KB5, KB6, KB7, \
31 KC0, KC1, KC2, KC3, KC4, KC5, KC6, KC7, \
32 KD0, KD1, KD2, KD3, KD4, KD5, KD6, KD7, \
33 KE0, KE1, KE2, KE3, KE4, KE5, KE6, KE7 \
34) { \
35 { K00, K01, K02, K03, K04, K05, K06, K07 }, \
36 { K10, K11, K12, K13, K14, K15, K16, K17 }, \
37 { K20, K21, K22, K23, K24, K25, K26, K27 }, \
38 { K30, K31, K32, K33, K34, K35, K36, K37 }, \
39 { K40, K41, K42, K43, K44, K45, K46, K47 }, \
40 { K50, K51, K52, K53, K54, K55, K56, K57 }, \
41 { K60, K61, K62, K63, K64, K65, K66, K67 }, \
42 { K70, K71, K72, K73, K74, K75, K76, K77 }, \
43 { K80, K81, K82, K83, K84, K85, K86, K87 }, \
44 { K90, K91, K92, K93, K94, K95, K96, K97 }, \
45 { KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7 }, \
46 { KB0, KB1, KB2, KB3, KB4, KB5, KB6, KB7 }, \
47 { KC0, KC1, KC2, KC3, KC4, KC5, KC6, KC7 }, \
48 { KD0, KD1, KD2, KD3, KD4, KD5, KD6, KD7 }, \
49 { KE0, KE1, KE2, KE3, KE4, KE5, KE6, KE7 } \
50}
51
18const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 52const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
19 /* Base */ 53 /* Base */
20 [0] = LAYOUT_debug( 54 [0] = LAYOUT_debug(
diff --git a/keyboards/handwired/sono1/sono1.c b/keyboards/handwired/sono1/sono1.c
index 9d8f79141d..d19f188a19 100644
--- a/keyboards/handwired/sono1/sono1.c
+++ b/keyboards/handwired/sono1/sono1.c
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16 16
17#include "sono1.h" 17#include "quantum.h"
18 18
19void matrix_init_kb(void) { 19void matrix_init_kb(void) {
20 /* LED pins setup */ 20 /* LED pins setup */
diff --git a/keyboards/handwired/sono1/sono1.h b/keyboards/handwired/sono1/sono1.h
deleted file mode 100644
index c49992d15d..0000000000
--- a/keyboards/handwired/sono1/sono1.h
+++ /dev/null
@@ -1,107 +0,0 @@
1/* Copyright 2020 DmNosachev
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#include "quantum.h"
20
21#define XXX KC_NO
22
23/* This is a shortcut to help you visually see your layout.
24 *
25 * The first section contains all of the arguments representing the physical
26 * layout of the board and position of the keys.
27 *
28 * The second converts the arguments into a two-dimensional array which
29 * represents the switch matrix.
30 */
31
32/*
33,---------------------------------------------------------------------------------------------------------, ,-----,
34| < | |NumLk| | f1 | f2 | f3 | f4 | f5 | | f6 | f7 | f8 | f9 | f10 | |RlUp |RlDn | |CurLk|
35|-------------------------------------------------------------------------------------------| |-----------| |-----|-----------------,
36| Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | = - | ^ | ^ | BS | |Home |Help | | * | / | - | + |
37|-------------------------------------------------------------------------------------------| |-----------| |-----------------------|
38| Tab | Q | W | E | R | T | Y | U | I | O | P | ~@ | {[ | Return | | Ins | Del | | 7 | 8 | 9 | = |
39|--------------------------------------------------------------------------------| | `-----------' |-----------------------|
40| Ctrl | A | S | D | F | G | H | J | K | L | +; | *: | }] | | | Up | | 4 | 5 | 6 | . |
41|--------------------------------------------------------------------------------`----------' |-----------| |-----------------------|
42| Shift | Z | X | C | V | B | N | M | , | . | ?/ | -- | Shift | |Left |Right| | 1 | 2 | 3 | , |
43|-------------------------------------------------------------------------------------------| |-----------| |-----------------------|
44|Caps | Opt |Kana | Cmd | Space1 | Space2 | Space3 | Enter | | Alt | | Down | | 0 | 000 | Enter |
45`-------------------------------------------------------------------------------------------' `-----------' '-----------------------'
46 |Thumb1|Thumb2|
47 `-------------'
48*/
49#define LAYOUT( \
50 K00, K01, K02, K03, K04, K05, K06, K07, K10, K11, K12, K13, K97, KA0, KD6, \
51 K14, K15, K16, K17, K20, K21, K22, K23, K24, K25, K26, K27, K30, K31, K74, KA1, KA2, KC0, KD0, KE0, KC1, \
52 K75, K32, K33, K34, K35, K36, K37, K40, K41, K42, K43, K44, K45, K76, KA3, KA4, KD1, KE1, KC2, KD2, \
53 K77, K47, K50, K51, K52, K53, K54, K55, K56, K57, K60, K80, K81, KB0, KE2, KC3, KD3, KE3, \
54 K82, K61, K62, K63, K64, K65, K66, K67, K70, K71, K72, K73, K83, KB1, KB2, KC4, KD4, KE4, KC5,\
55 K84, K85, K86, K87, K90, K91, K92, K93, K94, KB3, KD5, KE5, KC6, \
56 K95, K96 \
57) { \
58 { K00, K01, K02, K03, K04, K05, K06, K07 }, \
59 { K10, K11, K12, K13, K14, K15, K16, K17 }, \
60 { K20, K21, K22, K23, K24, K25, K26, K27 }, \
61 { K30, K31, K32, K33, K34, K35, K36, K37 }, \
62 { K40, K41, K42, K43, K44, K45, XXX, K47 }, \
63 { K50, K51, K52, K53, K54, K55, K56, K57 }, \
64 { K60, K61, K62, K63, K64, K65, K66, K67 }, \
65 { K70, K71, K72, K73, K74, K75, K76, K77 }, \
66 { K80, K81, K82, K83, K84, K85, K86, K87 }, \
67 { K90, K91, K92, K93, K94, K95, K96, K97 }, \
68 { KA0, KA1, KA2, KA3, KA4, XXX, XXX, XXX }, \
69 { KB0, KB1, KB2, KB3, XXX, XXX, XXX, XXX }, \
70 { KC0, KC1, KC2, KC3, KC4, KC5, KC6, XXX }, \
71 { KD0, KD1, KD2, KD3, KD4, KD5, KD6, XXX }, \
72 { KE0, KE1, KE2, KE3, KE4, KE5, XXX, XXX } \
73}
74
75#define LAYOUT_debug( \
76 K00, K01, K02, K03, K04, K05, K06, K07, \
77 K10, K11, K12, K13, K14, K15, K16, K17, \
78 K20, K21, K22, K23, K24, K25, K26, K27, \
79 K30, K31, K32, K33, K34, K35, K36, K37, \
80 K40, K41, K42, K43, K44, K45, K46, K47, \
81 K50, K51, K52, K53, K54, K55, K56, K57, \
82 K60, K61, K62, K63, K64, K65, K66, K67, \
83 K70, K71, K72, K73, K74, K75, K76, K77, \
84 K80, K81, K82, K83, K84, K85, K86, K87, \
85 K90, K91, K92, K93, K94, K95, K96, K97, \
86 KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7, \
87 KB0, KB1, KB2, KB3, KB4, KB5, KB6, KB7, \
88 KC0, KC1, KC2, KC3, KC4, KC5, KC6, KC7, \
89 KD0, KD1, KD2, KD3, KD4, KD5, KD6, KD7, \
90 KE0, KE1, KE2, KE3, KE4, KE5, KE6, KE7 \
91) { \
92 { K00, K01, K02, K03, K04, K05, K06, K07 }, \
93 { K10, K11, K12, K13, K14, K15, K16, K17 }, \
94 { K20, K21, K22, K23, K24, K25, K26, K27 }, \
95 { K30, K31, K32, K33, K34, K35, K36, K37 }, \
96 { K40, K41, K42, K43, K44, K45, K46, K47 }, \
97 { K50, K51, K52, K53, K54, K55, K56, K57 }, \
98 { K60, K61, K62, K63, K64, K65, K66, K67 }, \
99 { K70, K71, K72, K73, K74, K75, K76, K77 }, \
100 { K80, K81, K82, K83, K84, K85, K86, K87 }, \
101 { K90, K91, K92, K93, K94, K95, K96, K97 }, \
102 { KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7 }, \
103 { KB0, KB1, KB2, KB3, KB4, KB5, KB6, KB7 }, \
104 { KC0, KC1, KC2, KC3, KC4, KC5, KC6, KC7 }, \
105 { KD0, KD1, KD2, KD3, KD4, KD5, KD6, KD7 }, \
106 { KE0, KE1, KE2, KE3, KE4, KE5, KE6, KE7 } \
107}
diff --git a/keyboards/kagizaraya/chidori/chidori.h b/keyboards/kagizaraya/chidori/chidori.h
deleted file mode 100644
index d82b9217fb..0000000000
--- a/keyboards/kagizaraya/chidori/chidori.h
+++ /dev/null
@@ -1,57 +0,0 @@
1/* Copyright 2019 ENDO Katsuhiro <ka2hiro@kagizaraya.jp>
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#include "quantum.h"
20
21// clang-format off
22#define LAYOUT( \
23 L01, L02, L03, L04, L05, L06, R01, R02, R03, R04, R05, R06, \
24 L07, L08, L09, L10, L11, L12, R07, R08, R09, R10, R11, R12, \
25 L13, L14, L15, L16, L17, L18, R13, R14, R15, R16, R17, R18, \
26 L19, L20, L21, L22, L23, L24, R19, R20, R21, R22, R23, R24 \
27) { \
28 { L01, L02, L03, L04, L05, L06 }, \
29 { L07, L08, L09, L10, L11, L12 }, \
30 { L13, L14, L15, L16, L17, L18 }, \
31 { L19, L20, L21, L22, L23, L24 }, \
32 { R01, R02, R03, R04, R05, R06 }, \
33 { R07, R08, R09, R10, R11, R12 }, \
34 { R13, R14, R15, R16, R17, R18 }, \
35 { R19, R20, R21, R22, R23, R24 } \
36}
37
38#define LAYOUT_extended( \
39 L01, L02, L03, L04, L05, L06, M01, M02, M03, M04, M05, M06, R01, R02, R03, R04, R05, R06, \
40 L07, L08, L09, L10, L11, L12, M07, M08, M09, M10, M11, M12, R07, R08, R09, R10, R11, R12, \
41 L13, L14, L15, L16, L17, L18, M13, M14, M15, M16, M17, M18, R13, R14, R15, R16, R17, R18, \
42 L19, L20, L21, L22, L23, L24, M19, M20, M21, M22, M23, M24, R19, R20, R21, R22, R23, R24 \
43) { \
44 { L01, L02, L03, L04, L05, L06 }, \
45 { L07, L08, L09, L10, L11, L12 }, \
46 { L13, L14, L15, L16, L17, L18 }, \
47 { L19, L20, L21, L22, L23, L24 }, \
48 { M01, M02, M03, M04, M05, M06 }, \
49 { M07, M08, M09, M10, M11, M12 }, \
50 { M13, M14, M15, M16, M17, M18 }, \
51 { M19, M20, M21, M22, M23, M24 }, \
52 { R01, R02, R03, R04, R05, R06 }, \
53 { R07, R08, R09, R10, R11, R12 }, \
54 { R13, R14, R15, R16, R17, R18 }, \
55 { R19, R20, R21, R22, R23, R24 } \
56}
57// clang-format on
diff --git a/keyboards/kagizaraya/chidori/info.json b/keyboards/kagizaraya/chidori/info.json
index 8cafe4cc7e..16cd17f942 100644
--- a/keyboards/kagizaraya/chidori/info.json
+++ b/keyboards/kagizaraya/chidori/info.json
@@ -13,18 +13,148 @@
13 "layouts": { 13 "layouts": {
14 "LAYOUT": { 14 "LAYOUT": {
15 "layout": [ 15 "layout": [
16 {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, 16 {"matrix": [0, 0], "x": 0, "y": 0},
17 {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, 17 {"matrix": [0, 1], "x": 1, "y": 0},
18 {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, 18 {"matrix": [0, 2], "x": 2, "y": 0},
19 {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3} 19 {"matrix": [0, 3], "x": 3, "y": 0},
20 {"matrix": [0, 4], "x": 4, "y": 0},
21 {"matrix": [0, 5], "x": 5, "y": 0},
22
23 {"matrix": [4, 0], "x": 7, "y": 0},
24 {"matrix": [4, 1], "x": 8, "y": 0},
25 {"matrix": [4, 2], "x": 9, "y": 0},
26 {"matrix": [4, 3], "x": 10, "y": 0},
27 {"matrix": [4, 4], "x": 11, "y": 0},
28 {"matrix": [4, 5], "x": 12, "y": 0},
29
30 {"matrix": [1, 0], "x": 0, "y": 1},
31 {"matrix": [1, 1], "x": 1, "y": 1},
32 {"matrix": [1, 2], "x": 2, "y": 1},
33 {"matrix": [1, 3], "x": 3, "y": 1},
34 {"matrix": [1, 4], "x": 4, "y": 1},
35 {"matrix": [1, 5], "x": 5, "y": 1},
36
37 {"matrix": [5, 0], "x": 7, "y": 1},
38 {"matrix": [5, 1], "x": 8, "y": 1},
39 {"matrix": [5, 2], "x": 9, "y": 1},
40 {"matrix": [5, 3], "x": 10, "y": 1},
41 {"matrix": [5, 4], "x": 11, "y": 1},
42 {"matrix": [5, 5], "x": 12, "y": 1},
43
44 {"matrix": [2, 0], "x": 0, "y": 2},
45 {"matrix": [2, 1], "x": 1, "y": 2},
46 {"matrix": [2, 2], "x": 2, "y": 2},
47 {"matrix": [2, 3], "x": 3, "y": 2},
48 {"matrix": [2, 4], "x": 4, "y": 2},
49 {"matrix": [2, 5], "x": 5, "y": 2},
50
51 {"matrix": [6, 0], "x": 7, "y": 2},
52 {"matrix": [6, 1], "x": 8, "y": 2},
53 {"matrix": [6, 2], "x": 9, "y": 2},
54 {"matrix": [6, 3], "x": 10, "y": 2},
55 {"matrix": [6, 4], "x": 11, "y": 2},
56 {"matrix": [6, 5], "x": 12, "y": 2},
57
58 {"matrix": [3, 0], "x": 0, "y": 3},
59 {"matrix": [3, 1], "x": 1, "y": 3},
60 {"matrix": [3, 2], "x": 2, "y": 3},
61 {"matrix": [3, 3], "x": 3, "y": 3},
62 {"matrix": [3, 4], "x": 4, "y": 3},
63 {"matrix": [3, 5], "x": 5, "y": 3},
64
65 {"matrix": [7, 0], "x": 7, "y": 3},
66 {"matrix": [7, 1], "x": 8, "y": 3},
67 {"matrix": [7, 2], "x": 9, "y": 3},
68 {"matrix": [7, 3], "x": 10, "y": 3},
69 {"matrix": [7, 4], "x": 11, "y": 3},
70 {"matrix": [7, 5], "x": 12, "y": 3}
20 ] 71 ]
21 }, 72 },
22 "LAYOUT_extended": { 73 "LAYOUT_extended": {
23 "layout": [ 74 "layout": [
24 {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":16, "y":0}, {"x":17, "y":0}, {"x":18, "y":0}, {"x":19, "y":0}, 75 {"matrix": [0, 0], "x": 0, "y": 0},
25 {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1}, {"x":17, "y":1}, {"x":18, "y":1}, {"x":19, "y":1}, 76 {"matrix": [0, 1], "x": 1, "y": 0},
26 {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":17, "y":2}, {"x":18, "y":2}, {"x":19, "y":2}, 77 {"matrix": [0, 2], "x": 2, "y": 0},
27 {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":16, "y":3}, {"x":17, "y":3}, {"x":18, "y":3}, {"x":19, "y":3} 78 {"matrix": [0, 3], "x": 3, "y": 0},
79 {"matrix": [0, 4], "x": 4, "y": 0},
80 {"matrix": [0, 5], "x": 5, "y": 0},
81
82 {"matrix": [4, 0], "x": 7, "y": 0},
83 {"matrix": [4, 1], "x": 8, "y": 0},
84 {"matrix": [4, 2], "x": 9, "y": 0},
85 {"matrix": [4, 3], "x": 10, "y": 0},
86 {"matrix": [4, 4], "x": 11, "y": 0},
87 {"matrix": [4, 5], "x": 12, "y": 0},
88
89 {"matrix": [8, 0], "x": 14, "y": 0},
90 {"matrix": [8, 1], "x": 15, "y": 0},
91 {"matrix": [8, 2], "x": 16, "y": 0},
92 {"matrix": [8, 3], "x": 17, "y": 0},
93 {"matrix": [8, 4], "x": 18, "y": 0},
94 {"matrix": [8, 5], "x": 19, "y": 0},
95
96 {"matrix": [1, 0], "x": 0, "y": 1},
97 {"matrix": [1, 1], "x": 1, "y": 1},
98 {"matrix": [1, 2], "x": 2, "y": 1},
99 {"matrix": [1, 3], "x": 3, "y": 1},
100 {"matrix": [1, 4], "x": 4, "y": 1},
101 {"matrix": [1, 5], "x": 5, "y": 1},
102
103 {"matrix": [5, 0], "x": 7, "y": 1},
104 {"matrix": [5, 1], "x": 8, "y": 1},
105 {"matrix": [5, 2], "x": 9, "y": 1},
106 {"matrix": [5, 3], "x": 10, "y": 1},
107 {"matrix": [5, 4], "x": 11, "y": 1},
108 {"matrix": [5, 5], "x": 12, "y": 1},
109
110 {"matrix": [9, 0], "x": 14, "y": 1},
111 {"matrix": [9, 1], "x": 15, "y": 1},
112 {"matrix": [9, 2], "x": 16, "y": 1},
113 {"matrix": [9, 3], "x": 17, "y": 1},
114 {"matrix": [9, 4], "x": 18, "y": 1},
115 {"matrix": [9, 5], "x": 19, "y": 1},
116
117 {"matrix": [2, 0], "x": 0, "y": 2},
118 {"matrix": [2, 1], "x": 1, "y": 2},
119 {"matrix": [2, 2], "x": 2, "y": 2},
120 {"matrix": [2, 3], "x": 3, "y": 2},
121 {"matrix": [2, 4], "x": 4, "y": 2},
122 {"matrix": [2, 5], "x": 5, "y": 2},
123
124 {"matrix": [6, 0], "x": 7, "y": 2},
125 {"matrix": [6, 1], "x": 8, "y": 2},
126 {"matrix": [6, 2], "x": 9, "y": 2},
127 {"matrix": [6, 3], "x": 10, "y": 2},
128 {"matrix": [6, 4], "x": 11, "y": 2},
129 {"matrix": [6, 5], "x": 12, "y": 2},
130
131 {"matrix": [10, 0], "x": 14, "y": 2},
132 {"matrix": [10, 1], "x": 15, "y": 2},
133 {"matrix": [10, 2], "x": 16, "y": 2},
134 {"matrix": [10, 3], "x": 17, "y": 2},
135 {"matrix": [10, 4], "x": 18, "y": 2},
136 {"matrix": [10, 5], "x": 19, "y": 2},
137
138 {"matrix": [3, 0], "x": 0, "y": 3},
139 {"matrix": [3, 1], "x": 1, "y": 3},
140 {"matrix": [3, 2], "x": 2, "y": 3},
141 {"matrix": [3, 3], "x": 3, "y": 3},
142 {"matrix": [3, 4], "x": 4, "y": 3},
143 {"matrix": [3, 5], "x": 5, "y": 3},
144
145 {"matrix": [7, 0], "x": 7, "y": 3},
146 {"matrix": [7, 1], "x": 8, "y": 3},
147 {"matrix": [7, 2], "x": 9, "y": 3},
148 {"matrix": [7, 3], "x": 10, "y": 3},
149 {"matrix": [7, 4], "x": 11, "y": 3},
150 {"matrix": [7, 5], "x": 12, "y": 3},
151
152 {"matrix": [11, 0], "x": 14, "y": 3},
153 {"matrix": [11, 1], "x": 15, "y": 3},
154 {"matrix": [11, 2], "x": 16, "y": 3},
155 {"matrix": [11, 3], "x": 17, "y": 3},
156 {"matrix": [11, 4], "x": 18, "y": 3},
157 {"matrix": [11, 5], "x": 19, "y": 3}
28 ] 158 ]
29 } 159 }
30 } 160 }
diff --git a/keyboards/kc60/info.json b/keyboards/kc60/info.json
index 4e10acaf9e..ca8580ad1a 100644
--- a/keyboards/kc60/info.json
+++ b/keyboards/kc60/info.json
@@ -27,217 +27,217 @@
27 "layouts": { 27 "layouts": {
28 "LAYOUT_all": { 28 "LAYOUT_all": {
29 "layout": [ 29 "layout": [
30 {"x": 0, "y": 0}, 30 {"matrix": [0, 0], "x": 0, "y": 0},
31 {"x": 1, "y": 0}, 31 {"matrix": [0, 1], "x": 1, "y": 0},
32 {"x": 2, "y": 0}, 32 {"matrix": [0, 2], "x": 2, "y": 0},
33 {"x": 3, "y": 0}, 33 {"matrix": [0, 3], "x": 3, "y": 0},
34 {"x": 4, "y": 0}, 34 {"matrix": [0, 4], "x": 4, "y": 0},
35 {"x": 5, "y": 0}, 35 {"matrix": [0, 5], "x": 5, "y": 0},
36 {"x": 6, "y": 0}, 36 {"matrix": [0, 6], "x": 6, "y": 0},
37 {"x": 7, "y": 0}, 37 {"matrix": [0, 7], "x": 7, "y": 0},
38 {"x": 8, "y": 0}, 38 {"matrix": [0, 8], "x": 8, "y": 0},
39 {"x": 9, "y": 0}, 39 {"matrix": [0, 9], "x": 9, "y": 0},
40 {"x": 10, "y": 0}, 40 {"matrix": [0, 10], "x": 10, "y": 0},
41 {"x": 11, "y": 0}, 41 {"matrix": [0, 11], "x": 11, "y": 0},
42 {"x": 12, "y": 0}, 42 {"matrix": [0, 12], "x": 12, "y": 0},
43 {"x": 13, "y": 0}, 43 {"matrix": [0, 13], "x": 13, "y": 0},
44 {"x": 14, "y": 0}, 44 {"matrix": [4, 9], "x": 14, "y": 0},
45 45
46 {"x": 0, "y": 1, "w": 1.5}, 46 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
47 {"x": 1.5, "y": 1}, 47 {"matrix": [1, 1], "x": 1.5, "y": 1},
48 {"x": 2.5, "y": 1}, 48 {"matrix": [1, 2], "x": 2.5, "y": 1},
49 {"x": 3.5, "y": 1}, 49 {"matrix": [1, 3], "x": 3.5, "y": 1},
50 {"x": 4.5, "y": 1}, 50 {"matrix": [1, 4], "x": 4.5, "y": 1},
51 {"x": 5.5, "y": 1}, 51 {"matrix": [1, 5], "x": 5.5, "y": 1},
52 {"x": 6.5, "y": 1}, 52 {"matrix": [1, 6], "x": 6.5, "y": 1},
53 {"x": 7.5, "y": 1}, 53 {"matrix": [1, 7], "x": 7.5, "y": 1},
54 {"x": 8.5, "y": 1}, 54 {"matrix": [1, 8], "x": 8.5, "y": 1},
55 {"x": 9.5, "y": 1}, 55 {"matrix": [1, 9], "x": 9.5, "y": 1},
56 {"x": 10.5, "y": 1}, 56 {"matrix": [1, 10], "x": 10.5, "y": 1},
57 {"x": 11.5, "y": 1}, 57 {"matrix": [1, 11], "x": 11.5, "y": 1},
58 {"x": 12.5, "y": 1}, 58 {"matrix": [1, 12], "x": 12.5, "y": 1},
59 {"x": 13.5, "y": 1, "w": 1.5}, 59 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
60 60
61 {"x": 0, "y": 2, "w": 1.75}, 61 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
62 {"x": 1.75, "y": 2}, 62 {"matrix": [2, 1], "x": 1.75, "y": 2},
63 {"x": 2.75, "y": 2}, 63 {"matrix": [2, 2], "x": 2.75, "y": 2},
64 {"x": 3.75, "y": 2}, 64 {"matrix": [2, 3], "x": 3.75, "y": 2},
65 {"x": 4.75, "y": 2}, 65 {"matrix": [2, 4], "x": 4.75, "y": 2},
66 {"x": 5.75, "y": 2}, 66 {"matrix": [2, 5], "x": 5.75, "y": 2},
67 {"x": 6.75, "y": 2}, 67 {"matrix": [2, 6], "x": 6.75, "y": 2},
68 {"x": 7.75, "y": 2}, 68 {"matrix": [2, 7], "x": 7.75, "y": 2},
69 {"x": 8.75, "y": 2}, 69 {"matrix": [2, 8], "x": 8.75, "y": 2},
70 {"x": 9.75, "y": 2}, 70 {"matrix": [2, 9], "x": 9.75, "y": 2},
71 {"x": 10.75, "y": 2}, 71 {"matrix": [2, 10], "x": 10.75, "y": 2},
72 {"x": 11.75, "y": 2}, 72 {"matrix": [2, 11], "x": 11.75, "y": 2},
73 {"x": 12.75, "y": 2}, 73 {"matrix": [2, 12], "x": 12.75, "y": 2},
74 {"x": 13.75, "y": 2, "w": 1.25}, 74 {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
75 75
76 {"x": 0, "y": 3, "w": 1.25}, 76 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
77 {"x": 1.25, "y": 3}, 77 {"matrix": [3, 1], "x": 1.25, "y": 3},
78 {"x": 2.25, "y": 3}, 78 {"matrix": [3, 2], "x": 2.25, "y": 3},
79 {"x": 3.25, "y": 3}, 79 {"matrix": [3, 3], "x": 3.25, "y": 3},
80 {"x": 4.25, "y": 3}, 80 {"matrix": [3, 4], "x": 4.25, "y": 3},
81 {"x": 5.25, "y": 3}, 81 {"matrix": [3, 5], "x": 5.25, "y": 3},
82 {"x": 6.25, "y": 3}, 82 {"matrix": [3, 6], "x": 6.25, "y": 3},
83 {"x": 7.25, "y": 3}, 83 {"matrix": [3, 7], "x": 7.25, "y": 3},
84 {"x": 8.25, "y": 3}, 84 {"matrix": [3, 8], "x": 8.25, "y": 3},
85 {"x": 9.25, "y": 3}, 85 {"matrix": [3, 9], "x": 9.25, "y": 3},
86 {"x": 10.25, "y": 3}, 86 {"matrix": [3, 10], "x": 10.25, "y": 3},
87 {"x": 11.25, "y": 3}, 87 {"matrix": [3, 11], "x": 11.25, "y": 3},
88 {"x": 12.25, "y": 3, "w": 1.75}, 88 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
89 {"x": 14, "y": 3}, 89 {"matrix": [3, 12], "x": 14, "y": 3},
90 90
91 {"x": 0, "y": 4, "w": 1.25}, 91 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
92 {"x": 1.25, "y": 4, "w": 1.25}, 92 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
93 {"x": 2.5, "y": 4, "w": 1.25}, 93 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
94 {"x": 3.75, "y": 4, "w": 6.25}, 94 {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
95 {"x": 10, "y": 4, "w": 1.25}, 95 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
96 {"x": 11.25, "y": 4, "w": 1.25}, 96 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
97 {"x": 12.5, "y": 4, "w": 1.25}, 97 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
98 {"x": 13.75, "y": 4, "w": 1.25} 98 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
99 ] 99 ]
100 }, 100 },
101 "LAYOUT": { 101 "LAYOUT": {
102 "layout": [ 102 "layout": [
103 {"x": 0, "y": 0}, 103 {"matrix": [0, 0], "x": 0, "y": 0},
104 {"x": 1, "y": 0}, 104 {"matrix": [0, 1], "x": 1, "y": 0},
105 {"x": 2, "y": 0}, 105 {"matrix": [0, 2], "x": 2, "y": 0},
106 {"x": 3, "y": 0}, 106 {"matrix": [0, 3], "x": 3, "y": 0},
107 {"x": 4, "y": 0}, 107 {"matrix": [0, 4], "x": 4, "y": 0},
108 {"x": 5, "y": 0}, 108 {"matrix": [0, 5], "x": 5, "y": 0},
109 {"x": 6, "y": 0}, 109 {"matrix": [0, 6], "x": 6, "y": 0},
110 {"x": 7, "y": 0}, 110 {"matrix": [0, 7], "x": 7, "y": 0},
111 {"x": 8, "y": 0}, 111 {"matrix": [0, 8], "x": 8, "y": 0},
112 {"x": 9, "y": 0}, 112 {"matrix": [0, 9], "x": 9, "y": 0},
113 {"x": 10, "y": 0}, 113 {"matrix": [0, 10], "x": 10, "y": 0},
114 {"x": 11, "y": 0}, 114 {"matrix": [0, 11], "x": 11, "y": 0},
115 {"x": 12, "y": 0}, 115 {"matrix": [0, 12], "x": 12, "y": 0},
116 {"x": 13, "y": 0}, 116 {"matrix": [0, 13], "x": 13, "y": 0},
117 117
118 {"x": 0, "y": 1, "w": 1.5}, 118 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
119 {"x": 1.5, "y": 1}, 119 {"matrix": [1, 1], "x": 1.5, "y": 1},
120 {"x": 2.5, "y": 1}, 120 {"matrix": [1, 2], "x": 2.5, "y": 1},
121 {"x": 3.5, "y": 1}, 121 {"matrix": [1, 3], "x": 3.5, "y": 1},
122 {"x": 4.5, "y": 1}, 122 {"matrix": [1, 4], "x": 4.5, "y": 1},
123 {"x": 5.5, "y": 1}, 123 {"matrix": [1, 5], "x": 5.5, "y": 1},
124 {"x": 6.5, "y": 1}, 124 {"matrix": [1, 6], "x": 6.5, "y": 1},
125 {"x": 7.5, "y": 1}, 125 {"matrix": [1, 7], "x": 7.5, "y": 1},
126 {"x": 8.5, "y": 1}, 126 {"matrix": [1, 8], "x": 8.5, "y": 1},
127 {"x": 9.5, "y": 1}, 127 {"matrix": [1, 9], "x": 9.5, "y": 1},
128 {"x": 10.5, "y": 1}, 128 {"matrix": [1, 10], "x": 10.5, "y": 1},
129 {"x": 11.5, "y": 1}, 129 {"matrix": [1, 11], "x": 11.5, "y": 1},
130 {"x": 12.5, "y": 1}, 130 {"matrix": [1, 12], "x": 12.5, "y": 1},
131 {"x": 13.5, "y": 1, "w": 1.5}, 131 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
132 132
133 {"x": 0, "y": 2, "w": 1.75}, 133 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
134 {"x": 1.75, "y": 2}, 134 {"matrix": [2, 1], "x": 1.75, "y": 2},
135 {"x": 2.75, "y": 2}, 135 {"matrix": [2, 2], "x": 2.75, "y": 2},
136 {"x": 3.75, "y": 2}, 136 {"matrix": [2, 3], "x": 3.75, "y": 2},
137 {"x": 4.75, "y": 2}, 137 {"matrix": [2, 4], "x": 4.75, "y": 2},
138 {"x": 5.75, "y": 2}, 138 {"matrix": [2, 5], "x": 5.75, "y": 2},
139 {"x": 6.75, "y": 2}, 139 {"matrix": [2, 6], "x": 6.75, "y": 2},
140 {"x": 7.75, "y": 2}, 140 {"matrix": [2, 7], "x": 7.75, "y": 2},
141 {"x": 8.75, "y": 2}, 141 {"matrix": [2, 8], "x": 8.75, "y": 2},
142 {"x": 9.75, "y": 2}, 142 {"matrix": [2, 9], "x": 9.75, "y": 2},
143 {"x": 10.75, "y": 2}, 143 {"matrix": [2, 10], "x": 10.75, "y": 2},
144 {"x": 11.75, "y": 2}, 144 {"matrix": [2, 11], "x": 11.75, "y": 2},
145 {"x": 12.75, "y": 2}, 145 {"matrix": [2, 12], "x": 12.75, "y": 2},
146 {"x": 13.75, "y": 2, "w": 1.25}, 146 {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
147 147
148 {"x": 0, "y": 3, "w": 1.25}, 148 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
149 {"x": 1.25, "y": 3}, 149 {"matrix": [3, 1], "x": 1.25, "y": 3},
150 {"x": 2.25, "y": 3}, 150 {"matrix": [3, 2], "x": 2.25, "y": 3},
151 {"x": 3.25, "y": 3}, 151 {"matrix": [3, 3], "x": 3.25, "y": 3},
152 {"x": 4.25, "y": 3}, 152 {"matrix": [3, 4], "x": 4.25, "y": 3},
153 {"x": 5.25, "y": 3}, 153 {"matrix": [3, 5], "x": 5.25, "y": 3},
154 {"x": 6.25, "y": 3}, 154 {"matrix": [3, 6], "x": 6.25, "y": 3},
155 {"x": 7.25, "y": 3}, 155 {"matrix": [3, 7], "x": 7.25, "y": 3},
156 {"x": 8.25, "y": 3}, 156 {"matrix": [3, 8], "x": 8.25, "y": 3},
157 {"x": 9.25, "y": 3}, 157 {"matrix": [3, 9], "x": 9.25, "y": 3},
158 {"x": 10.25, "y": 3}, 158 {"matrix": [3, 10], "x": 10.25, "y": 3},
159 {"x": 11.25, "y": 3}, 159 {"matrix": [3, 11], "x": 11.25, "y": 3},
160 {"x": 12.25, "y": 3, "w": 1.75}, 160 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
161 {"x": 14, "y": 3}, 161 {"matrix": [3, 13], "x": 14, "y": 3},
162 162
163 {"x": 0, "y": 4, "w": 1.25}, 163 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
164 {"x": 1.25, "y": 4, "w": 1.25}, 164 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
165 {"x": 2.5, "y": 4, "w": 1.25}, 165 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
166 {"x": 3.75, "y": 4, "w": 6.25}, 166 {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
167 {"x": 14, "y": 0}, 167 {"matrix": [4, 9], "x": 14, "y": 0},
168 {"x": 10, "y": 4, "w": 1.25}, 168 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
169 {"x": 11.25, "y": 4, "w": 1.25}, 169 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
170 {"x": 12.5, "y": 4, "w": 1.25}, 170 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
171 {"x": 13.75, "y": 4, "w": 1.25} 171 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
172 ] 172 ]
173 }, 173 },
174 "LAYOUT_60_ansi": { 174 "LAYOUT_60_ansi": {
175 "layout": [ 175 "layout": [
176 {"x": 0, "y": 0}, 176 {"matrix": [0, 0], "x": 0, "y": 0},
177 {"x": 1, "y": 0}, 177 {"matrix": [0, 1], "x": 1, "y": 0},
178 {"x": 2, "y": 0}, 178 {"matrix": [0, 2], "x": 2, "y": 0},
179 {"x": 3, "y": 0}, 179 {"matrix": [0, 3], "x": 3, "y": 0},
180 {"x": 4, "y": 0}, 180 {"matrix": [0, 4], "x": 4, "y": 0},
181 {"x": 5, "y": 0}, 181 {"matrix": [0, 5], "x": 5, "y": 0},
182 {"x": 6, "y": 0}, 182 {"matrix": [0, 6], "x": 6, "y": 0},
183 {"x": 7, "y": 0}, 183 {"matrix": [0, 7], "x": 7, "y": 0},
184 {"x": 8, "y": 0}, 184 {"matrix": [0, 8], "x": 8, "y": 0},
185 {"x": 9, "y": 0}, 185 {"matrix": [0, 9], "x": 9, "y": 0},
186 {"x": 10, "y": 0}, 186 {"matrix": [0, 10], "x": 10, "y": 0},
187 {"x": 11, "y": 0}, 187 {"matrix": [0, 11], "x": 11, "y": 0},
188 {"x": 12, "y": 0}, 188 {"matrix": [0, 12], "x": 12, "y": 0},
189 {"x": 13, "y": 0, "w": 2}, 189 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
190 190
191 {"x": 0, "y": 1, "w": 1.5}, 191 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
192 {"x": 1.5, "y": 1}, 192 {"matrix": [1, 1], "x": 1.5, "y": 1},
193 {"x": 2.5, "y": 1}, 193 {"matrix": [1, 2], "x": 2.5, "y": 1},
194 {"x": 3.5, "y": 1}, 194 {"matrix": [1, 3], "x": 3.5, "y": 1},
195 {"x": 4.5, "y": 1}, 195 {"matrix": [1, 4], "x": 4.5, "y": 1},
196 {"x": 5.5, "y": 1}, 196 {"matrix": [1, 5], "x": 5.5, "y": 1},
197 {"x": 6.5, "y": 1}, 197 {"matrix": [1, 6], "x": 6.5, "y": 1},
198 {"x": 7.5, "y": 1}, 198 {"matrix": [1, 7], "x": 7.5, "y": 1},
199 {"x": 8.5, "y": 1}, 199 {"matrix": [1, 8], "x": 8.5, "y": 1},
200 {"x": 9.5, "y": 1}, 200 {"matrix": [1, 9], "x": 9.5, "y": 1},
201 {"x": 10.5, "y": 1}, 201 {"matrix": [1, 10], "x": 10.5, "y": 1},
202 {"x": 11.5, "y": 1}, 202 {"matrix": [1, 11], "x": 11.5, "y": 1},
203 {"x": 12.5, "y": 1}, 203 {"matrix": [1, 12], "x": 12.5, "y": 1},
204 {"x": 13.5, "y": 1, "w": 1.5}, 204 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
205 205
206 {"x": 0, "y": 2, "w": 1.75}, 206 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
207 {"x": 1.75, "y": 2}, 207 {"matrix": [2, 1], "x": 1.75, "y": 2},
208 {"x": 2.75, "y": 2}, 208 {"matrix": [2, 2], "x": 2.75, "y": 2},
209 {"x": 3.75, "y": 2}, 209 {"matrix": [2, 3], "x": 3.75, "y": 2},
210 {"x": 4.75, "y": 2}, 210 {"matrix": [2, 4], "x": 4.75, "y": 2},
211 {"x": 5.75, "y": 2}, 211 {"matrix": [2, 5], "x": 5.75, "y": 2},
212 {"x": 6.75, "y": 2}, 212 {"matrix": [2, 6], "x": 6.75, "y": 2},
213 {"x": 7.75, "y": 2}, 213 {"matrix": [2, 7], "x": 7.75, "y": 2},
214 {"x": 8.75, "y": 2}, 214 {"matrix": [2, 8], "x": 8.75, "y": 2},
215 {"x": 9.75, "y": 2}, 215 {"matrix": [2, 9], "x": 9.75, "y": 2},
216 {"x": 10.75, "y": 2}, 216 {"matrix": [2, 10], "x": 10.75, "y": 2},
217 {"x": 11.75, "y": 2}, 217 {"matrix": [2, 11], "x": 11.75, "y": 2},
218 {"x": 12.75, "y": 2, "w": 2.25}, 218 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
219 219
220 {"x": 0, "y": 3, "w": 2.25}, 220 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
221 {"x": 2.25, "y": 3}, 221 {"matrix": [3, 2], "x": 2.25, "y": 3},
222 {"x": 3.25, "y": 3}, 222 {"matrix": [3, 3], "x": 3.25, "y": 3},
223 {"x": 4.25, "y": 3}, 223 {"matrix": [3, 4], "x": 4.25, "y": 3},
224 {"x": 5.25, "y": 3}, 224 {"matrix": [3, 5], "x": 5.25, "y": 3},
225 {"x": 6.25, "y": 3}, 225 {"matrix": [3, 6], "x": 6.25, "y": 3},
226 {"x": 7.25, "y": 3}, 226 {"matrix": [3, 7], "x": 7.25, "y": 3},
227 {"x": 8.25, "y": 3}, 227 {"matrix": [3, 8], "x": 8.25, "y": 3},
228 {"x": 9.25, "y": 3}, 228 {"matrix": [3, 9], "x": 9.25, "y": 3},
229 {"x": 10.25, "y": 3}, 229 {"matrix": [3, 10], "x": 10.25, "y": 3},
230 {"x": 11.25, "y": 3}, 230 {"matrix": [3, 11], "x": 11.25, "y": 3},
231 {"x": 12.25, "y": 3, "w": 2.75}, 231 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
232 232
233 {"x": 0, "y": 4, "w": 1.25}, 233 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
234 {"x": 1.25, "y": 4, "w": 1.25}, 234 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
235 {"x": 2.5, "y": 4, "w": 1.25}, 235 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
236 {"x": 3.75, "y": 4, "w": 6.25}, 236 {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
237 {"x": 10, "y": 4, "w": 1.25}, 237 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
238 {"x": 11.25, "y": 4, "w": 1.25}, 238 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
239 {"x": 12.5, "y": 4, "w": 1.25}, 239 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
240 {"x": 13.75, "y": 4, "w": 1.25} 240 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
241 ] 241 ]
242 } 242 }
243 } 243 }
diff --git a/keyboards/kc60/kc60.c b/keyboards/kc60/kc60.c
index afba2da57e..22ce217b52 100644
--- a/keyboards/kc60/kc60.c
+++ b/keyboards/kc60/kc60.c
@@ -1,4 +1,4 @@
1#include "kc60.h" 1#include "quantum.h"
2 2
3void led_update_ports(led_t led_state) { 3void led_update_ports(led_t led_state) {
4 if (led_state.caps_lock) { 4 if (led_state.caps_lock) {
diff --git a/keyboards/kc60/kc60.h b/keyboards/kc60/kc60.h
deleted file mode 100644
index 79bdbd2a17..0000000000
--- a/keyboards/kc60/kc60.h
+++ /dev/null
@@ -1,93 +0,0 @@
1#pragma once
2
3#include "quantum.h"
4
5#define XXX KC_NO
6
7/* LAYOUT_all
8 * ,-----------------------------------------------------------.
9 * |00 |01 |02 |03 |04 |05 |06 |07 |08 |09 |0A |0B |0C |0D |49 |
10 * |-----------------------------------------------------------| ,-----.
11 * |10 |11 |12 |13 |14 |15 |16 |17 |18 |19 |1A |1B |1C |1D | | |
12 * |-----------------------------------------------------------| ,---. |
13 * |20 |21 |22 |23 |24 |25 |26 |17 |28 |29 |2A |2B |2D | |2C |2D |
14 * |-----------------------------------------------------------| `--------'
15 * |30 |31 |32 |33 |34 |35 |36 |37 |38 |39 |3A |3B |3D |3C |
16 * |-----------------------------------------------------------|
17 * |40 |41 |42 | 45 |4A |4B |4C |4D |
18 * `-----------------------------------------------------------'
19 * 2u Backspace = k0D
20 * 2.25u left Shift = k30
21 * 2.75u right Shift = k3D
22 */
23#define LAYOUT_all( \
24 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k49, \
25 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
26 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \
27 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3C, \
28 k40, k41, k42, k45, k4A, k4B, k4C, k4D \
29) { \
30 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
31 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
32 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \
33 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \
34 { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4A, k4B, k4C, k4D } \
35}
36
37/* LAYOUT
38 * Present for backwards compatibility with older keymaps. The commit that added
39 * split Backspace support put the right 1u key of the split on the bottom row,
40 * next to right Alt. The arguments for 1.75/1u right Shift are also in reverse
41 * order.
42 * ,-----------------------------------------------------------.
43 * |00 |01 |02 |03 |04 |05 |06 |07 |08 |09 |0A |0B |0C |0D |49 |
44 * |-----------------------------------------------------------| ,-----.
45 * |10 |11 |12 |13 |14 |15 |16 |17 |18 |19 |1A |1B |1C |1D | | |
46 * |-----------------------------------------------------------| ,---. |
47 * |20 |21 |22 |23 |24 |25 |26 |17 |28 |29 |2A |2B |2D | |2C |2D |
48 * |-----------------------------------------------------------| `--------'
49 * |30 |31 |32 |33 |34 |35 |36 |37 |38 |39 |3A |3B |3D |3C |
50 * |-----------------------------------------------------------|
51 * |40 |41 |42 | 45 |4A |4B |4C |4D |
52 * `-----------------------------------------------------------'
53 */
54#define LAYOUT( \
55 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
56 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
57 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \
58 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, \
59 k40, k41, k42, k45, k49, k4A, k4B, k4C, k4D \
60) { \
61 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
62 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
63 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \
64 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \
65 { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4A, k4B, k4C, k4D } \
66}
67
68/* LAYOUT_60_ansi
69 * ,-----------------------------------------------------------.
70 * |00 |01 |02 |03 |04 |05 |06 |07 |08 |09 |0A |0B |0C |0D |
71 * |-----------------------------------------------------------|
72 * |10 |11 |12 |13 |14 |15 |16 |17 |18 |19 |1A |1B |1C |1D |
73 * |-----------------------------------------------------------|
74 * |20 |21 |22 |23 |24 |25 |26 |17 |28 |29 |2A |2B |2D |
75 * |-----------------------------------------------------------|
76 * |30 |32 |33 |34 |35 |36 |37 |38 |39 |3A |3B |3D |
77 * |-----------------------------------------------------------|
78 * |40 |41 |42 | 45 |4A |4B |4C |4D |
79 * `-----------------------------------------------------------'
80 */
81#define LAYOUT_60_ansi( \
82 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
83 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
84 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, \
85 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, \
86 k40, k41, k42, k45, k4A, k4B, k4C, k4D \
87) { \
88 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
89 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
90 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D }, \
91 { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D }, \
92 { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4A, k4B, k4C, k4D } \
93}
diff --git a/keyboards/kc60se/info.json b/keyboards/kc60se/info.json
index a785cde305..afca676446 100644
--- a/keyboards/kc60se/info.json
+++ b/keyboards/kc60se/info.json
@@ -23,46 +23,357 @@
23 "layouts": { 23 "layouts": {
24 "LAYOUT_all": { 24 "LAYOUT_all": {
25 "layout": [ 25 "layout": [
26 {"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":"|", "x":13, "y":0},{"label":"~", "x":14, "y":0}, 26 {"matrix": [0, 0], "x": 0, "y": 0},
27 {"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":"Backspace", "x":13.5, "y":1, "w":1.5}, 27 {"matrix": [0, 1], "x": 1, "y": 0},
28 {"label":"Control", "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":2, "w":1.25}, 28 {"matrix": [0, 2], "x": 2, "y": 0},
29 {"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":"Fn", "x":14, "y":3}, 29 {"matrix": [0, 3], "x": 3, "y": 0},
30 {"label":"Gui", "x":0, "y":4, "w":1.25},{"label":"Alt", "x":1.25, "y":4, "w":1.25},{"label":"Fn", "x":2.5, "y":4, "w":1.25},{"label":" ", "x":3.75, "y":4, "w":6.25},{"label":"Alt", "x":10, "y":4, "w":1.25},{"label":"Gui", "x":11.25, "y":4, "w":1.25},{"label":"Win", "x":12.5, "y":4, "w":1.25},{"label":"Ctrl", "x":13.75, "y":4, "w":1.25} 30 {"matrix": [0, 4], "x": 4, "y": 0},
31 {"matrix": [0, 5], "x": 5, "y": 0},
32 {"matrix": [0, 6], "x": 6, "y": 0},
33 {"matrix": [0, 7], "x": 7, "y": 0},
34 {"matrix": [0, 8], "x": 8, "y": 0},
35 {"matrix": [0, 9], "x": 9, "y": 0},
36 {"matrix": [0, 10], "x": 10, "y": 0},
37 {"matrix": [0, 11], "x": 11, "y": 0},
38 {"matrix": [0, 12], "x": 12, "y": 0},
39 {"matrix": [0, 13], "x": 13, "y": 0},
40 {"matrix": [4, 9], "x": 14, "y": 0},
41
42 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
43 {"matrix": [1, 1], "x": 1.5, "y": 1},
44 {"matrix": [1, 2], "x": 2.5, "y": 1},
45 {"matrix": [1, 3], "x": 3.5, "y": 1},
46 {"matrix": [1, 4], "x": 4.5, "y": 1},
47 {"matrix": [1, 5], "x": 5.5, "y": 1},
48 {"matrix": [1, 6], "x": 6.5, "y": 1},
49 {"matrix": [1, 7], "x": 7.5, "y": 1},
50 {"matrix": [1, 8], "x": 8.5, "y": 1},
51 {"matrix": [1, 9], "x": 9.5, "y": 1},
52 {"matrix": [1, 10], "x": 10.5, "y": 1},
53 {"matrix": [1, 11], "x": 11.5, "y": 1},
54 {"matrix": [1, 12], "x": 12.5, "y": 1},
55 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
56
57 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
58 {"matrix": [2, 1], "x": 1.75, "y": 2},
59 {"matrix": [2, 2], "x": 2.75, "y": 2},
60 {"matrix": [2, 3], "x": 3.75, "y": 2},
61 {"matrix": [2, 4], "x": 4.75, "y": 2},
62 {"matrix": [2, 5], "x": 5.75, "y": 2},
63 {"matrix": [2, 6], "x": 6.75, "y": 2},
64 {"matrix": [2, 7], "x": 7.75, "y": 2},
65 {"matrix": [2, 8], "x": 8.75, "y": 2},
66 {"matrix": [2, 9], "x": 9.75, "y": 2},
67 {"matrix": [2, 10], "x": 10.75, "y": 2},
68 {"matrix": [2, 11], "x": 11.75, "y": 2},
69 {"matrix": [2, 12], "x": 12.75, "y": 2},
70 {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
71
72 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
73 {"matrix": [3, 1], "x": 1.25, "y": 3},
74 {"matrix": [3, 2], "x": 2.25, "y": 3},
75 {"matrix": [3, 3], "x": 3.25, "y": 3},
76 {"matrix": [3, 4], "x": 4.25, "y": 3},
77 {"matrix": [3, 5], "x": 5.25, "y": 3},
78 {"matrix": [3, 6], "x": 6.25, "y": 3},
79 {"matrix": [3, 7], "x": 7.25, "y": 3},
80 {"matrix": [3, 8], "x": 8.25, "y": 3},
81 {"matrix": [3, 9], "x": 9.25, "y": 3},
82 {"matrix": [3, 10], "x": 10.25, "y": 3},
83 {"matrix": [3, 11], "x": 11.25, "y": 3},
84 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
85 {"matrix": [3, 12], "x": 14, "y": 3},
86
87 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
88 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
89 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
90 {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
91 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
92 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
93 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
94 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
31 ] 95 ]
32 }, 96 },
33 "LAYOUT_60_ansi": { 97 "LAYOUT_60_ansi": {
34 "layout": [ 98 "layout": [
35 {"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":"Backspace", "x":13, "y":0, "w":2}, 99 {"matrix": [0, 0], "x": 0, "y": 0},
36 {"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}, 100 {"matrix": [0, 1], "x": 1, "y": 0},
37 {"label":"CapsLock", "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}, 101 {"matrix": [0, 2], "x": 2, "y": 0},
38 {"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":2.75}, 102 {"matrix": [0, 3], "x": 3, "y": 0},
39 {"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":" ", "x":3.75, "y":4, "w":6.25},{"label":"Alt", "x":10, "y":4, "w":1.25},{"label":"Gui", "x":11.25, "y":4, "w":1.25},{"label":"Win", "x":12.5, "y":4, "w":1.25},{"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] 103 {"matrix": [0, 4], "x": 4, "y": 0},
104 {"matrix": [0, 5], "x": 5, "y": 0},
105 {"matrix": [0, 6], "x": 6, "y": 0},
106 {"matrix": [0, 7], "x": 7, "y": 0},
107 {"matrix": [0, 8], "x": 8, "y": 0},
108 {"matrix": [0, 9], "x": 9, "y": 0},
109 {"matrix": [0, 10], "x": 10, "y": 0},
110 {"matrix": [0, 11], "x": 11, "y": 0},
111 {"matrix": [0, 12], "x": 12, "y": 0},
112 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
113
114 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
115 {"matrix": [1, 1], "x": 1.5, "y": 1},
116 {"matrix": [1, 2], "x": 2.5, "y": 1},
117 {"matrix": [1, 3], "x": 3.5, "y": 1},
118 {"matrix": [1, 4], "x": 4.5, "y": 1},
119 {"matrix": [1, 5], "x": 5.5, "y": 1},
120 {"matrix": [1, 6], "x": 6.5, "y": 1},
121 {"matrix": [1, 7], "x": 7.5, "y": 1},
122 {"matrix": [1, 8], "x": 8.5, "y": 1},
123 {"matrix": [1, 9], "x": 9.5, "y": 1},
124 {"matrix": [1, 10], "x": 10.5, "y": 1},
125 {"matrix": [1, 11], "x": 11.5, "y": 1},
126 {"matrix": [1, 12], "x": 12.5, "y": 1},
127 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
128
129 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
130 {"matrix": [2, 1], "x": 1.75, "y": 2},
131 {"matrix": [2, 2], "x": 2.75, "y": 2},
132 {"matrix": [2, 3], "x": 3.75, "y": 2},
133 {"matrix": [2, 4], "x": 4.75, "y": 2},
134 {"matrix": [2, 5], "x": 5.75, "y": 2},
135 {"matrix": [2, 6], "x": 6.75, "y": 2},
136 {"matrix": [2, 7], "x": 7.75, "y": 2},
137 {"matrix": [2, 8], "x": 8.75, "y": 2},
138 {"matrix": [2, 9], "x": 9.75, "y": 2},
139 {"matrix": [2, 10], "x": 10.75, "y": 2},
140 {"matrix": [2, 11], "x": 11.75, "y": 2},
141 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
142
143 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
144 {"matrix": [3, 2], "x": 2.25, "y": 3},
145 {"matrix": [3, 3], "x": 3.25, "y": 3},
146 {"matrix": [3, 4], "x": 4.25, "y": 3},
147 {"matrix": [3, 5], "x": 5.25, "y": 3},
148 {"matrix": [3, 6], "x": 6.25, "y": 3},
149 {"matrix": [3, 7], "x": 7.25, "y": 3},
150 {"matrix": [3, 8], "x": 8.25, "y": 3},
151 {"matrix": [3, 9], "x": 9.25, "y": 3},
152 {"matrix": [3, 10], "x": 10.25, "y": 3},
153 {"matrix": [3, 11], "x": 11.25, "y": 3},
154 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
155
156 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
157 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
158 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
159 {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
160 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
161 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
162 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
163 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
164 ]
40 }, 165 },
41 "LAYOUT_60_iso": { 166 "LAYOUT_60_iso": {
42 "layout": [ 167 "layout": [
43 {"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":"Backspace", "x":13, "y":0, "w":2}, 168 {"matrix": [0, 0], "x": 0, "y": 0},
44 {"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}, 169 {"matrix": [0, 1], "x": 1, "y": 0},
45 {"label":"Caps Lock", "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}, 170 {"matrix": [0, 2], "x": 2, "y": 0},
46 {"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":2.75}, 171 {"matrix": [0, 3], "x": 3, "y": 0},
47 {"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":"AltGr", "x":10, "y":4, "w":1.25},{"label":"Win", "x":11.25, "y":4, "w":1.25},{"label":"Menu", "x":12.5, "y":4, "w":1.25},{"label":"Ctrl", "x":13.75, "y":4, "w":1.25} 172 {"matrix": [0, 4], "x": 4, "y": 0},
48 ] 173 {"matrix": [0, 5], "x": 5, "y": 0},
49 }, 174 {"matrix": [0, 6], "x": 6, "y": 0},
50 "LAYOUT_60_ansi_split_bs_rshift": { 175 {"matrix": [0, 7], "x": 7, "y": 0},
176 {"matrix": [0, 8], "x": 8, "y": 0},
177 {"matrix": [0, 9], "x": 9, "y": 0},
178 {"matrix": [0, 10], "x": 10, "y": 0},
179 {"matrix": [0, 11], "x": 11, "y": 0},
180 {"matrix": [0, 12], "x": 12, "y": 0},
181 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
182
183 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
184 {"matrix": [1, 1], "x": 1.5, "y": 1},
185 {"matrix": [1, 2], "x": 2.5, "y": 1},
186 {"matrix": [1, 3], "x": 3.5, "y": 1},
187 {"matrix": [1, 4], "x": 4.5, "y": 1},
188 {"matrix": [1, 5], "x": 5.5, "y": 1},
189 {"matrix": [1, 6], "x": 6.5, "y": 1},
190 {"matrix": [1, 7], "x": 7.5, "y": 1},
191 {"matrix": [1, 8], "x": 8.5, "y": 1},
192 {"matrix": [1, 9], "x": 9.5, "y": 1},
193 {"matrix": [1, 10], "x": 10.5, "y": 1},
194 {"matrix": [1, 11], "x": 11.5, "y": 1},
195 {"matrix": [1, 12], "x": 12.5, "y": 1},
196
197 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
198 {"matrix": [2, 1], "x": 1.75, "y": 2},
199 {"matrix": [2, 2], "x": 2.75, "y": 2},
200 {"matrix": [2, 3], "x": 3.75, "y": 2},
201 {"matrix": [2, 4], "x": 4.75, "y": 2},
202 {"matrix": [2, 5], "x": 5.75, "y": 2},
203 {"matrix": [2, 6], "x": 6.75, "y": 2},
204 {"matrix": [2, 7], "x": 7.75, "y": 2},
205 {"matrix": [2, 8], "x": 8.75, "y": 2},
206 {"matrix": [2, 9], "x": 9.75, "y": 2},
207 {"matrix": [2, 10], "x": 10.75, "y": 2},
208 {"matrix": [2, 11], "x": 11.75, "y": 2},
209 {"matrix": [2, 12], "x": 12.75, "y": 2},
210 {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
211
212 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
213 {"matrix": [3, 1], "x": 1.25, "y": 3},
214 {"matrix": [3, 2], "x": 2.25, "y": 3},
215 {"matrix": [3, 3], "x": 3.25, "y": 3},
216 {"matrix": [3, 4], "x": 4.25, "y": 3},
217 {"matrix": [3, 5], "x": 5.25, "y": 3},
218 {"matrix": [3, 6], "x": 6.25, "y": 3},
219 {"matrix": [3, 7], "x": 7.25, "y": 3},
220 {"matrix": [3, 8], "x": 8.25, "y": 3},
221 {"matrix": [3, 9], "x": 9.25, "y": 3},
222 {"matrix": [3, 10], "x": 10.25, "y": 3},
223 {"matrix": [3, 11], "x": 11.25, "y": 3},
224 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
225
226 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
227 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
228 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
229 {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
230 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
231 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
232 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
233 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
234 ]
235 },
236 "LAYOUT_60_ansi_split_bs_rshift": {
51 "layout": [ 237 "layout": [
52 {"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":"|", "x":13, "y":0},{"label":"~", "x":14, "y":0}, 238 {"matrix": [0, 0], "x": 0, "y": 0},
53 {"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":"Backspace", "x":13.5, "y":1, "w":1.5}, 239 {"matrix": [0, 1], "x": 1, "y": 0},
54 {"label":"Control", "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}, 240 {"matrix": [0, 2], "x": 2, "y": 0},
55 {"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":"Fn", "x":14, "y":3}, 241 {"matrix": [0, 3], "x": 3, "y": 0},
56 {"label":"Gui", "x":0, "y":4, "w":1.25},{"label":"Alt", "x":1.25, "y":4, "w":1.25},{"label":"Fn", "x":2.5, "y":4, "w":1.25},{"label":" ", "x":3.75, "y":4, "w":6.25},{"label":"Alt", "x":10, "y":4, "w":1.25},{"label":"Gui", "x":11.25, "y":4, "w":1.25},{"label":"Win", "x":12.5, "y":4, "w":1.25},{"label":"Ctrl", "x":13.75, "y":4, "w":1.25} 242 {"matrix": [0, 4], "x": 4, "y": 0},
243 {"matrix": [0, 5], "x": 5, "y": 0},
244 {"matrix": [0, 6], "x": 6, "y": 0},
245 {"matrix": [0, 7], "x": 7, "y": 0},
246 {"matrix": [0, 8], "x": 8, "y": 0},
247 {"matrix": [0, 9], "x": 9, "y": 0},
248 {"matrix": [0, 10], "x": 10, "y": 0},
249 {"matrix": [0, 11], "x": 11, "y": 0},
250 {"matrix": [0, 12], "x": 12, "y": 0},
251 {"matrix": [0, 13], "x": 13, "y": 0},
252 {"matrix": [4, 9], "x": 14, "y": 0},
253
254 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
255 {"matrix": [1, 1], "x": 1.5, "y": 1},
256 {"matrix": [1, 2], "x": 2.5, "y": 1},
257 {"matrix": [1, 3], "x": 3.5, "y": 1},
258 {"matrix": [1, 4], "x": 4.5, "y": 1},
259 {"matrix": [1, 5], "x": 5.5, "y": 1},
260 {"matrix": [1, 6], "x": 6.5, "y": 1},
261 {"matrix": [1, 7], "x": 7.5, "y": 1},
262 {"matrix": [1, 8], "x": 8.5, "y": 1},
263 {"matrix": [1, 9], "x": 9.5, "y": 1},
264 {"matrix": [1, 10], "x": 10.5, "y": 1},
265 {"matrix": [1, 11], "x": 11.5, "y": 1},
266 {"matrix": [1, 12], "x": 12.5, "y": 1},
267 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
268
269 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
270 {"matrix": [2, 1], "x": 1.75, "y": 2},
271 {"matrix": [2, 2], "x": 2.75, "y": 2},
272 {"matrix": [2, 3], "x": 3.75, "y": 2},
273 {"matrix": [2, 4], "x": 4.75, "y": 2},
274 {"matrix": [2, 5], "x": 5.75, "y": 2},
275 {"matrix": [2, 6], "x": 6.75, "y": 2},
276 {"matrix": [2, 7], "x": 7.75, "y": 2},
277 {"matrix": [2, 8], "x": 8.75, "y": 2},
278 {"matrix": [2, 9], "x": 9.75, "y": 2},
279 {"matrix": [2, 10], "x": 10.75, "y": 2},
280 {"matrix": [2, 11], "x": 11.75, "y": 2},
281 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
282
283 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
284 {"matrix": [3, 2], "x": 2.25, "y": 3},
285 {"matrix": [3, 3], "x": 3.25, "y": 3},
286 {"matrix": [3, 4], "x": 4.25, "y": 3},
287 {"matrix": [3, 5], "x": 5.25, "y": 3},
288 {"matrix": [3, 6], "x": 6.25, "y": 3},
289 {"matrix": [3, 7], "x": 7.25, "y": 3},
290 {"matrix": [3, 8], "x": 8.25, "y": 3},
291 {"matrix": [3, 9], "x": 9.25, "y": 3},
292 {"matrix": [3, 10], "x": 10.25, "y": 3},
293 {"matrix": [3, 11], "x": 11.25, "y": 3},
294 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
295 {"matrix": [3, 12], "x": 14, "y": 3},
296
297 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
298 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
299 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
300 {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
301 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
302 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
303 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
304 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
57 ] 305 ]
58 }, 306 },
59 "LAYOUT_60_iso_split_bs_rshift": { 307 "LAYOUT_60_iso_split_bs_rshift": {
60 "layout": [ 308 "layout": [
61 {"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":"`", "x":13, "y":0},{"label":"Backspace", "x":14, "y":0}, 309 {"matrix": [0, 0], "x": 0, "y": 0},
62 {"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}, 310 {"matrix": [0, 1], "x": 1, "y": 0},
63 {"label":"Caps Lock", "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}, 311 {"matrix": [0, 2], "x": 2, "y": 0},
64 {"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":"Fn", "x":14, "y":3}, 312 {"matrix": [0, 3], "x": 3, "y": 0},
65 {"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":"AltGr", "x":10, "y":4, "w":1.25},{"label":"Win", "x":11.25, "y":4, "w":1.25},{"label":"Menu", "x":12.5, "y":4, "w":1.25},{"label":"Ctrl", "x":13.75, "y":4, "w":1.25} 313 {"matrix": [0, 4], "x": 4, "y": 0},
314 {"matrix": [0, 5], "x": 5, "y": 0},
315 {"matrix": [0, 6], "x": 6, "y": 0},
316 {"matrix": [0, 7], "x": 7, "y": 0},
317 {"matrix": [0, 8], "x": 8, "y": 0},
318 {"matrix": [0, 9], "x": 9, "y": 0},
319 {"matrix": [0, 10], "x": 10, "y": 0},
320 {"matrix": [0, 11], "x": 11, "y": 0},
321 {"matrix": [0, 12], "x": 12, "y": 0},
322 {"matrix": [0, 13], "x": 13, "y": 0},
323 {"matrix": [4, 9], "x": 14, "y": 0},
324
325 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
326 {"matrix": [1, 1], "x": 1.5, "y": 1},
327 {"matrix": [1, 2], "x": 2.5, "y": 1},
328 {"matrix": [1, 3], "x": 3.5, "y": 1},
329 {"matrix": [1, 4], "x": 4.5, "y": 1},
330 {"matrix": [1, 5], "x": 5.5, "y": 1},
331 {"matrix": [1, 6], "x": 6.5, "y": 1},
332 {"matrix": [1, 7], "x": 7.5, "y": 1},
333 {"matrix": [1, 8], "x": 8.5, "y": 1},
334 {"matrix": [1, 9], "x": 9.5, "y": 1},
335 {"matrix": [1, 10], "x": 10.5, "y": 1},
336 {"matrix": [1, 11], "x": 11.5, "y": 1},
337 {"matrix": [1, 12], "x": 12.5, "y": 1},
338
339 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
340 {"matrix": [2, 1], "x": 1.75, "y": 2},
341 {"matrix": [2, 2], "x": 2.75, "y": 2},
342 {"matrix": [2, 3], "x": 3.75, "y": 2},
343 {"matrix": [2, 4], "x": 4.75, "y": 2},
344 {"matrix": [2, 5], "x": 5.75, "y": 2},
345 {"matrix": [2, 6], "x": 6.75, "y": 2},
346 {"matrix": [2, 7], "x": 7.75, "y": 2},
347 {"matrix": [2, 8], "x": 8.75, "y": 2},
348 {"matrix": [2, 9], "x": 9.75, "y": 2},
349 {"matrix": [2, 10], "x": 10.75, "y": 2},
350 {"matrix": [2, 11], "x": 11.75, "y": 2},
351 {"matrix": [2, 12], "x": 12.75, "y": 2},
352 {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
353
354 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
355 {"matrix": [3, 1], "x": 1.25, "y": 3},
356 {"matrix": [3, 2], "x": 2.25, "y": 3},
357 {"matrix": [3, 3], "x": 3.25, "y": 3},
358 {"matrix": [3, 4], "x": 4.25, "y": 3},
359 {"matrix": [3, 5], "x": 5.25, "y": 3},
360 {"matrix": [3, 6], "x": 6.25, "y": 3},
361 {"matrix": [3, 7], "x": 7.25, "y": 3},
362 {"matrix": [3, 8], "x": 8.25, "y": 3},
363 {"matrix": [3, 9], "x": 9.25, "y": 3},
364 {"matrix": [3, 10], "x": 10.25, "y": 3},
365 {"matrix": [3, 11], "x": 11.25, "y": 3},
366 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
367 {"matrix": [3, 12], "x": 14, "y": 3},
368
369 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
370 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
371 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
372 {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
373 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
374 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
375 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
376 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
66 ] 377 ]
67 } 378 }
68 } 379 }
diff --git a/keyboards/kc60se/kc60se.c b/keyboards/kc60se/kc60se.c
index 7aa0ef9d77..660b9201b3 100644
--- a/keyboards/kc60se/kc60se.c
+++ b/keyboards/kc60se/kc60se.c
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16 16
17#include "kc60se.h" 17#include "quantum.h"
18 18
19void matrix_init_kb(void){ 19void matrix_init_kb(void){
20 setPinOutput(B2); 20 setPinOutput(B2);
diff --git a/keyboards/kc60se/kc60se.h b/keyboards/kc60se/kc60se.h
deleted file mode 100644
index 0277e3a905..0000000000
--- a/keyboards/kc60se/kc60se.h
+++ /dev/null
@@ -1,93 +0,0 @@
1/* Copyright 2017 Blake C. Lewis
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#include "quantum.h"
20
21#define ___ KC_NO
22
23// clang-format off
24#define LAYOUT_all( \
25 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K49, \
26 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
27 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
28 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \
29 K40, K41, K42, K45, K4A, K4B, K4C, K4D \
30) { \
31 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
32 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
33 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
34 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
35 { K40, K41, K42, ___, ___, K45, ___, ___, ___, K49, K4A, K4B, K4C, K4D } \
36}
37
38#define LAYOUT_60_ansi( \
39 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
40 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
41 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
42 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
43 K40, K41, K42, K45, K4A, K4B, K4C, K4D \
44) { \
45 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
46 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
47 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D }, \
48 { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D }, \
49 { K40, K41, K42, ___, ___, K45, ___, ___, ___, ___, K4A, K4B, K4C, K4D } \
50}
51
52#define LAYOUT_60_ansi_split_bs_rshift( \
53 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K49, \
54 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
55 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
56 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \
57 K40, K41, K42, K45, K4A, K4B, K4C, K4D \
58) { \
59 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
60 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
61 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D }, \
62 { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
63 { K40, K41, K42, ___, ___, K45, ___, ___, ___, K49, K4A, K4B, K4C, K4D } \
64}
65#define LAYOUT_60_iso( \
66 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
67 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
68 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
69 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
70 K40, K41, K42, K45, K4A, K4B, K4C, K4D \
71){ \
72 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
73 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___ }, \
74 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
75 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D }, \
76 { K40, K41, K42, ___, ___, K45, ___, ___, ___, ___, K4A, K4B, K4C, K4D } \
77}
78
79#define LAYOUT_60_iso_split_bs_rshift( \
80 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, k49, \
81 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
82 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
83 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \
84 K40, K41, K42, K45, K4A, K4B, K4C, K4D \
85){ \
86 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
87 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___ }, \
88 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
89 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
90 { K40, K41, K42, ___, ___, K45, ___, ___, ___, k49, K4A, K4B, K4C, K4D } \
91}
92#define LAYOUT LAYOUT_all
93// clang-format on
diff --git a/keyboards/keebsforall/freebird60/freebird60.h b/keyboards/keebsforall/freebird60/freebird60.h
deleted file mode 100644
index 84a9fa3fdb..0000000000
--- a/keyboards/keebsforall/freebird60/freebird60.h
+++ /dev/null
@@ -1,57 +0,0 @@
1/* Copyright 2020 KnoblesseOblige
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#include "quantum.h"
20
21#define kxx KC_NO
22
23/* This is a shortcut to help you visually see your layout.
24 *
25 * The first section contains all of the arguments representing the physical
26 * layout of the board and position of the keys.
27 *
28 * The second converts the arguments into a two-dimensional array which
29 * represents the switch matrix.
30 */
31#define LAYOUT( \
32 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
33 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
34 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
35 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3c, \
36 k40, k41, k42, k45, k49, k4a, k4b, k4d \
37) { \
38 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
39 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
40 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, kxx, k2d }, \
41 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, kxx, k3c, kxx }, \
42 { k40, k41, k42, kxx, kxx, k45, kxx, kxx, kxx, k49, k4a, k4b, kxx, k4d } \
43}
44
45#define LAYOUT_all( \
46 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
47 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
48 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
49 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3c, k3d, \
50 k40, k41, k42, k45, k49, k4a, k4b, k4c, k4d \
51) { \
52 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
53 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
54 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, kxx, k2d }, \
55 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, kxx, k3c, k3d }, \
56 { k40, k41, k42, kxx, kxx, k45, kxx, kxx, kxx, k49, k4a, k4b, k4c, k4d } \
57}
diff --git a/keyboards/keebsforall/freebird60/info.json b/keyboards/keebsforall/freebird60/info.json
index 743624abed..d2742610ac 100644
--- a/keyboards/keebsforall/freebird60/info.json
+++ b/keyboards/keebsforall/freebird60/info.json
@@ -17,10 +17,144 @@
17 "bootloader": "atmel-dfu", 17 "bootloader": "atmel-dfu",
18 "layouts": { 18 "layouts": {
19 "LAYOUT": { 19 "LAYOUT": {
20 "layout": [{"label":"~", "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":"Backspace", "x":13, "y":0, "w":2}, {"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":"Caps Lock", "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":"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":2.75}, {"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, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] 20 "layout": [
21 {"matrix": [0, 0], "x": 0, "y": 0},
22 {"matrix": [0, 1], "x": 1, "y": 0},
23 {"matrix": [0, 2], "x": 2, "y": 0},
24 {"matrix": [0, 3], "x": 3, "y": 0},
25 {"matrix": [0, 4], "x": 4, "y": 0},
26 {"matrix": [0, 5], "x": 5, "y": 0},
27 {"matrix": [0, 6], "x": 6, "y": 0},
28 {"matrix": [0, 7], "x": 7, "y": 0},
29 {"matrix": [0, 8], "x": 8, "y": 0},
30 {"matrix": [0, 9], "x": 9, "y": 0},
31 {"matrix": [0, 10], "x": 10, "y": 0},
32 {"matrix": [0, 11], "x": 11, "y": 0},
33 {"matrix": [0, 12], "x": 12, "y": 0},
34 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
35
36 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
37 {"matrix": [1, 1], "x": 1.5, "y": 1},
38 {"matrix": [1, 2], "x": 2.5, "y": 1},
39 {"matrix": [1, 3], "x": 3.5, "y": 1},
40 {"matrix": [1, 4], "x": 4.5, "y": 1},
41 {"matrix": [1, 5], "x": 5.5, "y": 1},
42 {"matrix": [1, 6], "x": 6.5, "y": 1},
43 {"matrix": [1, 7], "x": 7.5, "y": 1},
44 {"matrix": [1, 8], "x": 8.5, "y": 1},
45 {"matrix": [1, 9], "x": 9.5, "y": 1},
46 {"matrix": [1, 10], "x": 10.5, "y": 1},
47 {"matrix": [1, 11], "x": 11.5, "y": 1},
48 {"matrix": [1, 12], "x": 12.5, "y": 1},
49 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
50
51 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
52 {"matrix": [2, 1], "x": 1.75, "y": 2},
53 {"matrix": [2, 2], "x": 2.75, "y": 2},
54 {"matrix": [2, 3], "x": 3.75, "y": 2},
55 {"matrix": [2, 4], "x": 4.75, "y": 2},
56 {"matrix": [2, 5], "x": 5.75, "y": 2},
57 {"matrix": [2, 6], "x": 6.75, "y": 2},
58 {"matrix": [2, 7], "x": 7.75, "y": 2},
59 {"matrix": [2, 8], "x": 8.75, "y": 2},
60 {"matrix": [2, 9], "x": 9.75, "y": 2},
61 {"matrix": [2, 10], "x": 10.75, "y": 2},
62 {"matrix": [2, 11], "x": 11.75, "y": 2},
63 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
64
65 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
66 {"matrix": [3, 1], "x": 2.25, "y": 3},
67 {"matrix": [3, 2], "x": 3.25, "y": 3},
68 {"matrix": [3, 3], "x": 4.25, "y": 3},
69 {"matrix": [3, 4], "x": 5.25, "y": 3},
70 {"matrix": [3, 5], "x": 6.25, "y": 3},
71 {"matrix": [3, 6], "x": 7.25, "y": 3},
72 {"matrix": [3, 7], "x": 8.25, "y": 3},
73 {"matrix": [3, 8], "x": 9.25, "y": 3},
74 {"matrix": [3, 9], "x": 10.25, "y": 3},
75 {"matrix": [3, 10], "x": 11.25, "y": 3},
76 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
77
78 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
79 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
80 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
81 {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
82 {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
83 {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
84 {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
85 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
86 ]
21 }, 87 },
22 "LAYOUT_all": { 88 "LAYOUT_all": {
23 "layout": [{"label":"~", "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":"Backspace", "x":13, "y":0, "w":2}, {"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":"Caps Lock", "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":"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, "w":1.75}, {"label":"Up", "x":13, "y":3}, {"label":"Shift", "x":14, "y":3}, {"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":"Ctrl", "x":11, "y":4}, {"label":"Left", "x":12, "y":4}, {"label":"Down", "x":13, "y":4}, {"label":"Right", "x":14, "y":4}] 89 "layout": [
90 {"matrix": [0, 0], "x": 0, "y": 0},
91 {"matrix": [0, 1], "x": 1, "y": 0},
92 {"matrix": [0, 2], "x": 2, "y": 0},
93 {"matrix": [0, 3], "x": 3, "y": 0},
94 {"matrix": [0, 4], "x": 4, "y": 0},
95 {"matrix": [0, 5], "x": 5, "y": 0},
96 {"matrix": [0, 6], "x": 6, "y": 0},
97 {"matrix": [0, 7], "x": 7, "y": 0},
98 {"matrix": [0, 8], "x": 8, "y": 0},
99 {"matrix": [0, 9], "x": 9, "y": 0},
100 {"matrix": [0, 10], "x": 10, "y": 0},
101 {"matrix": [0, 11], "x": 11, "y": 0},
102 {"matrix": [0, 12], "x": 12, "y": 0},
103 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
104
105 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
106 {"matrix": [1, 1], "x": 1.5, "y": 1},
107 {"matrix": [1, 2], "x": 2.5, "y": 1},
108 {"matrix": [1, 3], "x": 3.5, "y": 1},
109 {"matrix": [1, 4], "x": 4.5, "y": 1},
110 {"matrix": [1, 5], "x": 5.5, "y": 1},
111 {"matrix": [1, 6], "x": 6.5, "y": 1},
112 {"matrix": [1, 7], "x": 7.5, "y": 1},
113 {"matrix": [1, 8], "x": 8.5, "y": 1},
114 {"matrix": [1, 9], "x": 9.5, "y": 1},
115 {"matrix": [1, 10], "x": 10.5, "y": 1},
116 {"matrix": [1, 11], "x": 11.5, "y": 1},
117 {"matrix": [1, 12], "x": 12.5, "y": 1},
118 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
119
120 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
121 {"matrix": [2, 1], "x": 1.75, "y": 2},
122 {"matrix": [2, 2], "x": 2.75, "y": 2},
123 {"matrix": [2, 3], "x": 3.75, "y": 2},
124 {"matrix": [2, 4], "x": 4.75, "y": 2},
125 {"matrix": [2, 5], "x": 5.75, "y": 2},
126 {"matrix": [2, 6], "x": 6.75, "y": 2},
127 {"matrix": [2, 7], "x": 7.75, "y": 2},
128 {"matrix": [2, 8], "x": 8.75, "y": 2},
129 {"matrix": [2, 9], "x": 9.75, "y": 2},
130 {"matrix": [2, 10], "x": 10.75, "y": 2},
131 {"matrix": [2, 11], "x": 11.75, "y": 2},
132 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
133
134 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
135 {"matrix": [3, 1], "x": 2.25, "y": 3},
136 {"matrix": [3, 2], "x": 3.25, "y": 3},
137 {"matrix": [3, 3], "x": 4.25, "y": 3},
138 {"matrix": [3, 4], "x": 5.25, "y": 3},
139 {"matrix": [3, 5], "x": 6.25, "y": 3},
140 {"matrix": [3, 6], "x": 7.25, "y": 3},
141 {"matrix": [3, 7], "x": 8.25, "y": 3},
142 {"matrix": [3, 8], "x": 9.25, "y": 3},
143 {"matrix": [3, 9], "x": 10.25, "y": 3},
144 {"matrix": [3, 10], "x": 11.25, "y": 3, "w": 1.75},
145 {"matrix": [3, 12], "x": 13, "y": 3},
146 {"matrix": [3, 13], "x": 14, "y": 3},
147
148 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
149 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
150 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
151 {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
152 {"matrix": [4, 9], "x": 10, "y": 4},
153 {"matrix": [4, 10], "x": 11, "y": 4},
154 {"matrix": [4, 11], "x": 12, "y": 4},
155 {"matrix": [4, 12], "x": 13, "y": 4},
156 {"matrix": [4, 13], "x": 14, "y": 4}
157 ]
24 } 158 }
25 } 159 }
26} 160}
diff --git a/keyboards/keyboardio/model01/info.json b/keyboards/keyboardio/model01/info.json
index bc24c214f7..0aad5ea39c 100644
--- a/keyboards/keyboardio/model01/info.json
+++ b/keyboards/keyboardio/model01/info.json
@@ -17,79 +17,150 @@
17 "layouts": { 17 "layouts": {
18 "LAYOUT": { 18 "LAYOUT": {
19 "layout": [ 19 "layout": [
20 {"label":"PROG", "x":0, "y":0.4, "h":1.3}, 20 {"matrix": [0, 7], "x": 0, "y": 0.4, "h": 1.3},
21 {"label":"1", "x":1, "y":0.2, "h":1.5}, 21 {"matrix": [0, 6], "x": 1, "y": 0.2, "h": 1.5},
22 {"label":"2", "x":2, "y":0.1, "h":1.1}, 22 {"matrix": [0, 5], "x": 2, "y": 0.1, "h": 1.1},
23 {"label":"3", "x":3, "y":0}, 23 {"matrix": [0, 4], "x": 3, "y": 0},
24 {"label":"4", "x":4, "y":0.1}, 24 {"matrix": [0, 3], "x": 4, "y": 0.1},
25 {"label":"5", "x":5, "y":0.3}, 25 {"matrix": [0, 2], "x": 5, "y": 0.3},
26 26
27 {"label":"6", "x":12.5, "y":0.3}, 27 {"matrix": [4, 5], "x": 12.5, "y": 0.3},
28 {"label":"7", "x":13.5, "y":0.1}, 28 {"matrix": [4, 4], "x": 13.5, "y": 0.1},
29 {"label":"8", "x":14.5, "y":0}, 29 {"matrix": [4, 3], "x": 14.5, "y": 0},
30 {"label":"9", "x":15.5, "y":0.1, "h":1.1}, 30 {"matrix": [4, 2], "x": 15.5, "y": 0.1, "h": 1.1},
31 {"label":"0", "x":16.5, "y":0.2, "h":1.5}, 31 {"matrix": [4, 1], "x": 16.5, "y": 0.2, "h": 1.5},
32 {"label":"NUM", "x":17.5, "y":0.4, "h":1.3}, 32 {"matrix": [4, 0], "x": 17.5, "y": 0.4, "h": 1.3},
33 33
34 {"label":"GRAVE", "x":0, "y":1.7}, 34 {"matrix": [1, 7], "x": 0, "y": 1.7},
35 {"label":"Q", "x":1, "y":1.7}, 35 {"matrix": [1, 6], "x": 1, "y": 1.7},
36 {"label":"W", "x":2, "y":1.2}, 36 {"matrix": [1, 5], "x": 2, "y": 1.2},
37 {"label":"E", "x":3, "y":1}, 37 {"matrix": [1, 4], "x": 3, "y": 1},
38 {"label":"R", "x":4, "y":1.1}, 38 {"matrix": [1, 3], "x": 4, "y": 1.1},
39 {"label":"T", "x":5, "y":1.3}, 39 {"matrix": [1, 2], "x": 5, "y": 1.3},
40 {"label":"LED", "x":6, "y":0.6, "h":1.5}, 40 {"matrix": [0, 1], "x": 6, "y": 0.6, "h": 1.5},
41 41
42 {"label":"ANY", "x":11.5, "y":0.6, "h":1.5}, 42 {"matrix": [4, 6], "x": 11.5, "y": 0.6, "h": 1.5},
43 {"label":"Y", "x":12.5, "y":1.3}, 43 {"matrix": [5, 5], "x": 12.5, "y": 1.3},
44 {"label":"U", "x":13.5, "y":1.1}, 44 {"matrix": [5, 4], "x": 13.5, "y": 1.1},
45 {"label":"I", "x":14.5, "y":1}, 45 {"matrix": [5, 3], "x": 14.5, "y": 1},
46 {"label":"O", "x":15.5, "y":1.2}, 46 {"matrix": [5, 2], "x": 15.5, "y": 1.2},
47 {"label":"P", "x":16.5, "y":1.7}, 47 {"matrix": [5, 1], "x": 16.5, "y": 1.7},
48 {"label":"EQUAL", "x":17.5, "y":1.7}, 48 {"matrix": [5, 0], "x": 17.5, "y": 1.7},
49 49
50 {"label":"PAGEUP", "x":0, "y":2.7}, 50 {"matrix": [2, 7], "x": 0, "y": 2.7},
51 {"label":"A", "x":1, "y":2.7}, 51 {"matrix": [2, 6], "x": 1, "y": 2.7},
52 {"label":"S", "x":2, "y":2.2}, 52 {"matrix": [2, 5], "x": 2, "y": 2.2},
53 {"label":"D", "x":3, "y":2}, 53 {"matrix": [2, 4], "x": 3, "y": 2},
54 {"label":"F", "x":4, "y":2.1}, 54 {"matrix": [2, 3], "x": 4, "y": 2.1},
55 {"label":"G", "x":5, "y":2.3}, 55 {"matrix": [2, 2], "x": 5, "y": 2.3},
56 {"label":"TAB", "x":6, "y":2.1, "h":1.3}, 56 {"matrix": [1, 1], "x": 6, "y": 2.1, "h": 1.3},
57 57
58 {"label":"ENTER", "x":11.5, "y":2.1, "h":1.3}, 58 {"matrix": [5, 6], "x": 11.5, "y": 2.1, "h": 1.3},
59 {"label":"H", "x":12.5, "y":2.3}, 59 {"matrix": [6, 5], "x": 12.5, "y": 2.3},
60 {"label":"J", "x":13.5, "y":2.1}, 60 {"matrix": [6, 4], "x": 13.5, "y": 2.1},
61 {"label":"K", "x":14.5, "y":2}, 61 {"matrix": [6, 3], "x": 14.5, "y": 2},
62 {"label":"L", "x":15.5, "y":2.2}, 62 {"matrix": [6, 2], "x": 15.5, "y": 2.2},
63 {"label":"SEMICOLON", "x":16.5, "y":2.7}, 63 {"matrix": [6, 1], "x": 16.5, "y": 2.7},
64 {"label":"QUOTE", "x":17.5, "y":2.7}, 64 {"matrix": [6, 0], "x": 17.5, "y": 2.7},
65 65
66 {"label":"PAGEDOWN", "x":0, "y":3.7, "h":1.2}, 66 {"matrix": [3, 7], "x": 0, "y": 3.7, "h": 1.2},
67 {"label":"Z", "x":1, "y":3.7}, 67 {"matrix": [3, 6], "x": 1, "y": 3.7},
68 {"label":"X", "x":2, "y":3.2, "h":1.15}, 68 {"matrix": [3, 5], "x": 2, "y": 3.2, "h": 1.15},
69 {"label":"C", "x":3, "y":3}, 69 {"matrix": [3, 4], "x": 3, "y": 3},
70 {"label":"V", "x":4, "y":3.1}, 70 {"matrix": [3, 3], "x": 4, "y": 3.1},
71 {"label":"B", "x":5, "y":3.3}, 71 {"matrix": [3, 2], "x": 5, "y": 3.3},
72 {"label":"ESC", "x":6, "y":3.4, "h":1.1}, 72 {"matrix": [2, 1], "x": 6, "y": 3.4, "h": 1.1},
73 73
74 {"label":"BUTTERFLY", "x":11.5, "y":3.4, "h":1.1}, 74 {"matrix": [6, 6], "x": 11.5, "y": 3.4, "h": 1.1},
75 {"label":"N", "x":12.5, "y":3.3}, 75 {"matrix": [7, 5], "x": 12.5, "y": 3.3},
76 {"label":"M", "x":13.5, "y":3.1}, 76 {"matrix": [7, 4], "x": 13.5, "y": 3.1},
77 {"label":"COMMA", "x":14.5, "y":3}, 77 {"matrix": [7, 3], "x": 14.5, "y": 3},
78 {"label":"DOT", "x":15.5, "y":3.2, "h":1.15}, 78 {"matrix": [7, 2], "x": 15.5, "y": 3.2, "h": 1.15},
79 {"label":"SLASH", "x":16.5, "y":3.7}, 79 {"matrix": [7, 1], "x": 16.5, "y": 3.7},
80 {"label":"MINS", "x":17.5, "y":3.7, "h":1.2}, 80 {"matrix": [7, 0], "x": 17.5, "y": 3.7, "h": 1.2},
81 81
82 {"label":"LCTL", "x":4.75, "y":4.3}, 82 {"matrix": [0, 0], "x": 4.75, "y": 4.3},
83 {"label":"RCTL", "x":12.75, "y":4.3}, 83 {"matrix": [4, 7], "x": 12.75, "y": 4.3},
84 {"label":"BACKSPACE", "x":5.75, "y":4.5},
85 {"label":"SPACE", "x":11.75, "y":4.5},
86 {"label":"LGUI", "x":6.75, "y":4.7},
87 {"label":"RALT", "x":10.75, "y":4.7},
88 {"label":"LSHIFT", "x":7.75, "y":5.1},
89 {"label":"RSHIFT", "x":9.75, "y":5.1},
90 84
91 {"label":"FN", "x":6.25, "y":6.1, "h":1.4}, 85 {"matrix": [1, 0], "x": 5.75, "y": 4.5},
92 {"label":"FN", "x":11.25, "y":6.1, "h":1.4} 86 {"matrix": [5, 7], "x": 11.75, "y": 4.5},
87
88 {"matrix": [2, 0], "x": 6.75, "y": 4.7},
89 {"matrix": [6, 7], "x": 10.75, "y": 4.7},
90
91 {"matrix": [3, 0], "x": 7.75, "y": 5.1},
92 {"matrix": [7, 7], "x": 9.75, "y": 5.1},
93
94 {"matrix": [3, 1], "x": 6.25, "y": 6.1, "h": 1.4},
95 {"matrix": [7, 6], "x": 11.25, "y": 6.1, "h": 1.4}
96 ]
97 },
98 "LAYOUT_thumb_row": {
99 "layout": [
100 {"matrix": [0, 7], "x": 0, "y": 0},
101 {"matrix": [0, 6], "x": 1, "y": 0},
102 {"matrix": [0, 5], "x": 2, "y": 0},
103 {"matrix": [0, 4], "x": 3, "y": 0},
104 {"matrix": [0, 3], "x": 4, "y": 0},
105 {"matrix": [0, 2], "x": 5, "y": 0},
106 {"matrix": [4, 5], "x": 6, "y": 0},
107 {"matrix": [4, 4], "x": 7, "y": 0},
108 {"matrix": [4, 3], "x": 8, "y": 0},
109 {"matrix": [4, 2], "x": 9, "y": 0},
110 {"matrix": [4, 1], "x": 10, "y": 0},
111 {"matrix": [4, 0], "x": 11, "y": 0},
112 {"matrix": [1, 7], "x": 12, "y": 0},
113 {"matrix": [1, 6], "x": 13, "y": 0},
114 {"matrix": [1, 5], "x": 14, "y": 0},
115 {"matrix": [1, 4], "x": 15, "y": 0},
116 {"matrix": [1, 3], "x": 16, "y": 0},
117 {"matrix": [1, 2], "x": 17, "y": 0},
118 {"matrix": [0, 1], "x": 18, "y": 0},
119 {"matrix": [4, 6], "x": 19, "y": 0},
120 {"matrix": [5, 5], "x": 20, "y": 0},
121 {"matrix": [5, 4], "x": 21, "y": 0},
122 {"matrix": [5, 3], "x": 22, "y": 0},
123 {"matrix": [5, 2], "x": 23, "y": 0},
124 {"matrix": [5, 1], "x": 24, "y": 0},
125 {"matrix": [5, 0], "x": 25, "y": 0},
126 {"matrix": [2, 7], "x": 26, "y": 0},
127 {"matrix": [2, 6], "x": 27, "y": 0},
128 {"matrix": [2, 5], "x": 28, "y": 0},
129 {"matrix": [2, 4], "x": 29, "y": 0},
130 {"matrix": [2, 3], "x": 30, "y": 0},
131 {"matrix": [2, 2], "x": 31, "y": 0},
132 {"matrix": [1, 1], "x": 32, "y": 0},
133 {"matrix": [5, 6], "x": 33, "y": 0},
134 {"matrix": [6, 5], "x": 34, "y": 0},
135 {"matrix": [6, 4], "x": 35, "y": 0},
136 {"matrix": [6, 3], "x": 36, "y": 0},
137 {"matrix": [6, 2], "x": 37, "y": 0},
138 {"matrix": [6, 1], "x": 38, "y": 0},
139 {"matrix": [6, 0], "x": 39, "y": 0},
140 {"matrix": [3, 7], "x": 40, "y": 0},
141 {"matrix": [3, 6], "x": 41, "y": 0},
142 {"matrix": [3, 5], "x": 42, "y": 0},
143 {"matrix": [3, 4], "x": 43, "y": 0},
144 {"matrix": [3, 3], "x": 44, "y": 0},
145 {"matrix": [3, 2], "x": 45, "y": 0},
146 {"matrix": [2, 1], "x": 46, "y": 0},
147 {"matrix": [6, 6], "x": 47, "y": 0},
148 {"matrix": [7, 5], "x": 48, "y": 0},
149 {"matrix": [7, 4], "x": 49, "y": 0},
150 {"matrix": [7, 3], "x": 50, "y": 0},
151 {"matrix": [7, 2], "x": 51, "y": 0},
152 {"matrix": [7, 1], "x": 52, "y": 0},
153 {"matrix": [7, 0], "x": 53, "y": 0},
154 {"matrix": [0, 0], "x": 54, "y": 0},
155 {"matrix": [1, 0], "x": 55, "y": 0},
156 {"matrix": [2, 0], "x": 56, "y": 0},
157 {"matrix": [3, 0], "x": 57, "y": 0},
158 {"matrix": [7, 7], "x": 58, "y": 0},
159 {"matrix": [6, 7], "x": 59, "y": 0},
160 {"matrix": [5, 7], "x": 60, "y": 0},
161 {"matrix": [4, 7], "x": 61, "y": 0},
162 {"matrix": [3, 1], "x": 62, "y": 0},
163 {"matrix": [7, 6], "x": 63, "y": 0}
93 ] 164 ]
94 } 165 }
95 } 166 }
diff --git a/keyboards/keyboardio/model01/model01.h b/keyboards/keyboardio/model01/model01.h
index 8e494cca30..5038f3b7c3 100644
--- a/keyboards/keyboardio/model01/model01.h
+++ b/keyboards/keyboardio/model01/model01.h
@@ -17,45 +17,6 @@
17 17
18#include "quantum.h" 18#include "quantum.h"
19 19
20#define LAYOUT( \
21 L07, L06, L05, L04, L03, L02, R05, R04, R03, R02, R01, R00, \
22 L17, L16, L15, L14, L13, L12, L01, R06, R15, R14, R13, R12, R11, R10, \
23 L27, L26, L25, L24, L23, L22, L11, R16, R25, R24, R23, R22, R21, R20, \
24 L37, L36, L35, L34, L33, L32, L21, R26, R35, R34, R33, R32, R31, R30, \
25 L00, R07, \
26 L10, R17, \
27 L20, R27, \
28 L30, R37, \
29 L31, R36 \
30 ) { \
31 {L00, L01, L02, L03, L04, L05, L06, L07}, \
32 {L10, L11, L12, L13, L14, L15, L16, L17}, \
33 {L20, L21, L22, L23, L24, L25, L26, L27}, \
34 {L30, L31, L32, L33, L34, L35, L36, L37}, \
35 {R00, R01, R02, R03, R04, R05, R06, R07}, \
36 {R10, R11, R12, R13, R14, R15, R16, R17}, \
37 {R20, R21, R22, R23, R24, R25, R26, R27}, \
38 {R30, R31, R32, R33, R34, R35, R36, R37} \
39 }
40
41#define LAYOUT_thumb_row( \
42 L07, L06, L05, L04, L03, L02, R05, R04, R03, R02, R01, R00, \
43 L17, L16, L15, L14, L13, L12, L01, R06, R15, R14, R13, R12, R11, R10, \
44 L27, L26, L25, L24, L23, L22, L11, R16, R25, R24, R23, R22, R21, R20, \
45 L37, L36, L35, L34, L33, L32, L21, R26, R35, R34, R33, R32, R31, R30, \
46 L00, L10, L20, L30, R37, R27, R17, R07, \
47 L31, R36 \
48 ) { \
49 {L00, L01, L02, L03, L04, L05, L06, L07}, \
50 {L10, L11, L12, L13, L14, L15, L16, L17}, \
51 {L20, L21, L22, L23, L24, L25, L26, L27}, \
52 {L30, L31, L32, L33, L34, L35, L36, L37}, \
53 {R00, R01, R02, R03, R04, R05, R06, R07}, \
54 {R10, R11, R12, R13, R14, R15, R16, R17}, \
55 {R20, R21, R22, R23, R24, R25, R26, R27}, \
56 {R30, R31, R32, R33, R34, R35, R36, R37} \
57 }
58
59#include "wire-protocol-constants.h" 20#include "wire-protocol-constants.h"
60#define I2C_ADDR_LEFT (0x58 << 1) 21#define I2C_ADDR_LEFT (0x58 << 1)
61#define I2C_ADDR_RIGHT (I2C_ADDR_LEFT + 6) 22#define I2C_ADDR_RIGHT (I2C_ADDR_LEFT + 6)
diff --git a/keyboards/keyprez/bison/bison.c b/keyboards/keyprez/bison/bison.c
index 30e0cdbe2b..2106ae8c2c 100644
--- a/keyboards/keyprez/bison/bison.c
+++ b/keyboards/keyprez/bison/bison.c
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16 16
17#include "bison.h" 17#include "quantum.h"
18 18
19bool encoder_update_kb(uint8_t index, bool clockwise) { 19bool encoder_update_kb(uint8_t index, bool clockwise) {
20 if (!encoder_update_user(index, clockwise)) { return false; } 20 if (!encoder_update_user(index, clockwise)) { return false; }
diff --git a/keyboards/keyprez/bison/bison.h b/keyboards/keyprez/bison/bison.h
deleted file mode 100644
index 74b7bae985..0000000000
--- a/keyboards/keyprez/bison/bison.h
+++ /dev/null
@@ -1,99 +0,0 @@
1/* Copyright 2021 csandven
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#include "quantum.h"
20
21#define LAYOUT( \
22 L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R07, \
23 L10, L11, L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, \
24 L20, L21, L22, L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25, R26, R27, \
25 L30, L31, L32, L33, L34, L35, L36, L37, L44, R40, R30, R31, R32, R33, R34, R35, R36, R37, \
26 L40, L41, L42, L43, R41, R42, R43, R44 \
27 ) \
28 { \
29 { L07, L06, L05, L04, L03, L02, L01, L00 }, \
30 { L17, L16, L15, L14, L13, L12, L11, L10 }, \
31 { L27, L26, L25, L24, L23, L22, L21, L20 }, \
32 { L37, L36, L35, L34, L33, L32, L31, L30 }, \
33 { L43, L42, L41, L40, L44, KC_NO, KC_NO, KC_NO }, \
34 { R00, R01, R02, R03, R04, R05, R06, R07 }, \
35 { R10, R11, R12, R13, R14, R15, R16, R17 }, \
36 { R20, R21, R22, R23, R24, R25, R26, R27 }, \
37 { R30, R31, R32, R33, R34, R35, R36, R37 }, \
38 { R41, R42, R43, R44, R40, KC_NO, KC_NO } \
39 }
40
41#define LAYOUT_6_8( \
42 L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R07, \
43 L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, \
44 L22, L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25, R26, R27, \
45 L32, L33, L34, L35, L36, L37, L44, R40, R30, R31, R32, R33, R34, R35, R36, R37, \
46 L40, L41, L42, L43, R41, R42, R43, R44 \
47 ) \
48 { \
49 { L07, L06, L05, L04, L03, L02, KC_NO, KC_NO }, \
50 { L17, L16, L15, L14, L13, L12, KC_NO, KC_NO }, \
51 { L27, L26, L25, L24, L23, L22, KC_NO, KC_NO }, \
52 { L37, L36, L35, L34, L33, L32, KC_NO, KC_NO }, \
53 { L43, L42, L41, L40, L44, KC_NO, KC_NO, KC_NO }, \
54 { R00, R01, R02, R03, R04, R05, R06, R07 }, \
55 { R10, R11, R12, R13, R14, R15, R16, R17 }, \
56 { R20, R21, R22, R23, R24, R25, R26, R27 }, \
57 { R30, R31, R32, R33, R34, R35, R36, R37 }, \
58 { R41, R42, R43, R44, R40, KC_NO, KC_NO } \
59 }
60
61#define LAYOUT_8_6( \
62 L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, \
63 L10, L11, L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, \
64 L20, L21, L22, L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25, \
65 L30, L31, L32, L33, L34, L35, L36, L37, L44, R40, R30, R31, R32, R33, R34, R35, \
66 L40, L41, L42, L43, R41, R42, R43, R44 \
67 ) \
68 { \
69 { L07, L06, L05, L04, L03, L02, L01, L00 }, \
70 { L17, L16, L15, L14, L13, L12, L11, L10 }, \
71 { L27, L26, L25, L24, L23, L22, L21, L20 }, \
72 { L37, L36, L35, L34, L33, L32, L31, L30 }, \
73 { L43, L42, L41, L40, L44, KC_NO, KC_NO, KC_NO }, \
74 { R00, R01, R02, R03, R04, R05, KC_NO, KC_NO }, \
75 { R10, R11, R12, R13, R14, R15, KC_NO, KC_NO }, \
76 { R20, R21, R22, R23, R24, R25, KC_NO, KC_NO }, \
77 { R30, R31, R32, R33, R34, R35, KC_NO, KC_NO }, \
78 { R41, R42, R43, R44, R40, KC_NO, KC_NO } \
79 }
80
81#define LAYOUT_6_6( \
82 L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, \
83 L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, \
84 L22, L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25, \
85 L32, L33, L34, L35, L36, L37, L44, R40, R30, R31, R32, R33, R34, R35, \
86 L40, L41, L42, L43, R41, R42, R43, R44 \
87 ) \
88 { \
89 { L07, L06, L05, L04, L03, L02, KC_NO, KC_NO }, \
90 { L17, L16, L15, L14, L13, L12, KC_NO, KC_NO }, \
91 { L27, L26, L25, L24, L23, L22, KC_NO, KC_NO }, \
92 { L37, L36, L35, L34, L33, L32, KC_NO, KC_NO }, \
93 { L43, L42, L41, L40, L44, KC_NO, KC_NO, KC_NO }, \
94 { R00, R01, R02, R03, R04, R05, KC_NO, KC_NO }, \
95 { R10, R11, R12, R13, R14, R15, KC_NO, KC_NO }, \
96 { R20, R21, R22, R23, R24, R25, KC_NO, KC_NO }, \
97 { R30, R31, R32, R33, R34, R35, KC_NO, KC_NO }, \
98 { R41, R42, R43, R44, R40, KC_NO, KC_NO } \
99 }
diff --git a/keyboards/keyprez/bison/info.json b/keyboards/keyprez/bison/info.json
index bc67710d03..3e47764d5e 100644
--- a/keyboards/keyprez/bison/info.json
+++ b/keyboards/keyprez/bison/info.json
@@ -33,301 +33,318 @@
33 "layouts": { 33 "layouts": {
34 "LAYOUT": { 34 "LAYOUT": {
35 "layout": [ 35 "layout": [
36 {"x": 0, "y": 0}, 36 {"matrix": [0, 7], "x": 0, "y": 0},
37 {"x": 1, "y": 0}, 37 {"matrix": [0, 6], "x": 1, "y": 0},
38 {"x": 2, "y": 0}, 38 {"matrix": [0, 5], "x": 2, "y": 0},
39 {"x": 3, "y": 0}, 39 {"matrix": [0, 4], "x": 3, "y": 0},
40 {"x": 4, "y": 0}, 40 {"matrix": [0, 3], "x": 4, "y": 0},
41 {"x": 5, "y": 0}, 41 {"matrix": [0, 2], "x": 5, "y": 0},
42 {"x": 6, "y": 0}, 42 {"matrix": [0, 1], "x": 6, "y": 0},
43 {"x": 7, "y": 0}, 43 {"matrix": [0, 0], "x": 7, "y": 0},
44 {"x": 10, "y": 0}, 44
45 {"x": 11, "y": 0}, 45 {"matrix": [5, 0], "x": 10, "y": 0},
46 {"x": 12, "y": 0}, 46 {"matrix": [5, 1], "x": 11, "y": 0},
47 {"x": 13, "y": 0}, 47 {"matrix": [5, 2], "x": 12, "y": 0},
48 {"x": 14, "y": 0}, 48 {"matrix": [5, 3], "x": 13, "y": 0},
49 {"x": 15, "y": 0}, 49 {"matrix": [5, 4], "x": 14, "y": 0},
50 {"x": 16, "y": 0}, 50 {"matrix": [5, 5], "x": 15, "y": 0},
51 {"x": 17, "y": 0}, 51 {"matrix": [5, 6], "x": 16, "y": 0},
52 52 {"matrix": [5, 7], "x": 17, "y": 0},
53 {"x": 0, "y": 1}, 53
54 {"x": 1, "y": 1}, 54 {"matrix": [1, 7], "x": 0, "y": 1},
55 {"x": 2, "y": 1}, 55 {"matrix": [1, 6], "x": 1, "y": 1},
56 {"x": 3, "y": 1}, 56 {"matrix": [1, 5], "x": 2, "y": 1},
57 {"x": 4, "y": 1}, 57 {"matrix": [1, 4], "x": 3, "y": 1},
58 {"x": 5, "y": 1}, 58 {"matrix": [1, 3], "x": 4, "y": 1},
59 {"x": 6, "y": 1}, 59 {"matrix": [1, 2], "x": 5, "y": 1},
60 {"x": 7, "y": 1}, 60 {"matrix": [1, 1], "x": 6, "y": 1},
61 {"x": 10, "y": 1}, 61 {"matrix": [1, 0], "x": 7, "y": 1},
62 {"x": 11, "y": 1}, 62
63 {"x": 12, "y": 1}, 63 {"matrix": [6, 0], "x": 10, "y": 1},
64 {"x": 13, "y": 1}, 64 {"matrix": [6, 1], "x": 11, "y": 1},
65 {"x": 14, "y": 1}, 65 {"matrix": [6, 2], "x": 12, "y": 1},
66 {"x": 15, "y": 1}, 66 {"matrix": [6, 3], "x": 13, "y": 1},
67 {"x": 16, "y": 1}, 67 {"matrix": [6, 4], "x": 14, "y": 1},
68 {"x": 17, "y": 1}, 68 {"matrix": [6, 5], "x": 15, "y": 1},
69 69 {"matrix": [6, 6], "x": 16, "y": 1},
70 {"x": 0, "y": 2}, 70 {"matrix": [6, 7], "x": 17, "y": 1},
71 {"x": 1, "y": 2}, 71
72 {"x": 2, "y": 2}, 72 {"matrix": [2, 7], "x": 0, "y": 2},
73 {"x": 3, "y": 2}, 73 {"matrix": [2, 6], "x": 1, "y": 2},
74 {"x": 4, "y": 2}, 74 {"matrix": [2, 5], "x": 2, "y": 2},
75 {"x": 5, "y": 2}, 75 {"matrix": [2, 4], "x": 3, "y": 2},
76 {"x": 6, "y": 2}, 76 {"matrix": [2, 3], "x": 4, "y": 2},
77 {"x": 7, "y": 2}, 77 {"matrix": [2, 2], "x": 5, "y": 2},
78 {"x": 10, "y": 2}, 78 {"matrix": [2, 1], "x": 6, "y": 2},
79 {"x": 11, "y": 2}, 79 {"matrix": [2, 0], "x": 7, "y": 2},
80 {"x": 12, "y": 2}, 80
81 {"x": 13, "y": 2}, 81 {"matrix": [7, 0], "x": 10, "y": 2},
82 {"x": 14, "y": 2}, 82 {"matrix": [7, 1], "x": 11, "y": 2},
83 {"x": 15, "y": 2}, 83 {"matrix": [7, 2], "x": 12, "y": 2},
84 {"x": 16, "y": 2}, 84 {"matrix": [7, 3], "x": 13, "y": 2},
85 {"x": 17, "y": 2}, 85 {"matrix": [7, 4], "x": 14, "y": 2},
86 86 {"matrix": [7, 5], "x": 15, "y": 2},
87 {"x": 0, "y": 3}, 87 {"matrix": [7, 6], "x": 16, "y": 2},
88 {"x": 1, "y": 3}, 88 {"matrix": [7, 7], "x": 17, "y": 2},
89 {"x": 2, "y": 3}, 89
90 {"x": 3, "y": 3}, 90 {"matrix": [3, 7], "x": 0, "y": 3},
91 {"x": 4, "y": 3}, 91 {"matrix": [3, 6], "x": 1, "y": 3},
92 {"x": 5, "y": 3}, 92 {"matrix": [3, 5], "x": 2, "y": 3},
93 {"x": 6, "y": 3}, 93 {"matrix": [3, 4], "x": 3, "y": 3},
94 {"x": 7, "y": 3}, 94 {"matrix": [3, 3], "x": 4, "y": 3},
95 {"x": 8, "y": 3}, 95 {"matrix": [3, 2], "x": 5, "y": 3},
96 {"x": 9, "y": 3}, 96 {"matrix": [3, 1], "x": 6, "y": 3},
97 {"x": 10, "y": 3}, 97 {"matrix": [3, 0], "x": 7, "y": 3},
98 {"x": 11, "y": 3}, 98 {"matrix": [4, 4], "x": 8, "y": 3},
99 {"x": 12, "y": 3}, 99
100 {"x": 13, "y": 3}, 100 {"matrix": [9, 4], "x": 9, "y": 3},
101 {"x": 14, "y": 3}, 101 {"matrix": [8, 0], "x": 10, "y": 3},
102 {"x": 15, "y": 3}, 102 {"matrix": [8, 1], "x": 11, "y": 3},
103 {"x": 16, "y": 3}, 103 {"matrix": [8, 2], "x": 12, "y": 3},
104 {"x": 17, "y": 3}, 104 {"matrix": [8, 3], "x": 13, "y": 3},
105 105 {"matrix": [8, 4], "x": 14, "y": 3},
106 {"x": 3.75, "y": 4}, 106 {"matrix": [8, 5], "x": 15, "y": 3},
107 {"x": 4.75, "y": 4}, 107 {"matrix": [8, 6], "x": 16, "y": 3},
108 {"x": 5.75, "y": 4}, 108 {"matrix": [8, 7], "x": 17, "y": 3},
109 {"x": 6.75, "y": 4, "w": 1.5}, 109
110 {"x": 9.75, "y": 4, "w": 1.5}, 110 {"matrix": [4, 3], "x": 3.75, "y": 4},
111 {"x": 11.25, "y": 4}, 111 {"matrix": [4, 2], "x": 4.75, "y": 4},
112 {"x": 12.25, "y": 4}, 112 {"matrix": [4, 1], "x": 5.75, "y": 4},
113 {"x": 13.25, "y": 4} 113 {"matrix": [4, 0], "x": 6.75, "y": 4, "w": 1.5},
114
115 {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 1.5},
116 {"matrix": [9, 1], "x": 11.25, "y": 4},
117 {"matrix": [9, 2], "x": 12.25, "y": 4},
118 {"matrix": [9, 3], "x": 13.25, "y": 4}
114 ] 119 ]
115 }, 120 },
116
117 "LAYOUT_6_8": { 121 "LAYOUT_6_8": {
118 "layout": [ 122 "layout": [
119 {"x": 0, "y": 0}, 123 {"matrix": [0, 5], "x": 0, "y": 0},
120 {"x": 1, "y": 0}, 124 {"matrix": [0, 4], "x": 1, "y": 0},
121 {"x": 2, "y": 0}, 125 {"matrix": [0, 3], "x": 2, "y": 0},
122 {"x": 3, "y": 0}, 126 {"matrix": [0, 2], "x": 3, "y": 0},
123 {"x": 4, "y": 0}, 127 {"matrix": [0, 1], "x": 4, "y": 0},
124 {"x": 5, "y": 0}, 128 {"matrix": [0, 0], "x": 5, "y": 0},
125 {"x": 8, "y": 0}, 129
126 {"x": 9, "y": 0}, 130 {"matrix": [5, 0], "x": 8, "y": 0},
127 {"x": 10, "y": 0}, 131 {"matrix": [5, 1], "x": 9, "y": 0},
128 {"x": 11, "y": 0}, 132 {"matrix": [5, 2], "x": 10, "y": 0},
129 {"x": 12, "y": 0}, 133 {"matrix": [5, 3], "x": 11, "y": 0},
130 {"x": 13, "y": 0}, 134 {"matrix": [5, 4], "x": 12, "y": 0},
131 {"x": 14, "y": 0}, 135 {"matrix": [5, 5], "x": 13, "y": 0},
132 {"x": 15, "y": 0}, 136 {"matrix": [5, 6], "x": 14, "y": 0},
133 137 {"matrix": [5, 7], "x": 15, "y": 0},
134 {"x": 0, "y": 1}, 138
135 {"x": 1, "y": 1}, 139 {"matrix": [1, 5], "x": 0, "y": 1},
136 {"x": 2, "y": 1}, 140 {"matrix": [1, 4], "x": 1, "y": 1},
137 {"x": 3, "y": 1}, 141 {"matrix": [1, 3], "x": 2, "y": 1},
138 {"x": 4, "y": 1}, 142 {"matrix": [1, 2], "x": 3, "y": 1},
139 {"x": 5, "y": 1}, 143 {"matrix": [1, 1], "x": 4, "y": 1},
140 {"x": 8, "y": 1}, 144 {"matrix": [1, 0], "x": 5, "y": 1},
141 {"x": 9, "y": 1}, 145
142 {"x": 10, "y": 1}, 146 {"matrix": [6, 0], "x": 8, "y": 1},
143 {"x": 11, "y": 1}, 147 {"matrix": [6, 1], "x": 9, "y": 1},
144 {"x": 12, "y": 1}, 148 {"matrix": [6, 2], "x": 10, "y": 1},
145 {"x": 13, "y": 1}, 149 {"matrix": [6, 3], "x": 11, "y": 1},
146 {"x": 14, "y": 1}, 150 {"matrix": [6, 4], "x": 12, "y": 1},
147 {"x": 15, "y": 1}, 151 {"matrix": [6, 5], "x": 13, "y": 1},
148 152 {"matrix": [6, 6], "x": 14, "y": 1},
149 {"x": 0, "y": 2}, 153 {"matrix": [6, 7], "x": 15, "y": 1},
150 {"x": 1, "y": 2}, 154
151 {"x": 2, "y": 2}, 155 {"matrix": [2, 5], "x": 0, "y": 2},
152 {"x": 3, "y": 2}, 156 {"matrix": [2, 4], "x": 1, "y": 2},
153 {"x": 4, "y": 2}, 157 {"matrix": [2, 3], "x": 2, "y": 2},
154 {"x": 5, "y": 2}, 158 {"matrix": [2, 2], "x": 3, "y": 2},
155 {"x": 8, "y": 2}, 159 {"matrix": [2, 1], "x": 4, "y": 2},
156 {"x": 9, "y": 2}, 160 {"matrix": [2, 0], "x": 5, "y": 2},
157 {"x": 10, "y": 2}, 161
158 {"x": 11, "y": 2}, 162 {"matrix": [7, 0], "x": 8, "y": 2},
159 {"x": 12, "y": 2}, 163 {"matrix": [7, 1], "x": 9, "y": 2},
160 {"x": 13, "y": 2}, 164 {"matrix": [7, 2], "x": 10, "y": 2},
161 {"x": 14, "y": 2}, 165 {"matrix": [7, 3], "x": 11, "y": 2},
162 {"x": 15, "y": 2}, 166 {"matrix": [7, 4], "x": 12, "y": 2},
163 167 {"matrix": [7, 5], "x": 13, "y": 2},
164 {"x": 0, "y": 3}, 168 {"matrix": [7, 6], "x": 14, "y": 2},
165 {"x": 1, "y": 3}, 169 {"matrix": [7, 7], "x": 15, "y": 2},
166 {"x": 2, "y": 3}, 170
167 {"x": 3, "y": 3}, 171 {"matrix": [3, 5], "x": 0, "y": 3},
168 {"x": 4, "y": 3}, 172 {"matrix": [3, 4], "x": 1, "y": 3},
169 {"x": 5, "y": 3}, 173 {"matrix": [3, 3], "x": 2, "y": 3},
170 {"x": 6, "y": 3}, 174 {"matrix": [3, 2], "x": 3, "y": 3},
171 {"x": 7, "y": 3}, 175 {"matrix": [3, 1], "x": 4, "y": 3},
172 {"x": 8, "y": 3}, 176 {"matrix": [3, 0], "x": 5, "y": 3},
173 {"x": 9, "y": 3}, 177 {"matrix": [4, 4], "x": 6, "y": 3},
174 {"x": 10, "y": 3}, 178
175 {"x": 11, "y": 3}, 179 {"matrix": [9, 4], "x": 7, "y": 3},
176 {"x": 12, "y": 3}, 180 {"matrix": [8, 0], "x": 8, "y": 3},
177 {"x": 13, "y": 3}, 181 {"matrix": [8, 1], "x": 9, "y": 3},
178 {"x": 14, "y": 3}, 182 {"matrix": [8, 2], "x": 10, "y": 3},
179 {"x": 15, "y": 3}, 183 {"matrix": [8, 3], "x": 11, "y": 3},
180 184 {"matrix": [8, 4], "x": 12, "y": 3},
181 {"x": 1.75, "y": 4}, 185 {"matrix": [8, 5], "x": 13, "y": 3},
182 {"x": 2.75, "y": 4}, 186 {"matrix": [8, 6], "x": 14, "y": 3},
183 {"x": 3.75, "y": 4}, 187 {"matrix": [8, 7], "x": 15, "y": 3},
184 {"x": 4.75, "y": 4, "w": 1.5}, 188
185 {"x": 7.75, "y": 4, "w": 1.5}, 189 {"matrix": [4, 3], "x": 1.75, "y": 4},
186 {"x": 9.25, "y": 4}, 190 {"matrix": [4, 2], "x": 2.75, "y": 4},
187 {"x": 10.25, "y": 4}, 191 {"matrix": [4, 1], "x": 3.75, "y": 4},
188 {"x": 11.25, "y": 4} 192 {"matrix": [4, 0], "x": 4.75, "y": 4, "w": 1.5},
193
194 {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 1.5},
195 {"matrix": [9, 1], "x": 9.25, "y": 4},
196 {"matrix": [9, 2], "x": 10.25, "y": 4},
197 {"matrix": [9, 3], "x": 11.25, "y": 4}
189 ] 198 ]
190 }, 199 },
191
192 "LAYOUT_8_6": { 200 "LAYOUT_8_6": {
193 "layout": [ 201 "layout": [
194 {"x": 0, "y": 0}, 202 {"matrix": [0, 7], "x": 0, "y": 0},
195 {"x": 1, "y": 0}, 203 {"matrix": [0, 6], "x": 1, "y": 0},
196 {"x": 2, "y": 0}, 204 {"matrix": [0, 5], "x": 2, "y": 0},
197 {"x": 3, "y": 0}, 205 {"matrix": [0, 4], "x": 3, "y": 0},
198 {"x": 4, "y": 0}, 206 {"matrix": [0, 3], "x": 4, "y": 0},
199 {"x": 5, "y": 0}, 207 {"matrix": [0, 2], "x": 5, "y": 0},
200 {"x": 6, "y": 0}, 208 {"matrix": [0, 1], "x": 6, "y": 0},
201 {"x": 7, "y": 0}, 209 {"matrix": [0, 0], "x": 7, "y": 0},
202 {"x": 10, "y": 0}, 210
203 {"x": 11, "y": 0}, 211 {"matrix": [5, 0], "x": 10, "y": 0},
204 {"x": 12, "y": 0}, 212 {"matrix": [5, 1], "x": 11, "y": 0},
205 {"x": 13, "y": 0}, 213 {"matrix": [5, 2], "x": 12, "y": 0},
206 {"x": 14, "y": 0}, 214 {"matrix": [5, 3], "x": 13, "y": 0},
207 {"x": 15, "y": 0}, 215 {"matrix": [5, 4], "x": 14, "y": 0},
208 216 {"matrix": [5, 5], "x": 15, "y": 0},
209 {"x": 0, "y": 1}, 217
210 {"x": 1, "y": 1}, 218 {"matrix": [1, 7], "x": 0, "y": 1},
211 {"x": 2, "y": 1}, 219 {"matrix": [1, 6], "x": 1, "y": 1},
212 {"x": 3, "y": 1}, 220 {"matrix": [1, 5], "x": 2, "y": 1},
213 {"x": 4, "y": 1}, 221 {"matrix": [1, 4], "x": 3, "y": 1},
214 {"x": 5, "y": 1}, 222 {"matrix": [1, 3], "x": 4, "y": 1},
215 {"x": 6, "y": 1}, 223 {"matrix": [1, 2], "x": 5, "y": 1},
216 {"x": 7, "y": 1}, 224 {"matrix": [1, 1], "x": 6, "y": 1},
217 {"x": 10, "y": 1}, 225 {"matrix": [1, 0], "x": 7, "y": 1},
218 {"x": 11, "y": 1}, 226
219 {"x": 12, "y": 1}, 227 {"matrix": [6, 0], "x": 10, "y": 1},
220 {"x": 13, "y": 1}, 228 {"matrix": [6, 1], "x": 11, "y": 1},
221 {"x": 14, "y": 1}, 229 {"matrix": [6, 2], "x": 12, "y": 1},
222 {"x": 15, "y": 1}, 230 {"matrix": [6, 3], "x": 13, "y": 1},
223 231 {"matrix": [6, 4], "x": 14, "y": 1},
224 {"x": 0, "y": 2}, 232 {"matrix": [6, 5], "x": 15, "y": 1},
225 {"x": 1, "y": 2}, 233
226 {"x": 2, "y": 2}, 234 {"matrix": [2, 7], "x": 0, "y": 2},
227 {"x": 3, "y": 2}, 235 {"matrix": [2, 6], "x": 1, "y": 2},
228 {"x": 4, "y": 2}, 236 {"matrix": [2, 5], "x": 2, "y": 2},
229 {"x": 5, "y": 2}, 237 {"matrix": [2, 4], "x": 3, "y": 2},
230 {"x": 6, "y": 2}, 238 {"matrix": [2, 3], "x": 4, "y": 2},
231 {"x": 7, "y": 2}, 239 {"matrix": [2, 2], "x": 5, "y": 2},
232 {"x": 10, "y": 2}, 240 {"matrix": [2, 1], "x": 6, "y": 2},
233 {"x": 11, "y": 2}, 241 {"matrix": [2, 0], "x": 7, "y": 2},
234 {"x": 12, "y": 2}, 242
235 {"x": 13, "y": 2}, 243 {"matrix": [7, 0], "x": 10, "y": 2},
236 {"x": 14, "y": 2}, 244 {"matrix": [7, 1], "x": 11, "y": 2},
237 {"x": 15, "y": 2}, 245 {"matrix": [7, 2], "x": 12, "y": 2},
238 246 {"matrix": [7, 3], "x": 13, "y": 2},
239 {"x": 0, "y": 3}, 247 {"matrix": [7, 4], "x": 14, "y": 2},
240 {"x": 1, "y": 3}, 248 {"matrix": [7, 5], "x": 15, "y": 2},
241 {"x": 2, "y": 3}, 249
242 {"x": 3, "y": 3}, 250 {"matrix": [3, 7], "x": 0, "y": 3},
243 {"x": 4, "y": 3}, 251 {"matrix": [3, 6], "x": 1, "y": 3},
244 {"x": 5, "y": 3}, 252 {"matrix": [3, 5], "x": 2, "y": 3},
245 {"x": 6, "y": 3}, 253 {"matrix": [3, 4], "x": 3, "y": 3},
246 {"x": 7, "y": 3}, 254 {"matrix": [3, 3], "x": 4, "y": 3},
247 {"x": 8, "y": 3}, 255 {"matrix": [3, 2], "x": 5, "y": 3},
248 {"x": 9, "y": 3}, 256 {"matrix": [3, 1], "x": 6, "y": 3},
249 {"x": 10, "y": 3}, 257 {"matrix": [3, 0], "x": 7, "y": 3},
250 {"x": 11, "y": 3}, 258 {"matrix": [4, 4], "x": 8, "y": 3},
251 {"x": 12, "y": 3}, 259
252 {"x": 13, "y": 3}, 260 {"matrix": [9, 4], "x": 9, "y": 3},
253 {"x": 14, "y": 3}, 261 {"matrix": [8, 0], "x": 10, "y": 3},
254 {"x": 15, "y": 3}, 262 {"matrix": [8, 1], "x": 11, "y": 3},
255 263 {"matrix": [8, 2], "x": 12, "y": 3},
256 {"x": 3.75, "y": 4}, 264 {"matrix": [8, 3], "x": 13, "y": 3},
257 {"x": 4.75, "y": 4}, 265 {"matrix": [8, 4], "x": 14, "y": 3},
258 {"x": 5.75, "y": 4}, 266 {"matrix": [8, 5], "x": 15, "y": 3},
259 {"x": 6.75, "y": 4, "w": 1.5}, 267
260 {"x": 9.75, "y": 4, "w": 1.5}, 268 {"matrix": [4, 3], "x": 3.75, "y": 4},
261 {"x": 11.25, "y": 4}, 269 {"matrix": [4, 2], "x": 4.75, "y": 4},
262 {"x": 12.25, "y": 4}, 270 {"matrix": [4, 1], "x": 5.75, "y": 4},
263 {"x": 13.25, "y": 4} 271 {"matrix": [4, 0], "x": 6.75, "y": 4, "w": 1.5},
272
273 {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 1.5},
274 {"matrix": [9, 1], "x": 11.25, "y": 4},
275 {"matrix": [9, 2], "x": 12.25, "y": 4},
276 {"matrix": [9, 3], "x": 13.25, "y": 4}
264 ] 277 ]
265 }, 278 },
266
267 "LAYOUT_6_6": { 279 "LAYOUT_6_6": {
268 "layout": [ 280 "layout": [
269 {"x": 0, "y": 0}, 281 {"matrix": [0, 5], "x": 0, "y": 0},
270 {"x": 1, "y": 0}, 282 {"matrix": [0, 4], "x": 1, "y": 0},
271 {"x": 2, "y": 0}, 283 {"matrix": [0, 3], "x": 2, "y": 0},
272 {"x": 3, "y": 0}, 284 {"matrix": [0, 2], "x": 3, "y": 0},
273 {"x": 4, "y": 0}, 285 {"matrix": [0, 1], "x": 4, "y": 0},
274 {"x": 5, "y": 0}, 286 {"matrix": [0, 0], "x": 5, "y": 0},
275 {"x": 8, "y": 0}, 287
276 {"x": 9, "y": 0}, 288 {"matrix": [5, 0], "x": 8, "y": 0},
277 {"x": 10, "y": 0}, 289 {"matrix": [5, 1], "x": 9, "y": 0},
278 {"x": 11, "y": 0}, 290 {"matrix": [5, 2], "x": 10, "y": 0},
279 {"x": 12, "y": 0}, 291 {"matrix": [5, 3], "x": 11, "y": 0},
280 {"x": 13, "y": 0}, 292 {"matrix": [5, 4], "x": 12, "y": 0},
281 293 {"matrix": [5, 5], "x": 13, "y": 0},
282 {"x": 0, "y": 1}, 294
283 {"x": 1, "y": 1}, 295 {"matrix": [1, 5], "x": 0, "y": 1},
284 {"x": 2, "y": 1}, 296 {"matrix": [1, 4], "x": 1, "y": 1},
285 {"x": 3, "y": 1}, 297 {"matrix": [1, 3], "x": 2, "y": 1},
286 {"x": 4, "y": 1}, 298 {"matrix": [1, 2], "x": 3, "y": 1},
287 {"x": 5, "y": 1}, 299 {"matrix": [1, 1], "x": 4, "y": 1},
288 {"x": 8, "y": 1}, 300 {"matrix": [1, 0], "x": 5, "y": 1},
289 {"x": 9, "y": 1}, 301
290 {"x": 10, "y": 1}, 302 {"matrix": [6, 0], "x": 8, "y": 1},
291 {"x": 11, "y": 1}, 303 {"matrix": [6, 1], "x": 9, "y": 1},
292 {"x": 12, "y": 1}, 304 {"matrix": [6, 2], "x": 10, "y": 1},
293 {"x": 13, "y": 1}, 305 {"matrix": [6, 3], "x": 11, "y": 1},
294 306 {"matrix": [6, 4], "x": 12, "y": 1},
295 {"x": 0, "y": 2}, 307 {"matrix": [6, 5], "x": 13, "y": 1},
296 {"x": 1, "y": 2}, 308
297 {"x": 2, "y": 2}, 309 {"matrix": [2, 5], "x": 0, "y": 2},
298 {"x": 3, "y": 2}, 310 {"matrix": [2, 4], "x": 1, "y": 2},
299 {"x": 4, "y": 2}, 311 {"matrix": [2, 3], "x": 2, "y": 2},
300 {"x": 5, "y": 2}, 312 {"matrix": [2, 2], "x": 3, "y": 2},
301 {"x": 8, "y": 2}, 313 {"matrix": [2, 1], "x": 4, "y": 2},
302 {"x": 9, "y": 2}, 314 {"matrix": [2, 0], "x": 5, "y": 2},
303 {"x": 10, "y": 2}, 315
304 {"x": 11, "y": 2}, 316 {"matrix": [7, 0], "x": 8, "y": 2},
305 {"x": 12, "y": 2}, 317 {"matrix": [7, 1], "x": 9, "y": 2},
306 {"x": 13, "y": 2}, 318 {"matrix": [7, 2], "x": 10, "y": 2},
307 319 {"matrix": [7, 3], "x": 11, "y": 2},
308 {"x": 0, "y": 3}, 320 {"matrix": [7, 4], "x": 12, "y": 2},
309 {"x": 1, "y": 3}, 321 {"matrix": [7, 5], "x": 13, "y": 2},
310 {"x": 2, "y": 3}, 322
311 {"x": 3, "y": 3}, 323 {"matrix": [3, 5], "x": 0, "y": 3},
312 {"x": 4, "y": 3}, 324 {"matrix": [3, 4], "x": 1, "y": 3},
313 {"x": 5, "y": 3}, 325 {"matrix": [3, 3], "x": 2, "y": 3},
314 {"x": 6, "y": 3}, 326 {"matrix": [3, 2], "x": 3, "y": 3},
315 {"x": 7, "y": 3}, 327 {"matrix": [3, 1], "x": 4, "y": 3},
316 {"x": 8, "y": 3}, 328 {"matrix": [3, 0], "x": 5, "y": 3},
317 {"x": 9, "y": 3}, 329 {"matrix": [4, 4], "x": 6, "y": 3},
318 {"x": 10, "y": 3}, 330
319 {"x": 11, "y": 3}, 331 {"matrix": [9, 4], "x": 7, "y": 3},
320 {"x": 12, "y": 3}, 332 {"matrix": [8, 0], "x": 8, "y": 3},
321 {"x": 13, "y": 3}, 333 {"matrix": [8, 1], "x": 9, "y": 3},
322 334 {"matrix": [8, 2], "x": 10, "y": 3},
323 {"x": 1.75, "y": 4}, 335 {"matrix": [8, 3], "x": 11, "y": 3},
324 {"x": 2.75, "y": 4}, 336 {"matrix": [8, 4], "x": 12, "y": 3},
325 {"x": 3.75, "y": 4}, 337 {"matrix": [8, 5], "x": 13, "y": 3},
326 {"x": 4.75, "y": 4, "w": 1.5}, 338
327 {"x": 7.75, "y": 4, "w": 1.5}, 339 {"matrix": [4, 3], "x": 1.75, "y": 4},
328 {"x": 9.25, "y": 4}, 340 {"matrix": [4, 2], "x": 2.75, "y": 4},
329 {"x": 10.25, "y": 4}, 341 {"matrix": [4, 1], "x": 3.75, "y": 4},
330 {"x": 11.25, "y": 4} 342 {"matrix": [4, 0], "x": 4.75, "y": 4, "w": 1.5},
343
344 {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 1.5},
345 {"matrix": [9, 1], "x": 9.25, "y": 4},
346 {"matrix": [9, 2], "x": 10.25, "y": 4},
347 {"matrix": [9, 3], "x": 11.25, "y": 4}
331 ] 348 ]
332 } 349 }
333 } 350 }
diff --git a/keyboards/keystonecaps/gameroyadvance/gameroyadvance.c b/keyboards/keystonecaps/gameroyadvance/gameroyadvance.c
deleted file mode 100644
index 70c49ce118..0000000000
--- a/keyboards/keystonecaps/gameroyadvance/gameroyadvance.c
+++ /dev/null
@@ -1,18 +0,0 @@
1/*
2Copyright 2022 @RoyMeetsWorld
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#include "gameroyadvance.h"
diff --git a/keyboards/keystonecaps/gameroyadvance/gameroyadvance.h b/keyboards/keystonecaps/gameroyadvance/gameroyadvance.h
deleted file mode 100644
index 01cb32b572..0000000000
--- a/keyboards/keystonecaps/gameroyadvance/gameroyadvance.h
+++ /dev/null
@@ -1,104 +0,0 @@
1/*
2Copyright 2022 @RoyMeetsWorld
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
19
20#include "quantum.h"
21
22/**
23 * The layout macro for ANSI boards, with illustrative grid of a typical assignment.
24 * ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───────┐
25 * │ESC│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ │ 7 │ 8 │ 9 │ 0 │ - │ + │ BACK │
26 * ┌─┴───┼───┼───┼───┼───┼───┼───┤┌───┬───┐ ┌───┬───┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
27 * │ TAB │ Q │ W │ E │ R │ T │ Y ││F1 │F2 │ │F7 │F8 │ │ Y │ U │ I │ O │ P │ [ │ ] │ \ │
28 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘├───┼───┤ ├───┼───┤ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
29 * │ CAPS │ A │ S │ D │ F │ G │ │F3 │F4 │ │F9 │F10│ │ H │ J │ K │ L │ ; │ ' │ Enter │
30 * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ├───┼───┤ ├───┼───┤ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
31 * │ LSHIFT │ Z │ X │ C │ V │ B │ │F5 │F6 │ │F11│F12│ │ B │ N │ M │ , │ . │ / │ RSHIFT │
32 * ├────┬───┴┬──┴─┬─┴──┬┴───┼───┴┬┴───┼───┘ └───┼───┴┬┴───┼───┴───┴──┬┴───┼───┴┬────┬────│
33 * │LCTL│LGUI│LALT│ FN │ │SPC │MUTE│ │MUTE│SPCE│ │RALT│ FN │RGUI│RCTL│
34 * └────┴────┴────┴────┘ └────┼────┤ ├────┼────┘ └────┴────┴────┴────┘
35 * │ENTR│ │ENTR│
36 * └────┘ └────┘
37 */
38#define LAYOUT( \
39 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R07, \
40 L10, L11, L12, L13, L14, L15, L16, L17, L18, R10, R11, R12, R13, R14, R15, R16, R17, R18, R28, \
41 L20, L21, L22, L23, L24, L25, L27, L28, R20, R21, R22, R23, R24, R25, R26, R27, R38, \
42 L30, L31, L32, L33, L34, L35, L37, L38, R30, R31, R32, R33, R34, R35, R36, R37, R46, \
43 L40, L41, L42, L43, L45, L48, R40, R42, R43, R44, R45, R47, \
44 L47, R41 \
45) \
46{ \
47 { L00, L01, L02, L03, L04, L05, L06, KC_NO, KC_NO }, \
48 { L10, L11, L12, L13, L14, L15, L16, L17, L18 }, \
49 { L20, L21, L22, L23, L24, L25, KC_NO, L27, L28 }, \
50 { L30, L31, L32, L33, L34, L35, KC_NO, L37, L38 }, \
51 { L40, L41, L42, L43, KC_NO, L45, KC_NO, L47, L48 }, \
52 { R00, R01, R02, R03, R04, R05, KC_NO, R07, KC_NO }, \
53 { R10, R11, R12, R13, R14, R15, R16, R17, R18 }, \
54 { R20, R21, R22, R23, R24, R25, R26, R27, R28 }, \
55 { R30, R31, R32, R33, R34, R35, R36, R37, R38 }, \
56 { R40, R41, R42, R43, R44, R45, R46, R47, KC_NO } \
57}
58
59/**
60 * The layout macro for split-key boards, with illustrative grid of a typical assignment.
61 *
62 * Backspace has two options with three distinct pads:
63 * - center pad (regular 2u backspace)
64 * - left pad + right pad (split backspace)
65 *
66 * You may wish to set the unused pad(s) to KC_NO or XXXXXX, as they will be ignored.
67 * ┌───────┐
68 * │ BACK │ (R07)
69 * └───────┘
70 * |
71 * ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┐
72 * │ESC│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ │ 7 │ 8 │ 9 │ 0 │ - │ + │ \ │BCK│ (R06 R08)
73 * ┌─┴───┼───┼───┼───┼───┼───┼───┤┌───┬───┐ ┌───┬───┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
74 * │ TAB │ Q │ W │ E │ R │ T │ Y ││F1 │F2 │ │F7 │F8 │ │ Y │ U │ I │ O │ P │ [ │ ] │ \ │
75 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘├───┼───┤ ├───┼───┤ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
76 * │ CAPS │ A │ S │ D │ F │ G │ │F3 │F4 │ │F9 │F10│ │ H │ J │ K │ L │ ; │ ' │ Enter │
77 * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ├───┼───┤ ├───┼───┤ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
78 * │LSFT│ \ │ Z │ X │ C │ V │ B │ │F5 │F6 │ │F11│F12│ │ B │ N │ M │ , │ . │ / │RSHIFT│PSC│
79 * ├────┼───┴┬──┴─┬─┴──┬┴───┼───┴┬┴───┼───┘ └───┼───┴┬┴───┼───┴───┴──┬┴───┼───┴┬────┬┴───│
80 * │LCTL│LGUI│LALT│ FN │ │SPC │MUTE│ │MUTE│SPCE│ │RALT│ FN │RGUI│RCTL│
81 * └────┴────┴────┴────┘ └────┼────┤ ├────┼────┘ └────┴────┴────┴────┘
82 * │ENTR│ │ENTR│
83 * └────┘ └────┘
84 */
85#define LAYOUT_all( \
86 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, R08, \
87 L10, L11, L12, L13, L14, L15, L16, L17, L18, R10, R11, R12, R13, R14, R15, R16, R17, R18, R28, \
88 L20, L21, L22, L23, L24, L25, L27, L28, R20, R21, R22, R23, R24, R25, R26, R27, R38, \
89 L30, L44, L31, L32, L33, L34, L35, L37, L38, R30, R31, R32, R33, R34, R35, R36, R37, R46, R48, \
90 L40, L41, L42, L43, L45, L48, R40, R42, R43, R44, R45, R47, \
91 L47, R41 \
92) \
93{ \
94 { L00, L01, L02, L03, L04, L05, L06, KC_NO, KC_NO }, \
95 { L10, L11, L12, L13, L14, L15, L16, L17, L18 }, \
96 { L20, L21, L22, L23, L24, L25, KC_NO, L27, L28 }, \
97 { L30, L31, L32, L33, L34, L35, KC_NO, L37, L38 }, \
98 { L40, L41, L42, L43, L44, L45, KC_NO, L47, L48 }, \
99 { R00, R01, R02, R03, R04, R05, R06, R07, R08 }, \
100 { R10, R11, R12, R13, R14, R15, R16, R17, R18 }, \
101 { R20, R21, R22, R23, R24, R25, R26, R27, R28 }, \
102 { R30, R31, R32, R33, R34, R35, R36, R37, R38 }, \
103 { R40, R41, R42, R43, R44, R45, R46, R47, R48 } \
104}
diff --git a/keyboards/keystonecaps/gameroyadvance/info.json b/keyboards/keystonecaps/gameroyadvance/info.json
index 19df3b7916..4528484069 100644
--- a/keyboards/keystonecaps/gameroyadvance/info.json
+++ b/keyboards/keystonecaps/gameroyadvance/info.json
@@ -42,211 +42,198 @@
42 "layouts": { 42 "layouts": {
43 "LAYOUT": { 43 "LAYOUT": {
44 "layout": [ 44 "layout": [
45 { "x": 0.5, "y": 0 }, 45 {"matrix": [0, 0], "x": 0.5, "y": 0},
46 { "x": 1.5, "y": 0 }, 46 {"matrix": [0, 1], "x": 1.5, "y": 0},
47 { "x": 2.5, "y": 0 }, 47 {"matrix": [0, 2], "x": 2.5, "y": 0},
48 { "x": 3.5, "y": 0 }, 48 {"matrix": [0, 3], "x": 3.5, "y": 0},
49 { "x": 4.5, "y": 0 }, 49 {"matrix": [0, 4], "x": 4.5, "y": 0},
50 { "x": 5.5, "y": 0 }, 50 {"matrix": [0, 5], "x": 5.5, "y": 0},
51 { "x": 6.5, "y": 0 }, 51 {"matrix": [0, 6], "x": 6.5, "y": 0},
52 52
53 { "x": 13.25, "y": 0 }, 53 {"matrix": [5, 0], "x": 13.25, "y": 0},
54 { "x": 14.25, "y": 0 }, 54 {"matrix": [5, 1], "x": 14.25, "y": 0},
55 { "x": 15.25, "y": 0 }, 55 {"matrix": [5, 2], "x": 15.25, "y": 0},
56 { "x": 16.25, "y": 0 }, 56 {"matrix": [5, 3], "x": 16.25, "y": 0},
57 { "x": 17.25, "y": 0 }, 57 {"matrix": [5, 4], "x": 17.25, "y": 0},
58 { "x": 18.25, "y": 0 }, 58 {"matrix": [5, 5], "x": 18.25, "y": 0},
59 { "x": 19.25, "y": 0, "w": 2 }, 59 {"matrix": [5, 7], "x": 19.25, "y": 0, "w": 2},
60 60
61 { "x": 0, "y": 1, "w": 1.5 }, 61 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
62 { "x": 1.5, "y": 1 }, 62 {"matrix": [1, 1], "x": 1.5, "y": 1},
63 { "x": 2.5, "y": 1 }, 63 {"matrix": [1, 2], "x": 2.5, "y": 1},
64 { "x": 3.5, "y": 1 }, 64 {"matrix": [1, 3], "x": 3.5, "y": 1},
65 { "x": 4.5, "y": 1 }, 65 {"matrix": [1, 4], "x": 4.5, "y": 1},
66 { "x": 5.5, "y": 1 }, 66 {"matrix": [1, 5], "x": 5.5, "y": 1},
67 { "x": 6.5, "y": 1 }, 67 {"matrix": [1, 6], "x": 6.5, "y": 1},
68 68 {"matrix": [1, 7], "x": 7.75, "y": 1},
69 { "x": 7.75, "y": 1 }, 69 {"matrix": [1, 8], "x": 8.75, "y": 1},
70 { "x": 8.75, "y": 1 }, 70
71 71 {"matrix": [6, 0], "x": 10.5, "y": 1},
72 { "x": 10.5, "y": 1 }, 72 {"matrix": [6, 1], "x": 11.5, "y": 1},
73 { "x": 11.5, "y": 1 }, 73 {"matrix": [6, 2], "x": 13.25, "y": 1},
74 74 {"matrix": [6, 3], "x": 14.25, "y": 1},
75 { "x": 13.25, "y": 1 }, 75 {"matrix": [6, 4], "x": 15.25, "y": 1},
76 { "x": 14.25, "y": 1 }, 76 {"matrix": [6, 5], "x": 16.25, "y": 1},
77 { "x": 15.25, "y": 1 }, 77 {"matrix": [6, 6], "x": 17.25, "y": 1},
78 { "x": 16.25, "y": 1 }, 78 {"matrix": [6, 7], "x": 18.25, "y": 1},
79 { "x": 17.25, "y": 1 }, 79 {"matrix": [6, 8], "x": 19.25, "y": 1},
80 { "x": 18.25, "y": 1 }, 80 {"matrix": [7, 8], "x": 20.25, "y": 1, "w": 1.5},
81 { "x": 19.25, "y": 1 }, 81
82 { "x": 20.25, "y": 1, "w": 1.5 }, 82 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
83 83 {"matrix": [2, 1], "x": 1.75, "y": 2},
84 { "x": 0, "y": 2, "w": 1.75 }, 84 {"matrix": [2, 2], "x": 2.75, "y": 2},
85 { "x": 1.75, "y": 2 }, 85 {"matrix": [2, 3], "x": 3.75, "y": 2},
86 { "x": 2.75, "y": 2 }, 86 {"matrix": [2, 4], "x": 4.75, "y": 2},
87 { "x": 3.75, "y": 2 }, 87 {"matrix": [2, 5], "x": 5.75, "y": 2},
88 { "x": 4.75, "y": 2 }, 88 {"matrix": [2, 7], "x": 7.75, "y": 2},
89 { "x": 5.75, "y": 2 }, 89 {"matrix": [2, 8], "x": 8.75, "y": 2},
90 90
91 { "x": 7.75, "y": 2 }, 91 {"matrix": [7, 0], "x": 10.5, "y": 2},
92 { "x": 8.75, "y": 2 }, 92 {"matrix": [7, 1], "x": 11.5, "y": 2},
93 93 {"matrix": [7, 2], "x": 13.5, "y": 2},
94 { "x": 10.5, "y": 2 }, 94 {"matrix": [7, 3], "x": 14.5, "y": 2},
95 { "x": 11.5, "y": 2 }, 95 {"matrix": [7, 4], "x": 15.5, "y": 2},
96 96 {"matrix": [7, 5], "x": 16.5, "y": 2},
97 { "x": 13.5, "y": 2 }, 97 {"matrix": [7, 6], "x": 17.5, "y": 2},
98 { "x": 14.5, "y": 2 }, 98 {"matrix": [7, 7], "x": 18.5, "y": 2},
99 { "x": 15.5, "y": 2 }, 99 {"matrix": [8, 8], "x": 19.5, "y": 2, "w": 2.25},
100 { "x": 16.5, "y": 2 }, 100
101 { "x": 17.5, "y": 2 }, 101 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
102 { "x": 18.5, "y": 2 }, 102 {"matrix": [3, 1], "x": 2.25, "y": 3},
103 { "x": 19.5, "y": 2, "w": 2.25 }, 103 {"matrix": [3, 2], "x": 3.25, "y": 3},
104 104 {"matrix": [3, 3], "x": 4.25, "y": 3},
105 { "x": 0, "y": 3, "w": 2.25 }, 105 {"matrix": [3, 4], "x": 5.25, "y": 3},
106 { "x": 2.25, "y": 3 }, 106 {"matrix": [3, 5], "x": 6.25, "y": 3},
107 { "x": 3.25, "y": 3 }, 107 {"matrix": [3, 7], "x": 7.75, "y": 3},
108 { "x": 4.25, "y": 3 }, 108 {"matrix": [3, 8], "x": 8.75, "y": 3},
109 { "x": 5.25, "y": 3 }, 109
110 { "x": 6.25, "y": 3 }, 110 {"matrix": [8, 0], "x": 10.5, "y": 3},
111 111 {"matrix": [8, 1], "x": 11.5, "y": 3},
112 { "x": 7.75, "y": 3 }, 112 {"matrix": [8, 2], "x": 13, "y": 3},
113 { "x": 8.75, "y": 3 }, 113 {"matrix": [8, 3], "x": 14, "y": 3},
114 114 {"matrix": [8, 4], "x": 15, "y": 3},
115 { "x": 10.5, "y": 3 }, 115 {"matrix": [8, 5], "x": 16, "y": 3},
116 { "x": 11.5, "y": 3 }, 116 {"matrix": [8, 6], "x": 17, "y": 3},
117 117 {"matrix": [8, 7], "x": 18, "y": 3},
118 { "x": 13, "y": 3 }, 118 {"matrix": [9, 6], "x": 19, "y": 3, "w": 2.75},
119 { "x": 14, "y": 3 }, 119
120 { "x": 15, "y": 3 }, 120 {"matrix": [4, 0], "x": 0.5, "y": 4, "w": 1.25},
121 { "x": 16, "y": 3 }, 121 {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.25},
122 { "x": 17, "y": 3 }, 122 {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.25},
123 { "x": 18, "y": 3 }, 123 {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.25},
124 { "x": 19, "y": 3, "w": 2.75 }, 124 {"matrix": [4, 5], "x": 6.5, "y": 4, "h": 1.5},
125 125 {"matrix": [4, 8], "x": 7.5, "y": 4},
126 { "x": 0.5, "y": 4, "w": 1.25 }, 126
127 { "x": 1.75, "y": 4, "w": 1.25 }, 127 {"matrix": [9, 0], "x": 11.75, "y": 4},
128 { "x": 3, "y": 4, "w": 1.25 }, 128 {"matrix": [9, 2], "x": 12.75, "y": 4, "h": 1.5},
129 { "x": 4.25, "y": 4, "w": 1.25 }, 129 {"matrix": [9, 3], "x": 16.25, "y": 4, "w": 1.25},
130 130 {"matrix": [9, 4], "x": 17.5, "y": 4, "w": 1.25},
131 { "x": 6.5, "y": 4, "h": 1.5 }, 131 {"matrix": [9, 5], "x": 18.75, "y": 4, "w": 1.25},
132 { "x": 7.5, "y": 4 }, 132 {"matrix": [9, 7], "x": 20, "y": 4, "w": 1.25},
133 133
134 { "x": 11.75, "y": 4 }, 134 {"matrix": [4, 7], "x": 7.5, "y": 5, "h": 1.5},
135 { "x": 12.75, "y": 4, "h": 1.5 }, 135
136 136 {"matrix": [9, 1], "x": 11.75, "y": 5, "h": 1.5}
137 { "x": 16.25, "y": 4, "w": 1.25 }, 137 ]
138 { "x": 17.5, "y": 4, "w": 1.25 }, 138 },
139 { "x": 18.75, "y": 4, "w": 1.25 },
140 { "x": 20, "y": 4, "w": 1.25 },
141
142 { "x": 7.5, "y": 5, "h": 1.5 },
143 { "x": 11.75, "y": 5, "h": 1.5 }
144 ] },
145 "LAYOUT_all": { 139 "LAYOUT_all": {
146 "layout": [ 140 "layout": [
147 { "x": 0.5, "y": 0 }, 141 {"matrix": [0, 0], "x": 0.5, "y": 0},
148 { "x": 1.5, "y": 0 }, 142 {"matrix": [0, 1], "x": 1.5, "y": 0},
149 { "x": 2.5, "y": 0 }, 143 {"matrix": [0, 2], "x": 2.5, "y": 0},
150 { "x": 3.5, "y": 0 }, 144 {"matrix": [0, 3], "x": 3.5, "y": 0},
151 { "x": 4.5, "y": 0 }, 145 {"matrix": [0, 4], "x": 4.5, "y": 0},
152 { "x": 5.5, "y": 0 }, 146 {"matrix": [0, 5], "x": 5.5, "y": 0},
153 { "x": 6.5, "y": 0 }, 147 {"matrix": [0, 6], "x": 6.5, "y": 0},
154 148
155 { "x": 13.25, "y": 0 }, 149 {"matrix": [5, 0], "x": 13.25, "y": 0},
156 { "x": 14.25, "y": 0 }, 150 {"matrix": [5, 1], "x": 14.25, "y": 0},
157 { "x": 15.25, "y": 0 }, 151 {"matrix": [5, 2], "x": 15.25, "y": 0},
158 { "x": 16.25, "y": 0 }, 152 {"matrix": [5, 3], "x": 16.25, "y": 0},
159 { "x": 17.25, "y": 0 }, 153 {"matrix": [5, 4], "x": 17.25, "y": 0},
160 { "x": 18.25, "y": 0 }, 154 {"matrix": [5, 5], "x": 18.25, "y": 0},
161 { "x": 19.25, "y": 0 }, 155 {"matrix": [5, 6], "x": 19.25, "y": 0},
162 { "x": 22.25, "y": 0, "w": 2 }, 156 {"matrix": [5, 7], "x": 22.25, "y": 0, "w": 2},
163 { "x": 20.25, "y": 0 }, 157 {"matrix": [5, 8], "x": 20.25, "y": 0},
164 158
165 { "x": 0, "y": 1, "w": 1.5 }, 159 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
166 { "x": 1.5, "y": 1 }, 160 {"matrix": [1, 1], "x": 1.5, "y": 1},
167 { "x": 2.5, "y": 1 }, 161 {"matrix": [1, 2], "x": 2.5, "y": 1},
168 { "x": 3.5, "y": 1 }, 162 {"matrix": [1, 3], "x": 3.5, "y": 1},
169 { "x": 4.5, "y": 1 }, 163 {"matrix": [1, 4], "x": 4.5, "y": 1},
170 { "x": 5.5, "y": 1 }, 164 {"matrix": [1, 5], "x": 5.5, "y": 1},
171 { "x": 6.5, "y": 1 }, 165 {"matrix": [1, 6], "x": 6.5, "y": 1},
172 166 {"matrix": [1, 7], "x": 7.75, "y": 1},
173 { "x": 7.75, "y": 1 }, 167 {"matrix": [1, 8], "x": 8.75, "y": 1},
174 { "x": 8.75, "y": 1 }, 168
175 169 {"matrix": [6, 0], "x": 10.5, "y": 1},
176 { "x": 10.5, "y": 1 }, 170 {"matrix": [6, 1], "x": 11.5, "y": 1},
177 { "x": 11.5, "y": 1 }, 171 {"matrix": [6, 2], "x": 13.25, "y": 1},
178 172 {"matrix": [6, 3], "x": 14.25, "y": 1},
179 { "x": 13.25, "y": 1 }, 173 {"matrix": [6, 4], "x": 15.25, "y": 1},
180 { "x": 14.25, "y": 1 }, 174 {"matrix": [6, 5], "x": 16.25, "y": 1},
181 { "x": 15.25, "y": 1 }, 175 {"matrix": [6, 6], "x": 17.25, "y": 1},
182 { "x": 16.25, "y": 1 }, 176 {"matrix": [6, 7], "x": 18.25, "y": 1},
183 { "x": 17.25, "y": 1 }, 177 {"matrix": [6, 8], "x": 19.25, "y": 1},
184 { "x": 18.25, "y": 1 }, 178 {"matrix": [7, 8], "x": 20.25, "y": 1, "w": 1.5},
185 { "x": 19.25, "y": 1 }, 179
186 { "x": 20.25, "y": 1, "w": 1.5 }, 180 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
187 181 {"matrix": [2, 1], "x": 1.75, "y": 2},
188 { "x": 0, "y": 2, "w": 1.75 }, 182 {"matrix": [2, 2], "x": 2.75, "y": 2},
189 { "x": 1.75, "y": 2 }, 183 {"matrix": [2, 3], "x": 3.75, "y": 2},
190 { "x": 2.75, "y": 2 }, 184 {"matrix": [2, 4], "x": 4.75, "y": 2},
191 { "x": 3.75, "y": 2 }, 185 {"matrix": [2, 5], "x": 5.75, "y": 2},
192 { "x": 4.75, "y": 2 }, 186 {"matrix": [2, 7], "x": 7.75, "y": 2},
193 { "x": 5.75, "y": 2 }, 187 {"matrix": [2, 8], "x": 8.75, "y": 2},
194 188
195 { "x": 7.75, "y": 2 }, 189 {"matrix": [7, 0], "x": 10.5, "y": 2},
196 { "x": 8.75, "y": 2 }, 190 {"matrix": [7, 1], "x": 11.5, "y": 2},
197 191 {"matrix": [7, 2], "x": 13.5, "y": 2},
198 { "x": 10.5, "y": 2 }, 192 {"matrix": [7, 3], "x": 14.5, "y": 2},
199 { "x": 11.5, "y": 2 }, 193 {"matrix": [7, 4], "x": 15.5, "y": 2},
200 194 {"matrix": [7, 5], "x": 16.5, "y": 2},
201 { "x": 13.5, "y": 2 }, 195 {"matrix": [7, 6], "x": 17.5, "y": 2},
202 { "x": 14.5, "y": 2 }, 196 {"matrix": [7, 7], "x": 18.5, "y": 2},
203 { "x": 15.5, "y": 2 }, 197 {"matrix": [8, 8], "x": 19.5, "y": 2, "w": 2.25},
204 { "x": 16.5, "y": 2 }, 198
205 { "x": 17.5, "y": 2 }, 199 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
206 { "x": 18.5, "y": 2 }, 200 {"matrix": [4, 4], "x": 1.25, "y": 3},
207 { "x": 19.5, "y": 2, "w": 2.25 }, 201 {"matrix": [3, 1], "x": 2.25, "y": 3},
208 202 {"matrix": [3, 2], "x": 3.25, "y": 3},
209 { "x": 0, "y": 3, "w": 1.25 }, 203 {"matrix": [3, 3], "x": 4.25, "y": 3},
210 { "x": 1.25, "y": 3 }, 204 {"matrix": [3, 4], "x": 5.25, "y": 3},
211 { "x": 2.25, "y": 3 }, 205 {"matrix": [3, 5], "x": 6.25, "y": 3},
212 { "x": 3.25, "y": 3 }, 206 {"matrix": [3, 7], "x": 7.75, "y": 3},
213 { "x": 4.25, "y": 3 }, 207 {"matrix": [3, 8], "x": 8.75, "y": 3},
214 { "x": 5.25, "y": 3 }, 208
215 { "x": 6.25, "y": 3 }, 209 {"matrix": [8, 0], "x": 10.5, "y": 3},
216 210 {"matrix": [8, 1], "x": 11.5, "y": 3},
217 { "x": 7.75, "y": 3 }, 211 {"matrix": [8, 2], "x": 13, "y": 3},
218 { "x": 8.75, "y": 3 }, 212 {"matrix": [8, 3], "x": 14, "y": 3},
219 213 {"matrix": [8, 4], "x": 15, "y": 3},
220 { "x": 10.5, "y": 3 }, 214 {"matrix": [8, 5], "x": 16, "y": 3},
221 { "x": 11.5, "y": 3 }, 215 {"matrix": [8, 6], "x": 17, "y": 3},
222 216 {"matrix": [8, 7], "x": 18, "y": 3},
223 { "x": 13, "y": 3 }, 217 {"matrix": [9, 6], "x": 19, "y": 3, "w": 1.75},
224 { "x": 14, "y": 3 }, 218 {"matrix": [9, 8], "x": 20.75, "y": 3},
225 { "x": 15, "y": 3 }, 219
226 { "x": 16, "y": 3 }, 220 {"matrix": [4, 0], "x": 0.5, "y": 4, "w": 1.25},
227 { "x": 17, "y": 3 }, 221 {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.25},
228 { "x": 18, "y": 3 }, 222 {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.25},
229 { "x": 19, "y": 3, "w": 1.75 }, 223 {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.25},
230 { "x": 20.75, "y": 3 }, 224 {"matrix": [4, 5], "x": 6.5, "y": 4, "h": 1.5},
231 225 {"matrix": [4, 8], "x": 7.5, "y": 4},
232 { "x": 0.5, "y": 4, "w": 1.25 }, 226
233 { "x": 1.75, "y": 4, "w": 1.25 }, 227 {"matrix": [9, 0], "x": 11.75, "y": 4},
234 { "x": 3, "y": 4, "w": 1.25 }, 228 {"matrix": [9, 2], "x": 12.75, "y": 4, "h": 1.5},
235 { "x": 4.25, "y": 4, "w": 1.25 }, 229 {"matrix": [9, 3], "x": 16.25, "y": 4, "w": 1.25},
236 230 {"matrix": [9, 4], "x": 17.5, "y": 4, "w": 1.25},
237 { "x": 6.5, "y": 4, "h": 1.5 }, 231 {"matrix": [9, 5], "x": 18.75, "y": 4, "w": 1.25},
238 { "x": 7.5, "y": 4 }, 232 {"matrix": [9, 7], "x": 20, "y": 4, "w": 1.25},
239 233
240 { "x": 11.75, "y": 4 }, 234 {"matrix": [4, 7], "x": 7.5, "y": 5, "h": 1.5},
241 { "x": 12.75, "y": 4, "h": 1.5 }, 235
242 236 {"matrix": [9, 1], "x": 11.75, "y": 5, "h": 1.5}
243 { "x": 16.25, "y": 4, "w": 1.25 },
244 { "x": 17.5, "y": 4, "w": 1.25 },
245 { "x": 18.75, "y": 4, "w": 1.25 },
246 { "x": 20, "y": 4, "w": 1.25 },
247
248 { "x": 7.5, "y": 5, "h": 1.5 },
249 { "x": 11.75, "y": 5, "h": 1.5 }
250 ] 237 ]
251 } 238 }
252 } 239 }
diff --git a/keyboards/kin80/info.json b/keyboards/kin80/info.json
index 86a805519e..4a90872f78 100644
--- a/keyboards/kin80/info.json
+++ b/keyboards/kin80/info.json
@@ -10,190 +10,208 @@
10 "layouts": { 10 "layouts": {
11 "LAYOUT": { 11 "LAYOUT": {
12 "layout": [ 12 "layout": [
13 {"x":0, "y":0}, 13 {"matrix": [0, 0], "x": 0, "y": 0},
14 {"x":1, "y":0}, 14 {"matrix": [0, 1], "x": 1, "y": 0},
15 {"x":2, "y":0}, 15 {"matrix": [0, 2], "x": 2, "y": 0},
16 {"x":3, "y":0}, 16 {"matrix": [0, 3], "x": 3, "y": 0},
17 {"x":4, "y":0}, 17 {"matrix": [0, 4], "x": 4, "y": 0},
18 {"x":5, "y":0}, 18 {"matrix": [0, 5], "x": 5, "y": 0},
19 {"x":11.5, "y":0}, 19
20 {"x":12.5, "y":0}, 20 {"matrix": [0, 6], "x": 11.5, "y": 0},
21 {"x":13.5, "y":0}, 21 {"matrix": [0, 7], "x": 12.5, "y": 0},
22 {"x":14.5, "y":0}, 22 {"matrix": [0, 8], "x": 13.5, "y": 0},
23 {"x":15.5, "y":0}, 23 {"matrix": [0, 9], "x": 14.5, "y": 0},
24 {"x":16.5, "y":0}, 24 {"matrix": [0, 10], "x": 15.5, "y": 0},
25 25 {"matrix": [0, 11], "x": 16.5, "y": 0},
26 {"x":0, "y":1.25, "w":1.25}, 26
27 {"x":1.25, "y":1.25}, 27 {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.25},
28 {"x":2.25, "y":1.25}, 28 {"matrix": [1, 1], "x": 1.25, "y": 1.25},
29 {"x":3.25, "y":1.25}, 29 {"matrix": [1, 2], "x": 2.25, "y": 1.25},
30 {"x":4.25, "y":1.25}, 30 {"matrix": [1, 3], "x": 3.25, "y": 1.25},
31 {"x":5.25, "y":1.25}, 31 {"matrix": [1, 4], "x": 4.25, "y": 1.25},
32 {"x":11.25, "y":1.25}, 32 {"matrix": [1, 5], "x": 5.25, "y": 1.25},
33 {"x":12.25, "y":1.25}, 33
34 {"x":13.25, "y":1.25}, 34 {"matrix": [1, 6], "x": 11.25, "y": 1.25},
35 {"x":14.25, "y":1.25}, 35 {"matrix": [1, 7], "x": 12.25, "y": 1.25},
36 {"x":15.25, "y":1.25}, 36 {"matrix": [1, 8], "x": 13.25, "y": 1.25},
37 {"x":16.25, "y":1.25, "w":1.25}, 37 {"matrix": [1, 9], "x": 14.25, "y": 1.25},
38 38 {"matrix": [1, 10], "x": 15.25, "y": 1.25},
39 {"x":0, "y":2.25, "w":1.25}, 39 {"matrix": [1, 11], "x": 16.25, "y": 1.25, "w": 1.25},
40 {"x":1.25, "y":2.25}, 40
41 {"x":2.25, "y":2.25}, 41 {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.25},
42 {"x":3.25, "y":2.25}, 42 {"matrix": [2, 1], "x": 1.25, "y": 2.25},
43 {"x":4.25, "y":2.25}, 43 {"matrix": [2, 2], "x": 2.25, "y": 2.25},
44 {"x":5.25, "y":2.25}, 44 {"matrix": [2, 3], "x": 3.25, "y": 2.25},
45 {"x":11.25, "y":2.25}, 45 {"matrix": [2, 4], "x": 4.25, "y": 2.25},
46 {"x":12.25, "y":2.25}, 46 {"matrix": [2, 5], "x": 5.25, "y": 2.25},
47 {"x":13.25, "y":2.25}, 47
48 {"x":14.25, "y":2.25}, 48 {"matrix": [2, 6], "x": 11.25, "y": 2.25},
49 {"x":15.25, "y":2.25}, 49 {"matrix": [2, 7], "x": 12.25, "y": 2.25},
50 {"x":16.25, "y":2.25, "w":1.25}, 50 {"matrix": [2, 8], "x": 13.25, "y": 2.25},
51 51 {"matrix": [2, 9], "x": 14.25, "y": 2.25},
52 {"x":0, "y":3.25, "w":1.25}, 52 {"matrix": [2, 10], "x": 15.25, "y": 2.25},
53 {"x":1.25, "y":3.25}, 53 {"matrix": [2, 11], "x": 16.25, "y": 2.25, "w": 1.25},
54 {"x":2.25, "y":3.25}, 54
55 {"x":3.25, "y":3.25}, 55 {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
56 {"x":4.25, "y":3.25}, 56 {"matrix": [3, 1], "x": 1.25, "y": 3.25},
57 {"x":5.25, "y":3.25}, 57 {"matrix": [3, 2], "x": 2.25, "y": 3.25},
58 {"x":11.25, "y":3.25}, 58 {"matrix": [3, 3], "x": 3.25, "y": 3.25},
59 {"x":12.25, "y":3.25}, 59 {"matrix": [3, 4], "x": 4.25, "y": 3.25},
60 {"x":13.25, "y":3.25}, 60 {"matrix": [3, 5], "x": 5.25, "y": 3.25},
61 {"x":14.25, "y":3.25}, 61
62 {"x":15.25, "y":3.25}, 62 {"matrix": [3, 6], "x": 11.25, "y": 3.25},
63 {"x":16.25, "y":3.25, "w":1.25}, 63 {"matrix": [3, 7], "x": 12.25, "y": 3.25},
64 64 {"matrix": [3, 8], "x": 13.25, "y": 3.25},
65 {"x":0, "y":4.25, "w":1.25}, 65 {"matrix": [3, 9], "x": 14.25, "y": 3.25},
66 {"x":1.25, "y":4.25}, 66 {"matrix": [3, 10], "x": 15.25, "y": 3.25},
67 {"x":2.25, "y":4.25}, 67 {"matrix": [3, 11], "x": 16.25, "y": 3.25, "w": 1.25},
68 {"x":3.25, "y":4.25}, 68
69 {"x":4.25, "y":4.25}, 69 {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
70 {"x":5.25, "y":4.25}, 70 {"matrix": [4, 1], "x": 1.25, "y": 4.25},
71 {"x":11.25, "y":4.25}, 71 {"matrix": [4, 2], "x": 2.25, "y": 4.25},
72 {"x":12.25, "y":4.25}, 72 {"matrix": [4, 3], "x": 3.25, "y": 4.25},
73 {"x":13.25, "y":4.25}, 73 {"matrix": [4, 4], "x": 4.25, "y": 4.25},
74 {"x":14.25, "y":4.25}, 74 {"matrix": [4, 5], "x": 5.25, "y": 4.25},
75 {"x":15.25, "y":4.25}, 75
76 {"x":16.25, "y":4.25, "w":1.25}, 76 {"matrix": [4, 6], "x": 11.25, "y": 4.25},
77 77 {"matrix": [4, 7], "x": 12.25, "y": 4.25},
78 {"x":1.25, "y":5.25}, 78 {"matrix": [4, 8], "x": 13.25, "y": 4.25},
79 {"x":2.25, "y":5.25}, 79 {"matrix": [4, 9], "x": 14.25, "y": 4.25},
80 {"x":3.25, "y":5.25}, 80 {"matrix": [4, 10], "x": 15.25, "y": 4.25},
81 {"x":4.25, "y":5.25}, 81 {"matrix": [4, 11], "x": 16.25, "y": 4.25, "w": 1.25},
82 {"x":12.25, "y":5.25}, 82
83 {"x":13.25, "y":5.25}, 83 {"matrix": [5, 1], "x": 1.25, "y": 5.25},
84 {"x":14.25, "y":5.25}, 84 {"matrix": [5, 2], "x": 2.25, "y": 5.25},
85 {"x":15.25, "y":5.25}, 85 {"matrix": [5, 3], "x": 3.25, "y": 5.25},
86 86 {"matrix": [5, 4], "x": 4.25, "y": 5.25},
87 {"x":6.25, "y":6}, 87
88 {"x":7.25, "y":6}, 88 {"matrix": [5, 7], "x": 12.25, "y": 5.25},
89 {"x":9.25, "y":6}, 89 {"matrix": [5, 8], "x": 13.25, "y": 5.25},
90 {"x":10.25, "y":6}, 90 {"matrix": [5, 9], "x": 14.25, "y": 5.25},
91 91 {"matrix": [5, 10], "x": 15.25, "y": 5.25},
92 {"x":7.25, "y":7}, 92
93 {"x":9.25, "y":7}, 93 {"matrix": [6, 2], "x": 6.25, "y": 6},
94 94 {"matrix": [6, 3], "x": 7.25, "y": 6},
95 {"x":5.25, "y":7, "h":2}, 95
96 {"x":6.25, "y":7, "h":2}, 96 {"matrix": [6, 9], "x": 9.25, "y": 6},
97 {"x":7.25, "y":8}, 97 {"matrix": [6, 8], "x": 10.25, "y": 6},
98 {"x":9.25, "y":8}, 98
99 {"x":10.25, "y":7, "h":2}, 99 {"matrix": [6, 4], "x": 7.25, "y": 7},
100 {"x":11.25, "y":7, "h":2} 100
101 {"matrix": [6, 10], "x": 9.25, "y": 7},
102
103 {"matrix": [6, 0], "x": 5.25, "y": 7, "h": 2},
104 {"matrix": [6, 1], "x": 6.25, "y": 7, "h": 2},
105 {"matrix": [6, 5], "x": 7.25, "y": 8},
106
107 {"matrix": [6, 11], "x": 9.25, "y": 8},
108 {"matrix": [6, 7], "x": 10.25, "y": 7, "h": 2},
109 {"matrix": [6, 6], "x": 11.25, "y": 7, "h": 2}
101 ] 110 ]
102 }, 111 },
103 "LAYOUT_all": { 112 "LAYOUT_all": {
104 "layout": [ 113 "layout": [
105 {"x":0, "y":0}, 114 {"matrix": [0, 0], "x": 0, "y": 0},
106 {"x":1, "y":0}, 115 {"matrix": [0, 1], "x": 1, "y": 0},
107 {"x":2, "y":0}, 116 {"matrix": [0, 2], "x": 2, "y": 0},
108 {"x":3, "y":0}, 117 {"matrix": [0, 3], "x": 3, "y": 0},
109 {"x":4, "y":0}, 118 {"matrix": [0, 4], "x": 4, "y": 0},
110 {"x":5, "y":0}, 119 {"matrix": [0, 5], "x": 5, "y": 0},
111 {"x":11.5, "y":0}, 120
112 {"x":12.5, "y":0}, 121 {"matrix": [0, 6], "x": 11.5, "y": 0},
113 {"x":13.5, "y":0}, 122 {"matrix": [0, 7], "x": 12.5, "y": 0},
114 {"x":14.5, "y":0}, 123 {"matrix": [0, 8], "x": 13.5, "y": 0},
115 {"x":15.5, "y":0}, 124 {"matrix": [0, 9], "x": 14.5, "y": 0},
116 {"x":16.5, "y":0}, 125 {"matrix": [0, 10], "x": 15.5, "y": 0},
117 126 {"matrix": [0, 11], "x": 16.5, "y": 0},
118 {"x":0, "y":1.25, "w":1.25}, 127
119 {"x":1.25, "y":1.25}, 128 {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.25},
120 {"x":2.25, "y":1.25}, 129 {"matrix": [1, 1], "x": 1.25, "y": 1.25},
121 {"x":3.25, "y":1.25}, 130 {"matrix": [1, 2], "x": 2.25, "y": 1.25},
122 {"x":4.25, "y":1.25}, 131 {"matrix": [1, 3], "x": 3.25, "y": 1.25},
123 {"x":5.25, "y":1.25}, 132 {"matrix": [1, 4], "x": 4.25, "y": 1.25},
124 {"x":11.25, "y":1.25}, 133 {"matrix": [1, 5], "x": 5.25, "y": 1.25},
125 {"x":12.25, "y":1.25}, 134
126 {"x":13.25, "y":1.25}, 135 {"matrix": [1, 6], "x": 11.25, "y": 1.25},
127 {"x":14.25, "y":1.25}, 136 {"matrix": [1, 7], "x": 12.25, "y": 1.25},
128 {"x":15.25, "y":1.25}, 137 {"matrix": [1, 8], "x": 13.25, "y": 1.25},
129 {"x":16.25, "y":1.25, "w":1.25}, 138 {"matrix": [1, 9], "x": 14.25, "y": 1.25},
130 139 {"matrix": [1, 10], "x": 15.25, "y": 1.25},
131 {"x":0, "y":2.25, "w":1.25}, 140 {"matrix": [1, 11], "x": 16.25, "y": 1.25, "w": 1.25},
132 {"x":1.25, "y":2.25}, 141
133 {"x":2.25, "y":2.25}, 142 {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.25},
134 {"x":3.25, "y":2.25}, 143 {"matrix": [2, 1], "x": 1.25, "y": 2.25},
135 {"x":4.25, "y":2.25}, 144 {"matrix": [2, 2], "x": 2.25, "y": 2.25},
136 {"x":5.25, "y":2.25}, 145 {"matrix": [2, 3], "x": 3.25, "y": 2.25},
137 {"x":11.25, "y":2.25}, 146 {"matrix": [2, 4], "x": 4.25, "y": 2.25},
138 {"x":12.25, "y":2.25}, 147 {"matrix": [2, 5], "x": 5.25, "y": 2.25},
139 {"x":13.25, "y":2.25}, 148
140 {"x":14.25, "y":2.25}, 149 {"matrix": [2, 6], "x": 11.25, "y": 2.25},
141 {"x":15.25, "y":2.25}, 150 {"matrix": [2, 7], "x": 12.25, "y": 2.25},
142 {"x":16.25, "y":2.25, "w":1.25}, 151 {"matrix": [2, 8], "x": 13.25, "y": 2.25},
143 152 {"matrix": [2, 9], "x": 14.25, "y": 2.25},
144 {"x":0, "y":3.25, "w":1.25}, 153 {"matrix": [2, 10], "x": 15.25, "y": 2.25},
145 {"x":1.25, "y":3.25}, 154 {"matrix": [2, 11], "x": 16.25, "y": 2.25, "w": 1.25},
146 {"x":2.25, "y":3.25}, 155
147 {"x":3.25, "y":3.25}, 156 {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
148 {"x":4.25, "y":3.25}, 157 {"matrix": [3, 1], "x": 1.25, "y": 3.25},
149 {"x":5.25, "y":3.25}, 158 {"matrix": [3, 2], "x": 2.25, "y": 3.25},
150 {"x":11.25, "y":3.25}, 159 {"matrix": [3, 3], "x": 3.25, "y": 3.25},
151 {"x":12.25, "y":3.25}, 160 {"matrix": [3, 4], "x": 4.25, "y": 3.25},
152 {"x":13.25, "y":3.25}, 161 {"matrix": [3, 5], "x": 5.25, "y": 3.25},
153 {"x":14.25, "y":3.25}, 162
154 {"x":15.25, "y":3.25}, 163 {"matrix": [3, 6], "x": 11.25, "y": 3.25},
155 {"x":16.25, "y":3.25, "w":1.25}, 164 {"matrix": [3, 7], "x": 12.25, "y": 3.25},
156 165 {"matrix": [3, 8], "x": 13.25, "y": 3.25},
157 {"x":0, "y":4.25, "w":1.25}, 166 {"matrix": [3, 9], "x": 14.25, "y": 3.25},
158 {"x":1.25, "y":4.25}, 167 {"matrix": [3, 10], "x": 15.25, "y": 3.25},
159 {"x":2.25, "y":4.25}, 168 {"matrix": [3, 11], "x": 16.25, "y": 3.25, "w": 1.25},
160 {"x":3.25, "y":4.25}, 169
161 {"x":4.25, "y":4.25}, 170 {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
162 {"x":5.25, "y":4.25}, 171 {"matrix": [4, 1], "x": 1.25, "y": 4.25},
163 {"x":11.25, "y":4.25}, 172 {"matrix": [4, 2], "x": 2.25, "y": 4.25},
164 {"x":12.25, "y":4.25}, 173 {"matrix": [4, 3], "x": 3.25, "y": 4.25},
165 {"x":13.25, "y":4.25}, 174 {"matrix": [4, 4], "x": 4.25, "y": 4.25},
166 {"x":14.25, "y":4.25}, 175 {"matrix": [4, 5], "x": 5.25, "y": 4.25},
167 {"x":15.25, "y":4.25}, 176
168 {"x":16.25, "y":4.25, "w":1.25}, 177 {"matrix": [4, 6], "x": 11.25, "y": 4.25},
169 178 {"matrix": [4, 7], "x": 12.25, "y": 4.25},
170 {"x":0.25, "y":5.25}, 179 {"matrix": [4, 8], "x": 13.25, "y": 4.25},
171 {"x":1.25, "y":5.25}, 180 {"matrix": [4, 9], "x": 14.25, "y": 4.25},
172 {"x":2.25, "y":5.25}, 181 {"matrix": [4, 10], "x": 15.25, "y": 4.25},
173 {"x":3.25, "y":5.25}, 182 {"matrix": [4, 11], "x": 16.25, "y": 4.25, "w": 1.25},
174 {"x":4.25, "y":5.25}, 183
175 {"x":5.25, "y":5.25}, 184 {"matrix": [5, 0], "x": 0.25, "y": 5.25},
176 {"x":11.25, "y":5.25}, 185 {"matrix": [5, 1], "x": 1.25, "y": 5.25},
177 {"x":12.25, "y":5.25}, 186 {"matrix": [5, 2], "x": 2.25, "y": 5.25},
178 {"x":13.25, "y":5.25}, 187 {"matrix": [5, 3], "x": 3.25, "y": 5.25},
179 {"x":14.25, "y":5.25}, 188 {"matrix": [5, 4], "x": 4.25, "y": 5.25},
180 {"x":15.25, "y":5.25}, 189 {"matrix": [5, 5], "x": 5.25, "y": 5.25},
181 {"x":16.25, "y":5.25}, 190
182 191 {"matrix": [5, 6], "x": 11.25, "y": 5.25},
183 {"x":6.25, "y":6}, 192 {"matrix": [5, 7], "x": 12.25, "y": 5.25},
184 {"x":7.25, "y":6}, 193 {"matrix": [5, 8], "x": 13.25, "y": 5.25},
185 {"x":9.25, "y":6}, 194 {"matrix": [5, 9], "x": 14.25, "y": 5.25},
186 {"x":10.25, "y":6}, 195 {"matrix": [5, 10], "x": 15.25, "y": 5.25},
187 196 {"matrix": [5, 11], "x": 16.25, "y": 5.25},
188 {"x":7.25, "y":7}, 197
189 {"x":9.25, "y":7}, 198 {"matrix": [6, 2], "x": 6.25, "y": 6},
190 199 {"matrix": [6, 3], "x": 7.25, "y": 6},
191 {"x":5.25, "y":7, "h":2}, 200
192 {"x":6.25, "y":7, "h":2}, 201 {"matrix": [6, 9], "x": 9.25, "y": 6},
193 {"x":7.25, "y":8}, 202 {"matrix": [6, 8], "x": 10.25, "y": 6},
194 {"x":9.25, "y":8}, 203
195 {"x":10.25, "y":7, "h":2}, 204 {"matrix": [6, 4], "x": 7.25, "y": 7},
196 {"x":11.25, "y":7, "h":2} 205
206 {"matrix": [6, 10], "x": 9.25, "y": 7},
207
208 {"matrix": [6, 0], "x": 5.25, "y": 7, "h": 2},
209 {"matrix": [6, 1], "x": 6.25, "y": 7, "h": 2},
210 {"matrix": [6, 5], "x": 7.25, "y": 8},
211
212 {"matrix": [6, 11], "x": 9.25, "y": 8},
213 {"matrix": [6, 7], "x": 10.25, "y": 7, "h": 2},
214 {"matrix": [6, 6], "x": 11.25, "y": 7, "h": 2}
197 ] 215 ]
198 } 216 }
199 } 217 }
diff --git a/keyboards/kin80/kin80.h b/keyboards/kin80/kin80.h
deleted file mode 100644
index 2bda24d19a..0000000000
--- a/keyboards/kin80/kin80.h
+++ /dev/null
@@ -1,62 +0,0 @@
1/* Copyright 2022 DmNosachev
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#include "quantum.h"
20
21/* readability */
22#define XXX KC_NO
23
24#define LAYOUT( \
25 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
26 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
27 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
28 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, \
29 k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, \
30 k51, k52, k53, k54, k57, k58, k59, k5A, \
31 k62, k63, k69, k68, \
32 k64, k6A, \
33 k60, k61, k65, k6B, k67, k66 \
34) { \
35 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
36 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
37 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
38 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B }, \
39 { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B }, \
40 { XXX, k51, k52, k53, k54, XXX, XXX, k57, k58, k59, k5A, XXX }, \
41 { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B } \
42}
43
44#define LAYOUT_all( \
45 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
46 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
47 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
48 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, \
49 k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, \
50 k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, \
51 k62, k63, k69, k68, \
52 k64, k6A, \
53 k60, k61, k65, k6B, k67, k66 \
54) { \
55 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
56 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
57 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
58 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B }, \
59 { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B }, \
60 { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B }, \
61 { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B } \
62}
diff --git a/keyboards/kinesis/alvicstep/alvicstep.h b/keyboards/kinesis/alvicstep/alvicstep.h
index 3b71e51678..7bd56c4678 100644
--- a/keyboards/kinesis/alvicstep/alvicstep.h
+++ b/keyboards/kinesis/alvicstep/alvicstep.h
@@ -8,96 +8,3 @@ void num_lock_led_on(void);
8void caps_lock_led_on(void); 8void caps_lock_led_on(void);
9void scroll_lock_led_on(void); 9void scroll_lock_led_on(void);
10void keypad_led_on(void); 10void keypad_led_on(void);
11
12#define ___ KC_NO
13
14#define LAYOUT( \
15 k02, k22, k12, k01, k21, k11, k00, k20, k10, \
16 k80, k70, k60, k50, k40, k30, \
17 k81, k71, k61, k51, k41, k31, \
18 k82, k72, k62, k52, k42, k32, \
19 k83, k73, k63, k53, k43, k33, \
20 k74, k64, k54, k34, \
21 k36, k35, \
22 k55, \
23 k56, k46, k75, \
24\
25 k03, k23, k13, k04, k24, k14, k05, k85, k84, \
26 k94, kA4, kB4, kD4, kE4, kF4, \
27 k95, kA5, kB5, kD5, kE5, kF5, \
28 k96, kA6, kB6, kD6, kE6, kF6, \
29 k97, kA7, kB7, kD7, kE7, kF7, \
30 k93, kB3, kD3, kE3, \
31 k47, k66, \
32 k67, \
33 k87, k76, k86 \
34) { \
35 { k00, k01, k02, k03, k04, k05, ___, ___ }, \
36 { k10, k11, k12, k13, k14, ___, ___, ___ }, \
37 { k20, k21, k22, k23, k24, ___, ___, ___ }, \
38 { k30, k31, k32, k33, k34, k35, k36, ___ }, \
39 { k40, k41, k42, k43, ___, ___, k46, k47 }, \
40 { k50, k51, k52, k53, k54, k55, k56, ___ }, \
41 { k60, k61, k62, k63, k64, ___, k66, k67 }, \
42 { k70, k71, k72, k73, k74, k75, k76, ___ }, \
43 { k80, k81, k82, k83, k84, k85, k86, k87 }, \
44 { ___, ___, ___, k93, k94, k95, k96, k97 }, \
45 { ___, ___, ___, ___, kA4, kA5, kA6, kA7 }, \
46 { ___, ___, ___, kB3, kB4, kB5, kB6, kB7 }, \
47 { ___, ___, ___, ___, ___, ___, ___, ___ }, \
48 { ___, ___, ___, kD3, kD4, kD5, kD6, kD7 }, \
49 { ___, ___, ___, kE3, kE4, kE5, kE6, kE7 }, \
50 { ___, ___, ___, ___, kF4, kF5, kF6, kF7 } \
51}
52
53#define LAYOUT_pretty( \
54 k02, k22, k12, k01, k21, k11, k00, k20, k10, k03, k23, k13, k04, k24, k14, k05, k85, k84, \
55 k80, k70, k60, k50, k40, k30, k94, kA4, kB4, kD4, kE4, kF4, \
56 k81, k71, k61, k51, k41, k31, k95, kA5, kB5, kD5, kE5, kF5, \
57 k82, k72, k62, k52, k42, k32, k96, kA6, kB6, kD6, kE6, kF6, \
58 k83, k73, k63, k53, k43, k33, k97, kA7, kB7, kD7, kE7, kF7, \
59 k74, k64, k54, k34, k93, kB3, kD3, kE3, \
60 k36, k35, k47, k66, \
61 k55, k67, \
62 k56, k46, k75, k87, k76, k86 \
63) { \
64 { k00, k01, k02, k03, k04, k05, ___, ___ }, \
65 { k10, k11, k12, k13, k14, ___, ___, ___ }, \
66 { k20, k21, k22, k23, k24, ___, ___, ___ }, \
67 { k30, k31, k32, k33, k34, k35, k36, ___ }, \
68 { k40, k41, k42, k43, ___, ___, k46, k47 }, \
69 { k50, k51, k52, k53, k54, k55, k56, ___ }, \
70 { k60, k61, k62, k63, k64, ___, k66, k67 }, \
71 { k70, k71, k72, k73, k74, k75, k76, ___ }, \
72 { k80, k81, k82, k83, k84, k85, k86, k87 }, \
73 { ___, ___, ___, k93, k94, k95, k96, k97 }, \
74 { ___, ___, ___, ___, kA4, kA5, kA6, kA7 }, \
75 { ___, ___, ___, kB3, kB4, kB5, kB6, kB7 }, \
76 { ___, ___, ___, ___, ___, ___, ___, ___ }, \
77 { ___, ___, ___, kD3, kD4, kD5, kD6, kD7 }, \
78 { ___, ___, ___, kE3, kE4, kE5, kE6, kE7 }, \
79 { ___, ___, ___, ___, kF4, kF5, kF6, kF7 } \
80}
81
82/*
83 Row pin configuration
84
85 PF0 A
86 PF1 B
87 PF2 C
88 PF3 G 0 = U4, 1 = U5
89
90
91 Matrix Map (US QWERTY keyboard layout shown)
92
93 | row 0 | row 1 | row 2 | row 3 | row 4 | row 5 | row 6 | row 7 | row 8 | row 9 | row A | row B | row C | row D | row E | row F
94 ----------------------------------------------------------------------------------------------------------------------------------------------------
95 PB0 col0 | F6 | F8 | F7 | 5% | 4$ | 3# | 2@ | 1! | =+ | | | | | | |
96 PB1 col1 | F3 | F5 | F4 | T | R | E | W | Q | Tab | | | | | | |
97 PB2 col2 | Esc | F2 | F1 | G | F | D | S | A | CapsLk | | | | | | |
98 PB3 col3 | F9 | F11 | F10 | B | V | C | X | Z | LShift | Up | | Down | | [{ | ]} |
99 PB4 col4 | F12 | ScrLk | PrtSc | Right | | Left | Insert | `~ | 1! | 6^ | 7& | 8* | | 9( | 0) | -_
100 PB5 col5 | Pause | | | LAlt | | Home | | End | Fn | Y | U | I | | O | P | \|
101 PB6 col6 | | | | LCtrl | Delete | Bksp | RCtrl | Enter | Space | H | J | K | | L | ;: | '"
102 PB7 col7 | | | | | RGUI | | PageUp | | PageDn | N | M | ,< | | .> | /? | RShift
103*/
diff --git a/keyboards/kinesis/alvicstep/info.json b/keyboards/kinesis/alvicstep/info.json
index 009bfb8393..ef3509caf3 100644
--- a/keyboards/kinesis/alvicstep/info.json
+++ b/keyboards/kinesis/alvicstep/info.json
@@ -7,5 +7,187 @@
7 "device_version": "0.0.1" 7 "device_version": "0.0.1"
8 }, 8 },
9 "processor": "at90usb1286", 9 "processor": "at90usb1286",
10 "bootloader": "halfkay" 10 "bootloader": "halfkay",
11 "layouts": {
12 "LAYOUT": {
13 "layout": [
14 {"matrix": [0, 2], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
15 {"matrix": [2, 2], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
16 {"matrix": [1, 2], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
17 {"matrix": [0, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
18 {"matrix": [2, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
19 {"matrix": [1, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
20 {"matrix": [0, 0], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
21 {"matrix": [2, 0], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
22 {"matrix": [1, 0], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
23 {"matrix": [8, 0], "x": 0, "y": 1.25, "w": 1.25},
24 {"matrix": [7, 0], "x": 1.25, "y": 1.25},
25 {"matrix": [6, 0], "x": 2.25, "y": 1},
26 {"matrix": [5, 0], "x": 3.25, "y": 1},
27 {"matrix": [4, 0], "x": 4.25, "y": 1},
28 {"matrix": [3, 0], "x": 5.25, "y": 1},
29 {"matrix": [8, 1], "x": 0, "y": 2.25, "w": 1.25},
30 {"matrix": [7, 1], "x": 1.25, "y": 2.25},
31 {"matrix": [6, 1], "x": 2.25, "y": 2},
32 {"matrix": [5, 1], "x": 3.25, "y": 2},
33 {"matrix": [4, 1], "x": 4.25, "y": 2},
34 {"matrix": [3, 1], "x": 5.25, "y": 2},
35 {"matrix": [8, 2], "x": 0, "y": 3.25, "w": 1.25},
36 {"matrix": [7, 2], "x": 1.25, "y": 3.25},
37 {"matrix": [6, 2], "x": 2.25, "y": 3},
38 {"matrix": [5, 2], "x": 3.25, "y": 3},
39 {"matrix": [4, 2], "x": 4.25, "y": 3},
40 {"matrix": [3, 2], "x": 5.25, "y": 3},
41 {"matrix": [8, 3], "x": 0, "y": 4.25, "w": 1.25},
42 {"matrix": [7, 3], "x": 1.25, "y": 4.25},
43 {"matrix": [6, 3], "x": 2.25, "y": 4},
44 {"matrix": [5, 3], "x": 3.25, "y": 4},
45 {"matrix": [4, 3], "x": 4.25, "y": 4},
46 {"matrix": [3, 3], "x": 5.25, "y": 4},
47 {"matrix": [7, 4], "x": 1.25, "y": 5.25},
48 {"matrix": [6, 4], "x": 2.25, "y": 5},
49 {"matrix": [5, 4], "x": 3.25, "y": 5},
50 {"matrix": [3, 4], "x": 4.25, "y": 5},
51 {"matrix": [3, 6], "x": 5.25, "y": 6},
52 {"matrix": [3, 5], "x": 6.25, "y": 6},
53 {"matrix": [5, 5], "x": 6.25, "y": 7},
54 {"matrix": [5, 6], "x": 4.25, "y": 7, "h": 2},
55 {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
56 {"matrix": [7, 5], "x": 6.25, "y": 8},
57 {"matrix": [0, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
58 {"matrix": [2, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
59 {"matrix": [1, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
60 {"matrix": [0, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
61 {"matrix": [2, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
62 {"matrix": [1, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
63 {"matrix": [0, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
64 {"matrix": [8, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
65 {"matrix": [8, 4], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
66 {"matrix": [9, 4], "x": 9.25, "y": 1},
67 {"matrix": [10, 4], "x": 10.25, "y": 1},
68 {"matrix": [11, 4], "x": 11.25, "y": 1},
69 {"matrix": [13, 4], "x": 12.25, "y": 1},
70 {"matrix": [14, 4], "x": 13.25, "y": 1.25},
71 {"matrix": [15, 4], "x": 14.25, "y": 1.25, "w": 1.25},
72 {"matrix": [9, 5], "x": 9.25, "y": 2},
73 {"matrix": [10, 5], "x": 10.25, "y": 2},
74 {"matrix": [11, 5], "x": 11.25, "y": 2},
75 {"matrix": [13, 5], "x": 12.25, "y": 2},
76 {"matrix": [14, 5], "x": 13.25, "y": 2.25},
77 {"matrix": [15, 5], "x": 14.25, "y": 2.25, "w": 1.25},
78 {"matrix": [9, 6], "x": 9.25, "y": 3},
79 {"matrix": [10, 6], "x": 10.25, "y": 3},
80 {"matrix": [11, 6], "x": 11.25, "y": 3},
81 {"matrix": [13, 6], "x": 12.25, "y": 3},
82 {"matrix": [14, 6], "x": 13.25, "y": 3.25},
83 {"matrix": [15, 6], "x": 14.25, "y": 3.25, "w": 1.25},
84 {"matrix": [9, 7], "x": 9.25, "y": 4},
85 {"matrix": [10, 7], "x": 10.25, "y": 4},
86 {"matrix": [11, 7], "x": 11.25, "y": 4},
87 {"matrix": [13, 7], "x": 12.25, "y": 4},
88 {"matrix": [14, 7], "x": 13.25, "y": 4.25},
89 {"matrix": [15, 7], "x": 14.25, "y": 4.25, "w": 1.25},
90 {"matrix": [9, 3], "x": 10.25, "y": 5},
91 {"matrix": [11, 3], "x": 11.25, "y": 5},
92 {"matrix": [13, 3], "x": 12.25, "y": 5},
93 {"matrix": [14, 3], "x": 13.25, "y": 5.25},
94 {"matrix": [4, 7], "x": 8.25, "y": 6},
95 {"matrix": [6, 6], "x": 9.25, "y": 6},
96 {"matrix": [6, 7], "x": 8.25, "y": 7},
97 {"matrix": [8, 7], "x": 8.25, "y": 8},
98 {"matrix": [7, 6], "x": 9.25, "y": 7, "h": 2},
99 {"matrix": [8, 6], "x": 10.25, "y": 7, "h": 2}
100 ]
101 },
102 "LAYOUT_pretty": {
103 "layout": [
104 {"matrix": [0, 2], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
105 {"matrix": [2, 2], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
106 {"matrix": [1, 2], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
107 {"matrix": [0, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
108 {"matrix": [2, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
109 {"matrix": [1, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
110 {"matrix": [0, 0], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
111 {"matrix": [2, 0], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
112 {"matrix": [1, 0], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
113 {"matrix": [0, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
114 {"matrix": [2, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
115 {"matrix": [1, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
116 {"matrix": [0, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
117 {"matrix": [2, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
118 {"matrix": [1, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
119 {"matrix": [0, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
120 {"matrix": [8, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
121 {"matrix": [8, 4], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
122 {"matrix": [8, 0], "x": 0, "y": 1.25, "w": 1.25},
123 {"matrix": [7, 0], "x": 1.25, "y": 1.25},
124 {"matrix": [6, 0], "x": 2.25, "y": 1},
125 {"matrix": [5, 0], "x": 3.25, "y": 1},
126 {"matrix": [4, 0], "x": 4.25, "y": 1},
127 {"matrix": [3, 0], "x": 5.25, "y": 1},
128 {"matrix": [9, 4], "x": 9.25, "y": 1},
129 {"matrix": [10, 4], "x": 10.25, "y": 1},
130 {"matrix": [11, 4], "x": 11.25, "y": 1},
131 {"matrix": [13, 4], "x": 12.25, "y": 1},
132 {"matrix": [14, 4], "x": 13.25, "y": 1.25},
133 {"matrix": [15, 4], "x": 14.25, "y": 1.25, "w": 1.25},
134 {"matrix": [8, 1], "x": 0, "y": 2.25, "w": 1.25},
135 {"matrix": [7, 1], "x": 1.25, "y": 2.25},
136 {"matrix": [6, 1], "x": 2.25, "y": 2},
137 {"matrix": [5, 1], "x": 3.25, "y": 2},
138 {"matrix": [4, 1], "x": 4.25, "y": 2},
139 {"matrix": [3, 1], "x": 5.25, "y": 2},
140 {"matrix": [9, 5], "x": 9.25, "y": 2},
141 {"matrix": [10, 5], "x": 10.25, "y": 2},
142 {"matrix": [11, 5], "x": 11.25, "y": 2},
143 {"matrix": [13, 5], "x": 12.25, "y": 2},
144 {"matrix": [14, 5], "x": 13.25, "y": 2.25},
145 {"matrix": [15, 5], "x": 14.25, "y": 2.25, "w": 1.25},
146 {"matrix": [8, 2], "x": 0, "y": 3.25, "w": 1.25},
147 {"matrix": [7, 2], "x": 1.25, "y": 3.25},
148 {"matrix": [6, 2], "x": 2.25, "y": 3},
149 {"matrix": [5, 2], "x": 3.25, "y": 3},
150 {"matrix": [4, 2], "x": 4.25, "y": 3},
151 {"matrix": [3, 2], "x": 5.25, "y": 3},
152 {"matrix": [9, 6], "x": 9.25, "y": 3},
153 {"matrix": [10, 6], "x": 10.25, "y": 3},
154 {"matrix": [11, 6], "x": 11.25, "y": 3},
155 {"matrix": [13, 6], "x": 12.25, "y": 3},
156 {"matrix": [14, 6], "x": 13.25, "y": 3.25},
157 {"matrix": [15, 6], "x": 14.25, "y": 3.25, "w": 1.25},
158 {"matrix": [8, 3], "x": 0, "y": 4.25, "w": 1.25},
159 {"matrix": [7, 3], "x": 1.25, "y": 4.25},
160 {"matrix": [6, 3], "x": 2.25, "y": 4},
161 {"matrix": [5, 3], "x": 3.25, "y": 4},
162 {"matrix": [4, 3], "x": 4.25, "y": 4},
163 {"matrix": [3, 3], "x": 5.25, "y": 4},
164 {"matrix": [9, 7], "x": 9.25, "y": 4},
165 {"matrix": [10, 7], "x": 10.25, "y": 4},
166 {"matrix": [11, 7], "x": 11.25, "y": 4},
167 {"matrix": [13, 7], "x": 12.25, "y": 4},
168 {"matrix": [14, 7], "x": 13.25, "y": 4.25},
169 {"matrix": [15, 7], "x": 14.25, "y": 4.25, "w": 1.25},
170 {"matrix": [7, 4], "x": 1.25, "y": 5.25},
171 {"matrix": [6, 4], "x": 2.25, "y": 5},
172 {"matrix": [5, 4], "x": 3.25, "y": 5},
173 {"matrix": [3, 4], "x": 4.25, "y": 5},
174 {"matrix": [9, 3], "x": 10.25, "y": 5},
175 {"matrix": [11, 3], "x": 11.25, "y": 5},
176 {"matrix": [13, 3], "x": 12.25, "y": 5},
177 {"matrix": [14, 3], "x": 13.25, "y": 5.25},
178 {"matrix": [3, 6], "x": 5.25, "y": 6},
179 {"matrix": [3, 5], "x": 6.25, "y": 6},
180 {"matrix": [4, 7], "x": 8.25, "y": 6},
181 {"matrix": [6, 6], "x": 9.25, "y": 6},
182 {"matrix": [5, 5], "x": 6.25, "y": 7},
183 {"matrix": [6, 7], "x": 8.25, "y": 7},
184 {"matrix": [5, 6], "x": 4.25, "y": 7, "h": 2},
185 {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
186 {"matrix": [7, 5], "x": 6.25, "y": 8},
187 {"matrix": [8, 7], "x": 8.25, "y": 8},
188 {"matrix": [7, 6], "x": 9.25, "y": 7, "h": 2},
189 {"matrix": [8, 6], "x": 10.25, "y": 7, "h": 2}
190 ]
191 }
192 }
11} 193}
diff --git a/keyboards/kinesis/info.json b/keyboards/kinesis/info.json
index 5b9baafae4..4454639ab0 100644
--- a/keyboards/kinesis/info.json
+++ b/keyboards/kinesis/info.json
@@ -1,13 +1,4 @@
1{ 1{
2 "url": "", 2 "url": "",
3 "maintainer": "qmk", 3 "maintainer": "qmk"
4 "layouts": {
5 "LAYOUT": {
6 "layout": [{"label":"Esc", "x":0, "y":0, "w":0.69, "h":0.85}, {"label":"F1", "x":0.7, "y":0, "w":0.69, "h":0.85}, {"label":"F2", "x":1.39, "y":0, "w":0.69, "h":0.85}, {"label":"F3", "x":2.09, "y":0, "w":0.69, "h":0.85}, {"label":"F4", "x":2.78, "y":0, "w":0.69, "h":0.85}, {"label":"F5", "x":3.48, "y":0, "w":0.69, "h":0.85}, {"label":"F6", "x":4.17, "y":0, "w":0.69, "h":0.85}, {"label":"F7", "x":4.87, "y":0, "w":0.69, "h":0.85}, {"label":"F8", "x":5.56, "y":0, "w":0.69, "h":0.85}, {"label":"+", "x":0, "y":1.25, "w":1.25}, {"label":"!", "x":1.25, "y":1.25}, {"label":"@", "x":2.25, "y":1}, {"label":"#", "x":3.25, "y":1}, {"label":"$", "x":4.25, "y":1}, {"label":"%", "x":5.25, "y":1}, {"label":"Tab", "x":0, "y":2.25, "w":1.25}, {"label":"Q", "x":1.25, "y":2.25}, {"label":"W", "x":2.25, "y":2}, {"label":"E", "x":3.25, "y":2}, {"label":"R", "x":4.25, "y":2}, {"label":"T", "x":5.25, "y":2}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.25}, {"label":"A", "x":1.25, "y":3.25}, {"label":"S", "x":2.25, "y":3}, {"label":"D", "x":3.25, "y":3}, {"label":"F", "x":4.25, "y":3}, {"label":"G", "x":5.25, "y":3}, {"label":"Shift", "x":0, "y":4.25, "w":1.25}, {"label":"Z", "x":1.25, "y":4.25}, {"label":"X", "x":2.25, "y":4}, {"label":"C", "x":3.25, "y":4}, {"label":"V", "x":4.25, "y":4}, {"label":"B", "x":5.25, "y":4}, {"label":"~", "x":1.25, "y":5.25}, {"label":"|", "x":2.25, "y":5}, {"label":"←", "x":3.25, "y":5}, {"label":"→", "x":4.25, "y":5}, {"label":"Ctrl", "x":5.25, "y":6}, {"label":"Alt", "x":6.25, "y":6}, {"label":"Home", "x":6.25, "y":7}, {"label":"Back Space", "x":4.25, "y":7, "h":2}, {"label":"Delete", "x":5.25, "y":7, "h":2}, {"label":"End", "x":6.25, "y":8}, {"label":"F9", "x":9.25, "y":0, "w":0.69, "h":0.85}, {"label":"F10", "x":9.95, "y":0, "w":0.69, "h":0.85}, {"label":"F11", "x":10.64, "y":0, "w":0.69, "h":0.85}, {"label":"F12", "x":11.34, "y":0, "w":0.69, "h":0.85}, {"label":"Print Scrn", "x":12.03, "y":0, "w":0.69, "h":0.85}, {"label":"Scroll Lock", "x":12.73, "y":0, "w":0.69, "h":0.85}, {"label":"Pause", "x":13.42, "y":0, "w":0.69, "h":0.85}, {"label":"Keypad", "x":14.12, "y":0, "w":0.69, "h":0.85}, {"label":"Progrm", "x":14.81, "y":0, "w":0.69, "h":0.85}, {"label":"^", "x":9.25, "y":1}, {"label":"&amp;", "x":10.25, "y":1}, {"label":"*", "x":11.25, "y":1}, {"label":"(", "x":12.25, "y":1}, {"label":")", "x":13.25, "y":1.25}, {"label":"_", "x":14.25, "y":1.25, "w":1.25}, {"label":"Y", "x":9.25, "y":2}, {"label":"U", "x":10.25, "y":2}, {"label":"I", "x":11.25, "y":2}, {"label":"O", "x":12.25, "y":2}, {"label":"P", "x":13.25, "y":2.25}, {"label":"|", "x":14.25, "y":2.25, "w":1.25}, {"label":"H", "x":9.25, "y":3}, {"label":"J", "x":10.25, "y":3}, {"label":"K", "x":11.25, "y":3}, {"label":"L", "x":12.25, "y":3}, {"label":":", "x":13.25, "y":3.25}, {"label":"\"", "x":14.25, "y":3.25, "w":1.25}, {"label":"N", "x":9.25, "y":4}, {"label":"M", "x":10.25, "y":4}, {"label":"&lt;", "x":11.25, "y":4}, {"label":"&gt;", "x":12.25, "y":4}, {"label":"?", "x":13.25, "y":4.25}, {"label":"Shift", "x":14.25, "y":4.25, "w":1.25}, {"label":"↑", "x":10.25, "y":5}, {"label":"↓", "x":11.25, "y":5}, {"label":"{", "x":12.25, "y":5}, {"label":"}", "x":13.25, "y":5.25}, {"label":"GUI", "x":8.25, "y":6}, {"label":"Ctrl", "x":9.25, "y":6}, {"label":"Page Up", "x":8.25, "y":7}, {"label":"Page Down", "x":8.25, "y":8}, {"label":"Enter", "x":9.25, "y":7, "h":2}, {"label":"Space", "x":10.25, "y":7, "h":2}]
7 },
8
9 "LAYOUT_pretty": {
10 "layout": [{"label":"Esc", "x":0, "y":0, "w":0.69, "h":0.85}, {"label":"F1", "x":0.7, "y":0, "w":0.69, "h":0.85}, {"label":"F2", "x":1.39, "y":0, "w":0.69, "h":0.85}, {"label":"F3", "x":2.09, "y":0, "w":0.69, "h":0.85}, {"label":"F4", "x":2.78, "y":0, "w":0.69, "h":0.85}, {"label":"F5", "x":3.48, "y":0, "w":0.69, "h":0.85}, {"label":"F6", "x":4.17, "y":0, "w":0.69, "h":0.85}, {"label":"F7", "x":4.87, "y":0, "w":0.69, "h":0.85}, {"label":"F8", "x":5.56, "y":0, "w":0.69, "h":0.85}, {"label":"F9", "x":9.25, "y":0, "w":0.69, "h":0.85}, {"label":"F10", "x":9.95, "y":0, "w":0.69, "h":0.85}, {"label":"F11", "x":10.64, "y":0, "w":0.69, "h":0.85}, {"label":"F12", "x":11.34, "y":0, "w":0.69, "h":0.85}, {"label":"Print Scrn", "x":12.03, "y":0, "w":0.69, "h":0.85}, {"label":"Scroll Lock", "x":12.73, "y":0, "w":0.69, "h":0.85}, {"label":"Pause", "x":13.42, "y":0, "w":0.69, "h":0.85}, {"label":"Keypad", "x":14.12, "y":0, "w":0.69, "h":0.85}, {"label":"Progrm", "x":14.81, "y":0, "w":0.69, "h":0.85}, {"label":"+", "x":0, "y":1.25, "w":1.25}, {"label":"!", "x":1.25, "y":1.25}, {"label":"@", "x":2.25, "y":1}, {"label":"#", "x":3.25, "y":1}, {"label":"$", "x":4.25, "y":1}, {"label":"%", "x":5.25, "y":1}, {"label":"^", "x":9.25, "y":1}, {"label":"&amp;", "x":10.25, "y":1}, {"label":"*", "x":11.25, "y":1}, {"label":"(", "x":12.25, "y":1}, {"label":")", "x":13.25, "y":1.25}, {"label":"_", "x":14.25, "y":1.25, "w":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.25}, {"label":"Q", "x":1.25, "y":2.25}, {"label":"W", "x":2.25, "y":2}, {"label":"E", "x":3.25, "y":2}, {"label":"R", "x":4.25, "y":2}, {"label":"T", "x":5.25, "y":2}, {"label":"Y", "x":9.25, "y":2}, {"label":"U", "x":10.25, "y":2}, {"label":"I", "x":11.25, "y":2}, {"label":"O", "x":12.25, "y":2}, {"label":"P", "x":13.25, "y":2.25}, {"label":"|", "x":14.25, "y":2.25, "w":1.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.25}, {"label":"A", "x":1.25, "y":3.25}, {"label":"S", "x":2.25, "y":3}, {"label":"D", "x":3.25, "y":3}, {"label":"F", "x":4.25, "y":3}, {"label":"G", "x":5.25, "y":3}, {"label":"H", "x":9.25, "y":3}, {"label":"J", "x":10.25, "y":3}, {"label":"K", "x":11.25, "y":3}, {"label":"L", "x":12.25, "y":3}, {"label":":", "x":13.25, "y":3.25}, {"label":"\"", "x":14.25, "y":3.25, "w":1.25}, {"label":"Shift", "x":0, "y":4.25, "w":1.25}, {"label":"Z", "x":1.25, "y":4.25}, {"label":"X", "x":2.25, "y":4}, {"label":"C", "x":3.25, "y":4}, {"label":"V", "x":4.25, "y":4}, {"label":"B", "x":5.25, "y":4}, {"label":"N", "x":9.25, "y":4}, {"label":"M", "x":10.25, "y":4}, {"label":"&lt;", "x":11.25, "y":4}, {"label":"&gt;", "x":12.25, "y":4}, {"label":"?", "x":13.25, "y":4.25}, {"label":"Shift", "x":14.25, "y":4.25, "w":1.25}, {"label":"~", "x":1.25, "y":5.25}, {"label":"|", "x":2.25, "y":5}, {"label":"←", "x":3.25, "y":5}, {"label":"→", "x":4.25, "y":5}, {"label":"↑", "x":10.25, "y":5}, {"label":"↓", "x":11.25, "y":5}, {"label":"{", "x":12.25, "y":5}, {"label":"}", "x":13.25, "y":5.25}, {"label":"Ctrl", "x":5.25, "y":6}, {"label":"Alt", "x":6.25, "y":6}, {"label":"GUI", "x":8.25, "y":6}, {"label":"Ctrl", "x":9.25, "y":6}, {"label":"Home", "x":6.25, "y":7}, {"label":"Page Up", "x":8.25, "y":7}, {"label":"Back Space", "x":4.25, "y":7, "h":2}, {"label":"Delete", "x":5.25, "y":7, "h":2}, {"label":"End", "x":6.25, "y":8}, {"label":"Page Down", "x":8.25, "y":8}, {"label":"Enter", "x":9.25, "y":7, "h":2}, {"label":"Space", "x":10.25, "y":7, "h":2}]
11 }
12 }
13} 4}
diff --git a/keyboards/kinesis/kint2pp/info.json b/keyboards/kinesis/kint2pp/info.json
index 66d27b5f98..b2ddfb80b0 100644
--- a/keyboards/kinesis/kint2pp/info.json
+++ b/keyboards/kinesis/kint2pp/info.json
@@ -20,5 +20,187 @@
20 }, 20 },
21 "processor": "at90usb1286", 21 "processor": "at90usb1286",
22 "bootloader": "halfkay", 22 "bootloader": "halfkay",
23 "debounce": 20 23 "debounce": 20,
24 "layouts": {
25 "LAYOUT": {
26 "layout": [
27 {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
28 {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
29 {"matrix": [14, 0], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
30 {"matrix": [12, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
31 {"matrix": [13, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
32 {"matrix": [14, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
33 {"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
34 {"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
35 {"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
36 {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
37 {"matrix": [1, 0], "x": 1.25, "y": 1.25},
38 {"matrix": [2, 0], "x": 2.25, "y": 1},
39 {"matrix": [3, 0], "x": 3.25, "y": 1},
40 {"matrix": [4, 0], "x": 4.25, "y": 1},
41 {"matrix": [5, 0], "x": 5.25, "y": 1},
42 {"matrix": [0, 1], "x": 0, "y": 2.25, "w": 1.25},
43 {"matrix": [1, 1], "x": 1.25, "y": 2.25},
44 {"matrix": [2, 1], "x": 2.25, "y": 2},
45 {"matrix": [3, 1], "x": 3.25, "y": 2},
46 {"matrix": [4, 1], "x": 4.25, "y": 2},
47 {"matrix": [5, 1], "x": 5.25, "y": 2},
48 {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.25},
49 {"matrix": [1, 2], "x": 1.25, "y": 3.25},
50 {"matrix": [2, 2], "x": 2.25, "y": 3},
51 {"matrix": [3, 2], "x": 3.25, "y": 3},
52 {"matrix": [4, 2], "x": 4.25, "y": 3},
53 {"matrix": [5, 2], "x": 5.25, "y": 3},
54 {"matrix": [0, 3], "x": 0, "y": 4.25, "w": 1.25},
55 {"matrix": [1, 3], "x": 1.25, "y": 4.25},
56 {"matrix": [2, 3], "x": 2.25, "y": 4},
57 {"matrix": [3, 3], "x": 3.25, "y": 4},
58 {"matrix": [4, 3], "x": 4.25, "y": 4},
59 {"matrix": [5, 3], "x": 5.25, "y": 4},
60 {"matrix": [1, 4], "x": 1.25, "y": 5.25},
61 {"matrix": [2, 4], "x": 2.25, "y": 5},
62 {"matrix": [3, 4], "x": 3.25, "y": 5},
63 {"matrix": [5, 4], "x": 4.25, "y": 5},
64 {"matrix": [5, 6], "x": 5.25, "y": 6},
65 {"matrix": [5, 5], "x": 6.25, "y": 6},
66 {"matrix": [3, 5], "x": 6.25, "y": 7},
67 {"matrix": [3, 6], "x": 4.25, "y": 7, "h": 2},
68 {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
69 {"matrix": [2, 5], "x": 6.25, "y": 8},
70 {"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
71 {"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
72 {"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
73 {"matrix": [12, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
74 {"matrix": [13, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
75 {"matrix": [14, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
76 {"matrix": [12, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
77 {"matrix": [14, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
78 {"matrix": [13, 5], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
79 {"matrix": [6, 0], "x": 9.25, "y": 1},
80 {"matrix": [7, 0], "x": 10.25, "y": 1},
81 {"matrix": [8, 0], "x": 11.25, "y": 1},
82 {"matrix": [9, 0], "x": 12.25, "y": 1},
83 {"matrix": [10, 0], "x": 13.25, "y": 1.25},
84 {"matrix": [11, 0], "x": 14.25, "y": 1.25, "w": 1.25},
85 {"matrix": [6, 1], "x": 9.25, "y": 2},
86 {"matrix": [7, 1], "x": 10.25, "y": 2},
87 {"matrix": [8, 1], "x": 11.25, "y": 2},
88 {"matrix": [9, 1], "x": 12.25, "y": 2},
89 {"matrix": [10, 1], "x": 13.25, "y": 2.25},
90 {"matrix": [11, 1], "x": 14.25, "y": 2.25, "w": 1.25},
91 {"matrix": [6, 2], "x": 9.25, "y": 3},
92 {"matrix": [7, 2], "x": 10.25, "y": 3},
93 {"matrix": [8, 2], "x": 11.25, "y": 3},
94 {"matrix": [9, 2], "x": 12.25, "y": 3},
95 {"matrix": [10, 2], "x": 13.25, "y": 3.25},
96 {"matrix": [11, 2], "x": 14.25, "y": 3.25, "w": 1.25},
97 {"matrix": [6, 3], "x": 9.25, "y": 4},
98 {"matrix": [7, 3], "x": 10.25, "y": 4},
99 {"matrix": [8, 3], "x": 11.25, "y": 4},
100 {"matrix": [9, 3], "x": 12.25, "y": 4},
101 {"matrix": [10, 3], "x": 13.25, "y": 4.25},
102 {"matrix": [11, 3], "x": 14.25, "y": 4.25, "w": 1.25},
103 {"matrix": [6, 4], "x": 10.25, "y": 5},
104 {"matrix": [8, 4], "x": 11.25, "y": 5},
105 {"matrix": [9, 4], "x": 12.25, "y": 5},
106 {"matrix": [10, 4], "x": 13.25, "y": 5.25},
107 {"matrix": [9, 6], "x": 8.25, "y": 6},
108 {"matrix": [8, 5], "x": 9.25, "y": 6},
109 {"matrix": [8, 6], "x": 8.25, "y": 7},
110 {"matrix": [6, 6], "x": 8.25, "y": 8},
111 {"matrix": [7, 5], "x": 9.25, "y": 7, "h": 2},
112 {"matrix": [6, 5], "x": 10.25, "y": 7, "h": 2}
113 ]
114 },
115 "LAYOUT_pretty": {
116 "layout": [
117 {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
118 {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
119 {"matrix": [14, 0], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
120 {"matrix": [12, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
121 {"matrix": [13, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
122 {"matrix": [14, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
123 {"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
124 {"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
125 {"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
126 {"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
127 {"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
128 {"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
129 {"matrix": [12, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
130 {"matrix": [13, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
131 {"matrix": [14, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
132 {"matrix": [12, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
133 {"matrix": [14, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
134 {"matrix": [13, 5], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
135 {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
136 {"matrix": [1, 0], "x": 1.25, "y": 1.25},
137 {"matrix": [2, 0], "x": 2.25, "y": 1},
138 {"matrix": [3, 0], "x": 3.25, "y": 1},
139 {"matrix": [4, 0], "x": 4.25, "y": 1},
140 {"matrix": [5, 0], "x": 5.25, "y": 1},
141 {"matrix": [6, 0], "x": 9.25, "y": 1},
142 {"matrix": [7, 0], "x": 10.25, "y": 1},
143 {"matrix": [8, 0], "x": 11.25, "y": 1},
144 {"matrix": [9, 0], "x": 12.25, "y": 1},
145 {"matrix": [10, 0], "x": 13.25, "y": 1.25},
146 {"matrix": [11, 0], "x": 14.25, "y": 1.25, "w": 1.25},
147 {"matrix": [0, 1], "x": 0, "y": 2.25, "w": 1.25},
148 {"matrix": [1, 1], "x": 1.25, "y": 2.25},
149 {"matrix": [2, 1], "x": 2.25, "y": 2},
150 {"matrix": [3, 1], "x": 3.25, "y": 2},
151 {"matrix": [4, 1], "x": 4.25, "y": 2},
152 {"matrix": [5, 1], "x": 5.25, "y": 2},
153 {"matrix": [6, 1], "x": 9.25, "y": 2},
154 {"matrix": [7, 1], "x": 10.25, "y": 2},
155 {"matrix": [8, 1], "x": 11.25, "y": 2},
156 {"matrix": [9, 1], "x": 12.25, "y": 2},
157 {"matrix": [10, 1], "x": 13.25, "y": 2.25},
158 {"matrix": [11, 1], "x": 14.25, "y": 2.25, "w": 1.25},
159 {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.25},
160 {"matrix": [1, 2], "x": 1.25, "y": 3.25},
161 {"matrix": [2, 2], "x": 2.25, "y": 3},
162 {"matrix": [3, 2], "x": 3.25, "y": 3},
163 {"matrix": [4, 2], "x": 4.25, "y": 3},
164 {"matrix": [5, 2], "x": 5.25, "y": 3},
165 {"matrix": [6, 2], "x": 9.25, "y": 3},
166 {"matrix": [7, 2], "x": 10.25, "y": 3},
167 {"matrix": [8, 2], "x": 11.25, "y": 3},
168 {"matrix": [9, 2], "x": 12.25, "y": 3},
169 {"matrix": [10, 2], "x": 13.25, "y": 3.25},
170 {"matrix": [11, 2], "x": 14.25, "y": 3.25, "w": 1.25},
171 {"matrix": [0, 3], "x": 0, "y": 4.25, "w": 1.25},
172 {"matrix": [1, 3], "x": 1.25, "y": 4.25},
173 {"matrix": [2, 3], "x": 2.25, "y": 4},
174 {"matrix": [3, 3], "x": 3.25, "y": 4},
175 {"matrix": [4, 3], "x": 4.25, "y": 4},
176 {"matrix": [5, 3], "x": 5.25, "y": 4},
177 {"matrix": [6, 3], "x": 9.25, "y": 4},
178 {"matrix": [7, 3], "x": 10.25, "y": 4},
179 {"matrix": [8, 3], "x": 11.25, "y": 4},
180 {"matrix": [9, 3], "x": 12.25, "y": 4},
181 {"matrix": [10, 3], "x": 13.25, "y": 4.25},
182 {"matrix": [11, 3], "x": 14.25, "y": 4.25, "w": 1.25},
183 {"matrix": [1, 4], "x": 1.25, "y": 5.25},
184 {"matrix": [2, 4], "x": 2.25, "y": 5},
185 {"matrix": [3, 4], "x": 3.25, "y": 5},
186 {"matrix": [5, 4], "x": 4.25, "y": 5},
187 {"matrix": [6, 4], "x": 10.25, "y": 5},
188 {"matrix": [8, 4], "x": 11.25, "y": 5},
189 {"matrix": [9, 4], "x": 12.25, "y": 5},
190 {"matrix": [10, 4], "x": 13.25, "y": 5.25},
191 {"matrix": [5, 6], "x": 5.25, "y": 6},
192 {"matrix": [5, 5], "x": 6.25, "y": 6},
193 {"matrix": [9, 6], "x": 8.25, "y": 6},
194 {"matrix": [8, 5], "x": 9.25, "y": 6},
195 {"matrix": [3, 5], "x": 6.25, "y": 7},
196 {"matrix": [8, 6], "x": 8.25, "y": 7},
197 {"matrix": [3, 6], "x": 4.25, "y": 7, "h": 2},
198 {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
199 {"matrix": [2, 5], "x": 6.25, "y": 8},
200 {"matrix": [6, 6], "x": 8.25, "y": 8},
201 {"matrix": [7, 5], "x": 9.25, "y": 7, "h": 2},
202 {"matrix": [6, 5], "x": 10.25, "y": 7, "h": 2}
203 ]
204 }
205 }
24} 206}
diff --git a/keyboards/kinesis/kint2pp/kint2pp.h b/keyboards/kinesis/kint2pp/kint2pp.h
deleted file mode 100644
index 57265d7313..0000000000
--- a/keyboards/kinesis/kint2pp/kint2pp.h
+++ /dev/null
@@ -1,99 +0,0 @@
1#pragma once
2
3#include "quantum.h"
4
5#define ___ KC_NO
6
7// This a shortcut to help you visually see your layout.
8// The first section contains all of the arguments as on the physical keyboard
9// The second converts the arguments into the 2-D scanned array
10
11#define LAYOUT( \
12 kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2, \
13 k00, k10, k20, k30, k40, k50, \
14 k01, k11, k21, k31, k41, k51, \
15 k02, k12, k22, k32, k42, k52, \
16 k03, k13, k23, k33, k43, k53, \
17 k14, k24, k34, k54, \
18 k56, k55, \
19 k35, \
20 k36, k46, k25, \
21 \
22 kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5, \
23 k60, k70, k80, k90, kA0, kB0, \
24 k61, k71, k81, k91, kA1, kB1, \
25 k62, k72, k82, k92, kA2, kB2, \
26 k63, k73, k83, k93, kA3, kB3, \
27 k64, k84, k94, kA4, \
28 k96, k85, \
29 k86, \
30 k66, k75, k65 \
31) { \
32 { k00, k01, k02, k03, ___, ___, ___ }, \
33 { k10, k11, k12, k13, k14, ___, ___ }, \
34 { k20, k21, k22, k23, k24, k25, ___ }, \
35 { k30, k31, k32, k33, k34, k35, k36 }, \
36 { k40, k41, k42, k43, ___, ___, k46 }, \
37 { k50, k51, k52, k53, k54, k55, k56 }, \
38 { k60, k61, k62, k63, k64, k65, k66 }, \
39 { k70, k71, k72, k73, ___, k75, ___ }, \
40 { k80, k81, k82, k83, k84, k85, k86 }, \
41 { k90, k91, k92, k93, k94, ___, k96 }, \
42 { kA0, kA1, kA2, kA3, kA4, ___, ___ }, \
43 { kB0, kB1, kB2, kB3, ___, ___, ___ }, \
44 { kC0, kC1, kC2, kC3, kC4, kC5, ___ }, \
45 { kD0, kD1, kD2, kD3, kD4, kD5, ___ }, \
46 { kE0, kE1, kE2, kE3, kE4, kE5, ___ } \
47}
48
49/* ---------------- LEFT HAND ----------------- ---------------- RIGHT HAND ---------------- */
50#define LAYOUT_pretty( \
51 kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2, kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5, \
52 k00, k10, k20, k30, k40, k50, k60, k70, k80, k90, kA0, kB0, \
53 k01, k11, k21, k31, k41, k51, k61, k71, k81, k91, kA1, kB1, \
54 k02, k12, k22, k32, k42, k52, k62, k72, k82, k92, kA2, kB2, \
55 k03, k13, k23, k33, k43, k53, k63, k73, k83, k93, kA3, kB3, \
56 k14, k24, k34, k54, k64, k84, k94, kA4, \
57 k56, k55, k96, k85, \
58 k35, k86, \
59 k36, k46, k25, k66, k75, k65 \
60) { \
61 { k00, k01, k02, k03, ___, ___, ___ }, \
62 { k10, k11, k12, k13, k14, ___, ___ }, \
63 { k20, k21, k22, k23, k24, k25, ___ }, \
64 { k30, k31, k32, k33, k34, k35, k36 }, \
65 { k40, k41, k42, k43, ___, ___, k46 }, \
66 { k50, k51, k52, k53, k54, k55, k56 }, \
67 { k60, k61, k62, k63, k64, k65, k66 }, \
68 { k70, k71, k72, k73, ___, k75, ___ }, \
69 { k80, k81, k82, k83, k84, k85, k86 }, \
70 { k90, k91, k92, k93, k94, ___, k96 }, \
71 { kA0, kA1, kA2, kA3, kA4, ___, ___ }, \
72 { kB0, kB1, kB2, kB3, ___, ___, ___ }, \
73 { kC0, kC1, kC2, kC3, kC4, kC5, ___ }, \
74 { kD0, kD1, kD2, kD3, kD4, kD5, ___ }, \
75 { kE0, kE1, kE2, kE3, kE4, kE5, ___ } \
76}
77
78/*
79This is the Stapelberg matrix as published at
80https://github.com/stapelberg/kinesis-firmware/blob/master/kb_kinesis/config.kspec
81Along with the pins for each row and column
82 PB0 PB1 PB2 PB3 PB4 PB5 PB6
83 kx0 kx1 kx2 kx3 kx4 kx5 kx6
84PD0 k0x Row: EQL TAB CAP LSH X2 -- --
85PD1 k1x Row: 1 Q A Z BQ -- --
86PD2 k2x Row: 2 W S X INS END --
87PD3 k3x Row: 3 E D C LFT HOM BAK
88PD4 k4x Row: 4 R F V -- -- DEL
89PD5 k5x Row: 5 T G B RT LAL LCT
90PD6 k6x Row: 6 Y H N UP SPC PGD
91PD7 k7x Row: 7 U J M -- RET --
92PC0 k8x Row: 8 I K COM DWN RCT PGU
93PC1 k9x Row: 9 O L PER LBR -- RAL
94PC2 kAx Row: 0 P SEM SLA RBR -- --
95PC3 kBx Row: MIN BSL APO RSH X1 -- --
96PC4 kCx Row: ESC F3 F6 F9 F12 PAU --
97PC5 kDx Row: F1 F4 F7 F10 PRT PRG --
98PC6 kEx Row: F2 F5 F8 F11 SLK KEY --
99*/
diff --git a/keyboards/kinesis/kint36/info.json b/keyboards/kinesis/kint36/info.json
index ac7c0dae98..2d71fc0eb3 100644
--- a/keyboards/kinesis/kint36/info.json
+++ b/keyboards/kinesis/kint36/info.json
@@ -20,5 +20,187 @@
20 }, 20 },
21 "processor": "MK66FX1M0", 21 "processor": "MK66FX1M0",
22 "bootloader": "halfkay", 22 "bootloader": "halfkay",
23 "debounce": 20 23 "debounce": 20,
24 "layouts": {
25 "LAYOUT": {
26 "layout": [
27 {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
28 {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
29 {"matrix": [14, 0], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
30 {"matrix": [12, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
31 {"matrix": [13, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
32 {"matrix": [14, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
33 {"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
34 {"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
35 {"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
36 {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
37 {"matrix": [1, 0], "x": 1.25, "y": 1.25},
38 {"matrix": [2, 0], "x": 2.25, "y": 1},
39 {"matrix": [3, 0], "x": 3.25, "y": 1},
40 {"matrix": [4, 0], "x": 4.25, "y": 1},
41 {"matrix": [5, 0], "x": 5.25, "y": 1},
42 {"matrix": [0, 1], "x": 0, "y": 2.25, "w": 1.25},
43 {"matrix": [1, 1], "x": 1.25, "y": 2.25},
44 {"matrix": [2, 1], "x": 2.25, "y": 2},
45 {"matrix": [3, 1], "x": 3.25, "y": 2},
46 {"matrix": [4, 1], "x": 4.25, "y": 2},
47 {"matrix": [5, 1], "x": 5.25, "y": 2},
48 {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.25},
49 {"matrix": [1, 2], "x": 1.25, "y": 3.25},
50 {"matrix": [2, 2], "x": 2.25, "y": 3},
51 {"matrix": [3, 2], "x": 3.25, "y": 3},
52 {"matrix": [4, 2], "x": 4.25, "y": 3},
53 {"matrix": [5, 2], "x": 5.25, "y": 3},
54 {"matrix": [0, 3], "x": 0, "y": 4.25, "w": 1.25},
55 {"matrix": [1, 3], "x": 1.25, "y": 4.25},
56 {"matrix": [2, 3], "x": 2.25, "y": 4},
57 {"matrix": [3, 3], "x": 3.25, "y": 4},
58 {"matrix": [4, 3], "x": 4.25, "y": 4},
59 {"matrix": [5, 3], "x": 5.25, "y": 4},
60 {"matrix": [1, 4], "x": 1.25, "y": 5.25},
61 {"matrix": [2, 4], "x": 2.25, "y": 5},
62 {"matrix": [3, 4], "x": 3.25, "y": 5},
63 {"matrix": [5, 4], "x": 4.25, "y": 5},
64 {"matrix": [5, 6], "x": 5.25, "y": 6},
65 {"matrix": [5, 5], "x": 6.25, "y": 6},
66 {"matrix": [3, 5], "x": 6.25, "y": 7},
67 {"matrix": [3, 6], "x": 4.25, "y": 7, "h": 2},
68 {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
69 {"matrix": [2, 5], "x": 6.25, "y": 8},
70 {"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
71 {"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
72 {"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
73 {"matrix": [12, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
74 {"matrix": [13, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
75 {"matrix": [14, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
76 {"matrix": [12, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
77 {"matrix": [14, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
78 {"matrix": [13, 5], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
79 {"matrix": [6, 0], "x": 9.25, "y": 1},
80 {"matrix": [7, 0], "x": 10.25, "y": 1},
81 {"matrix": [8, 0], "x": 11.25, "y": 1},
82 {"matrix": [9, 0], "x": 12.25, "y": 1},
83 {"matrix": [10, 0], "x": 13.25, "y": 1.25},
84 {"matrix": [11, 0], "x": 14.25, "y": 1.25, "w": 1.25},
85 {"matrix": [6, 1], "x": 9.25, "y": 2},
86 {"matrix": [7, 1], "x": 10.25, "y": 2},
87 {"matrix": [8, 1], "x": 11.25, "y": 2},
88 {"matrix": [9, 1], "x": 12.25, "y": 2},
89 {"matrix": [10, 1], "x": 13.25, "y": 2.25},
90 {"matrix": [11, 1], "x": 14.25, "y": 2.25, "w": 1.25},
91 {"matrix": [6, 2], "x": 9.25, "y": 3},
92 {"matrix": [7, 2], "x": 10.25, "y": 3},
93 {"matrix": [8, 2], "x": 11.25, "y": 3},
94 {"matrix": [9, 2], "x": 12.25, "y": 3},
95 {"matrix": [10, 2], "x": 13.25, "y": 3.25},
96 {"matrix": [11, 2], "x": 14.25, "y": 3.25, "w": 1.25},
97 {"matrix": [6, 3], "x": 9.25, "y": 4},
98 {"matrix": [7, 3], "x": 10.25, "y": 4},
99 {"matrix": [8, 3], "x": 11.25, "y": 4},
100 {"matrix": [9, 3], "x": 12.25, "y": 4},
101 {"matrix": [10, 3], "x": 13.25, "y": 4.25},
102 {"matrix": [11, 3], "x": 14.25, "y": 4.25, "w": 1.25},
103 {"matrix": [6, 4], "x": 10.25, "y": 5},
104 {"matrix": [8, 4], "x": 11.25, "y": 5},
105 {"matrix": [9, 4], "x": 12.25, "y": 5},
106 {"matrix": [10, 4], "x": 13.25, "y": 5.25},
107 {"matrix": [9, 6], "x": 8.25, "y": 6},
108 {"matrix": [8, 5], "x": 9.25, "y": 6},
109 {"matrix": [8, 6], "x": 8.25, "y": 7},
110 {"matrix": [6, 6], "x": 8.25, "y": 8},
111 {"matrix": [7, 5], "x": 9.25, "y": 7, "h": 2},
112 {"matrix": [6, 5], "x": 10.25, "y": 7, "h": 2}
113 ]
114 },
115 "LAYOUT_pretty": {
116 "layout": [
117 {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
118 {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
119 {"matrix": [14, 0], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
120 {"matrix": [12, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
121 {"matrix": [13, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
122 {"matrix": [14, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
123 {"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
124 {"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
125 {"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
126 {"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
127 {"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
128 {"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
129 {"matrix": [12, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
130 {"matrix": [13, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
131 {"matrix": [14, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
132 {"matrix": [12, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
133 {"matrix": [14, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
134 {"matrix": [13, 5], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
135 {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
136 {"matrix": [1, 0], "x": 1.25, "y": 1.25},
137 {"matrix": [2, 0], "x": 2.25, "y": 1},
138 {"matrix": [3, 0], "x": 3.25, "y": 1},
139 {"matrix": [4, 0], "x": 4.25, "y": 1},
140 {"matrix": [5, 0], "x": 5.25, "y": 1},
141 {"matrix": [6, 0], "x": 9.25, "y": 1},
142 {"matrix": [7, 0], "x": 10.25, "y": 1},
143 {"matrix": [8, 0], "x": 11.25, "y": 1},
144 {"matrix": [9, 0], "x": 12.25, "y": 1},
145 {"matrix": [10, 0], "x": 13.25, "y": 1.25},
146 {"matrix": [11, 0], "x": 14.25, "y": 1.25, "w": 1.25},
147 {"matrix": [0, 1], "x": 0, "y": 2.25, "w": 1.25},
148 {"matrix": [1, 1], "x": 1.25, "y": 2.25},
149 {"matrix": [2, 1], "x": 2.25, "y": 2},
150 {"matrix": [3, 1], "x": 3.25, "y": 2},
151 {"matrix": [4, 1], "x": 4.25, "y": 2},
152 {"matrix": [5, 1], "x": 5.25, "y": 2},
153 {"matrix": [6, 1], "x": 9.25, "y": 2},
154 {"matrix": [7, 1], "x": 10.25, "y": 2},
155 {"matrix": [8, 1], "x": 11.25, "y": 2},
156 {"matrix": [9, 1], "x": 12.25, "y": 2},
157 {"matrix": [10, 1], "x": 13.25, "y": 2.25},
158 {"matrix": [11, 1], "x": 14.25, "y": 2.25, "w": 1.25},
159 {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.25},
160 {"matrix": [1, 2], "x": 1.25, "y": 3.25},
161 {"matrix": [2, 2], "x": 2.25, "y": 3},
162 {"matrix": [3, 2], "x": 3.25, "y": 3},
163 {"matrix": [4, 2], "x": 4.25, "y": 3},
164 {"matrix": [5, 2], "x": 5.25, "y": 3},
165 {"matrix": [6, 2], "x": 9.25, "y": 3},
166 {"matrix": [7, 2], "x": 10.25, "y": 3},
167 {"matrix": [8, 2], "x": 11.25, "y": 3},
168 {"matrix": [9, 2], "x": 12.25, "y": 3},
169 {"matrix": [10, 2], "x": 13.25, "y": 3.25},
170 {"matrix": [11, 2], "x": 14.25, "y": 3.25, "w": 1.25},
171 {"matrix": [0, 3], "x": 0, "y": 4.25, "w": 1.25},
172 {"matrix": [1, 3], "x": 1.25, "y": 4.25},
173 {"matrix": [2, 3], "x": 2.25, "y": 4},
174 {"matrix": [3, 3], "x": 3.25, "y": 4},
175 {"matrix": [4, 3], "x": 4.25, "y": 4},
176 {"matrix": [5, 3], "x": 5.25, "y": 4},
177 {"matrix": [6, 3], "x": 9.25, "y": 4},
178 {"matrix": [7, 3], "x": 10.25, "y": 4},
179 {"matrix": [8, 3], "x": 11.25, "y": 4},
180 {"matrix": [9, 3], "x": 12.25, "y": 4},
181 {"matrix": [10, 3], "x": 13.25, "y": 4.25},
182 {"matrix": [11, 3], "x": 14.25, "y": 4.25, "w": 1.25},
183 {"matrix": [1, 4], "x": 1.25, "y": 5.25},
184 {"matrix": [2, 4], "x": 2.25, "y": 5},
185 {"matrix": [3, 4], "x": 3.25, "y": 5},
186 {"matrix": [5, 4], "x": 4.25, "y": 5},
187 {"matrix": [6, 4], "x": 10.25, "y": 5},
188 {"matrix": [8, 4], "x": 11.25, "y": 5},
189 {"matrix": [9, 4], "x": 12.25, "y": 5},
190 {"matrix": [10, 4], "x": 13.25, "y": 5.25},
191 {"matrix": [5, 6], "x": 5.25, "y": 6},
192 {"matrix": [5, 5], "x": 6.25, "y": 6},
193 {"matrix": [9, 6], "x": 8.25, "y": 6},
194 {"matrix": [8, 5], "x": 9.25, "y": 6},
195 {"matrix": [3, 5], "x": 6.25, "y": 7},
196 {"matrix": [8, 6], "x": 8.25, "y": 7},
197 {"matrix": [3, 6], "x": 4.25, "y": 7, "h": 2},
198 {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
199 {"matrix": [2, 5], "x": 6.25, "y": 8},
200 {"matrix": [6, 6], "x": 8.25, "y": 8},
201 {"matrix": [7, 5], "x": 9.25, "y": 7, "h": 2},
202 {"matrix": [6, 5], "x": 10.25, "y": 7, "h": 2}
203 ]
204 }
205 }
24} 206}
diff --git a/keyboards/kinesis/kint36/kint36.c b/keyboards/kinesis/kint36/kint36.c
index cc32a60262..b3ae9b570c 100644
--- a/keyboards/kinesis/kint36/kint36.c
+++ b/keyboards/kinesis/kint36/kint36.c
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16 16
17#include "kint36.h" 17#include "quantum.h"
18 18
19#define LED_POWER C5 19#define LED_POWER C5
20 20
diff --git a/keyboards/kinesis/kint36/kint36.h b/keyboards/kinesis/kint36/kint36.h
deleted file mode 100644
index d427a1c2d6..0000000000
--- a/keyboards/kinesis/kint36/kint36.h
+++ /dev/null
@@ -1,92 +0,0 @@
1/* Copyright 2020 QMK
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#include "quantum.h"
20
21#define ___ KC_NO
22
23// This a shortcut to help you visually see your layout.
24// The first section contains all of the arguments as on the physical keyboard
25// The second converts the arguments into the 2-D scanned array
26
27#define LAYOUT( \
28 kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2, \
29 k00, k10, k20, k30, k40, k50, \
30 k01, k11, k21, k31, k41, k51, \
31 k02, k12, k22, k32, k42, k52, \
32 k03, k13, k23, k33, k43, k53, \
33 k14, k24, k34, k54, \
34 k56, k55, \
35 k35, \
36 k36, k46, k25, \
37 \
38 kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5, \
39 k60, k70, k80, k90, kA0, kB0, \
40 k61, k71, k81, k91, kA1, kB1, \
41 k62, k72, k82, k92, kA2, kB2, \
42 k63, k73, k83, k93, kA3, kB3, \
43 k64, k84, k94, kA4, \
44 k96, k85, \
45 k86, \
46 k66, k75, k65 \
47) { \
48 { k00, k01, k02, k03, ___, ___, ___ }, \
49 { k10, k11, k12, k13, k14, ___, ___ }, \
50 { k20, k21, k22, k23, k24, k25, ___ }, \
51 { k30, k31, k32, k33, k34, k35, k36 }, \
52 { k40, k41, k42, k43, ___, ___, k46 }, \
53 { k50, k51, k52, k53, k54, k55, k56 }, \
54 { k60, k61, k62, k63, k64, k65, k66 }, \
55 { k70, k71, k72, k73, ___, k75, ___ }, \
56 { k80, k81, k82, k83, k84, k85, k86 }, \
57 { k90, k91, k92, k93, k94, ___, k96 }, \
58 { kA0, kA1, kA2, kA3, kA4, ___, ___ }, \
59 { kB0, kB1, kB2, kB3, ___, ___, ___ }, \
60 { kC0, kC1, kC2, kC3, kC4, kC5, ___ }, \
61 { kD0, kD1, kD2, kD3, kD4, kD5, ___ }, \
62 { kE0, kE1, kE2, kE3, kE4, kE5, ___ }, \
63}
64
65/* ---------------- LEFT HAND ----------------- ---------------- RIGHT HAND ---------------- */
66#define LAYOUT_pretty( \
67 kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2, kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5, \
68 k00, k10, k20, k30, k40, k50, k60, k70, k80, k90, kA0, kB0, \
69 k01, k11, k21, k31, k41, k51, k61, k71, k81, k91, kA1, kB1, \
70 k02, k12, k22, k32, k42, k52, k62, k72, k82, k92, kA2, kB2, \
71 k03, k13, k23, k33, k43, k53, k63, k73, k83, k93, kA3, kB3, \
72 k14, k24, k34, k54, k64, k84, k94, kA4, \
73 k56, k55, k96, k85, \
74 k35, k86, \
75 k36, k46, k25, k66, k75, k65 \
76) { \
77 { k00, k01, k02, k03, ___, ___, ___ }, \
78 { k10, k11, k12, k13, k14, ___, ___ }, \
79 { k20, k21, k22, k23, k24, k25, ___ }, \
80 { k30, k31, k32, k33, k34, k35, k36 }, \
81 { k40, k41, k42, k43, ___, ___, k46 }, \
82 { k50, k51, k52, k53, k54, k55, k56 }, \
83 { k60, k61, k62, k63, k64, k65, k66 }, \
84 { k70, k71, k72, k73, ___, k75, ___ }, \
85 { k80, k81, k82, k83, k84, k85, k86 }, \
86 { k90, k91, k92, k93, k94, ___, k96 }, \
87 { kA0, kA1, kA2, kA3, kA4, ___, ___ }, \
88 { kB0, kB1, kB2, kB3, ___, ___, ___ }, \
89 { kC0, kC1, kC2, kC3, kC4, kC5, ___ }, \
90 { kD0, kD1, kD2, kD3, kD4, kD5, ___ }, \
91 { kE0, kE1, kE2, kE3, kE4, kE5, ___ } \
92}
diff --git a/keyboards/kinesis/kint41/info.json b/keyboards/kinesis/kint41/info.json
index 0e25a46739..0a6424641a 100644
--- a/keyboards/kinesis/kint41/info.json
+++ b/keyboards/kinesis/kint41/info.json
@@ -18,5 +18,187 @@
18 "compose": "LINE_PIN24", 18 "compose": "LINE_PIN24",
19 "on_state": 0 19 "on_state": 0
20 }, 20 },
21 "debounce": 20 21 "debounce": 20,
22 "layouts": {
23 "LAYOUT": {
24 "layout": [
25 {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
26 {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
27 {"matrix": [14, 0], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
28 {"matrix": [12, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
29 {"matrix": [13, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
30 {"matrix": [14, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
31 {"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
32 {"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
33 {"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
34 {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
35 {"matrix": [1, 0], "x": 1.25, "y": 1.25},
36 {"matrix": [2, 0], "x": 2.25, "y": 1},
37 {"matrix": [3, 0], "x": 3.25, "y": 1},
38 {"matrix": [4, 0], "x": 4.25, "y": 1},
39 {"matrix": [5, 0], "x": 5.25, "y": 1},
40 {"matrix": [0, 1], "x": 0, "y": 2.25, "w": 1.25},
41 {"matrix": [1, 1], "x": 1.25, "y": 2.25},
42 {"matrix": [2, 1], "x": 2.25, "y": 2},
43 {"matrix": [3, 1], "x": 3.25, "y": 2},
44 {"matrix": [4, 1], "x": 4.25, "y": 2},
45 {"matrix": [5, 1], "x": 5.25, "y": 2},
46 {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.25},
47 {"matrix": [1, 2], "x": 1.25, "y": 3.25},
48 {"matrix": [2, 2], "x": 2.25, "y": 3},
49 {"matrix": [3, 2], "x": 3.25, "y": 3},
50 {"matrix": [4, 2], "x": 4.25, "y": 3},
51 {"matrix": [5, 2], "x": 5.25, "y": 3},
52 {"matrix": [0, 3], "x": 0, "y": 4.25, "w": 1.25},
53 {"matrix": [1, 3], "x": 1.25, "y": 4.25},
54 {"matrix": [2, 3], "x": 2.25, "y": 4},
55 {"matrix": [3, 3], "x": 3.25, "y": 4},
56 {"matrix": [4, 3], "x": 4.25, "y": 4},
57 {"matrix": [5, 3], "x": 5.25, "y": 4},
58 {"matrix": [1, 4], "x": 1.25, "y": 5.25},
59 {"matrix": [2, 4], "x": 2.25, "y": 5},
60 {"matrix": [3, 4], "x": 3.25, "y": 5},
61 {"matrix": [5, 4], "x": 4.25, "y": 5},
62 {"matrix": [5, 6], "x": 5.25, "y": 6},
63 {"matrix": [5, 5], "x": 6.25, "y": 6},
64 {"matrix": [3, 5], "x": 6.25, "y": 7},
65 {"matrix": [3, 6], "x": 4.25, "y": 7, "h": 2},
66 {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
67 {"matrix": [2, 5], "x": 6.25, "y": 8},
68 {"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
69 {"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
70 {"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
71 {"matrix": [12, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
72 {"matrix": [13, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
73 {"matrix": [14, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
74 {"matrix": [12, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
75 {"matrix": [14, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
76 {"matrix": [13, 5], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
77 {"matrix": [6, 0], "x": 9.25, "y": 1},
78 {"matrix": [7, 0], "x": 10.25, "y": 1},
79 {"matrix": [8, 0], "x": 11.25, "y": 1},
80 {"matrix": [9, 0], "x": 12.25, "y": 1},
81 {"matrix": [10, 0], "x": 13.25, "y": 1.25},
82 {"matrix": [11, 0], "x": 14.25, "y": 1.25, "w": 1.25},
83 {"matrix": [6, 1], "x": 9.25, "y": 2},
84 {"matrix": [7, 1], "x": 10.25, "y": 2},
85 {"matrix": [8, 1], "x": 11.25, "y": 2},
86 {"matrix": [9, 1], "x": 12.25, "y": 2},
87 {"matrix": [10, 1], "x": 13.25, "y": 2.25},
88 {"matrix": [11, 1], "x": 14.25, "y": 2.25, "w": 1.25},
89 {"matrix": [6, 2], "x": 9.25, "y": 3},
90 {"matrix": [7, 2], "x": 10.25, "y": 3},
91 {"matrix": [8, 2], "x": 11.25, "y": 3},
92 {"matrix": [9, 2], "x": 12.25, "y": 3},
93 {"matrix": [10, 2], "x": 13.25, "y": 3.25},
94 {"matrix": [11, 2], "x": 14.25, "y": 3.25, "w": 1.25},
95 {"matrix": [6, 3], "x": 9.25, "y": 4},
96 {"matrix": [7, 3], "x": 10.25, "y": 4},
97 {"matrix": [8, 3], "x": 11.25, "y": 4},
98 {"matrix": [9, 3], "x": 12.25, "y": 4},
99 {"matrix": [10, 3], "x": 13.25, "y": 4.25},
100 {"matrix": [11, 3], "x": 14.25, "y": 4.25, "w": 1.25},
101 {"matrix": [6, 4], "x": 10.25, "y": 5},
102 {"matrix": [8, 4], "x": 11.25, "y": 5},
103 {"matrix": [9, 4], "x": 12.25, "y": 5},
104 {"matrix": [10, 4], "x": 13.25, "y": 5.25},
105 {"matrix": [9, 6], "x": 8.25, "y": 6},
106 {"matrix": [8, 5], "x": 9.25, "y": 6},
107 {"matrix": [8, 6], "x": 8.25, "y": 7},
108 {"matrix": [6, 6], "x": 8.25, "y": 8},
109 {"matrix": [7, 5], "x": 9.25, "y": 7, "h": 2},
110 {"matrix": [6, 5], "x": 10.25, "y": 7, "h": 2}
111 ]
112 },
113 "LAYOUT_pretty": {
114 "layout": [
115 {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
116 {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
117 {"matrix": [14, 0], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
118 {"matrix": [12, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
119 {"matrix": [13, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
120 {"matrix": [14, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
121 {"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
122 {"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
123 {"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
124 {"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
125 {"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
126 {"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
127 {"matrix": [12, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
128 {"matrix": [13, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
129 {"matrix": [14, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
130 {"matrix": [12, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
131 {"matrix": [14, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
132 {"matrix": [13, 5], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
133 {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
134 {"matrix": [1, 0], "x": 1.25, "y": 1.25},
135 {"matrix": [2, 0], "x": 2.25, "y": 1},
136 {"matrix": [3, 0], "x": 3.25, "y": 1},
137 {"matrix": [4, 0], "x": 4.25, "y": 1},
138 {"matrix": [5, 0], "x": 5.25, "y": 1},
139 {"matrix": [6, 0], "x": 9.25, "y": 1},
140 {"matrix": [7, 0], "x": 10.25, "y": 1},
141 {"matrix": [8, 0], "x": 11.25, "y": 1},
142 {"matrix": [9, 0], "x": 12.25, "y": 1},
143 {"matrix": [10, 0], "x": 13.25, "y": 1.25},
144 {"matrix": [11, 0], "x": 14.25, "y": 1.25, "w": 1.25},
145 {"matrix": [0, 1], "x": 0, "y": 2.25, "w": 1.25},
146 {"matrix": [1, 1], "x": 1.25, "y": 2.25},
147 {"matrix": [2, 1], "x": 2.25, "y": 2},
148 {"matrix": [3, 1], "x": 3.25, "y": 2},
149 {"matrix": [4, 1], "x": 4.25, "y": 2},
150 {"matrix": [5, 1], "x": 5.25, "y": 2},
151 {"matrix": [6, 1], "x": 9.25, "y": 2},
152 {"matrix": [7, 1], "x": 10.25, "y": 2},
153 {"matrix": [8, 1], "x": 11.25, "y": 2},
154 {"matrix": [9, 1], "x": 12.25, "y": 2},
155 {"matrix": [10, 1], "x": 13.25, "y": 2.25},
156 {"matrix": [11, 1], "x": 14.25, "y": 2.25, "w": 1.25},
157 {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.25},
158 {"matrix": [1, 2], "x": 1.25, "y": 3.25},
159 {"matrix": [2, 2], "x": 2.25, "y": 3},
160 {"matrix": [3, 2], "x": 3.25, "y": 3},
161 {"matrix": [4, 2], "x": 4.25, "y": 3},
162 {"matrix": [5, 2], "x": 5.25, "y": 3},
163 {"matrix": [6, 2], "x": 9.25, "y": 3},
164 {"matrix": [7, 2], "x": 10.25, "y": 3},
165 {"matrix": [8, 2], "x": 11.25, "y": 3},
166 {"matrix": [9, 2], "x": 12.25, "y": 3},
167 {"matrix": [10, 2], "x": 13.25, "y": 3.25},
168 {"matrix": [11, 2], "x": 14.25, "y": 3.25, "w": 1.25},
169 {"matrix": [0, 3], "x": 0, "y": 4.25, "w": 1.25},
170 {"matrix": [1, 3], "x": 1.25, "y": 4.25},
171 {"matrix": [2, 3], "x": 2.25, "y": 4},
172 {"matrix": [3, 3], "x": 3.25, "y": 4},
173 {"matrix": [4, 3], "x": 4.25, "y": 4},
174 {"matrix": [5, 3], "x": 5.25, "y": 4},
175 {"matrix": [6, 3], "x": 9.25, "y": 4},
176 {"matrix": [7, 3], "x": 10.25, "y": 4},
177 {"matrix": [8, 3], "x": 11.25, "y": 4},
178 {"matrix": [9, 3], "x": 12.25, "y": 4},
179 {"matrix": [10, 3], "x": 13.25, "y": 4.25},
180 {"matrix": [11, 3], "x": 14.25, "y": 4.25, "w": 1.25},
181 {"matrix": [1, 4], "x": 1.25, "y": 5.25},
182 {"matrix": [2, 4], "x": 2.25, "y": 5},
183 {"matrix": [3, 4], "x": 3.25, "y": 5},
184 {"matrix": [5, 4], "x": 4.25, "y": 5},
185 {"matrix": [6, 4], "x": 10.25, "y": 5},
186 {"matrix": [8, 4], "x": 11.25, "y": 5},
187 {"matrix": [9, 4], "x": 12.25, "y": 5},
188 {"matrix": [10, 4], "x": 13.25, "y": 5.25},
189 {"matrix": [5, 6], "x": 5.25, "y": 6},
190 {"matrix": [5, 5], "x": 6.25, "y": 6},
191 {"matrix": [9, 6], "x": 8.25, "y": 6},
192 {"matrix": [8, 5], "x": 9.25, "y": 6},
193 {"matrix": [3, 5], "x": 6.25, "y": 7},
194 {"matrix": [8, 6], "x": 8.25, "y": 7},
195 {"matrix": [3, 6], "x": 4.25, "y": 7, "h": 2},
196 {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
197 {"matrix": [2, 5], "x": 6.25, "y": 8},
198 {"matrix": [6, 6], "x": 8.25, "y": 8},
199 {"matrix": [7, 5], "x": 9.25, "y": 7, "h": 2},
200 {"matrix": [6, 5], "x": 10.25, "y": 7, "h": 2}
201 ]
202 }
203 }
22} 204}
diff --git a/keyboards/kinesis/kint41/kint41.c b/keyboards/kinesis/kint41/kint41.c
index 2538b492de..6d339497ee 100644
--- a/keyboards/kinesis/kint41/kint41.c
+++ b/keyboards/kinesis/kint41/kint41.c
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16 16
17#include "kint41.h" 17#include "quantum.h"
18 18
19#define LED_POWER LINE_PIN13 19#define LED_POWER LINE_PIN13
20 20
diff --git a/keyboards/kinesis/kint41/kint41.h b/keyboards/kinesis/kint41/kint41.h
deleted file mode 100644
index d427a1c2d6..0000000000
--- a/keyboards/kinesis/kint41/kint41.h
+++ /dev/null
@@ -1,92 +0,0 @@
1/* Copyright 2020 QMK
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#include "quantum.h"
20
21#define ___ KC_NO
22
23// This a shortcut to help you visually see your layout.
24// The first section contains all of the arguments as on the physical keyboard
25// The second converts the arguments into the 2-D scanned array
26
27#define LAYOUT( \
28 kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2, \
29 k00, k10, k20, k30, k40, k50, \
30 k01, k11, k21, k31, k41, k51, \
31 k02, k12, k22, k32, k42, k52, \
32 k03, k13, k23, k33, k43, k53, \
33 k14, k24, k34, k54, \
34 k56, k55, \
35 k35, \
36 k36, k46, k25, \
37 \
38 kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5, \
39 k60, k70, k80, k90, kA0, kB0, \
40 k61, k71, k81, k91, kA1, kB1, \
41 k62, k72, k82, k92, kA2, kB2, \
42 k63, k73, k83, k93, kA3, kB3, \
43 k64, k84, k94, kA4, \
44 k96, k85, \
45 k86, \
46 k66, k75, k65 \
47) { \
48 { k00, k01, k02, k03, ___, ___, ___ }, \
49 { k10, k11, k12, k13, k14, ___, ___ }, \
50 { k20, k21, k22, k23, k24, k25, ___ }, \
51 { k30, k31, k32, k33, k34, k35, k36 }, \
52 { k40, k41, k42, k43, ___, ___, k46 }, \
53 { k50, k51, k52, k53, k54, k55, k56 }, \
54 { k60, k61, k62, k63, k64, k65, k66 }, \
55 { k70, k71, k72, k73, ___, k75, ___ }, \
56 { k80, k81, k82, k83, k84, k85, k86 }, \
57 { k90, k91, k92, k93, k94, ___, k96 }, \
58 { kA0, kA1, kA2, kA3, kA4, ___, ___ }, \
59 { kB0, kB1, kB2, kB3, ___, ___, ___ }, \
60 { kC0, kC1, kC2, kC3, kC4, kC5, ___ }, \
61 { kD0, kD1, kD2, kD3, kD4, kD5, ___ }, \
62 { kE0, kE1, kE2, kE3, kE4, kE5, ___ }, \
63}
64
65/* ---------------- LEFT HAND ----------------- ---------------- RIGHT HAND ---------------- */
66#define LAYOUT_pretty( \
67 kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2, kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5, \
68 k00, k10, k20, k30, k40, k50, k60, k70, k80, k90, kA0, kB0, \
69 k01, k11, k21, k31, k41, k51, k61, k71, k81, k91, kA1, kB1, \
70 k02, k12, k22, k32, k42, k52, k62, k72, k82, k92, kA2, kB2, \
71 k03, k13, k23, k33, k43, k53, k63, k73, k83, k93, kA3, kB3, \
72 k14, k24, k34, k54, k64, k84, k94, kA4, \
73 k56, k55, k96, k85, \
74 k35, k86, \
75 k36, k46, k25, k66, k75, k65 \
76) { \
77 { k00, k01, k02, k03, ___, ___, ___ }, \
78 { k10, k11, k12, k13, k14, ___, ___ }, \
79 { k20, k21, k22, k23, k24, k25, ___ }, \
80 { k30, k31, k32, k33, k34, k35, k36 }, \
81 { k40, k41, k42, k43, ___, ___, k46 }, \
82 { k50, k51, k52, k53, k54, k55, k56 }, \
83 { k60, k61, k62, k63, k64, k65, k66 }, \
84 { k70, k71, k72, k73, ___, k75, ___ }, \
85 { k80, k81, k82, k83, k84, k85, k86 }, \
86 { k90, k91, k92, k93, k94, ___, k96 }, \
87 { kA0, kA1, kA2, kA3, kA4, ___, ___ }, \
88 { kB0, kB1, kB2, kB3, ___, ___, ___ }, \
89 { kC0, kC1, kC2, kC3, kC4, kC5, ___ }, \
90 { kD0, kD1, kD2, kD3, kD4, kD5, ___ }, \
91 { kE0, kE1, kE2, kE3, kE4, kE5, ___ } \
92}
diff --git a/keyboards/kinesis/kintlc/info.json b/keyboards/kinesis/kintlc/info.json
index 2bbbd3eb30..6c8938ab35 100644
--- a/keyboards/kinesis/kintlc/info.json
+++ b/keyboards/kinesis/kintlc/info.json
@@ -19,5 +19,187 @@
19 }, 19 },
20 "processor": "MKL26Z64", 20 "processor": "MKL26Z64",
21 "bootloader": "halfkay", 21 "bootloader": "halfkay",
22 "debounce": 20 22 "debounce": 20,
23 "layouts": {
24 "LAYOUT": {
25 "layout": [
26 {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
27 {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
28 {"matrix": [14, 0], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
29 {"matrix": [12, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
30 {"matrix": [13, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
31 {"matrix": [14, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
32 {"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
33 {"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
34 {"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
35 {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
36 {"matrix": [1, 0], "x": 1.25, "y": 1.25},
37 {"matrix": [2, 0], "x": 2.25, "y": 1},
38 {"matrix": [3, 0], "x": 3.25, "y": 1},
39 {"matrix": [4, 0], "x": 4.25, "y": 1},
40 {"matrix": [5, 0], "x": 5.25, "y": 1},
41 {"matrix": [0, 1], "x": 0, "y": 2.25, "w": 1.25},
42 {"matrix": [1, 1], "x": 1.25, "y": 2.25},
43 {"matrix": [2, 1], "x": 2.25, "y": 2},
44 {"matrix": [3, 1], "x": 3.25, "y": 2},
45 {"matrix": [4, 1], "x": 4.25, "y": 2},
46 {"matrix": [5, 1], "x": 5.25, "y": 2},
47 {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.25},
48 {"matrix": [1, 2], "x": 1.25, "y": 3.25},
49 {"matrix": [2, 2], "x": 2.25, "y": 3},
50 {"matrix": [3, 2], "x": 3.25, "y": 3},
51 {"matrix": [4, 2], "x": 4.25, "y": 3},
52 {"matrix": [5, 2], "x": 5.25, "y": 3},
53 {"matrix": [0, 3], "x": 0, "y": 4.25, "w": 1.25},
54 {"matrix": [1, 3], "x": 1.25, "y": 4.25},
55 {"matrix": [2, 3], "x": 2.25, "y": 4},
56 {"matrix": [3, 3], "x": 3.25, "y": 4},
57 {"matrix": [4, 3], "x": 4.25, "y": 4},
58 {"matrix": [5, 3], "x": 5.25, "y": 4},
59 {"matrix": [1, 4], "x": 1.25, "y": 5.25},
60 {"matrix": [2, 4], "x": 2.25, "y": 5},
61 {"matrix": [3, 4], "x": 3.25, "y": 5},
62 {"matrix": [5, 4], "x": 4.25, "y": 5},
63 {"matrix": [5, 6], "x": 5.25, "y": 6},
64 {"matrix": [5, 5], "x": 6.25, "y": 6},
65 {"matrix": [3, 5], "x": 6.25, "y": 7},
66 {"matrix": [3, 6], "x": 4.25, "y": 7, "h": 2},
67 {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
68 {"matrix": [2, 5], "x": 6.25, "y": 8},
69 {"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
70 {"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
71 {"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
72 {"matrix": [12, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
73 {"matrix": [13, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
74 {"matrix": [14, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
75 {"matrix": [12, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
76 {"matrix": [14, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
77 {"matrix": [13, 5], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
78 {"matrix": [6, 0], "x": 9.25, "y": 1},
79 {"matrix": [7, 0], "x": 10.25, "y": 1},
80 {"matrix": [8, 0], "x": 11.25, "y": 1},
81 {"matrix": [9, 0], "x": 12.25, "y": 1},
82 {"matrix": [10, 0], "x": 13.25, "y": 1.25},
83 {"matrix": [11, 0], "x": 14.25, "y": 1.25, "w": 1.25},
84 {"matrix": [6, 1], "x": 9.25, "y": 2},
85 {"matrix": [7, 1], "x": 10.25, "y": 2},
86 {"matrix": [8, 1], "x": 11.25, "y": 2},
87 {"matrix": [9, 1], "x": 12.25, "y": 2},
88 {"matrix": [10, 1], "x": 13.25, "y": 2.25},
89 {"matrix": [11, 1], "x": 14.25, "y": 2.25, "w": 1.25},
90 {"matrix": [6, 2], "x": 9.25, "y": 3},
91 {"matrix": [7, 2], "x": 10.25, "y": 3},
92 {"matrix": [8, 2], "x": 11.25, "y": 3},
93 {"matrix": [9, 2], "x": 12.25, "y": 3},
94 {"matrix": [10, 2], "x": 13.25, "y": 3.25},
95 {"matrix": [11, 2], "x": 14.25, "y": 3.25, "w": 1.25},
96 {"matrix": [6, 3], "x": 9.25, "y": 4},
97 {"matrix": [7, 3], "x": 10.25, "y": 4},
98 {"matrix": [8, 3], "x": 11.25, "y": 4},
99 {"matrix": [9, 3], "x": 12.25, "y": 4},
100 {"matrix": [10, 3], "x": 13.25, "y": 4.25},
101 {"matrix": [11, 3], "x": 14.25, "y": 4.25, "w": 1.25},
102 {"matrix": [6, 4], "x": 10.25, "y": 5},
103 {"matrix": [8, 4], "x": 11.25, "y": 5},
104 {"matrix": [9, 4], "x": 12.25, "y": 5},
105 {"matrix": [10, 4], "x": 13.25, "y": 5.25},
106 {"matrix": [9, 6], "x": 8.25, "y": 6},
107 {"matrix": [8, 5], "x": 9.25, "y": 6},
108 {"matrix": [8, 6], "x": 8.25, "y": 7},
109 {"matrix": [6, 6], "x": 8.25, "y": 8},
110 {"matrix": [7, 5], "x": 9.25, "y": 7, "h": 2},
111 {"matrix": [6, 5], "x": 10.25, "y": 7, "h": 2}
112 ]
113 },
114 "LAYOUT_pretty": {
115 "layout": [
116 {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
117 {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
118 {"matrix": [14, 0], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
119 {"matrix": [12, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
120 {"matrix": [13, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
121 {"matrix": [14, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
122 {"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
123 {"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
124 {"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
125 {"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
126 {"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
127 {"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
128 {"matrix": [12, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
129 {"matrix": [13, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
130 {"matrix": [14, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
131 {"matrix": [12, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
132 {"matrix": [14, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
133 {"matrix": [13, 5], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
134 {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
135 {"matrix": [1, 0], "x": 1.25, "y": 1.25},
136 {"matrix": [2, 0], "x": 2.25, "y": 1},
137 {"matrix": [3, 0], "x": 3.25, "y": 1},
138 {"matrix": [4, 0], "x": 4.25, "y": 1},
139 {"matrix": [5, 0], "x": 5.25, "y": 1},
140 {"matrix": [6, 0], "x": 9.25, "y": 1},
141 {"matrix": [7, 0], "x": 10.25, "y": 1},
142 {"matrix": [8, 0], "x": 11.25, "y": 1},
143 {"matrix": [9, 0], "x": 12.25, "y": 1},
144 {"matrix": [10, 0], "x": 13.25, "y": 1.25},
145 {"matrix": [11, 0], "x": 14.25, "y": 1.25, "w": 1.25},
146 {"matrix": [0, 1], "x": 0, "y": 2.25, "w": 1.25},
147 {"matrix": [1, 1], "x": 1.25, "y": 2.25},
148 {"matrix": [2, 1], "x": 2.25, "y": 2},
149 {"matrix": [3, 1], "x": 3.25, "y": 2},
150 {"matrix": [4, 1], "x": 4.25, "y": 2},
151 {"matrix": [5, 1], "x": 5.25, "y": 2},
152 {"matrix": [6, 1], "x": 9.25, "y": 2},
153 {"matrix": [7, 1], "x": 10.25, "y": 2},
154 {"matrix": [8, 1], "x": 11.25, "y": 2},
155 {"matrix": [9, 1], "x": 12.25, "y": 2},
156 {"matrix": [10, 1], "x": 13.25, "y": 2.25},
157 {"matrix": [11, 1], "x": 14.25, "y": 2.25, "w": 1.25},
158 {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.25},
159 {"matrix": [1, 2], "x": 1.25, "y": 3.25},
160 {"matrix": [2, 2], "x": 2.25, "y": 3},
161 {"matrix": [3, 2], "x": 3.25, "y": 3},
162 {"matrix": [4, 2], "x": 4.25, "y": 3},
163 {"matrix": [5, 2], "x": 5.25, "y": 3},
164 {"matrix": [6, 2], "x": 9.25, "y": 3},
165 {"matrix": [7, 2], "x": 10.25, "y": 3},
166 {"matrix": [8, 2], "x": 11.25, "y": 3},
167 {"matrix": [9, 2], "x": 12.25, "y": 3},
168 {"matrix": [10, 2], "x": 13.25, "y": 3.25},
169 {"matrix": [11, 2], "x": 14.25, "y": 3.25, "w": 1.25},
170 {"matrix": [0, 3], "x": 0, "y": 4.25, "w": 1.25},
171 {"matrix": [1, 3], "x": 1.25, "y": 4.25},
172 {"matrix": [2, 3], "x": 2.25, "y": 4},
173 {"matrix": [3, 3], "x": 3.25, "y": 4},
174 {"matrix": [4, 3], "x": 4.25, "y": 4},
175 {"matrix": [5, 3], "x": 5.25, "y": 4},
176 {"matrix": [6, 3], "x": 9.25, "y": 4},
177 {"matrix": [7, 3], "x": 10.25, "y": 4},
178 {"matrix": [8, 3], "x": 11.25, "y": 4},
179 {"matrix": [9, 3], "x": 12.25, "y": 4},
180 {"matrix": [10, 3], "x": 13.25, "y": 4.25},
181 {"matrix": [11, 3], "x": 14.25, "y": 4.25, "w": 1.25},
182 {"matrix": [1, 4], "x": 1.25, "y": 5.25},
183 {"matrix": [2, 4], "x": 2.25, "y": 5},
184 {"matrix": [3, 4], "x": 3.25, "y": 5},
185 {"matrix": [5, 4], "x": 4.25, "y": 5},
186 {"matrix": [6, 4], "x": 10.25, "y": 5},
187 {"matrix": [8, 4], "x": 11.25, "y": 5},
188 {"matrix": [9, 4], "x": 12.25, "y": 5},
189 {"matrix": [10, 4], "x": 13.25, "y": 5.25},
190 {"matrix": [5, 6], "x": 5.25, "y": 6},
191 {"matrix": [5, 5], "x": 6.25, "y": 6},
192 {"matrix": [9, 6], "x": 8.25, "y": 6},
193 {"matrix": [8, 5], "x": 9.25, "y": 6},
194 {"matrix": [3, 5], "x": 6.25, "y": 7},
195 {"matrix": [8, 6], "x": 8.25, "y": 7},
196 {"matrix": [3, 6], "x": 4.25, "y": 7, "h": 2},
197 {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
198 {"matrix": [2, 5], "x": 6.25, "y": 8},
199 {"matrix": [6, 6], "x": 8.25, "y": 8},
200 {"matrix": [7, 5], "x": 9.25, "y": 7, "h": 2},
201 {"matrix": [6, 5], "x": 10.25, "y": 7, "h": 2}
202 ]
203 }
204 }
23} 205}
diff --git a/keyboards/kinesis/kintlc/kintlc.c b/keyboards/kinesis/kintlc/kintlc.c
index 19b723600a..9623d04fe0 100644
--- a/keyboards/kinesis/kintlc/kintlc.c
+++ b/keyboards/kinesis/kintlc/kintlc.c
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16 16
17#include "kintlc.h" 17#include "quantum.h"
18 18
19#define LED_POWER LINE_PIN13 19#define LED_POWER LINE_PIN13
20 20
diff --git a/keyboards/kinesis/kintlc/kintlc.h b/keyboards/kinesis/kintlc/kintlc.h
deleted file mode 100644
index d427a1c2d6..0000000000
--- a/keyboards/kinesis/kintlc/kintlc.h
+++ /dev/null
@@ -1,92 +0,0 @@
1/* Copyright 2020 QMK
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#include "quantum.h"
20
21#define ___ KC_NO
22
23// This a shortcut to help you visually see your layout.
24// The first section contains all of the arguments as on the physical keyboard
25// The second converts the arguments into the 2-D scanned array
26
27#define LAYOUT( \
28 kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2, \
29 k00, k10, k20, k30, k40, k50, \
30 k01, k11, k21, k31, k41, k51, \
31 k02, k12, k22, k32, k42, k52, \
32 k03, k13, k23, k33, k43, k53, \
33 k14, k24, k34, k54, \
34 k56, k55, \
35 k35, \
36 k36, k46, k25, \
37 \
38 kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5, \
39 k60, k70, k80, k90, kA0, kB0, \
40 k61, k71, k81, k91, kA1, kB1, \
41 k62, k72, k82, k92, kA2, kB2, \
42 k63, k73, k83, k93, kA3, kB3, \
43 k64, k84, k94, kA4, \
44 k96, k85, \
45 k86, \
46 k66, k75, k65 \
47) { \
48 { k00, k01, k02, k03, ___, ___, ___ }, \
49 { k10, k11, k12, k13, k14, ___, ___ }, \
50 { k20, k21, k22, k23, k24, k25, ___ }, \
51 { k30, k31, k32, k33, k34, k35, k36 }, \
52 { k40, k41, k42, k43, ___, ___, k46 }, \
53 { k50, k51, k52, k53, k54, k55, k56 }, \
54 { k60, k61, k62, k63, k64, k65, k66 }, \
55 { k70, k71, k72, k73, ___, k75, ___ }, \
56 { k80, k81, k82, k83, k84, k85, k86 }, \
57 { k90, k91, k92, k93, k94, ___, k96 }, \
58 { kA0, kA1, kA2, kA3, kA4, ___, ___ }, \
59 { kB0, kB1, kB2, kB3, ___, ___, ___ }, \
60 { kC0, kC1, kC2, kC3, kC4, kC5, ___ }, \
61 { kD0, kD1, kD2, kD3, kD4, kD5, ___ }, \
62 { kE0, kE1, kE2, kE3, kE4, kE5, ___ }, \
63}
64
65/* ---------------- LEFT HAND ----------------- ---------------- RIGHT HAND ---------------- */
66#define LAYOUT_pretty( \
67 kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2, kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5, \
68 k00, k10, k20, k30, k40, k50, k60, k70, k80, k90, kA0, kB0, \
69 k01, k11, k21, k31, k41, k51, k61, k71, k81, k91, kA1, kB1, \
70 k02, k12, k22, k32, k42, k52, k62, k72, k82, k92, kA2, kB2, \
71 k03, k13, k23, k33, k43, k53, k63, k73, k83, k93, kA3, kB3, \
72 k14, k24, k34, k54, k64, k84, k94, kA4, \
73 k56, k55, k96, k85, \
74 k35, k86, \
75 k36, k46, k25, k66, k75, k65 \
76) { \
77 { k00, k01, k02, k03, ___, ___, ___ }, \
78 { k10, k11, k12, k13, k14, ___, ___ }, \
79 { k20, k21, k22, k23, k24, k25, ___ }, \
80 { k30, k31, k32, k33, k34, k35, k36 }, \
81 { k40, k41, k42, k43, ___, ___, k46 }, \
82 { k50, k51, k52, k53, k54, k55, k56 }, \
83 { k60, k61, k62, k63, k64, k65, k66 }, \
84 { k70, k71, k72, k73, ___, k75, ___ }, \
85 { k80, k81, k82, k83, k84, k85, k86 }, \
86 { k90, k91, k92, k93, k94, ___, k96 }, \
87 { kA0, kA1, kA2, kA3, kA4, ___, ___ }, \
88 { kB0, kB1, kB2, kB3, ___, ___, ___ }, \
89 { kC0, kC1, kC2, kC3, kC4, kC5, ___ }, \
90 { kD0, kD1, kD2, kD3, kD4, kD5, ___ }, \
91 { kE0, kE1, kE2, kE3, kE4, kE5, ___ } \
92}
diff --git a/keyboards/kinesis/nguyenvietyen/info.json b/keyboards/kinesis/nguyenvietyen/info.json
index 1cbb042b83..803f64025f 100644
--- a/keyboards/kinesis/nguyenvietyen/info.json
+++ b/keyboards/kinesis/nguyenvietyen/info.json
@@ -14,5 +14,187 @@
14 "on_state": 0 14 "on_state": 0
15 }, 15 },
16 "processor": "atmega32u4", 16 "processor": "atmega32u4",
17 "bootloader": "caterina" 17 "bootloader": "caterina",
18 "layouts": {
19 "LAYOUT": {
20 "layout": [
21 {"matrix": [0, 2], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
22 {"matrix": [2, 2], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
23 {"matrix": [1, 2], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
24 {"matrix": [0, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
25 {"matrix": [2, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
26 {"matrix": [1, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
27 {"matrix": [0, 0], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
28 {"matrix": [2, 0], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
29 {"matrix": [1, 0], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
30 {"matrix": [8, 0], "x": 0, "y": 1.25, "w": 1.25},
31 {"matrix": [7, 0], "x": 1.25, "y": 1.25},
32 {"matrix": [6, 0], "x": 2.25, "y": 1},
33 {"matrix": [5, 0], "x": 3.25, "y": 1},
34 {"matrix": [4, 0], "x": 4.25, "y": 1},
35 {"matrix": [3, 0], "x": 5.25, "y": 1},
36 {"matrix": [8, 1], "x": 0, "y": 2.25, "w": 1.25},
37 {"matrix": [7, 1], "x": 1.25, "y": 2.25},
38 {"matrix": [6, 1], "x": 2.25, "y": 2},
39 {"matrix": [5, 1], "x": 3.25, "y": 2},
40 {"matrix": [4, 1], "x": 4.25, "y": 2},
41 {"matrix": [3, 1], "x": 5.25, "y": 2},
42 {"matrix": [8, 2], "x": 0, "y": 3.25, "w": 1.25},
43 {"matrix": [7, 2], "x": 1.25, "y": 3.25},
44 {"matrix": [6, 2], "x": 2.25, "y": 3},
45 {"matrix": [5, 2], "x": 3.25, "y": 3},
46 {"matrix": [4, 2], "x": 4.25, "y": 3},
47 {"matrix": [3, 2], "x": 5.25, "y": 3},
48 {"matrix": [8, 3], "x": 0, "y": 4.25, "w": 1.25},
49 {"matrix": [7, 3], "x": 1.25, "y": 4.25},
50 {"matrix": [6, 3], "x": 2.25, "y": 4},
51 {"matrix": [5, 3], "x": 3.25, "y": 4},
52 {"matrix": [4, 3], "x": 4.25, "y": 4},
53 {"matrix": [3, 3], "x": 5.25, "y": 4},
54 {"matrix": [7, 4], "x": 1.25, "y": 5.25},
55 {"matrix": [6, 4], "x": 2.25, "y": 5},
56 {"matrix": [5, 4], "x": 3.25, "y": 5},
57 {"matrix": [3, 4], "x": 4.25, "y": 5},
58 {"matrix": [3, 6], "x": 5.25, "y": 6},
59 {"matrix": [3, 5], "x": 6.25, "y": 6},
60 {"matrix": [5, 5], "x": 6.25, "y": 7},
61 {"matrix": [5, 6], "x": 4.25, "y": 7, "h": 2},
62 {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
63 {"matrix": [7, 5], "x": 6.25, "y": 8},
64 {"matrix": [0, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
65 {"matrix": [2, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
66 {"matrix": [1, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
67 {"matrix": [0, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
68 {"matrix": [2, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
69 {"matrix": [1, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
70 {"matrix": [0, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
71 {"matrix": [12, 0], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
72 {"matrix": [12, 1], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
73 {"matrix": [9, 4], "x": 9.25, "y": 1},
74 {"matrix": [10, 4], "x": 10.25, "y": 1},
75 {"matrix": [11, 4], "x": 11.25, "y": 1},
76 {"matrix": [13, 4], "x": 12.25, "y": 1},
77 {"matrix": [14, 4], "x": 13.25, "y": 1.25},
78 {"matrix": [15, 4], "x": 14.25, "y": 1.25, "w": 1.25},
79 {"matrix": [9, 5], "x": 9.25, "y": 2},
80 {"matrix": [10, 5], "x": 10.25, "y": 2},
81 {"matrix": [11, 5], "x": 11.25, "y": 2},
82 {"matrix": [13, 5], "x": 12.25, "y": 2},
83 {"matrix": [14, 5], "x": 13.25, "y": 2.25},
84 {"matrix": [15, 5], "x": 14.25, "y": 2.25, "w": 1.25},
85 {"matrix": [9, 6], "x": 9.25, "y": 3},
86 {"matrix": [10, 6], "x": 10.25, "y": 3},
87 {"matrix": [11, 6], "x": 11.25, "y": 3},
88 {"matrix": [13, 6], "x": 12.25, "y": 3},
89 {"matrix": [14, 6], "x": 13.25, "y": 3.25},
90 {"matrix": [15, 6], "x": 14.25, "y": 3.25, "w": 1.25},
91 {"matrix": [9, 7], "x": 9.25, "y": 4},
92 {"matrix": [10, 7], "x": 10.25, "y": 4},
93 {"matrix": [11, 7], "x": 11.25, "y": 4},
94 {"matrix": [13, 7], "x": 12.25, "y": 4},
95 {"matrix": [14, 7], "x": 13.25, "y": 4.25},
96 {"matrix": [15, 7], "x": 14.25, "y": 4.25, "w": 1.25},
97 {"matrix": [9, 3], "x": 10.25, "y": 5},
98 {"matrix": [11, 3], "x": 11.25, "y": 5},
99 {"matrix": [13, 3], "x": 12.25, "y": 5},
100 {"matrix": [14, 3], "x": 13.25, "y": 5.25},
101 {"matrix": [4, 7], "x": 8.25, "y": 6},
102 {"matrix": [6, 6], "x": 9.25, "y": 6},
103 {"matrix": [6, 7], "x": 8.25, "y": 7},
104 {"matrix": [8, 7], "x": 8.25, "y": 8},
105 {"matrix": [7, 6], "x": 9.25, "y": 7, "h": 2},
106 {"matrix": [8, 6], "x": 10.25, "y": 7, "h": 2}
107 ]
108 },
109 "LAYOUT_pretty": {
110 "layout": [
111 {"matrix": [0, 2], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
112 {"matrix": [2, 2], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
113 {"matrix": [1, 2], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
114 {"matrix": [0, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
115 {"matrix": [2, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
116 {"matrix": [1, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
117 {"matrix": [0, 0], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
118 {"matrix": [2, 0], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
119 {"matrix": [1, 0], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
120 {"matrix": [0, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
121 {"matrix": [2, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
122 {"matrix": [1, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
123 {"matrix": [0, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
124 {"matrix": [2, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
125 {"matrix": [1, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
126 {"matrix": [0, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
127 {"matrix": [12, 0], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
128 {"matrix": [12, 1], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
129 {"matrix": [8, 0], "x": 0, "y": 1.25, "w": 1.25},
130 {"matrix": [7, 0], "x": 1.25, "y": 1.25},
131 {"matrix": [6, 0], "x": 2.25, "y": 1},
132 {"matrix": [5, 0], "x": 3.25, "y": 1},
133 {"matrix": [4, 0], "x": 4.25, "y": 1},
134 {"matrix": [3, 0], "x": 5.25, "y": 1},
135 {"matrix": [9, 4], "x": 9.25, "y": 1},
136 {"matrix": [10, 4], "x": 10.25, "y": 1},
137 {"matrix": [11, 4], "x": 11.25, "y": 1},
138 {"matrix": [13, 4], "x": 12.25, "y": 1},
139 {"matrix": [14, 4], "x": 13.25, "y": 1.25},
140 {"matrix": [15, 4], "x": 14.25, "y": 1.25, "w": 1.25},
141 {"matrix": [8, 1], "x": 0, "y": 2.25, "w": 1.25},
142 {"matrix": [7, 1], "x": 1.25, "y": 2.25},
143 {"matrix": [6, 1], "x": 2.25, "y": 2},
144 {"matrix": [5, 1], "x": 3.25, "y": 2},
145 {"matrix": [4, 1], "x": 4.25, "y": 2},
146 {"matrix": [3, 1], "x": 5.25, "y": 2},
147 {"matrix": [9, 5], "x": 9.25, "y": 2},
148 {"matrix": [10, 5], "x": 10.25, "y": 2},
149 {"matrix": [11, 5], "x": 11.25, "y": 2},
150 {"matrix": [13, 5], "x": 12.25, "y": 2},
151 {"matrix": [14, 5], "x": 13.25, "y": 2.25},
152 {"matrix": [15, 5], "x": 14.25, "y": 2.25, "w": 1.25},
153 {"matrix": [8, 2], "x": 0, "y": 3.25, "w": 1.25},
154 {"matrix": [7, 2], "x": 1.25, "y": 3.25},
155 {"matrix": [6, 2], "x": 2.25, "y": 3},
156 {"matrix": [5, 2], "x": 3.25, "y": 3},
157 {"matrix": [4, 2], "x": 4.25, "y": 3},
158 {"matrix": [3, 2], "x": 5.25, "y": 3},
159 {"matrix": [9, 6], "x": 9.25, "y": 3},
160 {"matrix": [10, 6], "x": 10.25, "y": 3},
161 {"matrix": [11, 6], "x": 11.25, "y": 3},
162 {"matrix": [13, 6], "x": 12.25, "y": 3},
163 {"matrix": [14, 6], "x": 13.25, "y": 3.25},
164 {"matrix": [15, 6], "x": 14.25, "y": 3.25, "w": 1.25},
165 {"matrix": [8, 3], "x": 0, "y": 4.25, "w": 1.25},
166 {"matrix": [7, 3], "x": 1.25, "y": 4.25},
167 {"matrix": [6, 3], "x": 2.25, "y": 4},
168 {"matrix": [5, 3], "x": 3.25, "y": 4},
169 {"matrix": [4, 3], "x": 4.25, "y": 4},
170 {"matrix": [3, 3], "x": 5.25, "y": 4},
171 {"matrix": [9, 7], "x": 9.25, "y": 4},
172 {"matrix": [10, 7], "x": 10.25, "y": 4},
173 {"matrix": [11, 7], "x": 11.25, "y": 4},
174 {"matrix": [13, 7], "x": 12.25, "y": 4},
175 {"matrix": [14, 7], "x": 13.25, "y": 4.25},
176 {"matrix": [15, 7], "x": 14.25, "y": 4.25, "w": 1.25},
177 {"matrix": [7, 4], "x": 1.25, "y": 5.25},
178 {"matrix": [6, 4], "x": 2.25, "y": 5},
179 {"matrix": [5, 4], "x": 3.25, "y": 5},
180 {"matrix": [3, 4], "x": 4.25, "y": 5},
181 {"matrix": [9, 3], "x": 10.25, "y": 5},
182 {"matrix": [11, 3], "x": 11.25, "y": 5},
183 {"matrix": [13, 3], "x": 12.25, "y": 5},
184 {"matrix": [14, 3], "x": 13.25, "y": 5.25},
185 {"matrix": [3, 6], "x": 5.25, "y": 6},
186 {"matrix": [3, 5], "x": 6.25, "y": 6},
187 {"matrix": [4, 7], "x": 8.25, "y": 6},
188 {"matrix": [6, 6], "x": 9.25, "y": 6},
189 {"matrix": [5, 5], "x": 6.25, "y": 7},
190 {"matrix": [6, 7], "x": 8.25, "y": 7},
191 {"matrix": [5, 6], "x": 4.25, "y": 7, "h": 2},
192 {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
193 {"matrix": [7, 5], "x": 6.25, "y": 8},
194 {"matrix": [8, 7], "x": 8.25, "y": 8},
195 {"matrix": [7, 6], "x": 9.25, "y": 7, "h": 2},
196 {"matrix": [8, 6], "x": 10.25, "y": 7, "h": 2}
197 ]
198 }
199 }
18} 200}
diff --git a/keyboards/kinesis/nguyenvietyen/nguyenvietyen.h b/keyboards/kinesis/nguyenvietyen/nguyenvietyen.h
deleted file mode 100644
index 2aabcad1b8..0000000000
--- a/keyboards/kinesis/nguyenvietyen/nguyenvietyen.h
+++ /dev/null
@@ -1,74 +0,0 @@
1#pragma once
2
3#include "quantum.h"
4
5#define ___ KC_NO
6
7#define LAYOUT( \
8 k02, k22, k12, k01, k21, k11, k00, k20, k10, \
9 k80, k70, k60, k50, k40, k30, \
10 k81, k71, k61, k51, k41, k31, \
11 k82, k72, k62, k52, k42, k32, \
12 k83, k73, k63, k53, k43, k33, \
13 k74, k64, k54, k34, \
14 k36, k35, \
15 k55, \
16 k56, k46, k75, \
17 \
18 k03, k23, k13, k04, k24, k14, k05, kC0, kC1, \
19 k94, kA4, kB4, kD4, kE4, kF4, \
20 k95, kA5, kB5, kD5, kE5, kF5, \
21 k96, kA6, kB6, kD6, kE6, kF6, \
22 k97, kA7, kB7, kD7, kE7, kF7, \
23 k93, kB3, kD3, kE3, \
24 k47, k66, \
25 k67, \
26 k87, k76, k86 \
27) { \
28 { k00, k01, k02, k03, k04, k05, ___, ___ }, \
29 { k10, k11, k12, k13, k14, ___, ___, ___ }, \
30 { k20, k21, k22, k23, k24, ___, ___, ___ }, \
31 { k30, k31, k32, k33, k34, k35, k36, ___ }, \
32 { k40, k41, k42, k43, ___, ___, k46, k47 }, \
33 { k50, k51, k52, k53, k54, k55, k56, ___ }, \
34 { k60, k61, k62, k63, k64, ___, k66, k67 }, \
35 { k70, k71, k72, k73, k74, k75, k76, ___ }, \
36 { k80, k81, k82, k83, ___, ___, k86, k87 }, \
37 { ___, ___, ___, k93, k94, k95, k96, k97 }, \
38 { ___, ___, ___, ___, kA4, kA5, kA6, kA7 }, \
39 { ___, ___, ___, kB3, kB4, kB5, kB6, kB7 }, \
40 { kC0, kC1, ___, ___, ___, ___, ___, ___ }, \
41 { ___, ___, ___, kD3, kD4, kD5, kD6, kD7 }, \
42 { ___, ___, ___, kE3, kE4, kE5, kE6, kE7 }, \
43 { ___, ___, ___, ___, kF4, kF5, kF6, kF7 } \
44}
45
46/* ---------------- LEFT HAND ----------------- ---------------- RIGHT HAND ---------------- */
47#define LAYOUT_pretty( \
48 k02, k22, k12, k01, k21, k11, k00, k20, k10, k03, k23, k13, k04, k24, k14, k05, kC0, kC1, \
49 k80, k70, k60, k50, k40, k30, k94, kA4, kB4, kD4, kE4, kF4, \
50 k81, k71, k61, k51, k41, k31, k95, kA5, kB5, kD5, kE5, kF5, \
51 k82, k72, k62, k52, k42, k32, k96, kA6, kB6, kD6, kE6, kF6, \
52 k83, k73, k63, k53, k43, k33, k97, kA7, kB7, kD7, kE7, kF7, \
53 k74, k64, k54, k34, k93, kB3, kD3, kE3, \
54 k36, k35, k47, k66, \
55 k55, k67, \
56 k56, k46, k75, k87, k76, k86 \
57) { \
58 { k00, k01, k02, k03, k04, k05, ___, ___ }, \
59 { k10, k11, k12, k13, k14, ___, ___, ___ }, \
60 { k20, k21, k22, k23, k24, ___, ___, ___ }, \
61 { k30, k31, k32, k33, k34, k35, k36, ___ }, \
62 { k40, k41, k42, k43, ___, ___, k46, k47 }, \
63 { k50, k51, k52, k53, k54, k55, k56, ___ }, \
64 { k60, k61, k62, k63, k64, ___, k66, k67 }, \
65 { k70, k71, k72, k73, k74, k75, k76, ___ }, \
66 { k80, k81, k82, k83, ___, ___, k86, k87 }, \
67 { ___, ___, ___, k93, k94, k95, k96, k97 }, \
68 { ___, ___, ___, ___, kA4, kA5, kA6, kA7 }, \
69 { ___, ___, ___, kB3, kB4, kB5, kB6, kB7 }, \
70 { kC0, kC1, ___, ___, ___, ___, ___, ___ }, \
71 { ___, ___, ___, kD3, kD4, kD5, kD6, kD7 }, \
72 { ___, ___, ___, kE3, kE4, kE5, kE6, kE7 }, \
73 { ___, ___, ___, ___, kF4, kF5, kF6, kF7 } \
74}
diff --git a/keyboards/kinesis/stapelberg/info.json b/keyboards/kinesis/stapelberg/info.json
index 0224dd6393..4435edf4cc 100644
--- a/keyboards/kinesis/stapelberg/info.json
+++ b/keyboards/kinesis/stapelberg/info.json
@@ -19,5 +19,187 @@
19 "on_state": 0 19 "on_state": 0
20 }, 20 },
21 "processor": "at90usb1286", 21 "processor": "at90usb1286",
22 "bootloader": "halfkay" 22 "bootloader": "halfkay",
23 "layouts": {
24 "LAYOUT": {
25 "layout": [
26 {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
27 {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
28 {"matrix": [14, 0], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
29 {"matrix": [12, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
30 {"matrix": [13, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
31 {"matrix": [14, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
32 {"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
33 {"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
34 {"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
35 {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
36 {"matrix": [1, 0], "x": 1.25, "y": 1.25},
37 {"matrix": [2, 0], "x": 2.25, "y": 1},
38 {"matrix": [3, 0], "x": 3.25, "y": 1},
39 {"matrix": [4, 0], "x": 4.25, "y": 1},
40 {"matrix": [5, 0], "x": 5.25, "y": 1},
41 {"matrix": [0, 1], "x": 0, "y": 2.25, "w": 1.25},
42 {"matrix": [1, 1], "x": 1.25, "y": 2.25},
43 {"matrix": [2, 1], "x": 2.25, "y": 2},
44 {"matrix": [3, 1], "x": 3.25, "y": 2},
45 {"matrix": [4, 1], "x": 4.25, "y": 2},
46 {"matrix": [5, 1], "x": 5.25, "y": 2},
47 {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.25},
48 {"matrix": [1, 2], "x": 1.25, "y": 3.25},
49 {"matrix": [2, 2], "x": 2.25, "y": 3},
50 {"matrix": [3, 2], "x": 3.25, "y": 3},
51 {"matrix": [4, 2], "x": 4.25, "y": 3},
52 {"matrix": [5, 2], "x": 5.25, "y": 3},
53 {"matrix": [0, 3], "x": 0, "y": 4.25, "w": 1.25},
54 {"matrix": [1, 3], "x": 1.25, "y": 4.25},
55 {"matrix": [2, 3], "x": 2.25, "y": 4},
56 {"matrix": [3, 3], "x": 3.25, "y": 4},
57 {"matrix": [4, 3], "x": 4.25, "y": 4},
58 {"matrix": [5, 3], "x": 5.25, "y": 4},
59 {"matrix": [1, 4], "x": 1.25, "y": 5.25},
60 {"matrix": [2, 4], "x": 2.25, "y": 5},
61 {"matrix": [3, 4], "x": 3.25, "y": 5},
62 {"matrix": [5, 4], "x": 4.25, "y": 5},
63 {"matrix": [5, 6], "x": 5.25, "y": 6},
64 {"matrix": [5, 5], "x": 6.25, "y": 6},
65 {"matrix": [3, 5], "x": 6.25, "y": 7},
66 {"matrix": [3, 6], "x": 4.25, "y": 7, "h": 2},
67 {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
68 {"matrix": [2, 5], "x": 6.25, "y": 8},
69 {"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
70 {"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
71 {"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
72 {"matrix": [12, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
73 {"matrix": [13, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
74 {"matrix": [14, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
75 {"matrix": [12, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
76 {"matrix": [14, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
77 {"matrix": [13, 5], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
78 {"matrix": [6, 0], "x": 9.25, "y": 1},
79 {"matrix": [7, 0], "x": 10.25, "y": 1},
80 {"matrix": [8, 0], "x": 11.25, "y": 1},
81 {"matrix": [9, 0], "x": 12.25, "y": 1},
82 {"matrix": [10, 0], "x": 13.25, "y": 1.25},
83 {"matrix": [11, 0], "x": 14.25, "y": 1.25, "w": 1.25},
84 {"matrix": [6, 1], "x": 9.25, "y": 2},
85 {"matrix": [7, 1], "x": 10.25, "y": 2},
86 {"matrix": [8, 1], "x": 11.25, "y": 2},
87 {"matrix": [9, 1], "x": 12.25, "y": 2},
88 {"matrix": [10, 1], "x": 13.25, "y": 2.25},
89 {"matrix": [11, 1], "x": 14.25, "y": 2.25, "w": 1.25},
90 {"matrix": [6, 2], "x": 9.25, "y": 3},
91 {"matrix": [7, 2], "x": 10.25, "y": 3},
92 {"matrix": [8, 2], "x": 11.25, "y": 3},
93 {"matrix": [9, 2], "x": 12.25, "y": 3},
94 {"matrix": [10, 2], "x": 13.25, "y": 3.25},
95 {"matrix": [11, 2], "x": 14.25, "y": 3.25, "w": 1.25},
96 {"matrix": [6, 3], "x": 9.25, "y": 4},
97 {"matrix": [7, 3], "x": 10.25, "y": 4},
98 {"matrix": [8, 3], "x": 11.25, "y": 4},
99 {"matrix": [9, 3], "x": 12.25, "y": 4},
100 {"matrix": [10, 3], "x": 13.25, "y": 4.25},
101 {"matrix": [11, 3], "x": 14.25, "y": 4.25, "w": 1.25},
102 {"matrix": [6, 4], "x": 10.25, "y": 5},
103 {"matrix": [8, 4], "x": 11.25, "y": 5},
104 {"matrix": [9, 4], "x": 12.25, "y": 5},
105 {"matrix": [10, 4], "x": 13.25, "y": 5.25},
106 {"matrix": [9, 6], "x": 8.25, "y": 6},
107 {"matrix": [8, 5], "x": 9.25, "y": 6},
108 {"matrix": [8, 6], "x": 8.25, "y": 7},
109 {"matrix": [6, 6], "x": 8.25, "y": 8},
110 {"matrix": [7, 5], "x": 9.25, "y": 7, "h": 2},
111 {"matrix": [6, 5], "x": 10.25, "y": 7, "h": 2}
112 ]
113 },
114 "LAYOUT_pretty": {
115 "layout": [
116 {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
117 {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
118 {"matrix": [14, 0], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
119 {"matrix": [12, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
120 {"matrix": [13, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
121 {"matrix": [14, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
122 {"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
123 {"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
124 {"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
125 {"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
126 {"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
127 {"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
128 {"matrix": [12, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
129 {"matrix": [13, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
130 {"matrix": [14, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
131 {"matrix": [12, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
132 {"matrix": [14, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
133 {"matrix": [13, 5], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
134 {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
135 {"matrix": [1, 0], "x": 1.25, "y": 1.25},
136 {"matrix": [2, 0], "x": 2.25, "y": 1},
137 {"matrix": [3, 0], "x": 3.25, "y": 1},
138 {"matrix": [4, 0], "x": 4.25, "y": 1},
139 {"matrix": [5, 0], "x": 5.25, "y": 1},
140 {"matrix": [6, 0], "x": 9.25, "y": 1},
141 {"matrix": [7, 0], "x": 10.25, "y": 1},
142 {"matrix": [8, 0], "x": 11.25, "y": 1},
143 {"matrix": [9, 0], "x": 12.25, "y": 1},
144 {"matrix": [10, 0], "x": 13.25, "y": 1.25},
145 {"matrix": [11, 0], "x": 14.25, "y": 1.25, "w": 1.25},
146 {"matrix": [0, 1], "x": 0, "y": 2.25, "w": 1.25},
147 {"matrix": [1, 1], "x": 1.25, "y": 2.25},
148 {"matrix": [2, 1], "x": 2.25, "y": 2},
149 {"matrix": [3, 1], "x": 3.25, "y": 2},
150 {"matrix": [4, 1], "x": 4.25, "y": 2},
151 {"matrix": [5, 1], "x": 5.25, "y": 2},
152 {"matrix": [6, 1], "x": 9.25, "y": 2},
153 {"matrix": [7, 1], "x": 10.25, "y": 2},
154 {"matrix": [8, 1], "x": 11.25, "y": 2},
155 {"matrix": [9, 1], "x": 12.25, "y": 2},
156 {"matrix": [10, 1], "x": 13.25, "y": 2.25},
157 {"matrix": [11, 1], "x": 14.25, "y": 2.25, "w": 1.25},
158 {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.25},
159 {"matrix": [1, 2], "x": 1.25, "y": 3.25},
160 {"matrix": [2, 2], "x": 2.25, "y": 3},
161 {"matrix": [3, 2], "x": 3.25, "y": 3},
162 {"matrix": [4, 2], "x": 4.25, "y": 3},
163 {"matrix": [5, 2], "x": 5.25, "y": 3},
164 {"matrix": [6, 2], "x": 9.25, "y": 3},
165 {"matrix": [7, 2], "x": 10.25, "y": 3},
166 {"matrix": [8, 2], "x": 11.25, "y": 3},
167 {"matrix": [9, 2], "x": 12.25, "y": 3},
168 {"matrix": [10, 2], "x": 13.25, "y": 3.25},
169 {"matrix": [11, 2], "x": 14.25, "y": 3.25, "w": 1.25},
170 {"matrix": [0, 3], "x": 0, "y": 4.25, "w": 1.25},
171 {"matrix": [1, 3], "x": 1.25, "y": 4.25},
172 {"matrix": [2, 3], "x": 2.25, "y": 4},
173 {"matrix": [3, 3], "x": 3.25, "y": 4},
174 {"matrix": [4, 3], "x": 4.25, "y": 4},
175 {"matrix": [5, 3], "x": 5.25, "y": 4},
176 {"matrix": [6, 3], "x": 9.25, "y": 4},
177 {"matrix": [7, 3], "x": 10.25, "y": 4},
178 {"matrix": [8, 3], "x": 11.25, "y": 4},
179 {"matrix": [9, 3], "x": 12.25, "y": 4},
180 {"matrix": [10, 3], "x": 13.25, "y": 4.25},
181 {"matrix": [11, 3], "x": 14.25, "y": 4.25, "w": 1.25},
182 {"matrix": [1, 4], "x": 1.25, "y": 5.25},
183 {"matrix": [2, 4], "x": 2.25, "y": 5},
184 {"matrix": [3, 4], "x": 3.25, "y": 5},
185 {"matrix": [5, 4], "x": 4.25, "y": 5},
186 {"matrix": [6, 4], "x": 10.25, "y": 5},
187 {"matrix": [8, 4], "x": 11.25, "y": 5},
188 {"matrix": [9, 4], "x": 12.25, "y": 5},
189 {"matrix": [10, 4], "x": 13.25, "y": 5.25},
190 {"matrix": [5, 6], "x": 5.25, "y": 6},
191 {"matrix": [5, 5], "x": 6.25, "y": 6},
192 {"matrix": [9, 6], "x": 8.25, "y": 6},
193 {"matrix": [8, 5], "x": 9.25, "y": 6},
194 {"matrix": [3, 5], "x": 6.25, "y": 7},
195 {"matrix": [8, 6], "x": 8.25, "y": 7},
196 {"matrix": [3, 6], "x": 4.25, "y": 7, "h": 2},
197 {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
198 {"matrix": [2, 5], "x": 6.25, "y": 8},
199 {"matrix": [6, 6], "x": 8.25, "y": 8},
200 {"matrix": [7, 5], "x": 9.25, "y": 7, "h": 2},
201 {"matrix": [6, 5], "x": 10.25, "y": 7, "h": 2}
202 ]
203 }
204 }
23} 205}
diff --git a/keyboards/kinesis/stapelberg/stapelberg.h b/keyboards/kinesis/stapelberg/stapelberg.h
deleted file mode 100644
index f478c493fd..0000000000
--- a/keyboards/kinesis/stapelberg/stapelberg.h
+++ /dev/null
@@ -1,98 +0,0 @@
1#pragma once
2
3#include "quantum.h"
4
5#define ___ KC_NO
6
7// This a shortcut to help you visually see your layout.
8// The first section contains all of the arguments as on the physical keyboard
9// The second converts the arguments into the 2-D scanned array
10
11#define LAYOUT( \
12 kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2, \
13 k00, k10, k20, k30, k40, k50, \
14 k01, k11, k21, k31, k41, k51, \
15 k02, k12, k22, k32, k42, k52, \
16 k03, k13, k23, k33, k43, k53, \
17 k14, k24, k34, k54, \
18 k56, k55, \
19 k35, \
20 k36, k46, k25, \
21\
22 kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5, \
23 k60, k70, k80, k90, kA0, kB0, \
24 k61, k71, k81, k91, kA1, kB1, \
25 k62, k72, k82, k92, kA2, kB2, \
26 k63, k73, k83, k93, kA3, kB3, \
27 k64, k84, k94, kA4, \
28 k96, k85, \
29 k86, \
30 k66, k75, k65 \
31) { \
32 { k00, k01, k02, k03, ___, ___, ___ }, \
33 { k10, k11, k12, k13, k14, ___, ___ }, \
34 { k20, k21, k22, k23, k24, k25, ___ }, \
35 { k30, k31, k32, k33, k34, k35, k36 }, \
36 { k40, k41, k42, k43, ___, ___, k46 }, \
37 { k50, k51, k52, k53, k54, k55, k56 }, \
38 { k60, k61, k62, k63, k64, k65, k66 }, \
39 { k70, k71, k72, k73, ___, k75, ___ }, \
40 { k80, k81, k82, k83, k84, k85, k86 }, \
41 { k90, k91, k92, k93, k94, ___, k96 }, \
42 { kA0, kA1, kA2, kA3, kA4, ___, ___ }, \
43 { kB0, kB1, kB2, kB3, ___, ___, ___ }, \
44 { kC0, kC1, kC2, kC3, kC4, kC5, ___ }, \
45 { kD0, kD1, kD2, kD3, kD4, kD5, ___ }, \
46 { kE0, kE1, kE2, kE3, kE4, kE5, ___ } \
47}
48
49#define LAYOUT_pretty( \
50 kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2, kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5, \
51 k00, k10, k20, k30, k40, k50, k60, k70, k80, k90, kA0, kB0, \
52 k01, k11, k21, k31, k41, k51, k61, k71, k81, k91, kA1, kB1, \
53 k02, k12, k22, k32, k42, k52, k62, k72, k82, k92, kA2, kB2, \
54 k03, k13, k23, k33, k43, k53, k63, k73, k83, k93, kA3, kB3, \
55 k14, k24, k34, k54, k64, k84, k94, kA4, \
56 k56, k55, k96, k85, \
57 k35, k86, \
58 k36, k46, k25, k66, k75, k65 \
59) { \
60 { k00, k01, k02, k03, ___, ___, ___ }, \
61 { k10, k11, k12, k13, k14, ___, ___ }, \
62 { k20, k21, k22, k23, k24, k25, ___ }, \
63 { k30, k31, k32, k33, k34, k35, k36 }, \
64 { k40, k41, k42, k43, ___, ___, k46 }, \
65 { k50, k51, k52, k53, k54, k55, k56 }, \
66 { k60, k61, k62, k63, k64, k65, k66 }, \
67 { k70, k71, k72, k73, ___, k75, ___ }, \
68 { k80, k81, k82, k83, k84, k85, k86 }, \
69 { k90, k91, k92, k93, k94, ___, k96 }, \
70 { kA0, kA1, kA2, kA3, kA4, ___, ___ }, \
71 { kB0, kB1, kB2, kB3, ___, ___, ___ }, \
72 { kC0, kC1, kC2, kC3, kC4, kC5, ___ }, \
73 { kD0, kD1, kD2, kD3, kD4, kD5, ___ }, \
74 { kE0, kE1, kE2, kE3, kE4, kE5, ___ } \
75}
76
77/*
78This is the Stapelberg matrix as published at
79https://github.com/stapelberg/kinesis-firmware/blob/master/kb_kinesis/config.kspec
80Along with the pins for each row and column
81 PB0 PB1 PB2 PB3 PB4 PB5 PB6
82 kx0 kx1 kx2 kx3 kx4 kx5 kx6
83PD0 k0x Row: EQL TAB CAP LSH X2 -- --
84PD1 k1x Row: 1 Q A Z BQ -- --
85PD2 k2x Row: 2 W S X INS END --
86PD3 k3x Row: 3 E D C LFT HOM BAK
87PD4 k4x Row: 4 R F V -- -- DEL
88PD5 k5x Row: 5 T G B RT LAL LCT
89PD6 k6x Row: 6 Y H N UP SPC PGD
90PD7 k7x Row: 7 U J M -- RET --
91PC0 k8x Row: 8 I K COM DWN RCT PGU
92PC1 k9x Row: 9 O L PER LBR -- RAL
93PC2 kAx Row: 0 P SEM SLA RBR -- --
94PC3 kBx Row: MIN BSL APO RSH X1 -- --
95PC4 kCx Row: ESC F3 F6 F9 F12 PAU --
96PC5 kDx Row: F1 F4 F7 F10 PRT PRG --
97PC6 kEx Row: F2 F5 F8 F11 SLK KEY --
98*/
diff --git a/keyboards/ktec/daisy/daisy.h b/keyboards/ktec/daisy/daisy.h
deleted file mode 100644
index b78c604649..0000000000
--- a/keyboards/ktec/daisy/daisy.h
+++ /dev/null
@@ -1,51 +0,0 @@
1/* Copyright 2020
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#include "quantum.h"
20
21/* This is a shortcut to help you visually see your layout.
22 *
23 * The first section contains all of the arguments representing the physical
24 * layout of the board and position of the keys.
25 *
26 * The second converts the arguments into a two-dimensional array which
27 * represents the switch matrix.
28 */
29#define LAYOUT( \
30 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K3A, \
31 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
32 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
33 K30, K31, K32, K34, K35, K37, K38, K39 \
34) { \
35 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A }, \
36 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A }, \
37 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A }, \
38 { K30, K31, K32, KC_NO, K34, K35, KC_NO, K37, K38, K39, K3A } \
39}
40
41#define LAYOUT_625_space( \
42 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K3A, \
43 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
44 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
45 K30, K31, K32, K35, K38, K39 \
46) { \
47 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A }, \
48 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A }, \
49 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A }, \
50 { K30, K31, K32, KC_NO, KC_NO, K35, KC_NO, KC_NO, K38, K39, K3A } \
51}
diff --git a/keyboards/ktec/daisy/info.json b/keyboards/ktec/daisy/info.json
index db1711eacb..ddd45dae05 100644
--- a/keyboards/ktec/daisy/info.json
+++ b/keyboards/ktec/daisy/info.json
@@ -29,98 +29,98 @@
29 "layouts": { 29 "layouts": {
30 "LAYOUT": { 30 "LAYOUT": {
31 "layout": [ 31 "layout": [
32 {"x": 0, "y": 0}, 32 {"matrix": [0, 0], "x": 0, "y": 0},
33 {"x": 1, "y": 0}, 33 {"matrix": [0, 1], "x": 1, "y": 0},
34 {"x": 2, "y": 0}, 34 {"matrix": [0, 2], "x": 2, "y": 0},
35 {"x": 3, "y": 0}, 35 {"matrix": [0, 3], "x": 3, "y": 0},
36 {"x": 4, "y": 0}, 36 {"matrix": [0, 4], "x": 4, "y": 0},
37 {"x": 5, "y": 0}, 37 {"matrix": [0, 5], "x": 5, "y": 0},
38 {"x": 6, "y": 0}, 38 {"matrix": [0, 6], "x": 6, "y": 0},
39 {"x": 7, "y": 0}, 39 {"matrix": [0, 7], "x": 7, "y": 0},
40 {"x": 8, "y": 0}, 40 {"matrix": [0, 8], "x": 8, "y": 0},
41 {"x": 9, "y": 0}, 41 {"matrix": [0, 9], "x": 9, "y": 0},
42 {"x": 10, "y": 0}, 42 {"matrix": [0, 10], "x": 10, "y": 0},
43 {"x": 11, "y": 0}, 43 {"matrix": [3, 10], "x": 11, "y": 0},
44 44
45 {"x": 0, "y": 1, "w": 1.25}, 45 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
46 {"x": 1.25, "y": 1}, 46 {"matrix": [1, 1], "x": 1.25, "y": 1},
47 {"x": 2.25, "y": 1}, 47 {"matrix": [1, 2], "x": 2.25, "y": 1},
48 {"x": 3.25, "y": 1}, 48 {"matrix": [1, 3], "x": 3.25, "y": 1},
49 {"x": 4.25, "y": 1}, 49 {"matrix": [1, 4], "x": 4.25, "y": 1},
50 {"x": 5.25, "y": 1}, 50 {"matrix": [1, 5], "x": 5.25, "y": 1},
51 {"x": 6.25, "y": 1}, 51 {"matrix": [1, 6], "x": 6.25, "y": 1},
52 {"x": 7.25, "y": 1}, 52 {"matrix": [1, 7], "x": 7.25, "y": 1},
53 {"x": 8.25, "y": 1}, 53 {"matrix": [1, 8], "x": 8.25, "y": 1},
54 {"x": 9.25, "y": 1}, 54 {"matrix": [1, 9], "x": 9.25, "y": 1},
55 {"x": 10.25, "y": 1, "w": 1.75}, 55 {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75},
56 56
57 {"x": 0, "y": 2, "w": 1.75}, 57 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
58 {"x": 1.75, "y": 2}, 58 {"matrix": [2, 1], "x": 1.75, "y": 2},
59 {"x": 2.75, "y": 2}, 59 {"matrix": [2, 2], "x": 2.75, "y": 2},
60 {"x": 3.75, "y": 2}, 60 {"matrix": [2, 3], "x": 3.75, "y": 2},
61 {"x": 4.75, "y": 2}, 61 {"matrix": [2, 4], "x": 4.75, "y": 2},
62 {"x": 5.75, "y": 2}, 62 {"matrix": [2, 5], "x": 5.75, "y": 2},
63 {"x": 6.75, "y": 2}, 63 {"matrix": [2, 6], "x": 6.75, "y": 2},
64 {"x": 7.75, "y": 2}, 64 {"matrix": [2, 7], "x": 7.75, "y": 2},
65 {"x": 8.75, "y": 2}, 65 {"matrix": [2, 8], "x": 8.75, "y": 2},
66 {"x": 9.75, "y": 2}, 66 {"matrix": [2, 9], "x": 9.75, "y": 2},
67 {"x": 10.75, "y": 2, "w": 1.25}, 67 {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
68 68
69 {"x": 0, "y": 3, "w": 1.25}, 69 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
70 {"x": 1.25, "y": 3}, 70 {"matrix": [3, 1], "x": 1.25, "y": 3},
71 {"x": 2.25, "y": 3, "w": 1.25}, 71 {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
72 {"x": 3.5, "y": 3, "w": 2.25}, 72 {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.25},
73 {"x": 5.75, "y": 3, "w": 2.75}, 73 {"matrix": [3, 5], "x": 5.75, "y": 3, "w": 2.75},
74 {"x": 8.5, "y": 3, "w": 1.25}, 74 {"matrix": [3, 7], "x": 8.5, "y": 3, "w": 1.25},
75 {"x": 9.75, "y": 3}, 75 {"matrix": [3, 8], "x": 9.75, "y": 3},
76 {"x": 10.75, "y": 3, "w": 1.25} 76 {"matrix": [3, 9], "x": 10.75, "y": 3, "w": 1.25}
77 ] 77 ]
78 }, 78 },
79 "LAYOUT_625_space": { 79 "LAYOUT_625_space": {
80 "layout": [ 80 "layout": [
81 {"x": 0, "y": 0}, 81 {"matrix": [0, 0], "x": 0, "y": 0},
82 {"x": 1, "y": 0}, 82 {"matrix": [0, 1], "x": 1, "y": 0},
83 {"x": 2, "y": 0}, 83 {"matrix": [0, 2], "x": 2, "y": 0},
84 {"x": 3, "y": 0}, 84 {"matrix": [0, 3], "x": 3, "y": 0},
85 {"x": 4, "y": 0}, 85 {"matrix": [0, 4], "x": 4, "y": 0},
86 {"x": 5, "y": 0}, 86 {"matrix": [0, 5], "x": 5, "y": 0},
87 {"x": 6, "y": 0}, 87 {"matrix": [0, 6], "x": 6, "y": 0},
88 {"x": 7, "y": 0}, 88 {"matrix": [0, 7], "x": 7, "y": 0},
89 {"x": 8, "y": 0}, 89 {"matrix": [0, 8], "x": 8, "y": 0},
90 {"x": 9, "y": 0}, 90 {"matrix": [0, 9], "x": 9, "y": 0},
91 {"x": 10, "y": 0}, 91 {"matrix": [0, 10], "x": 10, "y": 0},
92 {"x": 11, "y": 0}, 92 {"matrix": [3, 10], "x": 11, "y": 0},
93 93
94 {"x": 0, "y": 1, "w": 1.25}, 94 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
95 {"x": 1.25, "y": 1}, 95 {"matrix": [1, 1], "x": 1.25, "y": 1},
96 {"x": 2.25, "y": 1}, 96 {"matrix": [1, 2], "x": 2.25, "y": 1},
97 {"x": 3.25, "y": 1}, 97 {"matrix": [1, 3], "x": 3.25, "y": 1},
98 {"x": 4.25, "y": 1}, 98 {"matrix": [1, 4], "x": 4.25, "y": 1},
99 {"x": 5.25, "y": 1}, 99 {"matrix": [1, 5], "x": 5.25, "y": 1},
100 {"x": 6.25, "y": 1}, 100 {"matrix": [1, 6], "x": 6.25, "y": 1},
101 {"x": 7.25, "y": 1}, 101 {"matrix": [1, 7], "x": 7.25, "y": 1},
102 {"x": 8.25, "y": 1}, 102 {"matrix": [1, 8], "x": 8.25, "y": 1},
103 {"x": 9.25, "y": 1}, 103 {"matrix": [1, 9], "x": 9.25, "y": 1},
104 {"x": 10.25, "y": 1, "w": 1.75}, 104 {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75},
105 105
106 {"x": 0, "y": 2, "w": 1.75}, 106 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
107 {"x": 1.75, "y": 2}, 107 {"matrix": [2, 1], "x": 1.75, "y": 2},
108 {"x": 2.75, "y": 2}, 108 {"matrix": [2, 2], "x": 2.75, "y": 2},
109 {"x": 3.75, "y": 2}, 109 {"matrix": [2, 3], "x": 3.75, "y": 2},
110 {"x": 4.75, "y": 2}, 110 {"matrix": [2, 4], "x": 4.75, "y": 2},
111 {"x": 5.75, "y": 2}, 111 {"matrix": [2, 5], "x": 5.75, "y": 2},
112 {"x": 6.75, "y": 2}, 112 {"matrix": [2, 6], "x": 6.75, "y": 2},
113 {"x": 7.75, "y": 2}, 113 {"matrix": [2, 7], "x": 7.75, "y": 2},
114 {"x": 8.75, "y": 2}, 114 {"matrix": [2, 8], "x": 8.75, "y": 2},
115 {"x": 9.75, "y": 2}, 115 {"matrix": [2, 9], "x": 9.75, "y": 2},
116 {"x": 10.75, "y": 2, "w": 1.25}, 116 {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
117 117
118 {"x": 0, "y": 3, "w": 1.25}, 118 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
119 {"x": 1.25, "y": 3}, 119 {"matrix": [3, 1], "x": 1.25, "y": 3},
120 {"x": 2.25, "y": 3}, 120 {"matrix": [3, 2], "x": 2.25, "y": 3},
121 {"x": 3.25, "y": 3, "w": 6.25}, 121 {"matrix": [3, 5], "x": 3.25, "y": 3, "w": 6.25},
122 {"x": 9.5, "y": 3, "w": 1.25}, 122 {"matrix": [3, 8], "x": 9.5, "y": 3, "w": 1.25},
123 {"x": 10.75, "y": 3, "w": 1.25} 123 {"matrix": [3, 9], "x": 10.75, "y": 3, "w": 1.25}
124 ] 124 ]
125 } 125 }
126 } 126 }
diff --git a/keyboards/lazydesigners/dimpleplus/dimpleplus.h b/keyboards/lazydesigners/dimpleplus/dimpleplus.h
deleted file mode 100644
index 93199dc6e0..0000000000
--- a/keyboards/lazydesigners/dimpleplus/dimpleplus.h
+++ /dev/null
@@ -1,47 +0,0 @@
1/*
2Copyright 2020 LAZYDESIGNERS
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17#pragma once
18
19#include "quantum.h"
20
21#define LAYOUT( \
22 K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
23 K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
24 K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
25 K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, \
26 K400, K402, K403, K404, K406, K407, K408, K409 \
27) { \
28 { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 }, \
29 { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \
30 { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211 }, \
31 { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, KC_NO }, \
32 { K400, KC_NO, K402, K403, K404, KC_NO, K406, K407, K408, K409, KC_NO, KC_NO } \
33}
34
35#define LAYOUT_7u( \
36 K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, \
37 K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
38 K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K211, \
39 K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, \
40 K400, K402, K404, K408, K409 \
41) { \
42 { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010 }, \
43 { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \
44 { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, KC_NO, K211 }, \
45 { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310 }, \
46 { K400, KC_NO, K402, KC_NO, K404, KC_NO, KC_NO, KC_NO, K408, K409, KC_NO, KC_NO } \
47}
diff --git a/keyboards/lazydesigners/dimpleplus/info.json b/keyboards/lazydesigners/dimpleplus/info.json
index cf05ed2c9b..0d47a51f95 100644
--- a/keyboards/lazydesigners/dimpleplus/info.json
+++ b/keyboards/lazydesigners/dimpleplus/info.json
@@ -24,115 +24,125 @@
24 "layouts": { 24 "layouts": {
25 "LAYOUT": { 25 "LAYOUT": {
26 "layout": [ 26 "layout": [
27 {"label":"K000 (B3,F1)", "x":0, "y":0}, 27 {"matrix": [0, 0], "x": 0, "y": 0},
28 {"label":"K001 (B3,D5)", "x":1.5, "y":0}, 28
29 {"label":"K002 (B3,F6)", "x":2.5, "y":0}, 29 {"matrix": [0, 1], "x": 1.5, "y": 0},
30 {"label":"K003 (B3,F7)", "x":3.5, "y":0}, 30 {"matrix": [0, 2], "x": 2.5, "y": 0},
31 {"label":"K004 (B3,C7)", "x":4.5, "y":0}, 31 {"matrix": [0, 3], "x": 3.5, "y": 0},
32 {"label":"K005 (B3,C6)", "x":5.5, "y":0}, 32 {"matrix": [0, 4], "x": 4.5, "y": 0},
33 {"label":"K006 (B3,B6)", "x":6.5, "y":0}, 33 {"matrix": [0, 5], "x": 5.5, "y": 0},
34 {"label":"K007 (B3,B5)", "x":7.5, "y":0}, 34 {"matrix": [0, 6], "x": 6.5, "y": 0},
35 {"label":"K008 (B3,B4)", "x":8.5, "y":0}, 35 {"matrix": [0, 7], "x": 7.5, "y": 0},
36 {"label":"K009 (B3,D7)", "x":9.5, "y":0}, 36 {"matrix": [0, 8], "x": 8.5, "y": 0},
37 {"label":"K010 (B3,D6)", "x":10.5, "y":0}, 37 {"matrix": [0, 9], "x": 9.5, "y": 0},
38 {"label":"K011 (B3,D4)", "x":11.5, "y":0}, 38 {"matrix": [0, 10], "x": 10.5, "y": 0},
39 {"label":"K100 (F0,F1)", "x":0, "y":1.25}, 39 {"matrix": [0, 11], "x": 11.5, "y": 0},
40 {"label":"K101 (F0,D5)", "x":1, "y":1.25}, 40
41 {"label":"K102 (F0,F6)", "x":2, "y":1.25}, 41 {"matrix": [1, 0], "x": 0, "y": 1.25},
42 {"label":"K103 (F0,F7)", "x":3, "y":1.25}, 42 {"matrix": [1, 1], "x": 1, "y": 1.25},
43 {"label":"K104 (F0,C7)", "x":4, "y":1.25}, 43 {"matrix": [1, 2], "x": 2, "y": 1.25},
44 {"label":"K105 (F0,C6)", "x":5, "y":1.25}, 44 {"matrix": [1, 3], "x": 3, "y": 1.25},
45 {"label":"K106 (F0,B6)", "x":6, "y":1.25}, 45 {"matrix": [1, 4], "x": 4, "y": 1.25},
46 {"label":"K107 (F0,B5)", "x":7, "y":1.25}, 46 {"matrix": [1, 5], "x": 5, "y": 1.25},
47 {"label":"K108 (F0,B4)", "x":8, "y":1.25}, 47 {"matrix": [1, 6], "x": 6, "y": 1.25},
48 {"label":"K109 (F0,D7)", "x":9, "y":1.25}, 48 {"matrix": [1, 7], "x": 7, "y": 1.25},
49 {"label":"K110 (F0,D6)", "x":10, "y":1.25}, 49 {"matrix": [1, 8], "x": 8, "y": 1.25},
50 {"label":"K111 (F0,D4)", "x":11, "y":1.25, "w":1.5}, 50 {"matrix": [1, 9], "x": 9, "y": 1.25},
51 {"label":"K200 (E6,F1)", "x":0, "y":2.25, "w":1.25}, 51 {"matrix": [1, 10], "x": 10, "y": 1.25},
52 {"label":"K201 (E6,D5)", "x":1.25, "y":2.25}, 52 {"matrix": [1, 11], "x": 11, "y": 1.25, "w": 1.5},
53 {"label":"K202 (E6,F6)", "x":2.25, "y":2.25}, 53
54 {"label":"K203 (E6,F7)", "x":3.25, "y":2.25}, 54 {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.25},
55 {"label":"K204 (E6,C7)", "x":4.25, "y":2.25}, 55 {"matrix": [2, 1], "x": 1.25, "y": 2.25},
56 {"label":"K205 (E6,C6)", "x":5.25, "y":2.25}, 56 {"matrix": [2, 2], "x": 2.25, "y": 2.25},
57 {"label":"K206 (E6,B6)", "x":6.25, "y":2.25}, 57 {"matrix": [2, 3], "x": 3.25, "y": 2.25},
58 {"label":"K207 (E6,B5)", "x":7.25, "y":2.25}, 58 {"matrix": [2, 4], "x": 4.25, "y": 2.25},
59 {"label":"K208 (E6,B4)", "x":8.25, "y":2.25}, 59 {"matrix": [2, 5], "x": 5.25, "y": 2.25},
60 {"label":"K209 (E6,D7)", "x":9.25, "y":2.25}, 60 {"matrix": [2, 6], "x": 6.25, "y": 2.25},
61 {"label":"K210 (E6,D6)", "x":10.25, "y":2.25}, 61 {"matrix": [2, 7], "x": 7.25, "y": 2.25},
62 {"label":"K211 (E6,D4)", "x":11.25, "y":2.25, "w":1.25}, 62 {"matrix": [2, 8], "x": 8.25, "y": 2.25},
63 {"label":"K300 (F4,F1)", "x":0, "y":3.25, "w":1.75}, 63 {"matrix": [2, 9], "x": 9.25, "y": 2.25},
64 {"label":"K301 (F4,D5)", "x":1.75, "y":3.25}, 64 {"matrix": [2, 10], "x": 10.25, "y": 2.25},
65 {"label":"K302 (F4,F6)", "x":2.75, "y":3.25}, 65 {"matrix": [2, 11], "x": 11.25, "y": 2.25, "w": 1.25},
66 {"label":"K303 (F4,F7)", "x":3.75, "y":3.25}, 66
67 {"label":"K304 (F4,C7)", "x":4.75, "y":3.25}, 67 {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
68 {"label":"K305 (F4,C6)", "x":5.75, "y":3.25}, 68 {"matrix": [3, 1], "x": 1.75, "y": 3.25},
69 {"label":"K306 (F4,B6)", "x":6.75, "y":3.25}, 69 {"matrix": [3, 2], "x": 2.75, "y": 3.25},
70 {"label":"K307 (F4,B5)", "x":7.75, "y":3.25}, 70 {"matrix": [3, 3], "x": 3.75, "y": 3.25},
71 {"label":"K308 (F4,B4)", "x":8.75, "y":3.25}, 71 {"matrix": [3, 4], "x": 4.75, "y": 3.25},
72 {"label":"K309 (F4,D7)", "x":9.75, "y":3.25}, 72 {"matrix": [3, 5], "x": 5.75, "y": 3.25},
73 {"label":"K310 (F4,D6)", "x":10.75, "y":3.25, "w":1.75}, 73 {"matrix": [3, 6], "x": 6.75, "y": 3.25},
74 {"label":"K400 (F5,F1)", "x":0.75, "y":4.25}, 74 {"matrix": [3, 7], "x": 7.75, "y": 3.25},
75 {"label":"K402 (F5,F6)", "x":1.75, "y":4.25}, 75 {"matrix": [3, 8], "x": 8.75, "y": 3.25},
76 {"label":"K403 (F5,F7)", "x":2.75, "y":4.25}, 76 {"matrix": [3, 9], "x": 9.75, "y": 3.25},
77 {"label":"K404 (F5,C7)", "x":3.75, "y":4.25, "w":2.25}, 77 {"matrix": [3, 10], "x": 10.75, "y": 3.25, "w": 1.75},
78 {"label":"K406 (F5,B6)", "x":6, "y":4.25, "w":2.75}, 78
79 {"label":"K407 (F5,B5)", "x":8.75, "y":4.25}, 79 {"matrix": [4, 0], "x": 0.75, "y": 4.25},
80 {"label":"K408 (F5,B4)", "x":9.75, "y":4.25}, 80 {"matrix": [4, 2], "x": 1.75, "y": 4.25},
81 {"label":"K409 (F5,D7)", "x":10.75, "y":4.25} 81 {"matrix": [4, 3], "x": 2.75, "y": 4.25},
82 {"matrix": [4, 4], "x": 3.75, "y": 4.25, "w": 2.25},
83 {"matrix": [4, 6], "x": 6, "y": 4.25, "w": 2.75},
84 {"matrix": [4, 7], "x": 8.75, "y": 4.25},
85 {"matrix": [4, 8], "x": 9.75, "y": 4.25},
86 {"matrix": [4, 9], "x": 10.75, "y": 4.25}
82 ] 87 ]
83 }, 88 },
84 "LAYOUT_7u": { 89 "LAYOUT_7u": {
85 "layout": [ 90 "layout": [
86 {"label":"K000 (B3,F1)", "x":0, "y":0}, 91 {"matrix": [0, 0], "x": 0, "y": 0},
87 {"label":"K001 (B3,D5)", "x":1.5, "y":0}, 92
88 {"label":"K002 (B3,F6)", "x":2.5, "y":0}, 93 {"matrix": [0, 1], "x": 1.5, "y": 0},
89 {"label":"K003 (B3,F7)", "x":3.5, "y":0}, 94 {"matrix": [0, 2], "x": 2.5, "y": 0},
90 {"label":"K004 (B3,C7)", "x":4.5, "y":0}, 95 {"matrix": [0, 3], "x": 3.5, "y": 0},
91 {"label":"K005 (B3,C6)", "x":5.5, "y":0}, 96 {"matrix": [0, 4], "x": 4.5, "y": 0},
92 {"label":"K006 (B3,B6)", "x":6.5, "y":0}, 97 {"matrix": [0, 5], "x": 5.5, "y": 0},
93 {"label":"K007 (B3,B5)", "x":7.5, "y":0}, 98 {"matrix": [0, 6], "x": 6.5, "y": 0},
94 {"label":"K008 (B3,B4)", "x":8.5, "y":0}, 99 {"matrix": [0, 7], "x": 7.5, "y": 0},
95 {"label":"K009 (B3,D7)", "x":9.5, "y":0}, 100 {"matrix": [0, 8], "x": 8.5, "y": 0},
96 {"label":"K010 (B3,D6)", "x":10.5, "y":0, "w":2}, 101 {"matrix": [0, 9], "x": 9.5, "y": 0},
97 {"label":"K100 (F0,F1)", "x":0, "y":1.25}, 102 {"matrix": [0, 10], "x": 10.5, "y": 0, "w": 2},
98 {"label":"K101 (F0,D5)", "x":1, "y":1.25}, 103
99 {"label":"K102 (F0,F6)", "x":2, "y":1.25}, 104 {"matrix": [1, 0], "x": 0, "y": 1.25},
100 {"label":"K103 (F0,F7)", "x":3, "y":1.25}, 105 {"matrix": [1, 1], "x": 1, "y": 1.25},
101 {"label":"K104 (F0,C7)", "x":4, "y":1.25}, 106 {"matrix": [1, 2], "x": 2, "y": 1.25},
102 {"label":"K105 (F0,C6)", "x":5, "y":1.25}, 107 {"matrix": [1, 3], "x": 3, "y": 1.25},
103 {"label":"K106 (F0,B6)", "x":6, "y":1.25}, 108 {"matrix": [1, 4], "x": 4, "y": 1.25},
104 {"label":"K107 (F0,B5)", "x":7, "y":1.25}, 109 {"matrix": [1, 5], "x": 5, "y": 1.25},
105 {"label":"K108 (F0,B4)", "x":8, "y":1.25}, 110 {"matrix": [1, 6], "x": 6, "y": 1.25},
106 {"label":"K109 (F0,D7)", "x":9, "y":1.25}, 111 {"matrix": [1, 7], "x": 7, "y": 1.25},
107 {"label":"K110 (F0,D6)", "x":10, "y":1.25}, 112 {"matrix": [1, 8], "x": 8, "y": 1.25},
108 {"label":"K111 (F0,D4)", "x":11, "y":1.25, "w":1.5}, 113 {"matrix": [1, 9], "x": 9, "y": 1.25},
109 {"label":"K200 (E6,F1)", "x":0, "y":2.25, "w":1.25}, 114 {"matrix": [1, 10], "x": 10, "y": 1.25},
110 {"label":"K201 (E6,D5)", "x":1.25, "y":2.25}, 115 {"matrix": [1, 11], "x": 11, "y": 1.25, "w": 1.5},
111 {"label":"K202 (E6,F6)", "x":2.25, "y":2.25}, 116
112 {"label":"K203 (E6,F7)", "x":3.25, "y":2.25}, 117 {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.25},
113 {"label":"K204 (E6,C7)", "x":4.25, "y":2.25}, 118 {"matrix": [2, 1], "x": 1.25, "y": 2.25},
114 {"label":"K205 (E6,C6)", "x":5.25, "y":2.25}, 119 {"matrix": [2, 2], "x": 2.25, "y": 2.25},
115 {"label":"K206 (E6,B6)", "x":6.25, "y":2.25}, 120 {"matrix": [2, 3], "x": 3.25, "y": 2.25},
116 {"label":"K207 (E6,B5)", "x":7.25, "y":2.25}, 121 {"matrix": [2, 4], "x": 4.25, "y": 2.25},
117 {"label":"K208 (E6,B4)", "x":8.25, "y":2.25}, 122 {"matrix": [2, 5], "x": 5.25, "y": 2.25},
118 {"label":"K209 (E6,D7)", "x":9.25, "y":2.25}, 123 {"matrix": [2, 6], "x": 6.25, "y": 2.25},
119 {"label":"K211 (E6,D4)", "x":10.25, "y":2.25, "w":2.25}, 124 {"matrix": [2, 7], "x": 7.25, "y": 2.25},
120 {"label":"K300 (F4,F1)", "x":0, "y":3.25, "w":1.75}, 125 {"matrix": [2, 8], "x": 8.25, "y": 2.25},
121 {"label":"K301 (F4,D5)", "x":1.75, "y":3.25}, 126 {"matrix": [2, 9], "x": 9.25, "y": 2.25},
122 {"label":"K302 (F4,F6)", "x":2.75, "y":3.25}, 127 {"matrix": [2, 11], "x": 10.25, "y": 2.25, "w": 2.25},
123 {"label":"K303 (F4,F7)", "x":3.75, "y":3.25}, 128
124 {"label":"K304 (F4,C7)", "x":4.75, "y":3.25}, 129 {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
125 {"label":"K305 (F4,C6)", "x":5.75, "y":3.25}, 130 {"matrix": [3, 1], "x": 1.75, "y": 3.25},
126 {"label":"K306 (F4,B6)", "x":6.75, "y":3.25}, 131 {"matrix": [3, 2], "x": 2.75, "y": 3.25},
127 {"label":"K307 (F4,B5)", "x":7.75, "y":3.25}, 132 {"matrix": [3, 3], "x": 3.75, "y": 3.25},
128 {"label":"K308 (F4,B4)", "x":8.75, "y":3.25}, 133 {"matrix": [3, 4], "x": 4.75, "y": 3.25},
129 {"label":"K309 (F4,D7)", "x":9.75, "y":3.25}, 134 {"matrix": [3, 5], "x": 5.75, "y": 3.25},
130 {"label":"K310 (F4,D6)", "x":10.75, "y":3.25, "w":1.75}, 135 {"matrix": [3, 6], "x": 6.75, "y": 3.25},
131 {"label":"K400 (F5,F1)", "x":0.75, "y":4.25}, 136 {"matrix": [3, 7], "x": 7.75, "y": 3.25},
132 {"label":"K402 (F5,F6)", "x":1.75, "y":4.25}, 137 {"matrix": [3, 8], "x": 8.75, "y": 3.25},
133 {"label":"K404 (F5,C7)", "x":2.75, "y":4.25, "w":7}, 138 {"matrix": [3, 9], "x": 9.75, "y": 3.25},
134 {"label":"K408 (F5,B4)", "x":9.75, "y":4.25}, 139 {"matrix": [3, 10], "x": 10.75, "y": 3.25, "w": 1.75},
135 {"label":"K409 (F5,D7)", "x":10.75, "y":4.25} 140
141 {"matrix": [4, 0], "x": 0.75, "y": 4.25},
142 {"matrix": [4, 2], "x": 1.75, "y": 4.25},
143 {"matrix": [4, 4], "x": 2.75, "y": 4.25, "w": 7},
144 {"matrix": [4, 8], "x": 9.75, "y": 4.25},
145 {"matrix": [4, 9], "x": 10.75, "y": 4.25}
136 ] 146 ]
137 } 147 }
138 } 148 }
diff --git a/keyboards/lfkeyboards/lfk78/lfk78.h b/keyboards/lfkeyboards/lfk78/lfk78.h
index e8dad4028c..ac7eaa3674 100644
--- a/keyboards/lfkeyboards/lfk78/lfk78.h
+++ b/keyboards/lfkeyboards/lfk78/lfk78.h
@@ -1,15 +1,8 @@
1#pragma once 1#pragma once
2 2
3#include QMK_KEYBOARD_H
3#include "quantum.h" 4#include "quantum.h"
4 5
5#if defined(KEYBOARD_lfkeyboards_lfk78_revb)
6# include QMK_KEYBOARD_H
7#elif defined(KEYBOARD_lfkeyboards_lfk78_revc)
8# include "revc.h"
9#elif defined(KEYBOARD_lfkeyboards_lfk78_revj)
10# include "revj.h"
11#endif
12
13typedef struct RGB_Color { 6typedef struct RGB_Color {
14 uint16_t red; 7 uint16_t red;
15 uint16_t green; 8 uint16_t green;
diff --git a/keyboards/lfkeyboards/lfk78/revc/info.json b/keyboards/lfkeyboards/lfk78/revc/info.json
index d1062dee05..830205c584 100644
--- a/keyboards/lfkeyboards/lfk78/revc/info.json
+++ b/keyboards/lfkeyboards/lfk78/revc/info.json
@@ -25,385 +25,385 @@
25 "layouts": { 25 "layouts": {
26 "LAYOUT": { 26 "LAYOUT": {
27 "layout": [ 27 "layout": [
28 {"x":0, "y":0}, 28 {"matrix": [0, 0], "x": 0, "y": 0},
29 {"x":1, "y":0}, 29 {"matrix": [0, 1], "x": 1, "y": 0},
30 30
31 {"x":2.25, "y":0}, 31 {"matrix": [0, 2], "x": 2.25, "y": 0},
32 {"x":3.25, "y":0}, 32 {"matrix": [0, 3], "x": 3.25, "y": 0},
33 {"x":4.25, "y":0}, 33 {"matrix": [0, 4], "x": 4.25, "y": 0},
34 {"x":5.25, "y":0}, 34 {"matrix": [0, 5], "x": 5.25, "y": 0},
35 {"x":6.25, "y":0}, 35 {"matrix": [0, 6], "x": 6.25, "y": 0},
36 {"x":7.25, "y":0}, 36 {"matrix": [0, 7], "x": 7.25, "y": 0},
37 {"x":8.25, "y":0}, 37 {"matrix": [0, 8], "x": 8.25, "y": 0},
38 {"x":9.25, "y":0}, 38 {"matrix": [0, 9], "x": 9.25, "y": 0},
39 {"x":10.25, "y":0}, 39 {"matrix": [0, 10], "x": 10.25, "y": 0},
40 {"x":11.25, "y":0}, 40 {"matrix": [0, 11], "x": 11.25, "y": 0},
41 {"x":12.25, "y":0}, 41 {"matrix": [0, 12], "x": 12.25, "y": 0},
42 {"x":13.25, "y":0}, 42 {"matrix": [0, 13], "x": 13.25, "y": 0},
43 {"x":14.25, "y":0}, 43 {"matrix": [0, 14], "x": 14.25, "y": 0},
44 {"x":15.25, "y":0, "w":2}, 44 {"matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
45 45
46 {"x":17.5, "y":0}, 46 {"matrix": [0, 16], "x": 17.5, "y": 0},
47 {"x":18.5, "y":0}, 47 {"matrix": [0, 17], "x": 18.5, "y": 0},
48 48
49 {"x":0, "y":1}, 49 {"matrix": [1, 0], "x": 0, "y": 1},
50 {"x":1, "y":1}, 50 {"matrix": [1, 1], "x": 1, "y": 1},
51 51
52 {"x":2.25, "y":1, "w":1.5}, 52 {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
53 {"x":3.75, "y":1}, 53 {"matrix": [1, 3], "x": 3.75, "y": 1},
54 {"x":4.75, "y":1}, 54 {"matrix": [1, 4], "x": 4.75, "y": 1},
55 {"x":5.75, "y":1}, 55 {"matrix": [1, 5], "x": 5.75, "y": 1},
56 {"x":6.75, "y":1}, 56 {"matrix": [1, 6], "x": 6.75, "y": 1},
57 {"x":7.75, "y":1}, 57 {"matrix": [1, 7], "x": 7.75, "y": 1},
58 {"x":8.75, "y":1}, 58 {"matrix": [1, 8], "x": 8.75, "y": 1},
59 {"x":9.75, "y":1}, 59 {"matrix": [1, 9], "x": 9.75, "y": 1},
60 {"x":10.75, "y":1}, 60 {"matrix": [1, 10], "x": 10.75, "y": 1},
61 {"x":11.75, "y":1}, 61 {"matrix": [1, 11], "x": 11.75, "y": 1},
62 {"x":12.75, "y":1}, 62 {"matrix": [1, 12], "x": 12.75, "y": 1},
63 {"x":13.75, "y":1}, 63 {"matrix": [1, 13], "x": 13.75, "y": 1},
64 {"x":14.75, "y":1}, 64 {"matrix": [1, 14], "x": 14.75, "y": 1},
65 {"x":15.75, "y":1, "w":1.5}, 65 {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
66 66
67 {"x":17.5, "y":1}, 67 {"matrix": [1, 16], "x": 17.5, "y": 1},
68 {"x":18.5, "y":1}, 68 {"matrix": [1, 17], "x": 18.5, "y": 1},
69 69
70 {"x":0, "y":2}, 70 {"matrix": [2, 0], "x": 0, "y": 2},
71 {"x":1, "y":2}, 71 {"matrix": [2, 1], "x": 1, "y": 2},
72 72
73 {"x":2.25, "y":2, "w":1.75}, 73 {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
74 {"x":4, "y":2}, 74 {"matrix": [2, 3], "x": 4, "y": 2},
75 {"x":5, "y":2}, 75 {"matrix": [2, 4], "x": 5, "y": 2},
76 {"x":6, "y":2}, 76 {"matrix": [2, 5], "x": 6, "y": 2},
77 {"x":7, "y":2}, 77 {"matrix": [2, 6], "x": 7, "y": 2},
78 {"x":8, "y":2}, 78 {"matrix": [2, 7], "x": 8, "y": 2},
79 {"x":9, "y":2}, 79 {"matrix": [2, 8], "x": 9, "y": 2},
80 {"x":10, "y":2}, 80 {"matrix": [2, 9], "x": 10, "y": 2},
81 {"x":11, "y":2}, 81 {"matrix": [2, 10], "x": 11, "y": 2},
82 {"x":12, "y":2}, 82 {"matrix": [2, 11], "x": 12, "y": 2},
83 {"x":13, "y":2}, 83 {"matrix": [2, 12], "x": 13, "y": 2},
84 {"x":14, "y":2}, 84 {"matrix": [2, 13], "x": 14, "y": 2},
85 {"x":15, "y":2, "w":2.25}, 85 {"matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
86 86
87 {"x":0, "y":3}, 87 {"matrix": [3, 0], "x": 0, "y": 3},
88 {"x":1, "y":3}, 88 {"matrix": [3, 1], "x": 1, "y": 3},
89 89
90 {"x":2.25, "y":3, "w":2.25}, 90 {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
91 {"x":4.5, "y":3}, 91 {"matrix": [3, 4], "x": 4.5, "y": 3},
92 {"x":5.5, "y":3}, 92 {"matrix": [3, 5], "x": 5.5, "y": 3},
93 {"x":6.5, "y":3}, 93 {"matrix": [3, 6], "x": 6.5, "y": 3},
94 {"x":7.5, "y":3}, 94 {"matrix": [3, 7], "x": 7.5, "y": 3},
95 {"x":8.5, "y":3}, 95 {"matrix": [3, 8], "x": 8.5, "y": 3},
96 {"x":9.5, "y":3}, 96 {"matrix": [3, 9], "x": 9.5, "y": 3},
97 {"x":10.5, "y":3}, 97 {"matrix": [3, 10], "x": 10.5, "y": 3},
98 {"x":11.5, "y":3}, 98 {"matrix": [3, 11], "x": 11.5, "y": 3},
99 {"x":12.5, "y":3}, 99 {"matrix": [3, 12], "x": 12.5, "y": 3},
100 {"x":13.5, "y":3}, 100 {"matrix": [3, 13], "x": 13.5, "y": 3},
101 {"x":14.5, "y":3, "w":2.75}, 101 {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
102 102
103 {"x":17.5, "y":3}, 103 {"matrix": [3, 16], "x": 17.5, "y": 3},
104 104
105 {"x":0, "y":4}, 105 {"matrix": [4, 0], "x": 0, "y": 4},
106 {"x":1, "y":4}, 106 {"matrix": [4, 1], "x": 1, "y": 4},
107 107
108 {"x":2.25, "y":4, "w":1.25}, 108 {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
109 {"x":3.5, "y":4, "w":1.25}, 109 {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
110 {"x":4.75, "y":4, "w":1.25}, 110 {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
111 {"x":6, "y":4, "w":6.25}, 111 {"matrix": [4, 8], "x": 6, "y": 4, "w": 6.25},
112 {"x":12.25, "y":4, "w":1.25}, 112 {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
113 {"x":13.5, "y":4, "w":1.25}, 113 {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.25},
114 {"x":14.75, "y":4, "w":1.25}, 114 {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.25},
115 115
116 {"x":16.5, "y":4}, 116 {"matrix": [4, 15], "x": 16.5, "y": 4},
117 {"x":17.5, "y":4}, 117 {"matrix": [4, 16], "x": 17.5, "y": 4},
118 {"x":18.5, "y":4} 118 {"matrix": [4, 17], "x": 18.5, "y": 4}
119 ] 119 ]
120 }, 120 },
121 "LAYOUT_split_bs": { 121 "LAYOUT_split_bs": {
122 "layout": [ 122 "layout": [
123 {"x":0, "y":0}, 123 {"matrix": [0, 0], "x": 0, "y": 0},
124 {"x":1, "y":0}, 124 {"matrix": [0, 1], "x": 1, "y": 0},
125 125
126 {"x":2.25, "y":0}, 126 {"matrix": [0, 2], "x": 2.25, "y": 0},
127 {"x":3.25, "y":0}, 127 {"matrix": [0, 3], "x": 3.25, "y": 0},
128 {"x":4.25, "y":0}, 128 {"matrix": [0, 4], "x": 4.25, "y": 0},
129 {"x":5.25, "y":0}, 129 {"matrix": [0, 5], "x": 5.25, "y": 0},
130 {"x":6.25, "y":0}, 130 {"matrix": [0, 6], "x": 6.25, "y": 0},
131 {"x":7.25, "y":0}, 131 {"matrix": [0, 7], "x": 7.25, "y": 0},
132 {"x":8.25, "y":0}, 132 {"matrix": [0, 8], "x": 8.25, "y": 0},
133 {"x":9.25, "y":0}, 133 {"matrix": [0, 9], "x": 9.25, "y": 0},
134 {"x":10.25, "y":0}, 134 {"matrix": [0, 10], "x": 10.25, "y": 0},
135 {"x":11.25, "y":0}, 135 {"matrix": [0, 11], "x": 11.25, "y": 0},
136 {"x":12.25, "y":0}, 136 {"matrix": [0, 12], "x": 12.25, "y": 0},
137 {"x":13.25, "y":0}, 137 {"matrix": [0, 13], "x": 13.25, "y": 0},
138 {"x":14.25, "y":0}, 138 {"matrix": [0, 14], "x": 14.25, "y": 0},
139 {"x":15.25, "y":0}, 139 {"matrix": [0, 15], "x": 15.25, "y": 0},
140 {"x":16.25, "y":0}, 140 {"matrix": [2, 15], "x": 16.25, "y": 0},
141 141
142 {"x":17.5, "y":0}, 142 {"matrix": [0, 16], "x": 17.5, "y": 0},
143 {"x":18.5, "y":0}, 143 {"matrix": [0, 17], "x": 18.5, "y": 0},
144 144
145 {"x":0, "y":1}, 145 {"matrix": [1, 0], "x": 0, "y": 1},
146 {"x":1, "y":1}, 146 {"matrix": [1, 1], "x": 1, "y": 1},
147 147
148 {"x":2.25, "y":1, "w":1.5}, 148 {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
149 {"x":3.75, "y":1}, 149 {"matrix": [1, 3], "x": 3.75, "y": 1},
150 {"x":4.75, "y":1}, 150 {"matrix": [1, 4], "x": 4.75, "y": 1},
151 {"x":5.75, "y":1}, 151 {"matrix": [1, 5], "x": 5.75, "y": 1},
152 {"x":6.75, "y":1}, 152 {"matrix": [1, 6], "x": 6.75, "y": 1},
153 {"x":7.75, "y":1}, 153 {"matrix": [1, 7], "x": 7.75, "y": 1},
154 {"x":8.75, "y":1}, 154 {"matrix": [1, 8], "x": 8.75, "y": 1},
155 {"x":9.75, "y":1}, 155 {"matrix": [1, 9], "x": 9.75, "y": 1},
156 {"x":10.75, "y":1}, 156 {"matrix": [1, 10], "x": 10.75, "y": 1},
157 {"x":11.75, "y":1}, 157 {"matrix": [1, 11], "x": 11.75, "y": 1},
158 {"x":12.75, "y":1}, 158 {"matrix": [1, 12], "x": 12.75, "y": 1},
159 {"x":13.75, "y":1}, 159 {"matrix": [1, 13], "x": 13.75, "y": 1},
160 {"x":14.75, "y":1}, 160 {"matrix": [1, 14], "x": 14.75, "y": 1},
161 {"x":15.75, "y":1, "w":1.5}, 161 {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
162 162
163 {"x":17.5, "y":1}, 163 {"matrix": [1, 16], "x": 17.5, "y": 1},
164 {"x":18.5, "y":1}, 164 {"matrix": [1, 17], "x": 18.5, "y": 1},
165 165
166 {"x":0, "y":2}, 166 {"matrix": [2, 0], "x": 0, "y": 2},
167 {"x":1, "y":2}, 167 {"matrix": [2, 1], "x": 1, "y": 2},
168 168
169 {"x":2.25, "y":2, "w":1.75}, 169 {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
170 {"x":4, "y":2}, 170 {"matrix": [2, 3], "x": 4, "y": 2},
171 {"x":5, "y":2}, 171 {"matrix": [2, 4], "x": 5, "y": 2},
172 {"x":6, "y":2}, 172 {"matrix": [2, 5], "x": 6, "y": 2},
173 {"x":7, "y":2}, 173 {"matrix": [2, 6], "x": 7, "y": 2},
174 {"x":8, "y":2}, 174 {"matrix": [2, 7], "x": 8, "y": 2},
175 {"x":9, "y":2}, 175 {"matrix": [2, 8], "x": 9, "y": 2},
176 {"x":10, "y":2}, 176 {"matrix": [2, 9], "x": 10, "y": 2},
177 {"x":11, "y":2}, 177 {"matrix": [2, 10], "x": 11, "y": 2},
178 {"x":12, "y":2}, 178 {"matrix": [2, 11], "x": 12, "y": 2},
179 {"x":13, "y":2}, 179 {"matrix": [2, 12], "x": 13, "y": 2},
180 {"x":14, "y":2}, 180 {"matrix": [2, 13], "x": 14, "y": 2},
181 {"x":15, "y":2, "w":2.25}, 181 {"matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
182 182
183 {"x":0, "y":3}, 183 {"matrix": [3, 0], "x": 0, "y": 3},
184 {"x":1, "y":3}, 184 {"matrix": [3, 1], "x": 1, "y": 3},
185 185
186 {"x":2.25, "y":3, "w":2.25}, 186 {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
187 {"x":4.5, "y":3}, 187 {"matrix": [3, 4], "x": 4.5, "y": 3},
188 {"x":5.5, "y":3}, 188 {"matrix": [3, 5], "x": 5.5, "y": 3},
189 {"x":6.5, "y":3}, 189 {"matrix": [3, 6], "x": 6.5, "y": 3},
190 {"x":7.5, "y":3}, 190 {"matrix": [3, 7], "x": 7.5, "y": 3},
191 {"x":8.5, "y":3}, 191 {"matrix": [3, 8], "x": 8.5, "y": 3},
192 {"x":9.5, "y":3}, 192 {"matrix": [3, 9], "x": 9.5, "y": 3},
193 {"x":10.5, "y":3}, 193 {"matrix": [3, 10], "x": 10.5, "y": 3},
194 {"x":11.5, "y":3}, 194 {"matrix": [3, 11], "x": 11.5, "y": 3},
195 {"x":12.5, "y":3}, 195 {"matrix": [3, 12], "x": 12.5, "y": 3},
196 {"x":13.5, "y":3}, 196 {"matrix": [3, 13], "x": 13.5, "y": 3},
197 {"x":14.5, "y":3, "w":2.75}, 197 {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
198 198
199 {"x":17.5, "y":3}, 199 {"matrix": [3, 16], "x": 17.5, "y": 3},
200 200
201 {"x":0, "y":4}, 201 {"matrix": [4, 0], "x": 0, "y": 4},
202 {"x":1, "y":4}, 202 {"matrix": [4, 1], "x": 1, "y": 4},
203 203
204 {"x":2.25, "y":4, "w":1.25}, 204 {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
205 {"x":3.5, "y":4, "w":1.25}, 205 {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
206 {"x":4.75, "y":4, "w":1.25}, 206 {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
207 {"x":6, "y":4, "w":6.25}, 207 {"matrix": [4, 8], "x": 6, "y": 4, "w": 6.25},
208 {"x":12.25, "y":4, "w":1.25}, 208 {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
209 {"x":13.5, "y":4, "w":1.25}, 209 {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.25},
210 {"x":14.75, "y":4, "w":1.25}, 210 {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.25},
211 211
212 {"x":16.5, "y":4}, 212 {"matrix": [4, 15], "x": 16.5, "y": 4},
213 {"x":17.5, "y":4}, 213 {"matrix": [4, 16], "x": 17.5, "y": 4},
214 {"x":18.5, "y":4} 214 {"matrix": [4, 17], "x": 18.5, "y": 4}
215 ] 215 ]
216 }, 216 },
217 "LAYOUT_split_rshift": { 217 "LAYOUT_split_rshift": {
218 "layout": [ 218 "layout": [
219 {"x":0, "y":0}, 219 {"matrix": [0, 0], "x": 0, "y": 0},
220 {"x":1, "y":0}, 220 {"matrix": [0, 1], "x": 1, "y": 0},
221 221
222 {"x":2.25, "y":0}, 222 {"matrix": [0, 2], "x": 2.25, "y": 0},
223 {"x":3.25, "y":0}, 223 {"matrix": [0, 3], "x": 3.25, "y": 0},
224 {"x":4.25, "y":0}, 224 {"matrix": [0, 4], "x": 4.25, "y": 0},
225 {"x":5.25, "y":0}, 225 {"matrix": [0, 5], "x": 5.25, "y": 0},
226 {"x":6.25, "y":0}, 226 {"matrix": [0, 6], "x": 6.25, "y": 0},
227 {"x":7.25, "y":0}, 227 {"matrix": [0, 7], "x": 7.25, "y": 0},
228 {"x":8.25, "y":0}, 228 {"matrix": [0, 8], "x": 8.25, "y": 0},
229 {"x":9.25, "y":0}, 229 {"matrix": [0, 9], "x": 9.25, "y": 0},
230 {"x":10.25, "y":0}, 230 {"matrix": [0, 10], "x": 10.25, "y": 0},
231 {"x":11.25, "y":0}, 231 {"matrix": [0, 11], "x": 11.25, "y": 0},
232 {"x":12.25, "y":0}, 232 {"matrix": [0, 12], "x": 12.25, "y": 0},
233 {"x":13.25, "y":0}, 233 {"matrix": [0, 13], "x": 13.25, "y": 0},
234 {"x":14.25, "y":0}, 234 {"matrix": [0, 14], "x": 14.25, "y": 0},
235 {"x":15.25, "y":0, "w":2}, 235 {"matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
236 236
237 {"x":17.5, "y":0}, 237 {"matrix": [0, 16], "x": 17.5, "y": 0},
238 {"x":18.5, "y":0}, 238 {"matrix": [0, 17], "x": 18.5, "y": 0},
239 239
240 {"x":0, "y":1}, 240 {"matrix": [1, 0], "x": 0, "y": 1},
241 {"x":1, "y":1}, 241 {"matrix": [1, 1], "x": 1, "y": 1},
242 242
243 {"x":2.25, "y":1, "w":1.5}, 243 {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
244 {"x":3.75, "y":1}, 244 {"matrix": [1, 3], "x": 3.75, "y": 1},
245 {"x":4.75, "y":1}, 245 {"matrix": [1, 4], "x": 4.75, "y": 1},
246 {"x":5.75, "y":1}, 246 {"matrix": [1, 5], "x": 5.75, "y": 1},
247 {"x":6.75, "y":1}, 247 {"matrix": [1, 6], "x": 6.75, "y": 1},
248 {"x":7.75, "y":1}, 248 {"matrix": [1, 7], "x": 7.75, "y": 1},
249 {"x":8.75, "y":1}, 249 {"matrix": [1, 8], "x": 8.75, "y": 1},
250 {"x":9.75, "y":1}, 250 {"matrix": [1, 9], "x": 9.75, "y": 1},
251 {"x":10.75, "y":1}, 251 {"matrix": [1, 10], "x": 10.75, "y": 1},
252 {"x":11.75, "y":1}, 252 {"matrix": [1, 11], "x": 11.75, "y": 1},
253 {"x":12.75, "y":1}, 253 {"matrix": [1, 12], "x": 12.75, "y": 1},
254 {"x":13.75, "y":1}, 254 {"matrix": [1, 13], "x": 13.75, "y": 1},
255 {"x":14.75, "y":1}, 255 {"matrix": [1, 14], "x": 14.75, "y": 1},
256 {"x":15.75, "y":1, "w":1.5}, 256 {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
257 257
258 {"x":17.5, "y":1}, 258 {"matrix": [1, 16], "x": 17.5, "y": 1},
259 {"x":18.5, "y":1}, 259 {"matrix": [1, 17], "x": 18.5, "y": 1},
260 260
261 {"x":0, "y":2}, 261 {"matrix": [2, 0], "x": 0, "y": 2},
262 {"x":1, "y":2}, 262 {"matrix": [2, 1], "x": 1, "y": 2},
263 263
264 {"x":2.25, "y":2, "w":1.75}, 264 {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
265 {"x":4, "y":2}, 265 {"matrix": [2, 3], "x": 4, "y": 2},
266 {"x":5, "y":2}, 266 {"matrix": [2, 4], "x": 5, "y": 2},
267 {"x":6, "y":2}, 267 {"matrix": [2, 5], "x": 6, "y": 2},
268 {"x":7, "y":2}, 268 {"matrix": [2, 6], "x": 7, "y": 2},
269 {"x":8, "y":2}, 269 {"matrix": [2, 7], "x": 8, "y": 2},
270 {"x":9, "y":2}, 270 {"matrix": [2, 8], "x": 9, "y": 2},
271 {"x":10, "y":2}, 271 {"matrix": [2, 9], "x": 10, "y": 2},
272 {"x":11, "y":2}, 272 {"matrix": [2, 10], "x": 11, "y": 2},
273 {"x":12, "y":2}, 273 {"matrix": [2, 11], "x": 12, "y": 2},
274 {"x":13, "y":2}, 274 {"matrix": [2, 12], "x": 13, "y": 2},
275 {"x":14, "y":2}, 275 {"matrix": [2, 13], "x": 14, "y": 2},
276 {"x":15, "y":2, "w":2.25}, 276 {"matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
277 277
278 {"x":0, "y":3}, 278 {"matrix": [3, 0], "x": 0, "y": 3},
279 {"x":1, "y":3}, 279 {"matrix": [3, 1], "x": 1, "y": 3},
280 280
281 {"x":2.25, "y":3, "w":2.25}, 281 {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
282 {"x":4.5, "y":3}, 282 {"matrix": [3, 4], "x": 4.5, "y": 3},
283 {"x":5.5, "y":3}, 283 {"matrix": [3, 5], "x": 5.5, "y": 3},
284 {"x":6.5, "y":3}, 284 {"matrix": [3, 6], "x": 6.5, "y": 3},
285 {"x":7.5, "y":3}, 285 {"matrix": [3, 7], "x": 7.5, "y": 3},
286 {"x":8.5, "y":3}, 286 {"matrix": [3, 8], "x": 8.5, "y": 3},
287 {"x":9.5, "y":3}, 287 {"matrix": [3, 9], "x": 9.5, "y": 3},
288 {"x":10.5, "y":3}, 288 {"matrix": [3, 10], "x": 10.5, "y": 3},
289 {"x":11.5, "y":3}, 289 {"matrix": [3, 11], "x": 11.5, "y": 3},
290 {"x":12.5, "y":3}, 290 {"matrix": [3, 12], "x": 12.5, "y": 3},
291 {"x":13.5, "y":3}, 291 {"matrix": [3, 13], "x": 13.5, "y": 3},
292 {"x":14.5, "y":3, "w":1.75}, 292 {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
293 {"x":16.25, "y":3}, 293 {"matrix": [3, 15], "x": 16.25, "y": 3},
294 294
295 {"x":17.5, "y":3}, 295 {"matrix": [3, 16], "x": 17.5, "y": 3},
296 296
297 {"x":0, "y":4}, 297 {"matrix": [4, 0], "x": 0, "y": 4},
298 {"x":1, "y":4}, 298 {"matrix": [4, 1], "x": 1, "y": 4},
299 299
300 {"x":2.25, "y":4, "w":1.25}, 300 {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
301 {"x":3.5, "y":4, "w":1.25}, 301 {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
302 {"x":4.75, "y":4, "w":1.25}, 302 {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
303 {"x":6, "y":4, "w":6.25}, 303 {"matrix": [4, 8], "x": 6, "y": 4, "w": 6.25},
304 {"x":12.25, "y":4, "w":1.25}, 304 {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
305 {"x":13.5, "y":4, "w":1.25}, 305 {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.25},
306 {"x":14.75, "y":4, "w":1.25}, 306 {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.25},
307 307
308 {"x":16.5, "y":4}, 308 {"matrix": [4, 15], "x": 16.5, "y": 4},
309 {"x":17.5, "y":4}, 309 {"matrix": [4, 16], "x": 17.5, "y": 4},
310 {"x":18.5, "y":4} 310 {"matrix": [4, 17], "x": 18.5, "y": 4}
311 ] 311 ]
312 }, 312 },
313 "LAYOUT_iso": { 313 "LAYOUT_iso": {
314 "layout": [ 314 "layout": [
315 {"x":0, "y":0}, 315 {"matrix": [0, 0], "x": 0, "y": 0},
316 {"x":1, "y":0}, 316 {"matrix": [0, 1], "x": 1, "y": 0},
317 317
318 {"x":2.25, "y":0}, 318 {"matrix": [0, 2], "x": 2.25, "y": 0},
319 {"x":3.25, "y":0}, 319 {"matrix": [0, 3], "x": 3.25, "y": 0},
320 {"x":4.25, "y":0}, 320 {"matrix": [0, 4], "x": 4.25, "y": 0},
321 {"x":5.25, "y":0}, 321 {"matrix": [0, 5], "x": 5.25, "y": 0},
322 {"x":6.25, "y":0}, 322 {"matrix": [0, 6], "x": 6.25, "y": 0},
323 {"x":7.25, "y":0}, 323 {"matrix": [0, 7], "x": 7.25, "y": 0},
324 {"x":8.25, "y":0}, 324 {"matrix": [0, 8], "x": 8.25, "y": 0},
325 {"x":9.25, "y":0}, 325 {"matrix": [0, 9], "x": 9.25, "y": 0},
326 {"x":10.25, "y":0}, 326 {"matrix": [0, 10], "x": 10.25, "y": 0},
327 {"x":11.25, "y":0}, 327 {"matrix": [0, 11], "x": 11.25, "y": 0},
328 {"x":12.25, "y":0}, 328 {"matrix": [0, 12], "x": 12.25, "y": 0},
329 {"x":13.25, "y":0}, 329 {"matrix": [0, 13], "x": 13.25, "y": 0},
330 {"x":14.25, "y":0}, 330 {"matrix": [0, 14], "x": 14.25, "y": 0},
331 {"x":15.25, "y":0, "w":2}, 331 {"matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
332 332
333 {"x":17.5, "y":0}, 333 {"matrix": [0, 16], "x": 17.5, "y": 0},
334 {"x":18.5, "y":0}, 334 {"matrix": [0, 17], "x": 18.5, "y": 0},
335 335
336 {"x":0, "y":1}, 336 {"matrix": [1, 0], "x": 0, "y": 1},
337 {"x":1, "y":1}, 337 {"matrix": [1, 1], "x": 1, "y": 1},
338 338
339 {"x":2.25, "y":1, "w":1.5}, 339 {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
340 {"x":3.75, "y":1}, 340 {"matrix": [1, 3], "x": 3.75, "y": 1},
341 {"x":4.75, "y":1}, 341 {"matrix": [1, 4], "x": 4.75, "y": 1},
342 {"x":5.75, "y":1}, 342 {"matrix": [1, 5], "x": 5.75, "y": 1},
343 {"x":6.75, "y":1}, 343 {"matrix": [1, 6], "x": 6.75, "y": 1},
344 {"x":7.75, "y":1}, 344 {"matrix": [1, 7], "x": 7.75, "y": 1},
345 {"x":8.75, "y":1}, 345 {"matrix": [1, 8], "x": 8.75, "y": 1},
346 {"x":9.75, "y":1}, 346 {"matrix": [1, 9], "x": 9.75, "y": 1},
347 {"x":10.75, "y":1}, 347 {"matrix": [1, 10], "x": 10.75, "y": 1},
348 {"x":11.75, "y":1}, 348 {"matrix": [1, 11], "x": 11.75, "y": 1},
349 {"x":12.75, "y":1}, 349 {"matrix": [1, 12], "x": 12.75, "y": 1},
350 {"x":13.75, "y":1}, 350 {"matrix": [1, 13], "x": 13.75, "y": 1},
351 {"x":14.75, "y":1}, 351 {"matrix": [1, 14], "x": 14.75, "y": 1},
352 {"x":16, "y":1, "w":1.25, "h":2}, 352 {"matrix": [1, 15], "x": 16, "y": 1, "w": 1.25, "h": 2},
353 353
354 {"x":17.5, "y":1}, 354 {"matrix": [1, 16], "x": 17.5, "y": 1},
355 {"x":18.5, "y":1}, 355 {"matrix": [1, 17], "x": 18.5, "y": 1},
356 356
357 {"x":0, "y":2}, 357 {"matrix": [2, 0], "x": 0, "y": 2},
358 {"x":1, "y":2}, 358 {"matrix": [2, 1], "x": 1, "y": 2},
359 359
360 {"x":2.25, "y":2, "w":1.75}, 360 {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
361 {"x":4, "y":2}, 361 {"matrix": [2, 3], "x": 4, "y": 2},
362 {"x":5, "y":2}, 362 {"matrix": [2, 4], "x": 5, "y": 2},
363 {"x":6, "y":2}, 363 {"matrix": [2, 5], "x": 6, "y": 2},
364 {"x":7, "y":2}, 364 {"matrix": [2, 6], "x": 7, "y": 2},
365 {"x":8, "y":2}, 365 {"matrix": [2, 7], "x": 8, "y": 2},
366 {"x":9, "y":2}, 366 {"matrix": [2, 8], "x": 9, "y": 2},
367 {"x":10, "y":2}, 367 {"matrix": [2, 9], "x": 10, "y": 2},
368 {"x":11, "y":2}, 368 {"matrix": [2, 10], "x": 11, "y": 2},
369 {"x":12, "y":2}, 369 {"matrix": [2, 11], "x": 12, "y": 2},
370 {"x":13, "y":2}, 370 {"matrix": [2, 12], "x": 13, "y": 2},
371 {"x":14, "y":2}, 371 {"matrix": [2, 13], "x": 14, "y": 2},
372 {"x":15, "y":2}, 372 {"matrix": [2, 14], "x": 15, "y": 2},
373 373
374 {"x":0, "y":3}, 374 {"matrix": [3, 0], "x": 0, "y": 3},
375 {"x":1, "y":3}, 375 {"matrix": [3, 1], "x": 1, "y": 3},
376 376
377 {"x":2.25, "y":3, "w":1.25}, 377 {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
378 {"x":3.5, "y":3}, 378 {"matrix": [3, 3], "x": 3.5, "y": 3},
379 {"x":4.5, "y":3}, 379 {"matrix": [3, 4], "x": 4.5, "y": 3},
380 {"x":5.5, "y":3}, 380 {"matrix": [3, 5], "x": 5.5, "y": 3},
381 {"x":6.5, "y":3}, 381 {"matrix": [3, 6], "x": 6.5, "y": 3},
382 {"x":7.5, "y":3}, 382 {"matrix": [3, 7], "x": 7.5, "y": 3},
383 {"x":8.5, "y":3}, 383 {"matrix": [3, 8], "x": 8.5, "y": 3},
384 {"x":9.5, "y":3}, 384 {"matrix": [3, 9], "x": 9.5, "y": 3},
385 {"x":10.5, "y":3}, 385 {"matrix": [3, 10], "x": 10.5, "y": 3},
386 {"x":11.5, "y":3}, 386 {"matrix": [3, 11], "x": 11.5, "y": 3},
387 {"x":12.5, "y":3}, 387 {"matrix": [3, 12], "x": 12.5, "y": 3},
388 {"x":13.5, "y":3}, 388 {"matrix": [3, 13], "x": 13.5, "y": 3},
389 {"x":14.5, "y":3, "w":2.75}, 389 {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
390 390
391 {"x":17.5, "y":3}, 391 {"matrix": [3, 16], "x": 17.5, "y": 3},
392 392
393 {"x":0, "y":4}, 393 {"matrix": [4, 0], "x": 0, "y": 4},
394 {"x":1, "y":4}, 394 {"matrix": [4, 1], "x": 1, "y": 4},
395 395
396 {"x":2.25, "y":4, "w":1.25}, 396 {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
397 {"x":3.5, "y":4, "w":1.25}, 397 {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
398 {"x":4.75, "y":4, "w":1.25}, 398 {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
399 {"x":6, "y":4, "w":6.25}, 399 {"matrix": [4, 8], "x": 6, "y": 4, "w": 6.25},
400 {"x":12.25, "y":4, "w":1.25}, 400 {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
401 {"x":13.5, "y":4, "w":1.25}, 401 {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.25},
402 {"x":14.75, "y":4, "w":1.25}, 402 {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.25},
403 403
404 {"x":16.5, "y":4}, 404 {"matrix": [4, 15], "x": 16.5, "y": 4},
405 {"x":17.5, "y":4}, 405 {"matrix": [4, 16], "x": 17.5, "y": 4},
406 {"x":18.5, "y":4} 406 {"matrix": [4, 17], "x": 18.5, "y": 4}
407 ] 407 ]
408 } 408 }
409 } 409 }
diff --git a/keyboards/lfkeyboards/lfk78/revc/revc.h b/keyboards/lfkeyboards/lfk78/revc/revc.h
deleted file mode 100644
index e7ab930d2f..0000000000
--- a/keyboards/lfkeyboards/lfk78/revc/revc.h
+++ /dev/null
@@ -1,78 +0,0 @@
1#pragma once
2
3#include "lfk78.h"
4
5// readability
6#define XXX KC_NO
7
8// This is a shortcut to help you visually see your layout.
9/*
10 * ,---------. ,-----------------------------------------------------------------------. ,---------.
11 * | 11 | 12 | | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 1A | 1B | 1C | 1D | 1E | 1F | 1G | | 1H | 1I |
12 * |---------| |-----------------------------------------------------------------------| |---------|
13 * | 21 | 22 | | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 2A | 2B | 2C | 2D | 2E | 2F | 2G | | 2H | 2I |
14 * |---------| |-----------------------------------------------------------------------| `---------'
15 * | 31 | 32 | | 33 | 34 | 35 | 36 | 37 | 38 | 39 | 3A | 3B | 3C | 3D | 3E | 3F |
16 * |---------| |-----------------------------------------------------------------------| ,----.
17 * | 41 | 42 | | 43 | 45 | 46 | 47 | 48 | 49 | 4A | 4B | 4C | 4D | 4E | 4F | | 4H |
18 * |---------| |-------------------------------------------------------------------------------------.
19 * | 51 | 52 | | 53 | 54 | 55 | 59 | 5D | 5E | 5F | | 5G | 5H | 5I |
20 * `---------' `--------------------------------------------------------------------' `--------------'
21 */
22// The first section contains all of the arguements
23// The second converts the arguments into a two-dimensional array
24#define LAYOUT( \
25 k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I, \
26 k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I, \
27 k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, \
28 k41, k42, k43, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4H, \
29 k51, k52, k53, k54, k55, k59, k5D, k5E, k5F, k5G, k5H, k5I \
30) { \
31 { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I }, \
32 { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I }, \
33 { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, XXX, XXX, XXX }, \
34 { k41, k42, k43, XXX, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, XXX, k4H, XXX }, \
35 { k51, k52, k53, k54, k55, XXX, XXX, XXX, k59, XXX, XXX, XXX, k5D, k5E, k5F, k5G, k5H, k5I } \
36}
37
38#define LAYOUT_split_bs( \
39 k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k3G, k1H, k1I, \
40 k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I, \
41 k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, \
42 k41, k42, k43, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4H, \
43 k51, k52, k53, k54, k55, k59, k5D, k5E, k5F, k5G, k5H, k5I \
44) { \
45 { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I }, \
46 { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I }, \
47 { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G, XXX, XXX }, \
48 { k41, k42, k43, XXX, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, XXX, k4H, XXX }, \
49 { k51, k52, k53, k54, k55, XXX, XXX, XXX, k59, XXX, XXX, XXX, k5D, k5E, k5F, k5G, k5H, k5I } \
50}
51
52#define LAYOUT_split_rshift( \
53 k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I, \
54 k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I, \
55 k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, \
56 k41, k42, k43, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, \
57 k51, k52, k53, k54, k55, k59, k5D, k5E, k5F, k5G, k5H, k5I \
58) { \
59 { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I }, \
60 { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I }, \
61 { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, XXX, XXX, XXX }, \
62 { k41, k42, k43, XXX, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, XXX }, \
63 { k51, k52, k53, k54, k55, XXX, XXX, XXX, k59, XXX, XXX, XXX, k5D, k5E, k5F, k5G, k5H, k5I } \
64}
65
66#define LAYOUT_iso( \
67 k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I, \
68 k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I, \
69 k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, \
70 k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4H, \
71 k51, k52, k53, k54, k55, k59, k5D, k5E, k5F, k5G, k5H, k5I \
72) { \
73 { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I }, \
74 { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I }, \
75 { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, XXX, XXX, XXX }, \
76 { k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, XXX, k4H, XXX }, \
77 { k51, k52, k53, k54, k55, XXX, XXX, XXX, k59, XXX, XXX, XXX, k5D, k5E, k5F, k5G, k5H, k5I } \
78}
diff --git a/keyboards/lfkeyboards/lfk78/revj/info.json b/keyboards/lfkeyboards/lfk78/revj/info.json
index 34c703f6a6..8f9198b089 100644
--- a/keyboards/lfkeyboards/lfk78/revj/info.json
+++ b/keyboards/lfkeyboards/lfk78/revj/info.json
@@ -25,385 +25,385 @@
25 "layouts": { 25 "layouts": {
26 "LAYOUT": { 26 "LAYOUT": {
27 "layout": [ 27 "layout": [
28 {"x":0, "y":0}, 28 {"matrix": [0, 0], "x": 0, "y": 0},
29 {"x":1, "y":0}, 29 {"matrix": [0, 1], "x": 1, "y": 0},
30 30
31 {"x":2.25, "y":0}, 31 {"matrix": [0, 2], "x": 2.25, "y": 0},
32 {"x":3.25, "y":0}, 32 {"matrix": [0, 3], "x": 3.25, "y": 0},
33 {"x":4.25, "y":0}, 33 {"matrix": [0, 4], "x": 4.25, "y": 0},
34 {"x":5.25, "y":0}, 34 {"matrix": [0, 5], "x": 5.25, "y": 0},
35 {"x":6.25, "y":0}, 35 {"matrix": [0, 6], "x": 6.25, "y": 0},
36 {"x":7.25, "y":0}, 36 {"matrix": [0, 7], "x": 7.25, "y": 0},
37 {"x":8.25, "y":0}, 37 {"matrix": [0, 8], "x": 8.25, "y": 0},
38 {"x":9.25, "y":0}, 38 {"matrix": [0, 9], "x": 9.25, "y": 0},
39 {"x":10.25, "y":0}, 39 {"matrix": [0, 10], "x": 10.25, "y": 0},
40 {"x":11.25, "y":0}, 40 {"matrix": [0, 11], "x": 11.25, "y": 0},
41 {"x":12.25, "y":0}, 41 {"matrix": [0, 12], "x": 12.25, "y": 0},
42 {"x":13.25, "y":0}, 42 {"matrix": [0, 13], "x": 13.25, "y": 0},
43 {"x":14.25, "y":0}, 43 {"matrix": [0, 14], "x": 14.25, "y": 0},
44 {"x":15.25, "y":0, "w":2}, 44 {"matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
45 45
46 {"x":17.5, "y":0}, 46 {"matrix": [0, 16], "x": 17.5, "y": 0},
47 {"x":18.5, "y":0}, 47 {"matrix": [0, 17], "x": 18.5, "y": 0},
48 48
49 {"x":0, "y":1}, 49 {"matrix": [1, 0], "x": 0, "y": 1},
50 {"x":1, "y":1}, 50 {"matrix": [1, 1], "x": 1, "y": 1},
51 51
52 {"x":2.25, "y":1, "w":1.5}, 52 {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
53 {"x":3.75, "y":1}, 53 {"matrix": [1, 3], "x": 3.75, "y": 1},
54 {"x":4.75, "y":1}, 54 {"matrix": [1, 4], "x": 4.75, "y": 1},
55 {"x":5.75, "y":1}, 55 {"matrix": [1, 5], "x": 5.75, "y": 1},
56 {"x":6.75, "y":1}, 56 {"matrix": [1, 6], "x": 6.75, "y": 1},
57 {"x":7.75, "y":1}, 57 {"matrix": [1, 7], "x": 7.75, "y": 1},
58 {"x":8.75, "y":1}, 58 {"matrix": [1, 8], "x": 8.75, "y": 1},
59 {"x":9.75, "y":1}, 59 {"matrix": [1, 9], "x": 9.75, "y": 1},
60 {"x":10.75, "y":1}, 60 {"matrix": [1, 10], "x": 10.75, "y": 1},
61 {"x":11.75, "y":1}, 61 {"matrix": [1, 11], "x": 11.75, "y": 1},
62 {"x":12.75, "y":1}, 62 {"matrix": [1, 12], "x": 12.75, "y": 1},
63 {"x":13.75, "y":1}, 63 {"matrix": [1, 13], "x": 13.75, "y": 1},
64 {"x":14.75, "y":1}, 64 {"matrix": [1, 14], "x": 14.75, "y": 1},
65 {"x":15.75, "y":1, "w":1.5}, 65 {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
66 66
67 {"x":17.5, "y":1}, 67 {"matrix": [1, 16], "x": 17.5, "y": 1},
68 {"x":18.5, "y":1}, 68 {"matrix": [1, 17], "x": 18.5, "y": 1},
69 69
70 {"x":0, "y":2}, 70 {"matrix": [2, 0], "x": 0, "y": 2},
71 {"x":1, "y":2}, 71 {"matrix": [2, 1], "x": 1, "y": 2},
72 72
73 {"x":2.25, "y":2, "w":1.75}, 73 {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
74 {"x":4, "y":2}, 74 {"matrix": [2, 3], "x": 4, "y": 2},
75 {"x":5, "y":2}, 75 {"matrix": [2, 4], "x": 5, "y": 2},
76 {"x":6, "y":2}, 76 {"matrix": [2, 5], "x": 6, "y": 2},
77 {"x":7, "y":2}, 77 {"matrix": [2, 6], "x": 7, "y": 2},
78 {"x":8, "y":2}, 78 {"matrix": [2, 7], "x": 8, "y": 2},
79 {"x":9, "y":2}, 79 {"matrix": [2, 8], "x": 9, "y": 2},
80 {"x":10, "y":2}, 80 {"matrix": [2, 9], "x": 10, "y": 2},
81 {"x":11, "y":2}, 81 {"matrix": [2, 10], "x": 11, "y": 2},
82 {"x":12, "y":2}, 82 {"matrix": [2, 11], "x": 12, "y": 2},
83 {"x":13, "y":2}, 83 {"matrix": [2, 12], "x": 13, "y": 2},
84 {"x":14, "y":2}, 84 {"matrix": [2, 13], "x": 14, "y": 2},
85 {"x":15, "y":2, "w":2.25}, 85 {"matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
86 86
87 {"x":0, "y":3}, 87 {"matrix": [3, 0], "x": 0, "y": 3},
88 {"x":1, "y":3}, 88 {"matrix": [3, 1], "x": 1, "y": 3},
89 89
90 {"x":2.25, "y":3, "w":2.25}, 90 {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
91 {"x":4.5, "y":3}, 91 {"matrix": [3, 4], "x": 4.5, "y": 3},
92 {"x":5.5, "y":3}, 92 {"matrix": [3, 5], "x": 5.5, "y": 3},
93 {"x":6.5, "y":3}, 93 {"matrix": [3, 6], "x": 6.5, "y": 3},
94 {"x":7.5, "y":3}, 94 {"matrix": [3, 7], "x": 7.5, "y": 3},
95 {"x":8.5, "y":3}, 95 {"matrix": [3, 8], "x": 8.5, "y": 3},
96 {"x":9.5, "y":3}, 96 {"matrix": [3, 9], "x": 9.5, "y": 3},
97 {"x":10.5, "y":3}, 97 {"matrix": [3, 10], "x": 10.5, "y": 3},
98 {"x":11.5, "y":3}, 98 {"matrix": [3, 11], "x": 11.5, "y": 3},
99 {"x":12.5, "y":3}, 99 {"matrix": [3, 12], "x": 12.5, "y": 3},
100 {"x":13.5, "y":3}, 100 {"matrix": [3, 13], "x": 13.5, "y": 3},
101 {"x":14.5, "y":3, "w":2.75}, 101 {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
102 102
103 {"x":17.5, "y":3}, 103 {"matrix": [3, 16], "x": 17.5, "y": 3},
104 104
105 {"x":0, "y":4}, 105 {"matrix": [4, 0], "x": 0, "y": 4},
106 {"x":1, "y":4}, 106 {"matrix": [4, 1], "x": 1, "y": 4},
107 107
108 {"x":2.25, "y":4, "w":1.25}, 108 {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
109 {"x":3.5, "y":4, "w":1.25}, 109 {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
110 {"x":4.75, "y":4, "w":1.25}, 110 {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
111 {"x":6, "y":4, "w":6.25}, 111 {"matrix": [4, 8], "x": 6, "y": 4, "w": 6.25},
112 {"x":12.25, "y":4, "w":1.25}, 112 {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
113 {"x":13.5, "y":4, "w":1.25}, 113 {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.25},
114 {"x":14.75, "y":4, "w":1.25}, 114 {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.25},
115 115
116 {"x":16.5, "y":4}, 116 {"matrix": [4, 15], "x": 16.5, "y": 4},
117 {"x":17.5, "y":4}, 117 {"matrix": [4, 16], "x": 17.5, "y": 4},
118 {"x":18.5, "y":4} 118 {"matrix": [4, 17], "x": 18.5, "y": 4}
119 ] 119 ]
120 }, 120 },
121 "LAYOUT_split_bs": { 121 "LAYOUT_split_bs": {
122 "layout": [ 122 "layout": [
123 {"x":0, "y":0}, 123 {"matrix": [0, 0], "x": 0, "y": 0},
124 {"x":1, "y":0}, 124 {"matrix": [0, 1], "x": 1, "y": 0},
125 125
126 {"x":2.25, "y":0}, 126 {"matrix": [0, 2], "x": 2.25, "y": 0},
127 {"x":3.25, "y":0}, 127 {"matrix": [0, 3], "x": 3.25, "y": 0},
128 {"x":4.25, "y":0}, 128 {"matrix": [0, 4], "x": 4.25, "y": 0},
129 {"x":5.25, "y":0}, 129 {"matrix": [0, 5], "x": 5.25, "y": 0},
130 {"x":6.25, "y":0}, 130 {"matrix": [0, 6], "x": 6.25, "y": 0},
131 {"x":7.25, "y":0}, 131 {"matrix": [0, 7], "x": 7.25, "y": 0},
132 {"x":8.25, "y":0}, 132 {"matrix": [0, 8], "x": 8.25, "y": 0},
133 {"x":9.25, "y":0}, 133 {"matrix": [0, 9], "x": 9.25, "y": 0},
134 {"x":10.25, "y":0}, 134 {"matrix": [0, 10], "x": 10.25, "y": 0},
135 {"x":11.25, "y":0}, 135 {"matrix": [0, 11], "x": 11.25, "y": 0},
136 {"x":12.25, "y":0}, 136 {"matrix": [0, 12], "x": 12.25, "y": 0},
137 {"x":13.25, "y":0}, 137 {"matrix": [0, 13], "x": 13.25, "y": 0},
138 {"x":14.25, "y":0}, 138 {"matrix": [0, 14], "x": 14.25, "y": 0},
139 {"x":15.25, "y":0}, 139 {"matrix": [0, 15], "x": 15.25, "y": 0},
140 {"x":16.25, "y":0}, 140 {"matrix": [2, 15], "x": 16.25, "y": 0},
141 141
142 {"x":17.5, "y":0}, 142 {"matrix": [0, 16], "x": 17.5, "y": 0},
143 {"x":18.5, "y":0}, 143 {"matrix": [0, 17], "x": 18.5, "y": 0},
144 144
145 {"x":0, "y":1}, 145 {"matrix": [1, 0], "x": 0, "y": 1},
146 {"x":1, "y":1}, 146 {"matrix": [1, 1], "x": 1, "y": 1},
147 147
148 {"x":2.25, "y":1, "w":1.5}, 148 {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
149 {"x":3.75, "y":1}, 149 {"matrix": [1, 3], "x": 3.75, "y": 1},
150 {"x":4.75, "y":1}, 150 {"matrix": [1, 4], "x": 4.75, "y": 1},
151 {"x":5.75, "y":1}, 151 {"matrix": [1, 5], "x": 5.75, "y": 1},
152 {"x":6.75, "y":1}, 152 {"matrix": [1, 6], "x": 6.75, "y": 1},
153 {"x":7.75, "y":1}, 153 {"matrix": [1, 7], "x": 7.75, "y": 1},
154 {"x":8.75, "y":1}, 154 {"matrix": [1, 8], "x": 8.75, "y": 1},
155 {"x":9.75, "y":1}, 155 {"matrix": [1, 9], "x": 9.75, "y": 1},
156 {"x":10.75, "y":1}, 156 {"matrix": [1, 10], "x": 10.75, "y": 1},
157 {"x":11.75, "y":1}, 157 {"matrix": [1, 11], "x": 11.75, "y": 1},
158 {"x":12.75, "y":1}, 158 {"matrix": [1, 12], "x": 12.75, "y": 1},
159 {"x":13.75, "y":1}, 159 {"matrix": [1, 13], "x": 13.75, "y": 1},
160 {"x":14.75, "y":1}, 160 {"matrix": [1, 14], "x": 14.75, "y": 1},
161 {"x":15.75, "y":1, "w":1.5}, 161 {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
162 162
163 {"x":17.5, "y":1}, 163 {"matrix": [1, 16], "x": 17.5, "y": 1},
164 {"x":18.5, "y":1}, 164 {"matrix": [1, 17], "x": 18.5, "y": 1},
165 165
166 {"x":0, "y":2}, 166 {"matrix": [2, 0], "x": 0, "y": 2},
167 {"x":1, "y":2}, 167 {"matrix": [2, 1], "x": 1, "y": 2},
168 168
169 {"x":2.25, "y":2, "w":1.75}, 169 {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
170 {"x":4, "y":2}, 170 {"matrix": [2, 3], "x": 4, "y": 2},
171 {"x":5, "y":2}, 171 {"matrix": [2, 4], "x": 5, "y": 2},
172 {"x":6, "y":2}, 172 {"matrix": [2, 5], "x": 6, "y": 2},
173 {"x":7, "y":2}, 173 {"matrix": [2, 6], "x": 7, "y": 2},
174 {"x":8, "y":2}, 174 {"matrix": [2, 7], "x": 8, "y": 2},
175 {"x":9, "y":2}, 175 {"matrix": [2, 8], "x": 9, "y": 2},
176 {"x":10, "y":2}, 176 {"matrix": [2, 9], "x": 10, "y": 2},
177 {"x":11, "y":2}, 177 {"matrix": [2, 10], "x": 11, "y": 2},
178 {"x":12, "y":2}, 178 {"matrix": [2, 11], "x": 12, "y": 2},
179 {"x":13, "y":2}, 179 {"matrix": [2, 12], "x": 13, "y": 2},
180 {"x":14, "y":2}, 180 {"matrix": [2, 13], "x": 14, "y": 2},
181 {"x":15, "y":2, "w":2.25}, 181 {"matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
182 182
183 {"x":0, "y":3}, 183 {"matrix": [3, 0], "x": 0, "y": 3},
184 {"x":1, "y":3}, 184 {"matrix": [3, 1], "x": 1, "y": 3},
185 185
186 {"x":2.25, "y":3, "w":2.25}, 186 {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
187 {"x":4.5, "y":3}, 187 {"matrix": [3, 4], "x": 4.5, "y": 3},
188 {"x":5.5, "y":3}, 188 {"matrix": [3, 5], "x": 5.5, "y": 3},
189 {"x":6.5, "y":3}, 189 {"matrix": [3, 6], "x": 6.5, "y": 3},
190 {"x":7.5, "y":3}, 190 {"matrix": [3, 7], "x": 7.5, "y": 3},
191 {"x":8.5, "y":3}, 191 {"matrix": [3, 8], "x": 8.5, "y": 3},
192 {"x":9.5, "y":3}, 192 {"matrix": [3, 9], "x": 9.5, "y": 3},
193 {"x":10.5, "y":3}, 193 {"matrix": [3, 10], "x": 10.5, "y": 3},
194 {"x":11.5, "y":3}, 194 {"matrix": [3, 11], "x": 11.5, "y": 3},
195 {"x":12.5, "y":3}, 195 {"matrix": [3, 12], "x": 12.5, "y": 3},
196 {"x":13.5, "y":3}, 196 {"matrix": [3, 13], "x": 13.5, "y": 3},
197 {"x":14.5, "y":3, "w":2.75}, 197 {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
198 198
199 {"x":17.5, "y":3}, 199 {"matrix": [3, 16], "x": 17.5, "y": 3},
200 200
201 {"x":0, "y":4}, 201 {"matrix": [4, 0], "x": 0, "y": 4},
202 {"x":1, "y":4}, 202 {"matrix": [4, 1], "x": 1, "y": 4},
203 203
204 {"x":2.25, "y":4, "w":1.25}, 204 {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
205 {"x":3.5, "y":4, "w":1.25}, 205 {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
206 {"x":4.75, "y":4, "w":1.25}, 206 {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
207 {"x":6, "y":4, "w":6.25}, 207 {"matrix": [4, 8], "x": 6, "y": 4, "w": 6.25},
208 {"x":12.25, "y":4, "w":1.25}, 208 {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
209 {"x":13.5, "y":4, "w":1.25}, 209 {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.25},
210 {"x":14.75, "y":4, "w":1.25}, 210 {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.25},
211 211
212 {"x":16.5, "y":4}, 212 {"matrix": [4, 15], "x": 16.5, "y": 4},
213 {"x":17.5, "y":4}, 213 {"matrix": [4, 16], "x": 17.5, "y": 4},
214 {"x":18.5, "y":4} 214 {"matrix": [4, 17], "x": 18.5, "y": 4}
215 ] 215 ]
216 }, 216 },
217 "LAYOUT_split_rshift": { 217 "LAYOUT_split_rshift": {
218 "layout": [ 218 "layout": [
219 {"x":0, "y":0}, 219 {"matrix": [0, 0], "x": 0, "y": 0},
220 {"x":1, "y":0}, 220 {"matrix": [0, 1], "x": 1, "y": 0},
221 221
222 {"x":2.25, "y":0}, 222 {"matrix": [0, 2], "x": 2.25, "y": 0},
223 {"x":3.25, "y":0}, 223 {"matrix": [0, 3], "x": 3.25, "y": 0},
224 {"x":4.25, "y":0}, 224 {"matrix": [0, 4], "x": 4.25, "y": 0},
225 {"x":5.25, "y":0}, 225 {"matrix": [0, 5], "x": 5.25, "y": 0},
226 {"x":6.25, "y":0}, 226 {"matrix": [0, 6], "x": 6.25, "y": 0},
227 {"x":7.25, "y":0}, 227 {"matrix": [0, 7], "x": 7.25, "y": 0},
228 {"x":8.25, "y":0}, 228 {"matrix": [0, 8], "x": 8.25, "y": 0},
229 {"x":9.25, "y":0}, 229 {"matrix": [0, 9], "x": 9.25, "y": 0},
230 {"x":10.25, "y":0}, 230 {"matrix": [0, 10], "x": 10.25, "y": 0},
231 {"x":11.25, "y":0}, 231 {"matrix": [0, 11], "x": 11.25, "y": 0},
232 {"x":12.25, "y":0}, 232 {"matrix": [0, 12], "x": 12.25, "y": 0},
233 {"x":13.25, "y":0}, 233 {"matrix": [0, 13], "x": 13.25, "y": 0},
234 {"x":14.25, "y":0}, 234 {"matrix": [0, 14], "x": 14.25, "y": 0},
235 {"x":15.25, "y":0, "w":2}, 235 {"matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
236 236
237 {"x":17.5, "y":0}, 237 {"matrix": [0, 16], "x": 17.5, "y": 0},
238 {"x":18.5, "y":0}, 238 {"matrix": [0, 17], "x": 18.5, "y": 0},
239 239
240 {"x":0, "y":1}, 240 {"matrix": [1, 0], "x": 0, "y": 1},
241 {"x":1, "y":1}, 241 {"matrix": [1, 1], "x": 1, "y": 1},
242 242
243 {"x":2.25, "y":1, "w":1.5}, 243 {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
244 {"x":3.75, "y":1}, 244 {"matrix": [1, 3], "x": 3.75, "y": 1},
245 {"x":4.75, "y":1}, 245 {"matrix": [1, 4], "x": 4.75, "y": 1},
246 {"x":5.75, "y":1}, 246 {"matrix": [1, 5], "x": 5.75, "y": 1},
247 {"x":6.75, "y":1}, 247 {"matrix": [1, 6], "x": 6.75, "y": 1},
248 {"x":7.75, "y":1}, 248 {"matrix": [1, 7], "x": 7.75, "y": 1},
249 {"x":8.75, "y":1}, 249 {"matrix": [1, 8], "x": 8.75, "y": 1},
250 {"x":9.75, "y":1}, 250 {"matrix": [1, 9], "x": 9.75, "y": 1},
251 {"x":10.75, "y":1}, 251 {"matrix": [1, 10], "x": 10.75, "y": 1},
252 {"x":11.75, "y":1}, 252 {"matrix": [1, 11], "x": 11.75, "y": 1},
253 {"x":12.75, "y":1}, 253 {"matrix": [1, 12], "x": 12.75, "y": 1},
254 {"x":13.75, "y":1}, 254 {"matrix": [1, 13], "x": 13.75, "y": 1},
255 {"x":14.75, "y":1}, 255 {"matrix": [1, 14], "x": 14.75, "y": 1},
256 {"x":15.75, "y":1, "w":1.5}, 256 {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
257 257
258 {"x":17.5, "y":1}, 258 {"matrix": [1, 16], "x": 17.5, "y": 1},
259 {"x":18.5, "y":1}, 259 {"matrix": [1, 17], "x": 18.5, "y": 1},
260 260
261 {"x":0, "y":2}, 261 {"matrix": [2, 0], "x": 0, "y": 2},
262 {"x":1, "y":2}, 262 {"matrix": [2, 1], "x": 1, "y": 2},
263 263
264 {"x":2.25, "y":2, "w":1.75}, 264 {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
265 {"x":4, "y":2}, 265 {"matrix": [2, 3], "x": 4, "y": 2},
266 {"x":5, "y":2}, 266 {"matrix": [2, 4], "x": 5, "y": 2},
267 {"x":6, "y":2}, 267 {"matrix": [2, 5], "x": 6, "y": 2},
268 {"x":7, "y":2}, 268 {"matrix": [2, 6], "x": 7, "y": 2},
269 {"x":8, "y":2}, 269 {"matrix": [2, 7], "x": 8, "y": 2},
270 {"x":9, "y":2}, 270 {"matrix": [2, 8], "x": 9, "y": 2},
271 {"x":10, "y":2}, 271 {"matrix": [2, 9], "x": 10, "y": 2},
272 {"x":11, "y":2}, 272 {"matrix": [2, 10], "x": 11, "y": 2},
273 {"x":12, "y":2}, 273 {"matrix": [2, 11], "x": 12, "y": 2},
274 {"x":13, "y":2}, 274 {"matrix": [2, 12], "x": 13, "y": 2},
275 {"x":14, "y":2}, 275 {"matrix": [2, 13], "x": 14, "y": 2},
276 {"x":15, "y":2, "w":2.25}, 276 {"matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
277 277
278 {"x":0, "y":3}, 278 {"matrix": [3, 0], "x": 0, "y": 3},
279 {"x":1, "y":3}, 279 {"matrix": [3, 1], "x": 1, "y": 3},
280 280
281 {"x":2.25, "y":3, "w":2.25}, 281 {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
282 {"x":4.5, "y":3}, 282 {"matrix": [3, 4], "x": 4.5, "y": 3},
283 {"x":5.5, "y":3}, 283 {"matrix": [3, 5], "x": 5.5, "y": 3},
284 {"x":6.5, "y":3}, 284 {"matrix": [3, 6], "x": 6.5, "y": 3},
285 {"x":7.5, "y":3}, 285 {"matrix": [3, 7], "x": 7.5, "y": 3},
286 {"x":8.5, "y":3}, 286 {"matrix": [3, 8], "x": 8.5, "y": 3},
287 {"x":9.5, "y":3}, 287 {"matrix": [3, 9], "x": 9.5, "y": 3},
288 {"x":10.5, "y":3}, 288 {"matrix": [3, 10], "x": 10.5, "y": 3},
289 {"x":11.5, "y":3}, 289 {"matrix": [3, 11], "x": 11.5, "y": 3},
290 {"x":12.5, "y":3}, 290 {"matrix": [3, 12], "x": 12.5, "y": 3},
291 {"x":13.5, "y":3}, 291 {"matrix": [3, 13], "x": 13.5, "y": 3},
292 {"x":14.5, "y":3, "w":1.75}, 292 {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
293 {"x":16.25, "y":3}, 293 {"matrix": [3, 15], "x": 16.25, "y": 3},
294 294
295 {"x":17.5, "y":3}, 295 {"matrix": [3, 16], "x": 17.5, "y": 3},
296 296
297 {"x":0, "y":4}, 297 {"matrix": [4, 0], "x": 0, "y": 4},
298 {"x":1, "y":4}, 298 {"matrix": [4, 1], "x": 1, "y": 4},
299 299
300 {"x":2.25, "y":4, "w":1.25}, 300 {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
301 {"x":3.5, "y":4, "w":1.25}, 301 {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
302 {"x":4.75, "y":4, "w":1.25}, 302 {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
303 {"x":6, "y":4, "w":6.25}, 303 {"matrix": [4, 8], "x": 6, "y": 4, "w": 6.25},
304 {"x":12.25, "y":4, "w":1.25}, 304 {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
305 {"x":13.5, "y":4, "w":1.25}, 305 {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.25},
306 {"x":14.75, "y":4, "w":1.25}, 306 {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.25},
307 307
308 {"x":16.5, "y":4}, 308 {"matrix": [4, 15], "x": 16.5, "y": 4},
309 {"x":17.5, "y":4}, 309 {"matrix": [4, 16], "x": 17.5, "y": 4},
310 {"x":18.5, "y":4} 310 {"matrix": [4, 17], "x": 18.5, "y": 4}
311 ] 311 ]
312 }, 312 },
313 "LAYOUT_iso": { 313 "LAYOUT_iso": {
314 "layout": [ 314 "layout": [
315 {"x":0, "y":0}, 315 {"matrix": [0, 0], "x": 0, "y": 0},
316 {"x":1, "y":0}, 316 {"matrix": [0, 1], "x": 1, "y": 0},
317 317
318 {"x":2.25, "y":0}, 318 {"matrix": [0, 2], "x": 2.25, "y": 0},
319 {"x":3.25, "y":0}, 319 {"matrix": [0, 3], "x": 3.25, "y": 0},
320 {"x":4.25, "y":0}, 320 {"matrix": [0, 4], "x": 4.25, "y": 0},
321 {"x":5.25, "y":0}, 321 {"matrix": [0, 5], "x": 5.25, "y": 0},
322 {"x":6.25, "y":0}, 322 {"matrix": [0, 6], "x": 6.25, "y": 0},
323 {"x":7.25, "y":0}, 323 {"matrix": [0, 7], "x": 7.25, "y": 0},
324 {"x":8.25, "y":0}, 324 {"matrix": [0, 8], "x": 8.25, "y": 0},
325 {"x":9.25, "y":0}, 325 {"matrix": [0, 9], "x": 9.25, "y": 0},
326 {"x":10.25, "y":0}, 326 {"matrix": [0, 10], "x": 10.25, "y": 0},
327 {"x":11.25, "y":0}, 327 {"matrix": [0, 11], "x": 11.25, "y": 0},
328 {"x":12.25, "y":0}, 328 {"matrix": [0, 12], "x": 12.25, "y": 0},
329 {"x":13.25, "y":0}, 329 {"matrix": [0, 13], "x": 13.25, "y": 0},
330 {"x":14.25, "y":0}, 330 {"matrix": [0, 14], "x": 14.25, "y": 0},
331 {"x":15.25, "y":0, "w":2}, 331 {"matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
332 332
333 {"x":17.5, "y":0}, 333 {"matrix": [0, 16], "x": 17.5, "y": 0},
334 {"x":18.5, "y":0}, 334 {"matrix": [0, 17], "x": 18.5, "y": 0},
335 335
336 {"x":0, "y":1}, 336 {"matrix": [1, 0], "x": 0, "y": 1},
337 {"x":1, "y":1}, 337 {"matrix": [1, 1], "x": 1, "y": 1},
338 338
339 {"x":2.25, "y":1, "w":1.5}, 339 {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
340 {"x":3.75, "y":1}, 340 {"matrix": [1, 3], "x": 3.75, "y": 1},
341 {"x":4.75, "y":1}, 341 {"matrix": [1, 4], "x": 4.75, "y": 1},
342 {"x":5.75, "y":1}, 342 {"matrix": [1, 5], "x": 5.75, "y": 1},
343 {"x":6.75, "y":1}, 343 {"matrix": [1, 6], "x": 6.75, "y": 1},
344 {"x":7.75, "y":1}, 344 {"matrix": [1, 7], "x": 7.75, "y": 1},
345 {"x":8.75, "y":1}, 345 {"matrix": [1, 8], "x": 8.75, "y": 1},
346 {"x":9.75, "y":1}, 346 {"matrix": [1, 9], "x": 9.75, "y": 1},
347 {"x":10.75, "y":1}, 347 {"matrix": [1, 10], "x": 10.75, "y": 1},
348 {"x":11.75, "y":1}, 348 {"matrix": [1, 11], "x": 11.75, "y": 1},
349 {"x":12.75, "y":1}, 349 {"matrix": [1, 12], "x": 12.75, "y": 1},
350 {"x":13.75, "y":1}, 350 {"matrix": [1, 13], "x": 13.75, "y": 1},
351 {"x":14.75, "y":1}, 351 {"matrix": [1, 14], "x": 14.75, "y": 1},
352 {"x":16, "y":1, "w":1.25, "h":2}, 352 {"matrix": [1, 15], "x": 16, "y": 1, "w": 1.25, "h": 2},
353 353
354 {"x":17.5, "y":1}, 354 {"matrix": [1, 16], "x": 17.5, "y": 1},
355 {"x":18.5, "y":1}, 355 {"matrix": [1, 17], "x": 18.5, "y": 1},
356 356
357 {"x":0, "y":2}, 357 {"matrix": [2, 0], "x": 0, "y": 2},
358 {"x":1, "y":2}, 358 {"matrix": [2, 1], "x": 1, "y": 2},
359 359
360 {"x":2.25, "y":2, "w":1.75}, 360 {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
361 {"x":4, "y":2}, 361 {"matrix": [2, 3], "x": 4, "y": 2},
362 {"x":5, "y":2}, 362 {"matrix": [2, 4], "x": 5, "y": 2},
363 {"x":6, "y":2}, 363 {"matrix": [2, 5], "x": 6, "y": 2},
364 {"x":7, "y":2}, 364 {"matrix": [2, 6], "x": 7, "y": 2},
365 {"x":8, "y":2}, 365 {"matrix": [2, 7], "x": 8, "y": 2},
366 {"x":9, "y":2}, 366 {"matrix": [2, 8], "x": 9, "y": 2},
367 {"x":10, "y":2}, 367 {"matrix": [2, 9], "x": 10, "y": 2},
368 {"x":11, "y":2}, 368 {"matrix": [2, 10], "x": 11, "y": 2},
369 {"x":12, "y":2}, 369 {"matrix": [2, 11], "x": 12, "y": 2},
370 {"x":13, "y":2}, 370 {"matrix": [2, 12], "x": 13, "y": 2},
371 {"x":14, "y":2}, 371 {"matrix": [2, 13], "x": 14, "y": 2},
372 {"x":15, "y":2}, 372 {"matrix": [2, 14], "x": 15, "y": 2},
373 373
374 {"x":0, "y":3}, 374 {"matrix": [3, 0], "x": 0, "y": 3},
375 {"x":1, "y":3}, 375 {"matrix": [3, 1], "x": 1, "y": 3},
376 376
377 {"x":2.25, "y":3, "w":1.25}, 377 {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
378 {"x":3.5, "y":3}, 378 {"matrix": [3, 3], "x": 3.5, "y": 3},
379 {"x":4.5, "y":3}, 379 {"matrix": [3, 4], "x": 4.5, "y": 3},
380 {"x":5.5, "y":3}, 380 {"matrix": [3, 5], "x": 5.5, "y": 3},
381 {"x":6.5, "y":3}, 381 {"matrix": [3, 6], "x": 6.5, "y": 3},
382 {"x":7.5, "y":3}, 382 {"matrix": [3, 7], "x": 7.5, "y": 3},
383 {"x":8.5, "y":3}, 383 {"matrix": [3, 8], "x": 8.5, "y": 3},
384 {"x":9.5, "y":3}, 384 {"matrix": [3, 9], "x": 9.5, "y": 3},
385 {"x":10.5, "y":3}, 385 {"matrix": [3, 10], "x": 10.5, "y": 3},
386 {"x":11.5, "y":3}, 386 {"matrix": [3, 11], "x": 11.5, "y": 3},
387 {"x":12.5, "y":3}, 387 {"matrix": [3, 12], "x": 12.5, "y": 3},
388 {"x":13.5, "y":3}, 388 {"matrix": [3, 13], "x": 13.5, "y": 3},
389 {"x":14.5, "y":3, "w":2.75}, 389 {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
390 390
391 {"x":17.5, "y":3}, 391 {"matrix": [3, 16], "x": 17.5, "y": 3},
392 392
393 {"x":0, "y":4}, 393 {"matrix": [4, 0], "x": 0, "y": 4},
394 {"x":1, "y":4}, 394 {"matrix": [4, 1], "x": 1, "y": 4},
395 395
396 {"x":2.25, "y":4, "w":1.25}, 396 {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
397 {"x":3.5, "y":4, "w":1.25}, 397 {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
398 {"x":4.75, "y":4, "w":1.25}, 398 {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
399 {"x":6, "y":4, "w":6.25}, 399 {"matrix": [4, 8], "x": 6, "y": 4, "w": 6.25},
400 {"x":12.25, "y":4, "w":1.25}, 400 {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
401 {"x":13.5, "y":4, "w":1.25}, 401 {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.25},
402 {"x":14.75, "y":4, "w":1.25}, 402 {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.25},
403 403
404 {"x":16.5, "y":4}, 404 {"matrix": [4, 15], "x": 16.5, "y": 4},
405 {"x":17.5, "y":4}, 405 {"matrix": [4, 16], "x": 17.5, "y": 4},
406 {"x":18.5, "y":4} 406 {"matrix": [4, 17], "x": 18.5, "y": 4}
407 ] 407 ]
408 } 408 }
409 } 409 }
diff --git a/keyboards/lfkeyboards/lfk78/revj/revj.h b/keyboards/lfkeyboards/lfk78/revj/revj.h
deleted file mode 100644
index e7ab930d2f..0000000000
--- a/keyboards/lfkeyboards/lfk78/revj/revj.h
+++ /dev/null
@@ -1,78 +0,0 @@
1#pragma once
2
3#include "lfk78.h"
4
5// readability
6#define XXX KC_NO
7
8// This is a shortcut to help you visually see your layout.
9/*
10 * ,---------. ,-----------------------------------------------------------------------. ,---------.
11 * | 11 | 12 | | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 1A | 1B | 1C | 1D | 1E | 1F | 1G | | 1H | 1I |
12 * |---------| |-----------------------------------------------------------------------| |---------|
13 * | 21 | 22 | | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 2A | 2B | 2C | 2D | 2E | 2F | 2G | | 2H | 2I |
14 * |---------| |-----------------------------------------------------------------------| `---------'
15 * | 31 | 32 | | 33 | 34 | 35 | 36 | 37 | 38 | 39 | 3A | 3B | 3C | 3D | 3E | 3F |
16 * |---------| |-----------------------------------------------------------------------| ,----.
17 * | 41 | 42 | | 43 | 45 | 46 | 47 | 48 | 49 | 4A | 4B | 4C | 4D | 4E | 4F | | 4H |
18 * |---------| |-------------------------------------------------------------------------------------.
19 * | 51 | 52 | | 53 | 54 | 55 | 59 | 5D | 5E | 5F | | 5G | 5H | 5I |
20 * `---------' `--------------------------------------------------------------------' `--------------'
21 */
22// The first section contains all of the arguements
23// The second converts the arguments into a two-dimensional array
24#define LAYOUT( \
25 k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I, \
26 k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I, \
27 k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, \
28 k41, k42, k43, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4H, \
29 k51, k52, k53, k54, k55, k59, k5D, k5E, k5F, k5G, k5H, k5I \
30) { \
31 { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I }, \
32 { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I }, \
33 { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, XXX, XXX, XXX }, \
34 { k41, k42, k43, XXX, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, XXX, k4H, XXX }, \
35 { k51, k52, k53, k54, k55, XXX, XXX, XXX, k59, XXX, XXX, XXX, k5D, k5E, k5F, k5G, k5H, k5I } \
36}
37
38#define LAYOUT_split_bs( \
39 k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k3G, k1H, k1I, \
40 k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I, \
41 k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, \
42 k41, k42, k43, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4H, \
43 k51, k52, k53, k54, k55, k59, k5D, k5E, k5F, k5G, k5H, k5I \
44) { \
45 { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I }, \
46 { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I }, \
47 { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G, XXX, XXX }, \
48 { k41, k42, k43, XXX, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, XXX, k4H, XXX }, \
49 { k51, k52, k53, k54, k55, XXX, XXX, XXX, k59, XXX, XXX, XXX, k5D, k5E, k5F, k5G, k5H, k5I } \
50}
51
52#define LAYOUT_split_rshift( \
53 k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I, \
54 k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I, \
55 k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, \
56 k41, k42, k43, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, \
57 k51, k52, k53, k54, k55, k59, k5D, k5E, k5F, k5G, k5H, k5I \
58) { \
59 { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I }, \
60 { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I }, \
61 { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, XXX, XXX, XXX }, \
62 { k41, k42, k43, XXX, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, XXX }, \
63 { k51, k52, k53, k54, k55, XXX, XXX, XXX, k59, XXX, XXX, XXX, k5D, k5E, k5F, k5G, k5H, k5I } \
64}
65
66#define LAYOUT_iso( \
67 k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I, \
68 k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I, \
69 k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, \
70 k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4H, \
71 k51, k52, k53, k54, k55, k59, k5D, k5E, k5F, k5G, k5H, k5I \
72) { \
73 { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I }, \
74 { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I }, \
75 { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, XXX, XXX, XXX }, \
76 { k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, XXX, k4H, XXX }, \
77 { k51, k52, k53, k54, k55, XXX, XXX, XXX, k59, XXX, XXX, XXX, k5D, k5E, k5F, k5G, k5H, k5I } \
78}
diff --git a/keyboards/makenova/omega/omega4/info.json b/keyboards/makenova/omega/omega4/info.json
index 437f850963..8d5bc0ddcf 100644
--- a/keyboards/makenova/omega/omega4/info.json
+++ b/keyboards/makenova/omega/omega4/info.json
@@ -23,13 +23,124 @@
23 }, 23 },
24 "layouts": { 24 "layouts": {
25 "LAYOUT": { 25 "LAYOUT": {
26 "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0}, {"label":"A", "x":0.25, "y":1}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":5.25, "y":1}, {"label":"J", "x":6.25, "y":1}, {"label":"K", "x":7.25, "y":1}, {"label":"L", "x":8.25, "y":1}, {"label":":", "x":9.25, "y":1}, {"label":"Z", "x":0.5, "y":2}, {"label":"X", "x":1.5, "y":2}, {"label":"C", "x":2.5, "y":2}, {"label":"V", "x":3.5, "y":2}, {"label":"", "x":4.5, "y":2}, {"label":"", "x":5.5, "y":2}, {"label":"B", "x":6.5, "y":2}, {"label":"N", "x":7.5, "y":2}, {"label":"M", "x":8.5, "y":2}, {"label":"<", "x":9.5, "y":2}, {"label":"", "x":0.75, "y":3}, {"label":"", "x":1.75, "y":3}, {"label":"Space", "x":2.75, "y":3, "w":6}, {"label":"", "x":8.75, "y":3}, {"label":"", "x":9.75, "y":3}] 26 "layout": [
27 {"matrix": [0, 0], "x": 0, "y": 0},
28 {"matrix": [0, 1], "x": 1, "y": 0},
29 {"matrix": [0, 2], "x": 2, "y": 0},
30 {"matrix": [0, 3], "x": 3, "y": 0},
31 {"matrix": [0, 4], "x": 4, "y": 0},
32 {"matrix": [0, 5], "x": 5, "y": 0},
33 {"matrix": [0, 6], "x": 6, "y": 0},
34 {"matrix": [0, 7], "x": 7, "y": 0},
35 {"matrix": [0, 8], "x": 8, "y": 0},
36 {"matrix": [0, 9], "x": 9, "y": 0},
37
38 {"matrix": [1, 0], "x": 0.25, "y": 1},
39 {"matrix": [1, 1], "x": 1.25, "y": 1},
40 {"matrix": [1, 2], "x": 2.25, "y": 1},
41 {"matrix": [1, 3], "x": 3.25, "y": 1},
42 {"matrix": [1, 4], "x": 4.25, "y": 1},
43 {"matrix": [1, 5], "x": 5.25, "y": 1},
44 {"matrix": [1, 6], "x": 6.25, "y": 1},
45 {"matrix": [1, 7], "x": 7.25, "y": 1},
46 {"matrix": [1, 8], "x": 8.25, "y": 1},
47 {"matrix": [1, 9], "x": 9.25, "y": 1},
48
49 {"matrix": [2, 0], "x": 0.5, "y": 2},
50 {"matrix": [2, 1], "x": 1.5, "y": 2},
51 {"matrix": [2, 2], "x": 2.5, "y": 2},
52 {"matrix": [2, 3], "x": 3.5, "y": 2},
53 {"matrix": [2, 4], "x": 4.5, "y": 2},
54 {"matrix": [2, 5], "x": 5.5, "y": 2},
55 {"matrix": [2, 6], "x": 6.5, "y": 2},
56 {"matrix": [2, 7], "x": 7.5, "y": 2},
57 {"matrix": [2, 8], "x": 8.5, "y": 2},
58 {"matrix": [2, 9], "x": 9.5, "y": 2},
59
60 {"matrix": [3, 0], "x": 0.75, "y": 3},
61 {"matrix": [3, 1], "x": 1.75, "y": 3},
62 {"matrix": [3, 5], "x": 2.75, "y": 3, "w": 6},
63 {"matrix": [3, 8], "x": 8.75, "y": 3},
64 {"matrix": [3, 9], "x": 9.75, "y": 3}
65 ]
27 }, 66 },
28 "LAYOUT_6u_bar": { 67 "LAYOUT_6u_bar": {
29 "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0}, {"label":"A", "x":0.25, "y":1}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":5.25, "y":1}, {"label":"J", "x":6.25, "y":1}, {"label":"K", "x":7.25, "y":1}, {"label":"L", "x":8.25, "y":1}, {"label":":", "x":9.25, "y":1}, {"label":"Z", "x":0.5, "y":2}, {"label":"X", "x":1.5, "y":2}, {"label":"C", "x":2.5, "y":2}, {"label":"V", "x":3.5, "y":2}, {"label":"", "x":4.5, "y":2}, {"label":"", "x":5.5, "y":2}, {"label":"B", "x":6.5, "y":2}, {"label":"N", "x":7.5, "y":2}, {"label":"M", "x":8.5, "y":2}, {"label":"<", "x":9.5, "y":2}, {"label":"", "x":0.75, "y":3}, {"label":"Space", "x":1.75, "y":3, "w":8}, {"label":"", "x":9.75, "y":3}] 68 "layout": [
69 {"matrix": [0, 0], "x": 0, "y": 0},
70 {"matrix": [0, 1], "x": 1, "y": 0},
71 {"matrix": [0, 2], "x": 2, "y": 0},
72 {"matrix": [0, 3], "x": 3, "y": 0},
73 {"matrix": [0, 4], "x": 4, "y": 0},
74 {"matrix": [0, 5], "x": 5, "y": 0},
75 {"matrix": [0, 6], "x": 6, "y": 0},
76 {"matrix": [0, 7], "x": 7, "y": 0},
77 {"matrix": [0, 8], "x": 8, "y": 0},
78 {"matrix": [0, 9], "x": 9, "y": 0},
79
80 {"matrix": [1, 0], "x": 0.25, "y": 1},
81 {"matrix": [1, 1], "x": 1.25, "y": 1},
82 {"matrix": [1, 2], "x": 2.25, "y": 1},
83 {"matrix": [1, 3], "x": 3.25, "y": 1},
84 {"matrix": [1, 4], "x": 4.25, "y": 1},
85 {"matrix": [1, 5], "x": 5.25, "y": 1},
86 {"matrix": [1, 6], "x": 6.25, "y": 1},
87 {"matrix": [1, 7], "x": 7.25, "y": 1},
88 {"matrix": [1, 8], "x": 8.25, "y": 1},
89 {"matrix": [1, 9], "x": 9.25, "y": 1},
90
91 {"matrix": [2, 0], "x": 0.5, "y": 2},
92 {"matrix": [2, 1], "x": 1.5, "y": 2},
93 {"matrix": [2, 2], "x": 2.5, "y": 2},
94 {"matrix": [2, 3], "x": 3.5, "y": 2},
95 {"matrix": [2, 4], "x": 4.5, "y": 2},
96 {"matrix": [2, 5], "x": 5.5, "y": 2},
97 {"matrix": [2, 6], "x": 6.5, "y": 2},
98 {"matrix": [2, 7], "x": 7.5, "y": 2},
99 {"matrix": [2, 8], "x": 8.5, "y": 2},
100 {"matrix": [2, 9], "x": 9.5, "y": 2},
101
102 {"matrix": [3, 0], "x": 0.75, "y": 3},
103 {"matrix": [3, 5], "x": 1.75, "y": 3, "w": 8},
104 {"matrix": [3, 9], "x": 9.75, "y": 3}
105 ]
30 }, 106 },
31 "LAYOUT_10u_bar": { 107 "LAYOUT_10u_bar": {
32 "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0}, {"label":"A", "x":0.25, "y":1}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":5.25, "y":1}, {"label":"J", "x":6.25, "y":1}, {"label":"K", "x":7.25, "y":1}, {"label":"L", "x":8.25, "y":1}, {"label":":", "x":9.25, "y":1}, {"label":"Z", "x":0.5, "y":2}, {"label":"X", "x":1.5, "y":2}, {"label":"C", "x":2.5, "y":2}, {"label":"V", "x":3.5, "y":2}, {"label":"", "x":4.5, "y":2}, {"label":"", "x":5.5, "y":2}, {"label":"B", "x":6.5, "y":2}, {"label":"N", "x":7.5, "y":2}, {"label":"M", "x":8.5, "y":2}, {"label":"<", "x":9.5, "y":2}, {"label":"Space", "x":0.75, "y":3, "w":10}] 108 "layout": [
109 {"matrix": [0, 0], "x": 0, "y": 0},
110 {"matrix": [0, 1], "x": 1, "y": 0},
111 {"matrix": [0, 2], "x": 2, "y": 0},
112 {"matrix": [0, 3], "x": 3, "y": 0},
113 {"matrix": [0, 4], "x": 4, "y": 0},
114 {"matrix": [0, 5], "x": 5, "y": 0},
115 {"matrix": [0, 6], "x": 6, "y": 0},
116 {"matrix": [0, 7], "x": 7, "y": 0},
117 {"matrix": [0, 8], "x": 8, "y": 0},
118 {"matrix": [0, 9], "x": 9, "y": 0},
119
120 {"matrix": [1, 0], "x": 0.25, "y": 1},
121 {"matrix": [1, 1], "x": 1.25, "y": 1},
122 {"matrix": [1, 2], "x": 2.25, "y": 1},
123 {"matrix": [1, 3], "x": 3.25, "y": 1},
124 {"matrix": [1, 4], "x": 4.25, "y": 1},
125 {"matrix": [1, 5], "x": 5.25, "y": 1},
126 {"matrix": [1, 6], "x": 6.25, "y": 1},
127 {"matrix": [1, 7], "x": 7.25, "y": 1},
128 {"matrix": [1, 8], "x": 8.25, "y": 1},
129 {"matrix": [1, 9], "x": 9.25, "y": 1},
130
131 {"matrix": [2, 0], "x": 0.5, "y": 2},
132 {"matrix": [2, 1], "x": 1.5, "y": 2},
133 {"matrix": [2, 2], "x": 2.5, "y": 2},
134 {"matrix": [2, 3], "x": 3.5, "y": 2},
135 {"matrix": [2, 4], "x": 4.5, "y": 2},
136 {"matrix": [2, 5], "x": 5.5, "y": 2},
137 {"matrix": [2, 6], "x": 6.5, "y": 2},
138 {"matrix": [2, 7], "x": 7.5, "y": 2},
139 {"matrix": [2, 8], "x": 8.5, "y": 2},
140 {"matrix": [2, 9], "x": 9.5, "y": 2},
141
142 {"matrix": [3, 5], "x": 0.75, "y": 3, "w": 10}
143 ]
33 } 144 }
34 } 145 }
35} \ No newline at end of file 146} \ No newline at end of file
diff --git a/keyboards/makenova/omega/omega4/omega4.h b/keyboards/makenova/omega/omega4/omega4.h
deleted file mode 100644
index 754b58ee35..0000000000
--- a/keyboards/makenova/omega/omega4/omega4.h
+++ /dev/null
@@ -1,51 +0,0 @@
1// Copyright 2022 makenova (@makenova)
2// SPDX-License-Identifier: GPL-2.0-or-later
3
4#pragma once
5
6#include "quantum.h"
7
8/* This is a shortcut to help you visually see your layout.
9 *
10 * The first section contains all of the arguments representing the physical
11 * layout of the board and position of the keys.
12 *
13 * The second converts the arguments into a two-dimensional array which
14 * represents the switch matrix.
15 */
16
17#define LAYOUT( \
18 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
19 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
20 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
21 K30, K31, K35, K38, K39 \
22){ \
23 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
24 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \
25 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
26 { K30, K31, KC_NO, KC_NO, KC_NO, K35, KC_NO, KC_NO, K38, K39 } \
27}
28
29#define LAYOUT_6u_bar( \
30 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
31 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
32 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
33 K30, K35, K39 \
34){ \
35 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
36 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \
37 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
38 { K30, KC_NO, KC_NO, KC_NO, KC_NO, K35, KC_NO, KC_NO, KC_NO, K39 } \
39}
40
41#define LAYOUT_10u_bar( \
42 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
43 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
44 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
45 K35 \
46){ \
47 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
48 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \
49 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
50 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K35, KC_NO, KC_NO, KC_NO, KC_NO } \
51}
diff --git a/keyboards/matthewdias/m3n3van/info.json b/keyboards/matthewdias/m3n3van/info.json
index 5b7cafa2da..4b9a31aefc 100644
--- a/keyboards/matthewdias/m3n3van/info.json
+++ b/keyboards/matthewdias/m3n3van/info.json
@@ -23,50 +23,102 @@
23 "layouts": { 23 "layouts": {
24 "LAYOUT": { 24 "LAYOUT": {
25 "layout": [ 25 "layout": [
26 { "label": "Esc", "x": 0, "y": 0 }, 26 {"matrix": [0, 0], "x": 0, "y": 0},
27 { "label": "Q", "x": 1, "y": 0 }, 27 {"matrix": [0, 1], "x": 1, "y": 0},
28 { "label": "W", "x": 2, "y": 0 }, 28 {"matrix": [0, 2], "x": 2, "y": 0},
29 { "label": "E", "x": 3, "y": 0 }, 29 {"matrix": [0, 3], "x": 3, "y": 0},
30 { "label": "R", "x": 4, "y": 0 }, 30 {"matrix": [0, 4], "x": 4, "y": 0},
31 { "label": "T", "x": 5, "y": 0 }, 31 {"matrix": [0, 5], "x": 5, "y": 0},
32 { "label": "Y", "x": 6, "y": 0 }, 32 {"matrix": [0, 6], "x": 6, "y": 0},
33 { "label": "U", "x": 7, "y": 0 }, 33 {"matrix": [0, 7], "x": 7, "y": 0},
34 { "label": "I", "x": 8, "y": 0 }, 34 {"matrix": [0, 8], "x": 8, "y": 0},
35 { "label": "O", "x": 9, "y": 0 }, 35 {"matrix": [0, 9], "x": 9, "y": 0},
36 { "label": "P", "x": 10, "y": 0 }, 36 {"matrix": [0, 10], "x": 10, "y": 0},
37 { "label": "Backspace", "x": 11, "y": 0, "w": 1.75 }, 37 {"matrix": [0, 12], "x": 11, "y": 0, "w": 1.75},
38 { "label": "Tab", "x": 0, "y": 1, "w": 1.25 }, 38
39 { "label": "A", "x": 1.25, "y": 1 }, 39 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
40 { "label": "S", "x": 2.25, "y": 1 }, 40 {"matrix": [1, 1], "x": 1.25, "y": 1},
41 { "label": "D", "x": 3.25, "y": 1 }, 41 {"matrix": [1, 2], "x": 2.25, "y": 1},
42 { "label": "F", "x": 4.25, "y": 1 }, 42 {"matrix": [1, 3], "x": 3.25, "y": 1},
43 { "label": "G", "x": 5.25, "y": 1 }, 43 {"matrix": [1, 4], "x": 4.25, "y": 1},
44 { "label": "H", "x": 6.25, "y": 1 }, 44 {"matrix": [1, 5], "x": 5.25, "y": 1},
45 { "label": "J", "x": 7.25, "y": 1 }, 45 {"matrix": [1, 6], "x": 6.25, "y": 1},
46 { "label": "K", "x": 8.25, "y": 1 }, 46 {"matrix": [1, 7], "x": 7.25, "y": 1},
47 { "label": "L", "x": 9.25, "y": 1 }, 47 {"matrix": [1, 8], "x": 8.25, "y": 1},
48 { "label": ";", "x": 10.25, "y": 1 }, 48 {"matrix": [1, 9], "x": 9.25, "y": 1},
49 { "label": "Enter", "x": 11.25, "y": 1, "w": 1.5 }, 49 {"matrix": [1, 10], "x": 10.25, "y": 1},
50 { "label": "Shift", "x": 0, "y": 2, "w": 1.75 }, 50 {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.5},
51 { "label": "Z", "x": 1.75, "y": 2 }, 51
52 { "label": "X", "x": 2.75, "y": 2 }, 52 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
53 { "label": "C", "x": 3.75, "y": 2 }, 53 {"matrix": [2, 2], "x": 1.75, "y": 2},
54 { "label": "V", "x": 4.75, "y": 2 }, 54 {"matrix": [2, 3], "x": 2.75, "y": 2},
55 { "label": "B", "x": 5.75, "y": 2 }, 55 {"matrix": [2, 4], "x": 3.75, "y": 2},
56 { "label": "N", "x": 6.75, "y": 2 }, 56 {"matrix": [2, 5], "x": 4.75, "y": 2},
57 { "label": "M", "x": 7.75, "y": 2 }, 57 {"matrix": [2, 6], "x": 5.75, "y": 2},
58 { "label": "<", "x": 8.75, "y": 2 }, 58 {"matrix": [2, 7], "x": 6.75, "y": 2},
59 { "label": ">", "x": 9.75, "y": 2 }, 59 {"matrix": [2, 8], "x": 7.75, "y": 2},
60 { "label": "/", "x": 10.75, "y": 2 }, 60 {"matrix": [2, 9], "x": 8.75, "y": 2},
61 { "label": "Shift", "x": 11.75, "y": 2 }, 61 {"matrix": [2, 10], "x": 9.75, "y": 2},
62 { "label": "Ctrl", "x": 0, "y": 3 }, 62 {"matrix": [2, 11], "x": 10.75, "y": 2},
63 { "label": "Alt", "x": 1, "y": 3, "w": 1.25 }, 63 {"matrix": [2, 12], "x": 11.75, "y": 2},
64 { "label": "Meta", "x": 2.25, "y": 3 }, 64
65 { "x": 3.25, "y": 3, "w": 3 }, 65 {"matrix": [3, 0], "x": 0, "y": 3},
66 { "x": 6.25, "y": 3, "w": 3 }, 66 {"matrix": [3, 1], "x": 1, "y": 3, "w": 1.25},
67 { "label": "Meta", "x": 9.25, "y": 3, "w": 1.25 }, 67 {"matrix": [3, 2], "x": 2.25, "y": 3},
68 { "label": "Alt", "x": 10.5, "y": 3 }, 68 {"matrix": [3, 4], "x": 3.25, "y": 3, "w": 3},
69 { "label": "Ctrl", "x": 11.5, "y": 3, "w": 1.25 } 69 {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 3},
70 {"matrix": [3, 9], "x": 9.25, "y": 3, "w": 1.25},
71 {"matrix": [3, 11], "x": 10.5, "y": 3},
72 {"matrix": [3, 12], "x": 11.5, "y": 3, "w": 1.25}
73 ]
74 },
75 "LAYOUT_encoder": {
76 "layout": [
77 {"matrix": [0, 0], "x": 0, "y": 0},
78 {"matrix": [0, 1], "x": 1, "y": 0},
79 {"matrix": [0, 2], "x": 2, "y": 0},
80 {"matrix": [0, 3], "x": 3, "y": 0},
81 {"matrix": [0, 4], "x": 4, "y": 0},
82 {"matrix": [0, 5], "x": 5, "y": 0},
83 {"matrix": [0, 6], "x": 6, "y": 0},
84 {"matrix": [0, 7], "x": 7, "y": 0},
85 {"matrix": [0, 8], "x": 8, "y": 0},
86 {"matrix": [0, 9], "x": 9, "y": 0},
87 {"matrix": [0, 10], "x": 10, "y": 0},
88 {"matrix": [0, 11], "x": 11, "y": 0},
89 {"matrix": [0, 12], "x": 12, "y": 0},
90 {"matrix": [1, 0], "x": 13, "y": 0},
91 {"matrix": [1, 1], "x": 14, "y": 0},
92 {"matrix": [1, 2], "x": 15, "y": 0},
93 {"matrix": [1, 3], "x": 16, "y": 0},
94 {"matrix": [1, 4], "x": 17, "y": 0},
95 {"matrix": [1, 5], "x": 18, "y": 0},
96 {"matrix": [1, 6], "x": 19, "y": 0},
97 {"matrix": [1, 7], "x": 20, "y": 0},
98 {"matrix": [1, 8], "x": 21, "y": 0},
99 {"matrix": [1, 9], "x": 22, "y": 0},
100 {"matrix": [1, 10], "x": 23, "y": 0},
101 {"matrix": [1, 12], "x": 24, "y": 0},
102 {"matrix": [2, 0], "x": 25, "y": 0},
103 {"matrix": [2, 2], "x": 26, "y": 0},
104 {"matrix": [2, 3], "x": 27, "y": 0},
105 {"matrix": [2, 4], "x": 28, "y": 0},
106 {"matrix": [2, 5], "x": 29, "y": 0},
107 {"matrix": [2, 6], "x": 30, "y": 0},
108 {"matrix": [2, 7], "x": 31, "y": 0},
109 {"matrix": [2, 8], "x": 32, "y": 0},
110 {"matrix": [2, 9], "x": 33, "y": 0},
111 {"matrix": [2, 10], "x": 34, "y": 0},
112 {"matrix": [2, 11], "x": 35, "y": 0},
113 {"matrix": [2, 12], "x": 36, "y": 0},
114 {"matrix": [3, 0], "x": 37, "y": 0},
115 {"matrix": [3, 1], "x": 38, "y": 0},
116 {"matrix": [3, 2], "x": 39, "y": 0},
117 {"matrix": [3, 4], "x": 40, "y": 0},
118 {"matrix": [3, 7], "x": 41, "y": 0},
119 {"matrix": [3, 9], "x": 42, "y": 0},
120 {"matrix": [3, 11], "x": 43, "y": 0},
121 {"matrix": [3, 12], "x": 44, "y": 0}
70 ] 122 ]
71 } 123 }
72 } 124 }
diff --git a/keyboards/matthewdias/m3n3van/m3n3van.h b/keyboards/matthewdias/m3n3van/m3n3van.h
deleted file mode 100644
index be9efe7e54..0000000000
--- a/keyboards/matthewdias/m3n3van/m3n3van.h
+++ /dev/null
@@ -1,48 +0,0 @@
1/*
2Copyright 2021 Matthew Dias <matthewdias@me.com>
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
19
20#include "quantum.h"
21
22#define XXX KC_NO
23
24#define LAYOUT( \
25 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0C, \
26 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1C, \
27 K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
28 K30, K31, K32, K34, K37, K39, K3B, K3C \
29) \
30{ \
31 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, XXX, K0C }, \
32 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, XXX, K1C }, \
33 { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \
34 { K30, K31, K32, XXX, K34, XXX, XXX, K37, XXX, K39, XXX, K3B, K3C } \
35}
36
37#define LAYOUT_encoder( \
38 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \
39 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1C, \
40 K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
41 K30, K31, K32, K34, K37, K39, K3B, K3C \
42) \
43{ \
44 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
45 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, XXX, K1C }, \
46 { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \
47 { K30, K31, K32, XXX, K34, XXX, XXX, K37, XXX, K39, XXX, K3B, K3C } \
48}
diff --git a/keyboards/mechkeys/acr60/acr60.h b/keyboards/mechkeys/acr60/acr60.h
deleted file mode 100644
index 5a52a3bc86..0000000000
--- a/keyboards/mechkeys/acr60/acr60.h
+++ /dev/null
@@ -1,122 +0,0 @@
1/* Copyright 2017 Ryan Mitchell (@newtmitch)
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#include "quantum.h"
20
21#define ___ KC_NO
22
23#define LAYOUT_all( \
24 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
25 K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
26 K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
27 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
28 K40, K41, K43, K44, K46, K48, K4A, K4B, K4C, K4D, K4E \
29) { \
30 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
31 { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
32 { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___ }, \
33 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
34 { K40, K41, ___, K43, K44, ___, K46, ___, K48, ___, K4A, K4B, K4C, K4D, K4E } \
35}
36
37#define LAYOUT( \
38 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
39 K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
40 K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
41 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
42 K40, K41, K43, K44, K46, K48, K4A, K4B, K4C, K4D, K4E \
43) { \
44 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
45 { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
46 { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___ }, \
47 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \
48 { K40, K41, ___, K43, K44, ___, K46, ___, K48, ___, K4A, K4B, K4C, K4D, K4E } \
49}
50
51#define LAYOUT_hhkb( \
52 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
53 K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
54 K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
55 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
56 K41, K43, K46, K4B, K4D \
57) { \
58 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
59 { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
60 { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___ }, \
61 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \
62 { ___, K41, ___, K43, ___, ___, K46, ___, ___, ___, ___, K4B, ___, K4D, ___ } \
63}
64
65#define LAYOUT_true_hhkb( \
66 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
67 K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
68 K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
69 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
70 K41, K43, K46, K4A, K4B \
71) { \
72 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
73 { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
74 { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___ }, \
75 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \
76 { ___, K41, ___, K43, ___, ___, K46, ___, ___, ___, K4A, K4B, ___, ___, ___ } \
77}
78
79#define LAYOUT_directional( \
80 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
81 K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
82 K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
83 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3C, K3D, K3E, \
84 K40, K41, K43, K44, K46, K48, K4A, K4B, K4C, K4D, K4E \
85) { \
86 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
87 { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
88 { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___ }, \
89 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, ___, K3C, K3D, K3E }, \
90 { K40, K41, ___, K43, K44, ___, K46, ___, K48, ___, K4A, K4B, K4C, K4D, K4E } \
91}
92
93/* Mitch's keymap, "MitchSplit":
94 * Standard 60% base, split right shift, 3-split space, standard modifier row.
95 * Split shift is 2.75u + 1.25u + 2.25u (total of 6.25u). Might not work with other orientations.
96 */
97/*
98 * ,-----------------------------------------------------------.
99 * |00 |01 |02 |03 |04 |05 |06 |07 |08 |09 |0A |0B |0C |0E |
100 * |-----------------------------------------------------------|
101 * |10 |12 |13 |14 |15 |16 |17 |18 |19 |1A |1B |1C |1D |1E |
102 * |-----------------------------------------------------------|
103 * |20 |22 |23 |24 |25 |26 |27 |28 |29 |2A |2B |2C |2D |
104 * |-----------------------------------------------------------|
105 * |30 |32 |33 |34 |35 |36 |37 |38 |39 |3A |3B |3D |3E |
106 * |-----------------------------------------------------------|
107 * |40 |41 |43 |44 |46 |48 |4A |4B |4D |4E |
108 * `-----------------------------------------------------------'
109 */
110#define LAYOUT_mitchsplit( \
111 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \
112 K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
113 K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
114 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
115 K40, K41, K43, K44, K46, K48, K4A, K4B, K4D, K4E \
116) { \
117 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, ___, K0E }, \
118 { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
119 { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___ }, \
120 { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \
121 { K40, K41, ___, K43, K44, ___, K46, ___, K48, ___, K4A, K4B, ___, K4D, K4E } \
122}
diff --git a/keyboards/mechkeys/acr60/info.json b/keyboards/mechkeys/acr60/info.json
index 67d28157c5..422b3f6270 100644
--- a/keyboards/mechkeys/acr60/info.json
+++ b/keyboards/mechkeys/acr60/info.json
@@ -32,438 +32,438 @@
32 "layouts": { 32 "layouts": {
33 "LAYOUT_all": { 33 "LAYOUT_all": {
34 "layout": [ 34 "layout": [
35 {"label":"K00", "x":0, "y":0}, 35 {"matrix": [0, 0], "x": 0, "y": 0},
36 {"label":"K01", "x":1, "y":0}, 36 {"matrix": [0, 1], "x": 1, "y": 0},
37 {"label":"K02", "x":2, "y":0}, 37 {"matrix": [0, 2], "x": 2, "y": 0},
38 {"label":"K03", "x":3, "y":0}, 38 {"matrix": [0, 3], "x": 3, "y": 0},
39 {"label":"K04", "x":4, "y":0}, 39 {"matrix": [0, 4], "x": 4, "y": 0},
40 {"label":"K05", "x":5, "y":0}, 40 {"matrix": [0, 5], "x": 5, "y": 0},
41 {"label":"K06", "x":6, "y":0}, 41 {"matrix": [0, 6], "x": 6, "y": 0},
42 {"label":"K07", "x":7, "y":0}, 42 {"matrix": [0, 7], "x": 7, "y": 0},
43 {"label":"K08", "x":8, "y":0}, 43 {"matrix": [0, 8], "x": 8, "y": 0},
44 {"label":"K09", "x":9, "y":0}, 44 {"matrix": [0, 9], "x": 9, "y": 0},
45 {"label":"K0A", "x":10, "y":0}, 45 {"matrix": [0, 10], "x": 10, "y": 0},
46 {"label":"K0B", "x":11, "y":0}, 46 {"matrix": [0, 11], "x": 11, "y": 0},
47 {"label":"K0C", "x":12, "y":0}, 47 {"matrix": [0, 12], "x": 12, "y": 0},
48 {"label":"K0D", "x":13, "y":0}, 48 {"matrix": [0, 13], "x": 13, "y": 0},
49 {"label":"K0E", "x":14, "y":0}, 49 {"matrix": [0, 14], "x": 14, "y": 0},
50 50
51 {"label":"K10", "x":0, "y":1, "w":1.5}, 51 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
52 {"label":"K12", "x":1.5, "y":1}, 52 {"matrix": [1, 2], "x": 1.5, "y": 1},
53 {"label":"K13", "x":2.5, "y":1}, 53 {"matrix": [1, 3], "x": 2.5, "y": 1},
54 {"label":"K14", "x":3.5, "y":1}, 54 {"matrix": [1, 4], "x": 3.5, "y": 1},
55 {"label":"K15", "x":4.5, "y":1}, 55 {"matrix": [1, 5], "x": 4.5, "y": 1},
56 {"label":"K16", "x":5.5, "y":1}, 56 {"matrix": [1, 6], "x": 5.5, "y": 1},
57 {"label":"K17", "x":6.5, "y":1}, 57 {"matrix": [1, 7], "x": 6.5, "y": 1},
58 {"label":"K18", "x":7.5, "y":1}, 58 {"matrix": [1, 8], "x": 7.5, "y": 1},
59 {"label":"K19", "x":8.5, "y":1}, 59 {"matrix": [1, 9], "x": 8.5, "y": 1},
60 {"label":"K1A", "x":9.5, "y":1}, 60 {"matrix": [1, 10], "x": 9.5, "y": 1},
61 {"label":"K1B", "x":10.5, "y":1}, 61 {"matrix": [1, 11], "x": 10.5, "y": 1},
62 {"label":"K1C", "x":11.5, "y":1}, 62 {"matrix": [1, 12], "x": 11.5, "y": 1},
63 {"label":"K1D", "x":12.5, "y":1}, 63 {"matrix": [1, 13], "x": 12.5, "y": 1},
64 {"label":"K1E", "x":13.5, "y":1, "w":1.5}, 64 {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
65 65
66 {"label":"K20", "x":0, "y":2, "w":1.75}, 66 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
67 {"label":"K22", "x":1.75, "y":2}, 67 {"matrix": [2, 2], "x": 1.75, "y": 2},
68 {"label":"K23", "x":2.75, "y":2}, 68 {"matrix": [2, 3], "x": 2.75, "y": 2},
69 {"label":"K24", "x":3.75, "y":2}, 69 {"matrix": [2, 4], "x": 3.75, "y": 2},
70 {"label":"K25", "x":4.75, "y":2}, 70 {"matrix": [2, 5], "x": 4.75, "y": 2},
71 {"label":"K26", "x":5.75, "y":2}, 71 {"matrix": [2, 6], "x": 5.75, "y": 2},
72 {"label":"K27", "x":6.75, "y":2}, 72 {"matrix": [2, 7], "x": 6.75, "y": 2},
73 {"label":"K28", "x":7.75, "y":2}, 73 {"matrix": [2, 8], "x": 7.75, "y": 2},
74 {"label":"K29", "x":8.75, "y":2}, 74 {"matrix": [2, 9], "x": 8.75, "y": 2},
75 {"label":"K2A", "x":9.75, "y":2}, 75 {"matrix": [2, 10], "x": 9.75, "y": 2},
76 {"label":"K2B", "x":10.75, "y":2}, 76 {"matrix": [2, 11], "x": 10.75, "y": 2},
77 {"label":"K2C", "x":11.75, "y":2}, 77 {"matrix": [2, 12], "x": 11.75, "y": 2},
78 {"label":"K2D", "x":12.75, "y":2, "w":2.25}, 78 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
79 79
80 {"label":"K30", "x":0, "y":3}, 80 {"matrix": [3, 0], "x": 0, "y": 3},
81 {"label":"K31", "x":1, "y":3}, 81 {"matrix": [3, 1], "x": 1, "y": 3},
82 {"label":"K32", "x":2, "y":3}, 82 {"matrix": [3, 2], "x": 2, "y": 3},
83 {"label":"K33", "x":3, "y":3}, 83 {"matrix": [3, 3], "x": 3, "y": 3},
84 {"label":"K34", "x":4, "y":3}, 84 {"matrix": [3, 4], "x": 4, "y": 3},
85 {"label":"K35", "x":5, "y":3}, 85 {"matrix": [3, 5], "x": 5, "y": 3},
86 {"label":"K36", "x":6, "y":3}, 86 {"matrix": [3, 6], "x": 6, "y": 3},
87 {"label":"K37", "x":7, "y":3}, 87 {"matrix": [3, 7], "x": 7, "y": 3},
88 {"label":"K38", "x":8, "y":3}, 88 {"matrix": [3, 8], "x": 8, "y": 3},
89 {"label":"K39", "x":9, "y":3}, 89 {"matrix": [3, 9], "x": 9, "y": 3},
90 {"label":"K3A", "x":10, "y":3}, 90 {"matrix": [3, 10], "x": 10, "y": 3},
91 {"label":"K3B", "x":11, "y":3}, 91 {"matrix": [3, 11], "x": 11, "y": 3},
92 {"label":"K3C", "x":12, "y":3}, 92 {"matrix": [3, 12], "x": 12, "y": 3},
93 {"label":"K3D", "x":13, "y":3}, 93 {"matrix": [3, 13], "x": 13, "y": 3},
94 {"label":"K3E", "x":14, "y":3}, 94 {"matrix": [3, 14], "x": 14, "y": 3},
95 95
96 {"label":"K40", "x":0, "y":4, "w":1.25}, 96 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
97 {"label":"K41", "x":1.25, "y":4, "w":1.25}, 97 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
98 {"label":"K43", "x":2.5, "y":4, "w":1.25}, 98 {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
99 {"label":"K44", "x":3.75, "y":4, "w":2.25}, 99 {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
100 {"label":"K46", "x":6, "y":4, "w":1.25}, 100 {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
101 {"label":"K48", "x":7.25, "y":4, "w":2.75}, 101 {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
102 {"label":"K4A", "x":10, "y":4}, 102 {"matrix": [4, 10], "x": 10, "y": 4},
103 {"label":"K4B", "x":11, "y":4}, 103 {"matrix": [4, 11], "x": 11, "y": 4},
104 {"label":"K4C", "x":12, "y":4}, 104 {"matrix": [4, 12], "x": 12, "y": 4},
105 {"label":"K4D", "x":13, "y":4}, 105 {"matrix": [4, 13], "x": 13, "y": 4},
106 {"label":"K4E", "x":14, "y":4} 106 {"matrix": [4, 14], "x": 14, "y": 4}
107 ] 107 ]
108 }, 108 },
109 "LAYOUT": { 109 "LAYOUT": {
110 "layout": [ 110 "layout": [
111 {"label":"K00", "x":0, "y":0}, 111 {"matrix": [0, 0], "x": 0, "y": 0},
112 {"label":"K01", "x":1, "y":0}, 112 {"matrix": [0, 1], "x": 1, "y": 0},
113 {"label":"K02", "x":2, "y":0}, 113 {"matrix": [0, 2], "x": 2, "y": 0},
114 {"label":"K03", "x":3, "y":0}, 114 {"matrix": [0, 3], "x": 3, "y": 0},
115 {"label":"K04", "x":4, "y":0}, 115 {"matrix": [0, 4], "x": 4, "y": 0},
116 {"label":"K05", "x":5, "y":0}, 116 {"matrix": [0, 5], "x": 5, "y": 0},
117 {"label":"K06", "x":6, "y":0}, 117 {"matrix": [0, 6], "x": 6, "y": 0},
118 {"label":"K07", "x":7, "y":0}, 118 {"matrix": [0, 7], "x": 7, "y": 0},
119 {"label":"K08", "x":8, "y":0}, 119 {"matrix": [0, 8], "x": 8, "y": 0},
120 {"label":"K09", "x":9, "y":0}, 120 {"matrix": [0, 9], "x": 9, "y": 0},
121 {"label":"K0A", "x":10, "y":0}, 121 {"matrix": [0, 10], "x": 10, "y": 0},
122 {"label":"K0B", "x":11, "y":0}, 122 {"matrix": [0, 11], "x": 11, "y": 0},
123 {"label":"K0C", "x":12, "y":0}, 123 {"matrix": [0, 12], "x": 12, "y": 0},
124 {"label":"K0D", "x":13, "y":0}, 124 {"matrix": [0, 13], "x": 13, "y": 0},
125 {"label":"K0E", "x":14, "y":0}, 125 {"matrix": [0, 14], "x": 14, "y": 0},
126 126
127 {"label":"K10", "x":0, "y":1, "w":1.5}, 127 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
128 {"label":"K12", "x":1.5, "y":1}, 128 {"matrix": [1, 2], "x": 1.5, "y": 1},
129 {"label":"K13", "x":2.5, "y":1}, 129 {"matrix": [1, 3], "x": 2.5, "y": 1},
130 {"label":"K14", "x":3.5, "y":1}, 130 {"matrix": [1, 4], "x": 3.5, "y": 1},
131 {"label":"K15", "x":4.5, "y":1}, 131 {"matrix": [1, 5], "x": 4.5, "y": 1},
132 {"label":"K16", "x":5.5, "y":1}, 132 {"matrix": [1, 6], "x": 5.5, "y": 1},
133 {"label":"K17", "x":6.5, "y":1}, 133 {"matrix": [1, 7], "x": 6.5, "y": 1},
134 {"label":"K18", "x":7.5, "y":1}, 134 {"matrix": [1, 8], "x": 7.5, "y": 1},
135 {"label":"K19", "x":8.5, "y":1}, 135 {"matrix": [1, 9], "x": 8.5, "y": 1},
136 {"label":"K1A", "x":9.5, "y":1}, 136 {"matrix": [1, 10], "x": 9.5, "y": 1},
137 {"label":"K1B", "x":10.5, "y":1}, 137 {"matrix": [1, 11], "x": 10.5, "y": 1},
138 {"label":"K1C", "x":11.5, "y":1}, 138 {"matrix": [1, 12], "x": 11.5, "y": 1},
139 {"label":"K1D", "x":12.5, "y":1}, 139 {"matrix": [1, 13], "x": 12.5, "y": 1},
140 {"label":"K1E", "x":13.5, "y":1, "w":1.5}, 140 {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
141 141
142 {"label":"K20", "x":0, "y":2, "w":1.75}, 142 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
143 {"label":"K22", "x":1.75, "y":2}, 143 {"matrix": [2, 2], "x": 1.75, "y": 2},
144 {"label":"K23", "x":2.75, "y":2}, 144 {"matrix": [2, 3], "x": 2.75, "y": 2},
145 {"label":"K24", "x":3.75, "y":2}, 145 {"matrix": [2, 4], "x": 3.75, "y": 2},
146 {"label":"K25", "x":4.75, "y":2}, 146 {"matrix": [2, 5], "x": 4.75, "y": 2},
147 {"label":"K26", "x":5.75, "y":2}, 147 {"matrix": [2, 6], "x": 5.75, "y": 2},
148 {"label":"K27", "x":6.75, "y":2}, 148 {"matrix": [2, 7], "x": 6.75, "y": 2},
149 {"label":"K28", "x":7.75, "y":2}, 149 {"matrix": [2, 8], "x": 7.75, "y": 2},
150 {"label":"K29", "x":8.75, "y":2}, 150 {"matrix": [2, 9], "x": 8.75, "y": 2},
151 {"label":"K2A", "x":9.75, "y":2}, 151 {"matrix": [2, 10], "x": 9.75, "y": 2},
152 {"label":"K2B", "x":10.75, "y":2}, 152 {"matrix": [2, 11], "x": 10.75, "y": 2},
153 {"label":"K2C", "x":11.75, "y":2}, 153 {"matrix": [2, 12], "x": 11.75, "y": 2},
154 {"label":"K2D", "x":12.75, "y":2, "w":2.25}, 154 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
155 155
156 {"label":"K30", "x":0, "y":3, "w":1.25}, 156 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
157 {"label":"K31", "x":1.25, "y":3}, 157 {"matrix": [3, 1], "x": 1.25, "y": 3},
158 {"label":"K32", "x":2.25, "y":3}, 158 {"matrix": [3, 2], "x": 2.25, "y": 3},
159 {"label":"K33", "x":3.25, "y":3}, 159 {"matrix": [3, 3], "x": 3.25, "y": 3},
160 {"label":"K34", "x":4.25, "y":3}, 160 {"matrix": [3, 4], "x": 4.25, "y": 3},
161 {"label":"K35", "x":5.25, "y":3}, 161 {"matrix": [3, 5], "x": 5.25, "y": 3},
162 {"label":"K36", "x":6.25, "y":3}, 162 {"matrix": [3, 6], "x": 6.25, "y": 3},
163 {"label":"K37", "x":7.25, "y":3}, 163 {"matrix": [3, 7], "x": 7.25, "y": 3},
164 {"label":"K38", "x":8.25, "y":3}, 164 {"matrix": [3, 8], "x": 8.25, "y": 3},
165 {"label":"K39", "x":9.25, "y":3}, 165 {"matrix": [3, 9], "x": 9.25, "y": 3},
166 {"label":"K3A", "x":10.25, "y":3}, 166 {"matrix": [3, 10], "x": 10.25, "y": 3},
167 {"label":"K3B", "x":11.25, "y":3}, 167 {"matrix": [3, 11], "x": 11.25, "y": 3},
168 {"label":"K3D", "x":12.25, "y":3, "w":1.75}, 168 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
169 {"label":"K3E", "x":14, "y":3}, 169 {"matrix": [3, 14], "x": 14, "y": 3},
170 170
171 {"label":"K40", "x":0, "y":4, "w":1.25}, 171 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
172 {"label":"K41", "x":1.25, "y":4, "w":1.25}, 172 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
173 {"label":"K43", "x":2.5, "y":4, "w":1.25}, 173 {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
174 {"label":"K44", "x":3.75, "y":4, "w":2.25}, 174 {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
175 {"label":"K46", "x":6, "y":4, "w":1.25}, 175 {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
176 {"label":"K48", "x":7.25, "y":4, "w":2.75}, 176 {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
177 {"label":"K4A", "x":10, "y":4}, 177 {"matrix": [4, 10], "x": 10, "y": 4},
178 {"label":"K4B", "x":11, "y":4}, 178 {"matrix": [4, 11], "x": 11, "y": 4},
179 {"label":"K4C", "x":12, "y":4}, 179 {"matrix": [4, 12], "x": 12, "y": 4},
180 {"label":"K4D", "x":13, "y":4}, 180 {"matrix": [4, 13], "x": 13, "y": 4},
181 {"label":"K4E", "x":14, "y":4} 181 {"matrix": [4, 14], "x": 14, "y": 4}
182 ] 182 ]
183 }, 183 },
184 "LAYOUT_hhkb": { 184 "LAYOUT_hhkb": {
185 "layout": [ 185 "layout": [
186 {"label":"K00", "x":0, "y":0}, 186 {"matrix": [0, 0], "x": 0, "y": 0},
187 {"label":"K01", "x":1, "y":0}, 187 {"matrix": [0, 1], "x": 1, "y": 0},
188 {"label":"K02", "x":2, "y":0}, 188 {"matrix": [0, 2], "x": 2, "y": 0},
189 {"label":"K03", "x":3, "y":0}, 189 {"matrix": [0, 3], "x": 3, "y": 0},
190 {"label":"K04", "x":4, "y":0}, 190 {"matrix": [0, 4], "x": 4, "y": 0},
191 {"label":"K05", "x":5, "y":0}, 191 {"matrix": [0, 5], "x": 5, "y": 0},
192 {"label":"K06", "x":6, "y":0}, 192 {"matrix": [0, 6], "x": 6, "y": 0},
193 {"label":"K07", "x":7, "y":0}, 193 {"matrix": [0, 7], "x": 7, "y": 0},
194 {"label":"K08", "x":8, "y":0}, 194 {"matrix": [0, 8], "x": 8, "y": 0},
195 {"label":"K09", "x":9, "y":0}, 195 {"matrix": [0, 9], "x": 9, "y": 0},
196 {"label":"K0A", "x":10, "y":0}, 196 {"matrix": [0, 10], "x": 10, "y": 0},
197 {"label":"K0B", "x":11, "y":0}, 197 {"matrix": [0, 11], "x": 11, "y": 0},
198 {"label":"K0C", "x":12, "y":0}, 198 {"matrix": [0, 12], "x": 12, "y": 0},
199 {"label":"K0D", "x":13, "y":0}, 199 {"matrix": [0, 13], "x": 13, "y": 0},
200 {"label":"K0E", "x":14, "y":0}, 200 {"matrix": [0, 14], "x": 14, "y": 0},
201 201
202 {"label":"K10", "x":0, "y":1, "w":1.5}, 202 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
203 {"label":"K12", "x":1.5, "y":1}, 203 {"matrix": [1, 2], "x": 1.5, "y": 1},
204 {"label":"K13", "x":2.5, "y":1}, 204 {"matrix": [1, 3], "x": 2.5, "y": 1},
205 {"label":"K14", "x":3.5, "y":1}, 205 {"matrix": [1, 4], "x": 3.5, "y": 1},
206 {"label":"K15", "x":4.5, "y":1}, 206 {"matrix": [1, 5], "x": 4.5, "y": 1},
207 {"label":"K16", "x":5.5, "y":1}, 207 {"matrix": [1, 6], "x": 5.5, "y": 1},
208 {"label":"K17", "x":6.5, "y":1}, 208 {"matrix": [1, 7], "x": 6.5, "y": 1},
209 {"label":"K18", "x":7.5, "y":1}, 209 {"matrix": [1, 8], "x": 7.5, "y": 1},
210 {"label":"K19", "x":8.5, "y":1}, 210 {"matrix": [1, 9], "x": 8.5, "y": 1},
211 {"label":"K1A", "x":9.5, "y":1}, 211 {"matrix": [1, 10], "x": 9.5, "y": 1},
212 {"label":"K1B", "x":10.5, "y":1}, 212 {"matrix": [1, 11], "x": 10.5, "y": 1},
213 {"label":"K1C", "x":11.5, "y":1}, 213 {"matrix": [1, 12], "x": 11.5, "y": 1},
214 {"label":"K1D", "x":12.5, "y":1}, 214 {"matrix": [1, 13], "x": 12.5, "y": 1},
215 {"label":"K1E", "x":13.5, "y":1, "w":1.5}, 215 {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
216 216
217 {"label":"K20", "x":0, "y":2, "w":1.75}, 217 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
218 {"label":"K22", "x":1.75, "y":2}, 218 {"matrix": [2, 2], "x": 1.75, "y": 2},
219 {"label":"K23", "x":2.75, "y":2}, 219 {"matrix": [2, 3], "x": 2.75, "y": 2},
220 {"label":"K24", "x":3.75, "y":2}, 220 {"matrix": [2, 4], "x": 3.75, "y": 2},
221 {"label":"K25", "x":4.75, "y":2}, 221 {"matrix": [2, 5], "x": 4.75, "y": 2},
222 {"label":"K26", "x":5.75, "y":2}, 222 {"matrix": [2, 6], "x": 5.75, "y": 2},
223 {"label":"K27", "x":6.75, "y":2}, 223 {"matrix": [2, 7], "x": 6.75, "y": 2},
224 {"label":"K28", "x":7.75, "y":2}, 224 {"matrix": [2, 8], "x": 7.75, "y": 2},
225 {"label":"K29", "x":8.75, "y":2}, 225 {"matrix": [2, 9], "x": 8.75, "y": 2},
226 {"label":"K2A", "x":9.75, "y":2}, 226 {"matrix": [2, 10], "x": 9.75, "y": 2},
227 {"label":"K2B", "x":10.75, "y":2}, 227 {"matrix": [2, 11], "x": 10.75, "y": 2},
228 {"label":"K2C", "x":11.75, "y":2}, 228 {"matrix": [2, 12], "x": 11.75, "y": 2},
229 {"label":"K2D", "x":12.75, "y":2, "w":2.25}, 229 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
230 230
231 {"label":"K30", "x":0, "y":3, "w":1.25}, 231 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
232 {"label":"K31", "x":1.25, "y":3}, 232 {"matrix": [3, 1], "x": 1.25, "y": 3},
233 {"label":"K32", "x":2.25, "y":3}, 233 {"matrix": [3, 2], "x": 2.25, "y": 3},
234 {"label":"K33", "x":3.25, "y":3}, 234 {"matrix": [3, 3], "x": 3.25, "y": 3},
235 {"label":"K34", "x":4.25, "y":3}, 235 {"matrix": [3, 4], "x": 4.25, "y": 3},
236 {"label":"K35", "x":5.25, "y":3}, 236 {"matrix": [3, 5], "x": 5.25, "y": 3},
237 {"label":"K36", "x":6.25, "y":3}, 237 {"matrix": [3, 6], "x": 6.25, "y": 3},
238 {"label":"K37", "x":7.25, "y":3}, 238 {"matrix": [3, 7], "x": 7.25, "y": 3},
239 {"label":"K38", "x":8.25, "y":3}, 239 {"matrix": [3, 8], "x": 8.25, "y": 3},
240 {"label":"K39", "x":9.25, "y":3}, 240 {"matrix": [3, 9], "x": 9.25, "y": 3},
241 {"label":"K3A", "x":10.25, "y":3}, 241 {"matrix": [3, 10], "x": 10.25, "y": 3},
242 {"label":"K3B", "x":11.25, "y":3}, 242 {"matrix": [3, 11], "x": 11.25, "y": 3},
243 {"label":"K3D", "x":12.25, "y":3, "w":1.75}, 243 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
244 {"label":"K3E", "x":14, "y":3}, 244 {"matrix": [3, 14], "x": 14, "y": 3},
245 245
246 {"label":"K41", "x":1.5, "y":4}, 246 {"matrix": [4, 1], "x": 1.5, "y": 4},
247 {"label":"K43", "x":2.5, "y":4, "w":1.5}, 247 {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
248 {"label":"K46", "x":4, "y":4, "w":7}, 248 {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
249 {"label":"K4B", "x":11, "y":4, "w":1.5}, 249 {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
250 {"label":"K4D", "x":12.5, "y":4} 250 {"matrix": [4, 13], "x": 12.5, "y": 4}
251 ] 251 ]
252 }, 252 },
253 "LAYOUT_true_hhkb": { 253 "LAYOUT_true_hhkb": {
254 "layout": [ 254 "layout": [
255 {"label":"K00", "x":0, "y":0}, 255 {"matrix": [0, 0], "x": 0, "y": 0},
256 {"label":"K01", "x":1, "y":0}, 256 {"matrix": [0, 1], "x": 1, "y": 0},
257 {"label":"K02", "x":2, "y":0}, 257 {"matrix": [0, 2], "x": 2, "y": 0},
258 {"label":"K03", "x":3, "y":0}, 258 {"matrix": [0, 3], "x": 3, "y": 0},
259 {"label":"K04", "x":4, "y":0}, 259 {"matrix": [0, 4], "x": 4, "y": 0},
260 {"label":"K05", "x":5, "y":0}, 260 {"matrix": [0, 5], "x": 5, "y": 0},
261 {"label":"K06", "x":6, "y":0}, 261 {"matrix": [0, 6], "x": 6, "y": 0},
262 {"label":"K07", "x":7, "y":0}, 262 {"matrix": [0, 7], "x": 7, "y": 0},
263 {"label":"K08", "x":8, "y":0}, 263 {"matrix": [0, 8], "x": 8, "y": 0},
264 {"label":"K09", "x":9, "y":0}, 264 {"matrix": [0, 9], "x": 9, "y": 0},
265 {"label":"K0A", "x":10, "y":0}, 265 {"matrix": [0, 10], "x": 10, "y": 0},
266 {"label":"K0B", "x":11, "y":0}, 266 {"matrix": [0, 11], "x": 11, "y": 0},
267 {"label":"K0C", "x":12, "y":0}, 267 {"matrix": [0, 12], "x": 12, "y": 0},
268 {"label":"K0D", "x":13, "y":0}, 268 {"matrix": [0, 13], "x": 13, "y": 0},
269 {"label":"K0E", "x":14, "y":0}, 269 {"matrix": [0, 14], "x": 14, "y": 0},
270 270
271 {"label":"K10", "x":0, "y":1, "w":1.5}, 271 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
272 {"label":"K12", "x":1.5, "y":1}, 272 {"matrix": [1, 2], "x": 1.5, "y": 1},
273 {"label":"K13", "x":2.5, "y":1}, 273 {"matrix": [1, 3], "x": 2.5, "y": 1},
274 {"label":"K14", "x":3.5, "y":1}, 274 {"matrix": [1, 4], "x": 3.5, "y": 1},
275 {"label":"K15", "x":4.5, "y":1}, 275 {"matrix": [1, 5], "x": 4.5, "y": 1},
276 {"label":"K16", "x":5.5, "y":1}, 276 {"matrix": [1, 6], "x": 5.5, "y": 1},
277 {"label":"K17", "x":6.5, "y":1}, 277 {"matrix": [1, 7], "x": 6.5, "y": 1},
278 {"label":"K18", "x":7.5, "y":1}, 278 {"matrix": [1, 8], "x": 7.5, "y": 1},
279 {"label":"K19", "x":8.5, "y":1}, 279 {"matrix": [1, 9], "x": 8.5, "y": 1},
280 {"label":"K1A", "x":9.5, "y":1}, 280 {"matrix": [1, 10], "x": 9.5, "y": 1},
281 {"label":"K1B", "x":10.5, "y":1}, 281 {"matrix": [1, 11], "x": 10.5, "y": 1},
282 {"label":"K1C", "x":11.5, "y":1}, 282 {"matrix": [1, 12], "x": 11.5, "y": 1},
283 {"label":"K1D", "x":12.5, "y":1}, 283 {"matrix": [1, 13], "x": 12.5, "y": 1},
284 {"label":"K1E", "x":13.5, "y":1, "w":1.5}, 284 {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
285 285
286 {"label":"K20", "x":0, "y":2, "w":1.75}, 286 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
287 {"label":"K22", "x":1.75, "y":2}, 287 {"matrix": [2, 2], "x": 1.75, "y": 2},
288 {"label":"K23", "x":2.75, "y":2}, 288 {"matrix": [2, 3], "x": 2.75, "y": 2},
289 {"label":"K24", "x":3.75, "y":2}, 289 {"matrix": [2, 4], "x": 3.75, "y": 2},
290 {"label":"K25", "x":4.75, "y":2}, 290 {"matrix": [2, 5], "x": 4.75, "y": 2},
291 {"label":"K26", "x":5.75, "y":2}, 291 {"matrix": [2, 6], "x": 5.75, "y": 2},
292 {"label":"K27", "x":6.75, "y":2}, 292 {"matrix": [2, 7], "x": 6.75, "y": 2},
293 {"label":"K28", "x":7.75, "y":2}, 293 {"matrix": [2, 8], "x": 7.75, "y": 2},
294 {"label":"K29", "x":8.75, "y":2}, 294 {"matrix": [2, 9], "x": 8.75, "y": 2},
295 {"label":"K2A", "x":9.75, "y":2}, 295 {"matrix": [2, 10], "x": 9.75, "y": 2},
296 {"label":"K2B", "x":10.75, "y":2}, 296 {"matrix": [2, 11], "x": 10.75, "y": 2},
297 {"label":"K2C", "x":11.75, "y":2}, 297 {"matrix": [2, 12], "x": 11.75, "y": 2},
298 {"label":"K2D", "x":12.75, "y":2, "w":2.25}, 298 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
299 299
300 {"label":"K30", "x":0, "y":3, "w":1.25}, 300 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
301 {"label":"K31", "x":1.25, "y":3}, 301 {"matrix": [3, 1], "x": 1.25, "y": 3},
302 {"label":"K32", "x":2.25, "y":3}, 302 {"matrix": [3, 2], "x": 2.25, "y": 3},
303 {"label":"K33", "x":3.25, "y":3}, 303 {"matrix": [3, 3], "x": 3.25, "y": 3},
304 {"label":"K34", "x":4.25, "y":3}, 304 {"matrix": [3, 4], "x": 4.25, "y": 3},
305 {"label":"K35", "x":5.25, "y":3}, 305 {"matrix": [3, 5], "x": 5.25, "y": 3},
306 {"label":"K36", "x":6.25, "y":3}, 306 {"matrix": [3, 6], "x": 6.25, "y": 3},
307 {"label":"K37", "x":7.25, "y":3}, 307 {"matrix": [3, 7], "x": 7.25, "y": 3},
308 {"label":"K38", "x":8.25, "y":3}, 308 {"matrix": [3, 8], "x": 8.25, "y": 3},
309 {"label":"K39", "x":9.25, "y":3}, 309 {"matrix": [3, 9], "x": 9.25, "y": 3},
310 {"label":"K3A", "x":10.25, "y":3}, 310 {"matrix": [3, 10], "x": 10.25, "y": 3},
311 {"label":"K3B", "x":11.25, "y":3}, 311 {"matrix": [3, 11], "x": 11.25, "y": 3},
312 {"label":"K3D", "x":12.25, "y":3, "w":1.75}, 312 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
313 {"label":"K3E", "x":14, "y":3}, 313 {"matrix": [3, 14], "x": 14, "y": 3},
314 314
315 {"label":"K41", "x":1.5, "y":4}, 315 {"matrix": [4, 1], "x": 1.5, "y": 4},
316 {"label":"K43", "x":2.5, "y":4, "w":1.5}, 316 {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
317 {"label":"K46", "x":4, "y":4, "w":6}, 317 {"matrix": [4, 6], "x": 4, "y": 4, "w": 6},
318 {"label":"K4A", "x":10, "y":4, "w":1.5}, 318 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
319 {"label":"K4B", "x":11.5, "y":4} 319 {"matrix": [4, 11], "x": 11.5, "y": 4}
320 ] 320 ]
321 }, 321 },
322 "LAYOUT_directional": { 322 "LAYOUT_directional": {
323 "layout": [ 323 "layout": [
324 {"label":"K00", "x":0, "y":0}, 324 {"matrix": [0, 0], "x": 0, "y": 0},
325 {"label":"K01", "x":1, "y":0}, 325 {"matrix": [0, 1], "x": 1, "y": 0},
326 {"label":"K02", "x":2, "y":0}, 326 {"matrix": [0, 2], "x": 2, "y": 0},
327 {"label":"K03", "x":3, "y":0}, 327 {"matrix": [0, 3], "x": 3, "y": 0},
328 {"label":"K04", "x":4, "y":0}, 328 {"matrix": [0, 4], "x": 4, "y": 0},
329 {"label":"K05", "x":5, "y":0}, 329 {"matrix": [0, 5], "x": 5, "y": 0},
330 {"label":"K06", "x":6, "y":0}, 330 {"matrix": [0, 6], "x": 6, "y": 0},
331 {"label":"K07", "x":7, "y":0}, 331 {"matrix": [0, 7], "x": 7, "y": 0},
332 {"label":"K08", "x":8, "y":0}, 332 {"matrix": [0, 8], "x": 8, "y": 0},
333 {"label":"K09", "x":9, "y":0}, 333 {"matrix": [0, 9], "x": 9, "y": 0},
334 {"label":"K0A", "x":10, "y":0}, 334 {"matrix": [0, 10], "x": 10, "y": 0},
335 {"label":"K0B", "x":11, "y":0}, 335 {"matrix": [0, 11], "x": 11, "y": 0},
336 {"label":"K0C", "x":12, "y":0}, 336 {"matrix": [0, 12], "x": 12, "y": 0},
337 {"label":"K0D", "x":13, "y":0}, 337 {"matrix": [0, 13], "x": 13, "y": 0},
338 {"label":"K0E", "x":14, "y":0}, 338 {"matrix": [0, 14], "x": 14, "y": 0},
339 339
340 {"label":"K10", "x":0, "y":1, "w":1.5}, 340 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
341 {"label":"K12", "x":1.5, "y":1}, 341 {"matrix": [1, 2], "x": 1.5, "y": 1},
342 {"label":"K13", "x":2.5, "y":1}, 342 {"matrix": [1, 3], "x": 2.5, "y": 1},
343 {"label":"K14", "x":3.5, "y":1}, 343 {"matrix": [1, 4], "x": 3.5, "y": 1},
344 {"label":"K15", "x":4.5, "y":1}, 344 {"matrix": [1, 5], "x": 4.5, "y": 1},
345 {"label":"K16", "x":5.5, "y":1}, 345 {"matrix": [1, 6], "x": 5.5, "y": 1},
346 {"label":"K17", "x":6.5, "y":1}, 346 {"matrix": [1, 7], "x": 6.5, "y": 1},
347 {"label":"K18", "x":7.5, "y":1}, 347 {"matrix": [1, 8], "x": 7.5, "y": 1},
348 {"label":"K19", "x":8.5, "y":1}, 348 {"matrix": [1, 9], "x": 8.5, "y": 1},
349 {"label":"K1A", "x":9.5, "y":1}, 349 {"matrix": [1, 10], "x": 9.5, "y": 1},
350 {"label":"K1B", "x":10.5, "y":1}, 350 {"matrix": [1, 11], "x": 10.5, "y": 1},
351 {"label":"K1C", "x":11.5, "y":1}, 351 {"matrix": [1, 12], "x": 11.5, "y": 1},
352 {"label":"K1D", "x":12.5, "y":1}, 352 {"matrix": [1, 13], "x": 12.5, "y": 1},
353 {"label":"K1E", "x":13.5, "y":1, "w":1.5}, 353 {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
354 354
355 {"label":"K20", "x":0, "y":2, "w":1.75}, 355 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
356 {"label":"K22", "x":1.75, "y":2}, 356 {"matrix": [2, 2], "x": 1.75, "y": 2},
357 {"label":"K23", "x":2.75, "y":2}, 357 {"matrix": [2, 3], "x": 2.75, "y": 2},
358 {"label":"K24", "x":3.75, "y":2}, 358 {"matrix": [2, 4], "x": 3.75, "y": 2},
359 {"label":"K25", "x":4.75, "y":2}, 359 {"matrix": [2, 5], "x": 4.75, "y": 2},
360 {"label":"K26", "x":5.75, "y":2}, 360 {"matrix": [2, 6], "x": 5.75, "y": 2},
361 {"label":"K27", "x":6.75, "y":2}, 361 {"matrix": [2, 7], "x": 6.75, "y": 2},
362 {"label":"K28", "x":7.75, "y":2}, 362 {"matrix": [2, 8], "x": 7.75, "y": 2},
363 {"label":"K29", "x":8.75, "y":2}, 363 {"matrix": [2, 9], "x": 8.75, "y": 2},
364 {"label":"K2A", "x":9.75, "y":2}, 364 {"matrix": [2, 10], "x": 9.75, "y": 2},
365 {"label":"K2B", "x":10.75, "y":2}, 365 {"matrix": [2, 11], "x": 10.75, "y": 2},
366 {"label":"K2C", "x":11.75, "y":2}, 366 {"matrix": [2, 12], "x": 11.75, "y": 2},
367 {"label":"K2D", "x":12.75, "y":2, "w":2.25}, 367 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
368 368
369 {"label":"K30", "x":0, "y":3, "w":1.25}, 369 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
370 {"label":"K31", "x":1.25, "y":3}, 370 {"matrix": [3, 1], "x": 1.25, "y": 3},
371 {"label":"K32", "x":2.25, "y":3}, 371 {"matrix": [3, 2], "x": 2.25, "y": 3},
372 {"label":"K33", "x":3.25, "y":3}, 372 {"matrix": [3, 3], "x": 3.25, "y": 3},
373 {"label":"K34", "x":4.25, "y":3}, 373 {"matrix": [3, 4], "x": 4.25, "y": 3},
374 {"label":"K35", "x":5.25, "y":3}, 374 {"matrix": [3, 5], "x": 5.25, "y": 3},
375 {"label":"K36", "x":6.25, "y":3}, 375 {"matrix": [3, 6], "x": 6.25, "y": 3},
376 {"label":"K37", "x":7.25, "y":3}, 376 {"matrix": [3, 7], "x": 7.25, "y": 3},
377 {"label":"K38", "x":8.25, "y":3}, 377 {"matrix": [3, 8], "x": 8.25, "y": 3},
378 {"label":"K39", "x":9.25, "y":3}, 378 {"matrix": [3, 9], "x": 9.25, "y": 3},
379 {"label":"K3A", "x":10.25, "y":3}, 379 {"matrix": [3, 10], "x": 10.25, "y": 3},
380 {"label":"K3C", "x":11.25, "y":3, "w":1.75}, 380 {"matrix": [3, 12], "x": 11.25, "y": 3, "w": 1.75},
381 {"label":"K3D", "x":13, "y":3}, 381 {"matrix": [3, 13], "x": 13, "y": 3},
382 {"label":"K3E", "x":14, "y":3}, 382 {"matrix": [3, 14], "x": 14, "y": 3},
383 383
384 {"label":"K40", "x":0, "y":4, "w":1.25}, 384 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
385 {"label":"K41", "x":1.25, "y":4, "w":1.25}, 385 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
386 {"label":"K43", "x":2.5, "y":4, "w":1.25}, 386 {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
387 {"label":"K44", "x":3.75, "y":4, "w":2.25}, 387 {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
388 {"label":"K46", "x":6, "y":4, "w":1.25}, 388 {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
389 {"label":"K48", "x":7.25, "y":4, "w":2.75}, 389 {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
390 {"label":"K4A", "x":10, "y":4}, 390 {"matrix": [4, 10], "x": 10, "y": 4},
391 {"label":"K4B", "x":11, "y":4}, 391 {"matrix": [4, 11], "x": 11, "y": 4},
392 {"label":"K4C", "x":12, "y":4}, 392 {"matrix": [4, 12], "x": 12, "y": 4},
393 {"label":"K4D", "x":13, "y":4}, 393 {"matrix": [4, 13], "x": 13, "y": 4},
394 {"label":"K4E", "x":14, "y":4} 394 {"matrix": [4, 14], "x": 14, "y": 4}
395 ] 395 ]
396 }, 396 },
397 "LAYOUT_mitchsplit": { 397 "LAYOUT_mitchsplit": {
398 "layout": [ 398 "layout": [
399 {"label":"K00", "x":0, "y":0}, 399 {"matrix": [0, 0], "x": 0, "y": 0},
400 {"label":"K01", "x":1, "y":0}, 400 {"matrix": [0, 1], "x": 1, "y": 0},
401 {"label":"K02", "x":2, "y":0}, 401 {"matrix": [0, 2], "x": 2, "y": 0},
402 {"label":"K03", "x":3, "y":0}, 402 {"matrix": [0, 3], "x": 3, "y": 0},
403 {"label":"K04", "x":4, "y":0}, 403 {"matrix": [0, 4], "x": 4, "y": 0},
404 {"label":"K05", "x":5, "y":0}, 404 {"matrix": [0, 5], "x": 5, "y": 0},
405 {"label":"K06", "x":6, "y":0}, 405 {"matrix": [0, 6], "x": 6, "y": 0},
406 {"label":"K07", "x":7, "y":0}, 406 {"matrix": [0, 7], "x": 7, "y": 0},
407 {"label":"K08", "x":8, "y":0}, 407 {"matrix": [0, 8], "x": 8, "y": 0},
408 {"label":"K09", "x":9, "y":0}, 408 {"matrix": [0, 9], "x": 9, "y": 0},
409 {"label":"K0A", "x":10, "y":0}, 409 {"matrix": [0, 10], "x": 10, "y": 0},
410 {"label":"K0B", "x":11, "y":0}, 410 {"matrix": [0, 11], "x": 11, "y": 0},
411 {"label":"K0C", "x":12, "y":0}, 411 {"matrix": [0, 12], "x": 12, "y": 0},
412 {"label":"K0E", "x":13, "y":0, "w":2}, 412 {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
413 413
414 {"label":"K10", "x":0, "y":1, "w":1.5}, 414 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
415 {"label":"K12", "x":1.5, "y":1}, 415 {"matrix": [1, 2], "x": 1.5, "y": 1},
416 {"label":"K13", "x":2.5, "y":1}, 416 {"matrix": [1, 3], "x": 2.5, "y": 1},
417 {"label":"K14", "x":3.5, "y":1}, 417 {"matrix": [1, 4], "x": 3.5, "y": 1},
418 {"label":"K15", "x":4.5, "y":1}, 418 {"matrix": [1, 5], "x": 4.5, "y": 1},
419 {"label":"K16", "x":5.5, "y":1}, 419 {"matrix": [1, 6], "x": 5.5, "y": 1},
420 {"label":"K17", "x":6.5, "y":1}, 420 {"matrix": [1, 7], "x": 6.5, "y": 1},
421 {"label":"K18", "x":7.5, "y":1}, 421 {"matrix": [1, 8], "x": 7.5, "y": 1},
422 {"label":"K19", "x":8.5, "y":1}, 422 {"matrix": [1, 9], "x": 8.5, "y": 1},
423 {"label":"K1A", "x":9.5, "y":1}, 423 {"matrix": [1, 10], "x": 9.5, "y": 1},
424 {"label":"K1B", "x":10.5, "y":1}, 424 {"matrix": [1, 11], "x": 10.5, "y": 1},
425 {"label":"K1C", "x":11.5, "y":1}, 425 {"matrix": [1, 12], "x": 11.5, "y": 1},
426 {"label":"K1D", "x":12.5, "y":1}, 426 {"matrix": [1, 13], "x": 12.5, "y": 1},
427 {"label":"K1E", "x":13.5, "y":1, "w":1.5}, 427 {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
428 428
429 {"label":"K20", "x":0, "y":2, "w":1.75}, 429 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
430 {"label":"K22", "x":1.75, "y":2}, 430 {"matrix": [2, 2], "x": 1.75, "y": 2},
431 {"label":"K23", "x":2.75, "y":2}, 431 {"matrix": [2, 3], "x": 2.75, "y": 2},
432 {"label":"K24", "x":3.75, "y":2}, 432 {"matrix": [2, 4], "x": 3.75, "y": 2},
433 {"label":"K25", "x":4.75, "y":2}, 433 {"matrix": [2, 5], "x": 4.75, "y": 2},
434 {"label":"K26", "x":5.75, "y":2}, 434 {"matrix": [2, 6], "x": 5.75, "y": 2},
435 {"label":"K27", "x":6.75, "y":2}, 435 {"matrix": [2, 7], "x": 6.75, "y": 2},
436 {"label":"K28", "x":7.75, "y":2}, 436 {"matrix": [2, 8], "x": 7.75, "y": 2},
437 {"label":"K29", "x":8.75, "y":2}, 437 {"matrix": [2, 9], "x": 8.75, "y": 2},
438 {"label":"K2A", "x":9.75, "y":2}, 438 {"matrix": [2, 10], "x": 9.75, "y": 2},
439 {"label":"K2B", "x":10.75, "y":2}, 439 {"matrix": [2, 11], "x": 10.75, "y": 2},
440 {"label":"K2C", "x":11.75, "y":2}, 440 {"matrix": [2, 12], "x": 11.75, "y": 2},
441 {"label":"K2D", "x":12.75, "y":2, "w":2.25}, 441 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
442 442
443 {"label":"K30", "x":0, "y":3, "w":2.25}, 443 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
444 {"label":"K32", "x":2.25, "y":3}, 444 {"matrix": [3, 2], "x": 2.25, "y": 3},
445 {"label":"K33", "x":3.25, "y":3}, 445 {"matrix": [3, 3], "x": 3.25, "y": 3},
446 {"label":"K34", "x":4.25, "y":3}, 446 {"matrix": [3, 4], "x": 4.25, "y": 3},
447 {"label":"K35", "x":5.25, "y":3}, 447 {"matrix": [3, 5], "x": 5.25, "y": 3},
448 {"label":"K36", "x":6.25, "y":3}, 448 {"matrix": [3, 6], "x": 6.25, "y": 3},
449 {"label":"K37", "x":7.25, "y":3}, 449 {"matrix": [3, 7], "x": 7.25, "y": 3},
450 {"label":"K38", "x":8.25, "y":3}, 450 {"matrix": [3, 8], "x": 8.25, "y": 3},
451 {"label":"K39", "x":9.25, "y":3}, 451 {"matrix": [3, 9], "x": 9.25, "y": 3},
452 {"label":"K3A", "x":10.25, "y":3}, 452 {"matrix": [3, 10], "x": 10.25, "y": 3},
453 {"label":"K3B", "x":11.25, "y":3}, 453 {"matrix": [3, 11], "x": 11.25, "y": 3},
454 {"label":"K3D", "x":12.25, "y":3, "w":1.75}, 454 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
455 {"label":"K3E", "x":14, "y":3}, 455 {"matrix": [3, 14], "x": 14, "y": 3},
456 456
457 {"label":"K40", "x":0, "y":4, "w":1.25}, 457 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
458 {"label":"K41", "x":1.25, "y":4, "w":1.25}, 458 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
459 {"label":"K43", "x":2.5, "y":4, "w":1.25}, 459 {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
460 {"label":"K44", "x":3.75, "y":4, "w":2.75}, 460 {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.75},
461 {"label":"K46", "x":6.5, "y":4, "w":1.25}, 461 {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
462 {"label":"K48", "x":7.75, "y":4, "w":2.25}, 462 {"matrix": [4, 8], "x": 7.75, "y": 4, "w": 2.25},
463 {"label":"K4A", "x":10, "y":4, "w":1.25}, 463 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
464 {"label":"K4B", "x":11.25, "y":4, "w":1.25}, 464 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
465 {"label":"K4D", "x":12.5, "y":4, "w":1.25}, 465 {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
466 {"label":"K4E", "x":13.75, "y":4, "w":1.25} 466 {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
467 ] 467 ]
468 } 468 }
469 } 469 }
diff --git a/keyboards/mechkeys/mechmini/v1/info.json b/keyboards/mechkeys/mechmini/v1/info.json
index 5932ce53d0..eea1d15feb 100644
--- a/keyboards/mechkeys/mechmini/v1/info.json
+++ b/keyboards/mechkeys/mechmini/v1/info.json
@@ -24,98 +24,98 @@
24 "layouts": { 24 "layouts": {
25 "LAYOUT": { 25 "LAYOUT": {
26 "layout": [ 26 "layout": [
27 {"x":0, "y":0}, 27 {"matrix": [3, 0], "x": 0, "y": 0},
28 {"x":1, "y":0}, 28 {"matrix": [3, 1], "x": 1, "y": 0},
29 {"x":2, "y":0}, 29 {"matrix": [3, 2], "x": 2, "y": 0},
30 {"x":3, "y":0}, 30 {"matrix": [3, 3], "x": 3, "y": 0},
31 {"x":4, "y":0}, 31 {"matrix": [3, 4], "x": 4, "y": 0},
32 {"x":5, "y":0}, 32 {"matrix": [3, 5], "x": 5, "y": 0},
33 {"x":6, "y":0}, 33 {"matrix": [3, 6], "x": 6, "y": 0},
34 {"x":7, "y":0}, 34 {"matrix": [3, 7], "x": 7, "y": 0},
35 {"x":8, "y":0}, 35 {"matrix": [3, 8], "x": 8, "y": 0},
36 {"x":9, "y":0}, 36 {"matrix": [3, 9], "x": 9, "y": 0},
37 {"x":10, "y":0}, 37 {"matrix": [3, 10], "x": 10, "y": 0},
38 {"x":11, "y":0}, 38 {"matrix": [3, 11], "x": 11, "y": 0},
39 39
40 {"x":0, "y":1, "w":1.25}, 40 {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.25},
41 {"x":1.25, "y":1}, 41 {"matrix": [2, 1], "x": 1.25, "y": 1},
42 {"x":2.25, "y":1}, 42 {"matrix": [2, 2], "x": 2.25, "y": 1},
43 {"x":3.25, "y":1}, 43 {"matrix": [2, 3], "x": 3.25, "y": 1},
44 {"x":4.25, "y":1}, 44 {"matrix": [2, 4], "x": 4.25, "y": 1},
45 {"x":5.25, "y":1}, 45 {"matrix": [2, 5], "x": 5.25, "y": 1},
46 {"x":6.25, "y":1}, 46 {"matrix": [2, 6], "x": 6.25, "y": 1},
47 {"x":7.25, "y":1}, 47 {"matrix": [2, 7], "x": 7.25, "y": 1},
48 {"x":8.25, "y":1}, 48 {"matrix": [2, 8], "x": 8.25, "y": 1},
49 {"x":9.25, "y":1}, 49 {"matrix": [2, 9], "x": 9.25, "y": 1},
50 {"x":10.25, "y":1, "w":1.75}, 50 {"matrix": [2, 10], "x": 10.25, "y": 1, "w": 1.75},
51 51
52 {"x":0, "y":2, "w":1.75}, 52 {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.75},
53 {"x":1.75, "y":2}, 53 {"matrix": [1, 1], "x": 1.75, "y": 2},
54 {"x":2.75, "y":2}, 54 {"matrix": [1, 2], "x": 2.75, "y": 2},
55 {"x":3.75, "y":2}, 55 {"matrix": [1, 3], "x": 3.75, "y": 2},
56 {"x":4.75, "y":2}, 56 {"matrix": [1, 4], "x": 4.75, "y": 2},
57 {"x":5.75, "y":2}, 57 {"matrix": [1, 5], "x": 5.75, "y": 2},
58 {"x":6.75, "y":2}, 58 {"matrix": [1, 6], "x": 6.75, "y": 2},
59 {"x":7.75, "y":2}, 59 {"matrix": [1, 7], "x": 7.75, "y": 2},
60 {"x":8.75, "y":2}, 60 {"matrix": [1, 8], "x": 8.75, "y": 2},
61 {"x":9.75, "y":2, "w":1.25}, 61 {"matrix": [1, 9], "x": 9.75, "y": 2, "w": 1.25},
62 {"x":11, "y":2}, 62 {"matrix": [1, 10], "x": 11, "y": 2},
63 63
64 {"x":0, "y":3, "w":1.25}, 64 {"matrix": [0, 0], "x": 0, "y": 3, "w": 1.25},
65 {"x":1.25, "y":3}, 65 {"matrix": [0, 1], "x": 1.25, "y": 3},
66 {"x":2.25, "y":3}, 66 {"matrix": [0, 2], "x": 2.25, "y": 3},
67 {"x":3.25, "y":3, "w":6.25}, 67 {"matrix": [0, 5], "x": 3.25, "y": 3, "w": 6.25},
68 {"x":9.5, "y":3, "w":1.25}, 68 {"matrix": [0, 9], "x": 9.5, "y": 3, "w": 1.25},
69 {"x":10.75, "y":3, "w":1.25} 69 {"matrix": [0, 10], "x": 10.75, "y": 3, "w": 1.25}
70 ] 70 ]
71 }, 71 },
72 "LAYOUT_split_space": { 72 "LAYOUT_split_space": {
73 "layout": [ 73 "layout": [
74 {"x":0, "y":0}, 74 {"matrix": [3, 0], "x": 0, "y": 0},
75 {"x":1, "y":0}, 75 {"matrix": [3, 1], "x": 1, "y": 0},
76 {"x":2, "y":0}, 76 {"matrix": [3, 2], "x": 2, "y": 0},
77 {"x":3, "y":0}, 77 {"matrix": [3, 3], "x": 3, "y": 0},
78 {"x":4, "y":0}, 78 {"matrix": [3, 4], "x": 4, "y": 0},
79 {"x":5, "y":0}, 79 {"matrix": [3, 5], "x": 5, "y": 0},
80 {"x":6, "y":0}, 80 {"matrix": [3, 6], "x": 6, "y": 0},
81 {"x":7, "y":0}, 81 {"matrix": [3, 7], "x": 7, "y": 0},
82 {"x":8, "y":0}, 82 {"matrix": [3, 8], "x": 8, "y": 0},
83 {"x":9, "y":0}, 83 {"matrix": [3, 9], "x": 9, "y": 0},
84 {"x":10, "y":0}, 84 {"matrix": [3, 10], "x": 10, "y": 0},
85 {"x":11, "y":0}, 85 {"matrix": [3, 11], "x": 11, "y": 0},
86 86
87 {"x":0, "y":1, "w":1.25}, 87 {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.25},
88 {"x":1.25, "y":1}, 88 {"matrix": [2, 1], "x": 1.25, "y": 1},
89 {"x":2.25, "y":1}, 89 {"matrix": [2, 2], "x": 2.25, "y": 1},
90 {"x":3.25, "y":1}, 90 {"matrix": [2, 3], "x": 3.25, "y": 1},
91 {"x":4.25, "y":1}, 91 {"matrix": [2, 4], "x": 4.25, "y": 1},
92 {"x":5.25, "y":1}, 92 {"matrix": [2, 5], "x": 5.25, "y": 1},
93 {"x":6.25, "y":1}, 93 {"matrix": [2, 6], "x": 6.25, "y": 1},
94 {"x":7.25, "y":1}, 94 {"matrix": [2, 7], "x": 7.25, "y": 1},
95 {"x":8.25, "y":1}, 95 {"matrix": [2, 8], "x": 8.25, "y": 1},
96 {"x":9.25, "y":1}, 96 {"matrix": [2, 9], "x": 9.25, "y": 1},
97 {"x":10.25, "y":1, "w":1.75}, 97 {"matrix": [2, 10], "x": 10.25, "y": 1, "w": 1.75},
98 98
99 {"x":0, "y":2, "w":1.75}, 99 {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.75},
100 {"x":1.75, "y":2}, 100 {"matrix": [1, 1], "x": 1.75, "y": 2},
101 {"x":2.75, "y":2}, 101 {"matrix": [1, 2], "x": 2.75, "y": 2},
102 {"x":3.75, "y":2}, 102 {"matrix": [1, 3], "x": 3.75, "y": 2},
103 {"x":4.75, "y":2}, 103 {"matrix": [1, 4], "x": 4.75, "y": 2},
104 {"x":5.75, "y":2}, 104 {"matrix": [1, 5], "x": 5.75, "y": 2},
105 {"x":6.75, "y":2}, 105 {"matrix": [1, 6], "x": 6.75, "y": 2},
106 {"x":7.75, "y":2}, 106 {"matrix": [1, 7], "x": 7.75, "y": 2},
107 {"x":8.75, "y":2}, 107 {"matrix": [1, 8], "x": 8.75, "y": 2},
108 {"x":9.75, "y":2, "w":1.25}, 108 {"matrix": [1, 9], "x": 9.75, "y": 2, "w": 1.25},
109 {"x":11, "y":2}, 109 {"matrix": [1, 10], "x": 11, "y": 2},
110 110
111 {"x":0, "y":3, "w":1.25}, 111 {"matrix": [0, 0], "x": 0, "y": 3, "w": 1.25},
112 {"x":1.25, "y":3}, 112 {"matrix": [0, 1], "x": 1.25, "y": 3},
113 {"x":2.25, "y":3, "w":1.25}, 113 {"matrix": [0, 2], "x": 2.25, "y": 3, "w": 1.25},
114 {"x":3.5, "y":3, "w":2.75}, 114 {"matrix": [0, 3], "x": 3.5, "y": 3, "w": 2.75},
115 {"x":6.25, "y":3, "w":2.25}, 115 {"matrix": [0, 6], "x": 6.25, "y": 3, "w": 2.25},
116 {"x":8.5, "y":3, "w":1.25}, 116 {"matrix": [0, 8], "x": 8.5, "y": 3, "w": 1.25},
117 {"x":9.75, "y":3}, 117 {"matrix": [0, 9], "x": 9.75, "y": 3},
118 {"x":10.75, "y":3, "w":1.25} 118 {"matrix": [0, 10], "x": 10.75, "y": 3, "w": 1.25}
119 ] 119 ]
120 } 120 }
121 } 121 }
diff --git a/keyboards/mechkeys/mechmini/v1/v1.h b/keyboards/mechkeys/mechmini/v1/v1.h
deleted file mode 100644
index 6991930d6f..0000000000
--- a/keyboards/mechkeys/mechmini/v1/v1.h
+++ /dev/null
@@ -1,48 +0,0 @@
1/*
2Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
19
20#include "quantum.h"
21
22#define ___ KC_NO
23
24#define LAYOUT( \
25 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, \
26 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
27 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
28 K00, K01, K02, K05, K09, K0A \
29) \
30{ \
31 { K00, K01, K02, ___, ___, K05, ___, ___, ___, K09, K0A, ___ }, \
32 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, ___ }, \
33 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, ___ }, \
34 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B } \
35}
36
37#define LAYOUT_split_space( \
38 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, \
39 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
40 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
41 K00, K01, K02, K03, K06, K08, K09, K0A \
42) \
43{ \
44 { K00, K01, K02, K03, ___, ___, K06, ___, K08, K09, K0A, ___ }, \
45 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, ___ }, \
46 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, ___ }, \
47 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B } \
48}
diff --git a/keyboards/mechlovin/pisces/info.json b/keyboards/mechlovin/pisces/info.json
index 3159cc500b..84fdaefd21 100644
--- a/keyboards/mechlovin/pisces/info.json
+++ b/keyboards/mechlovin/pisces/info.json
@@ -27,153 +27,155 @@
27 "layouts": { 27 "layouts": {
28 "LAYOUT_all": { 28 "LAYOUT_all": {
29 "layout": [ 29 "layout": [
30 {"label":"K00 (B0,E6)", "x":0, "y":0}, 30 {"matrix": [0, 0], "x": 0, "y": 0},
31 {"label":"K01 (B0,B1)", "x":1, "y":0}, 31 {"matrix": [0, 1], "x": 1, "y": 0},
32 {"label":"K02 (B0,B3)", "x":2, "y":0}, 32 {"matrix": [0, 2], "x": 2, "y": 0},
33 {"label":"K03 (B0,D0)", "x":3, "y":0}, 33 {"matrix": [0, 3], "x": 3, "y": 0},
34 {"label":"K04 (B0,D1)", "x":4, "y":0}, 34 {"matrix": [0, 4], "x": 4, "y": 0},
35 {"label":"K05 (B0,D2)", "x":5, "y":0}, 35 {"matrix": [0, 5], "x": 5, "y": 0},
36 {"label":"K06 (B0,D3)", "x":6, "y":0}, 36 {"matrix": [0, 6], "x": 6, "y": 0},
37 {"label":"K07 (B0,D5)", "x":7, "y":0}, 37 {"matrix": [0, 7], "x": 7, "y": 0},
38 {"label":"K08 (B0,F4)", "x":8, "y":0}, 38 {"matrix": [0, 8], "x": 8, "y": 0},
39 {"label":"K09 (B0,F1)", "x":9, "y":0}, 39 {"matrix": [0, 9], "x": 9, "y": 0},
40 {"label":"K0A (B0,D4)", "x":10, "y":0}, 40 {"matrix": [0, 10], "x": 10, "y": 0},
41 {"label":"K0B (B0,D6)", "x":11, "y":0}, 41 {"matrix": [0, 11], "x": 11, "y": 0},
42 {"label":"K0C (B0,D7)", "x":12, "y":0}, 42 {"matrix": [0, 12], "x": 12, "y": 0},
43 {"label":"K0D (B0,B4)", "x":13, "y":0}, 43 {"matrix": [0, 13], "x": 13, "y": 0},
44 {"label":"K0E (B0,B5)", "x":14, "y":0}, 44 {"matrix": [0, 14], "x": 14, "y": 0},
45 45
46 {"label":"K10 (F0,E6)", "x":0, "y":1, "w":1.5}, 46 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
47 {"label":"K11 (F0,B1)", "x":1.5, "y":1}, 47 {"matrix": [1, 1], "x": 1.5, "y": 1},
48 {"label":"K12 (F0,B3)", "x":2.5, "y":1}, 48 {"matrix": [1, 2], "x": 2.5, "y": 1},
49 {"label":"K13 (F0,D0)", "x":3.5, "y":1}, 49 {"matrix": [1, 3], "x": 3.5, "y": 1},
50 {"label":"K14 (F0,D1)", "x":4.5, "y":1}, 50 {"matrix": [1, 4], "x": 4.5, "y": 1},
51 {"label":"K15 (F0,D2)", "x":5.5, "y":1}, 51 {"matrix": [1, 5], "x": 5.5, "y": 1},
52 {"label":"K16 (F0,D3)", "x":6.5, "y":1}, 52 {"matrix": [1, 6], "x": 6.5, "y": 1},
53 {"label":"K17 (F0,D5)", "x":7.5, "y":1}, 53 {"matrix": [1, 7], "x": 7.5, "y": 1},
54 {"label":"K18 (F0,F4)", "x":8.5, "y":1}, 54 {"matrix": [1, 8], "x": 8.5, "y": 1},
55 {"label":"K19 (F0,F1)", "x":9.5, "y":1}, 55 {"matrix": [1, 9], "x": 9.5, "y": 1},
56 {"label":"K1A (F0,D4)", "x":10.5, "y":1}, 56 {"matrix": [1, 10], "x": 10.5, "y": 1},
57 {"label":"K1B (F0,D6)", "x":11.5, "y":1}, 57 {"matrix": [1, 11], "x": 11.5, "y": 1},
58 {"label":"K1C (F0,D7)", "x":12.5, "y":1}, 58 {"matrix": [1, 12], "x": 12.5, "y": 1},
59 {"label":"K1D (F0,B4)", "x":13.5, "y":1, "w":1.5}, 59 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
60 {"label":"K1E (F0,B5)", "x":15, "y":1}, 60 {"matrix": [1, 14], "x": 15, "y": 1},
61 61
62 {"label":"K20 (F5,E6)", "x":0, "y":2, "w":1.75}, 62 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
63 {"label":"K21 (F5,B1)", "x":1.75, "y":2}, 63 {"matrix": [2, 1], "x": 1.75, "y": 2},
64 {"label":"K22 (F5,B3)", "x":2.75, "y":2}, 64 {"matrix": [2, 2], "x": 2.75, "y": 2},
65 {"label":"K23 (F5,D0)", "x":3.75, "y":2}, 65 {"matrix": [2, 3], "x": 3.75, "y": 2},
66 {"label":"K24 (F5,D1)", "x":4.75, "y":2}, 66 {"matrix": [2, 4], "x": 4.75, "y": 2},
67 {"label":"K25 (F5,D2)", "x":5.75, "y":2}, 67 {"matrix": [2, 5], "x": 5.75, "y": 2},
68 {"label":"K26 (F5,D3)", "x":6.75, "y":2}, 68 {"matrix": [2, 6], "x": 6.75, "y": 2},
69 {"label":"K27 (F5,D5)", "x":7.75, "y":2}, 69 {"matrix": [2, 7], "x": 7.75, "y": 2},
70 {"label":"K28 (F5,F4)", "x":8.75, "y":2}, 70 {"matrix": [2, 8], "x": 8.75, "y": 2},
71 {"label":"K29 (F5,F1)", "x":9.75, "y":2}, 71 {"matrix": [2, 9], "x": 9.75, "y": 2},
72 {"label":"K2A (F5,D4)", "x":10.75, "y":2}, 72 {"matrix": [2, 10], "x": 10.75, "y": 2},
73 {"label":"K2B (F5,D6)", "x":11.75, "y":2}, 73 {"matrix": [2, 11], "x": 11.75, "y": 2},
74 {"label":"K2C (F5,D7)", "x":12.75, "y":2}, 74 {"matrix": [2, 12], "x": 12.75, "y": 2},
75 {"label":"K2D (F5,B4)", "x":13.75, "y":2, "w":1.25}, 75 {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
76 {"label":"K2E (F5,B5)", "x":15, "y":2}, 76 {"matrix": [2, 14], "x": 15, "y": 2},
77 77
78 {"label":"K30 (F6,E6)", "x":0, "y":3, "w":1.25}, 78 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
79 {"label":"K31 (F6,B1)", "x":1.25, "y":3}, 79 {"matrix": [3, 1], "x": 1.25, "y": 3},
80 {"label":"K32 (F6,B3)", "x":2.25, "y":3}, 80 {"matrix": [3, 2], "x": 2.25, "y": 3},
81 {"label":"K33 (F6,D0)", "x":3.25, "y":3}, 81 {"matrix": [3, 3], "x": 3.25, "y": 3},
82 {"label":"K34 (F6,D1)", "x":4.25, "y":3}, 82 {"matrix": [3, 4], "x": 4.25, "y": 3},
83 {"label":"K35 (F6,D2)", "x":5.25, "y":3}, 83 {"matrix": [3, 5], "x": 5.25, "y": 3},
84 {"label":"K36 (F6,D3)", "x":6.25, "y":3}, 84 {"matrix": [3, 6], "x": 6.25, "y": 3},
85 {"label":"K37 (F6,D5)", "x":7.25, "y":3}, 85 {"matrix": [3, 7], "x": 7.25, "y": 3},
86 {"label":"K38 (F6,F4)", "x":8.25, "y":3}, 86 {"matrix": [3, 8], "x": 8.25, "y": 3},
87 {"label":"K39 (F6,F1)", "x":9.25, "y":3}, 87 {"matrix": [3, 9], "x": 9.25, "y": 3},
88 {"label":"K3A (F6,D4)", "x":10.25, "y":3}, 88 {"matrix": [3, 10], "x": 10.25, "y": 3},
89 {"label":"K3B (F6,D6)", "x":11.25, "y":3}, 89 {"matrix": [3, 11], "x": 11.25, "y": 3},
90 {"label":"K3C (F6,D7)", "x":12.25, "y":3, "w":1.75}, 90 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
91 {"label":"K3D (F6,B4)", "x":14, "y":3}, 91 {"matrix": [3, 13], "x": 14, "y": 3},
92 {"label":"K3E (F6,B5)", "x":15, "y":3}, 92 {"matrix": [3, 14], "x": 15, "y": 3},
93 93
94 {"label":"K40 (F7,E6)", "x":0, "y":4, "w":1.25}, 94 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
95 {"label":"K41 (F7,B1)", "x":1.25, "y":4, "w":1.25}, 95 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
96 {"label":"K42 (F7,B3)", "x":2.5, "y":4, "w":1.25}, 96 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
97 {"label":"K46 (F7,D3)", "x":3.75, "y":4, "w":6.25}, 97 {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
98 {"label":"K4A (F7,D4)", "x":10, "y":4, "w":1.25}, 98 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
99 {"label":"K4B (F7,D6)", "x":11.25, "y":4, "w":1.25}, 99 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
100 {"label":"K4C (F7,D7)", "x":13, "y":4}, 100
101 {"label":"K4D (F7,B4)", "x":14, "y":4}, 101 {"matrix": [4, 12], "x": 13, "y": 4},
102 {"label":"K4E (F7,B5)", "x":15, "y":4} 102 {"matrix": [4, 13], "x": 14, "y": 4},
103 {"matrix": [4, 14], "x": 15, "y": 4}
103 ] 104 ]
104 }, 105 },
105 "LAYOUT": { 106 "LAYOUT": {
106 "layout": [ 107 "layout": [
107 {"label":"K00 (B0,E6)", "x":0, "y":0}, 108 {"matrix": [0, 0], "x": 0, "y": 0},
108 {"label":"K01 (B0,B1)", "x":1, "y":0}, 109 {"matrix": [0, 1], "x": 1, "y": 0},
109 {"label":"K02 (B0,B3)", "x":2, "y":0}, 110 {"matrix": [0, 2], "x": 2, "y": 0},
110 {"label":"K03 (B0,D0)", "x":3, "y":0}, 111 {"matrix": [0, 3], "x": 3, "y": 0},
111 {"label":"K04 (B0,D1)", "x":4, "y":0}, 112 {"matrix": [0, 4], "x": 4, "y": 0},
112 {"label":"K05 (B0,D2)", "x":5, "y":0}, 113 {"matrix": [0, 5], "x": 5, "y": 0},
113 {"label":"K06 (B0,D3)", "x":6, "y":0}, 114 {"matrix": [0, 6], "x": 6, "y": 0},
114 {"label":"K07 (B0,D5)", "x":7, "y":0}, 115 {"matrix": [0, 7], "x": 7, "y": 0},
115 {"label":"K08 (B0,F4)", "x":8, "y":0}, 116 {"matrix": [0, 8], "x": 8, "y": 0},
116 {"label":"K09 (B0,F1)", "x":9, "y":0}, 117 {"matrix": [0, 9], "x": 9, "y": 0},
117 {"label":"K0A (B0,D4)", "x":10, "y":0}, 118 {"matrix": [0, 10], "x": 10, "y": 0},
118 {"label":"K0B (B0,D6)", "x":11, "y":0}, 119 {"matrix": [0, 11], "x": 11, "y": 0},
119 {"label":"K0C (B0,D7)", "x":12, "y":0}, 120 {"matrix": [0, 12], "x": 12, "y": 0},
120 {"label":"K0D (B0,B4)", "x":13, "y":0, "w":2}, 121 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
122
123 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
124 {"matrix": [1, 1], "x": 1.5, "y": 1},
125 {"matrix": [1, 2], "x": 2.5, "y": 1},
126 {"matrix": [1, 3], "x": 3.5, "y": 1},
127 {"matrix": [1, 4], "x": 4.5, "y": 1},
128 {"matrix": [1, 5], "x": 5.5, "y": 1},
129 {"matrix": [1, 6], "x": 6.5, "y": 1},
130 {"matrix": [1, 7], "x": 7.5, "y": 1},
131 {"matrix": [1, 8], "x": 8.5, "y": 1},
132 {"matrix": [1, 9], "x": 9.5, "y": 1},
133 {"matrix": [1, 10], "x": 10.5, "y": 1},
134 {"matrix": [1, 11], "x": 11.5, "y": 1},
135 {"matrix": [1, 12], "x": 12.5, "y": 1},
136 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
137 {"matrix": [1, 14], "x": 15, "y": 1},
121 138
122 {"label":"K10 (F0,E6)", "x":0, "y":1, "w":1.5}, 139 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
123 {"label":"K11 (F0,B1)", "x":1.5, "y":1}, 140 {"matrix": [2, 1], "x": 1.75, "y": 2},
124 {"label":"K12 (F0,B3)", "x":2.5, "y":1}, 141 {"matrix": [2, 2], "x": 2.75, "y": 2},
125 {"label":"K13 (F0,D0)", "x":3.5, "y":1}, 142 {"matrix": [2, 3], "x": 3.75, "y": 2},
126 {"label":"K14 (F0,D1)", "x":4.5, "y":1}, 143 {"matrix": [2, 4], "x": 4.75, "y": 2},
127 {"label":"K15 (F0,D2)", "x":5.5, "y":1}, 144 {"matrix": [2, 5], "x": 5.75, "y": 2},
128 {"label":"K16 (F0,D3)", "x":6.5, "y":1}, 145 {"matrix": [2, 6], "x": 6.75, "y": 2},
129 {"label":"K17 (F0,D5)", "x":7.5, "y":1}, 146 {"matrix": [2, 7], "x": 7.75, "y": 2},
130 {"label":"K18 (F0,F4)", "x":8.5, "y":1}, 147 {"matrix": [2, 8], "x": 8.75, "y": 2},
131 {"label":"K19 (F0,F1)", "x":9.5, "y":1}, 148 {"matrix": [2, 9], "x": 9.75, "y": 2},
132 {"label":"K1A (F0,D4)", "x":10.5, "y":1}, 149 {"matrix": [2, 10], "x": 10.75, "y": 2},
133 {"label":"K1B (F0,D6)", "x":11.5, "y":1}, 150 {"matrix": [2, 11], "x": 11.75, "y": 2},
134 {"label":"K1C (F0,D7)", "x":12.5, "y":1}, 151 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
135 {"label":"K1D (F0,B4)", "x":13.5, "y":1, "w":1.5}, 152 {"matrix": [2, 14], "x": 15, "y": 2},
136 {"label":"K1E (F0,B5)", "x":15, "y":1},
137 153
138 {"label":"K20 (F5,E6)", "x":0, "y":2, "w":1.75}, 154 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
139 {"label":"K21 (F5,B1)", "x":1.75, "y":2}, 155 {"matrix": [3, 2], "x": 2.25, "y": 3},
140 {"label":"K22 (F5,B3)", "x":2.75, "y":2}, 156 {"matrix": [3, 3], "x": 3.25, "y": 3},
141 {"label":"K23 (F5,D0)", "x":3.75, "y":2}, 157 {"matrix": [3, 4], "x": 4.25, "y": 3},
142 {"label":"K24 (F5,D1)", "x":4.75, "y":2}, 158 {"matrix": [3, 5], "x": 5.25, "y": 3},
143 {"label":"K25 (F5,D2)", "x":5.75, "y":2}, 159 {"matrix": [3, 6], "x": 6.25, "y": 3},
144 {"label":"K26 (F5,D3)", "x":6.75, "y":2}, 160 {"matrix": [3, 7], "x": 7.25, "y": 3},
145 {"label":"K27 (F5,D5)", "x":7.75, "y":2}, 161 {"matrix": [3, 8], "x": 8.25, "y": 3},
146 {"label":"K28 (F5,F4)", "x":8.75, "y":2}, 162 {"matrix": [3, 9], "x": 9.25, "y": 3},
147 {"label":"K29 (F5,F1)", "x":9.75, "y":2}, 163 {"matrix": [3, 10], "x": 10.25, "y": 3},
148 {"label":"K2A (F5,D4)", "x":10.75, "y":2}, 164 {"matrix": [3, 11], "x": 11.25, "y": 3},
149 {"label":"K2B (F5,D6)", "x":11.75, "y":2}, 165 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
150 {"label":"K2D (F5,B4)", "x":12.75, "y":2, "w":2.25}, 166 {"matrix": [3, 13], "x": 14, "y": 3},
151 {"label":"K2E (F5,B5)", "x":15, "y":2}, 167 {"matrix": [3, 14], "x": 15, "y": 3},
152 168
153 {"label":"K30 (F6,E6)", "x":0, "y":3, "w":2.25}, 169 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
154 {"label":"K32 (F6,B3)", "x":2.25, "y":3}, 170 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
155 {"label":"K33 (F6,D0)", "x":3.25, "y":3}, 171 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
156 {"label":"K34 (F6,D1)", "x":4.25, "y":3}, 172 {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
157 {"label":"K35 (F6,D2)", "x":5.25, "y":3}, 173 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
158 {"label":"K36 (F6,D3)", "x":6.25, "y":3}, 174 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
159 {"label":"K37 (F6,D5)", "x":7.25, "y":3},
160 {"label":"K38 (F6,F4)", "x":8.25, "y":3},
161 {"label":"K39 (F6,F1)", "x":9.25, "y":3},
162 {"label":"K3A (F6,D4)", "x":10.25, "y":3},
163 {"label":"K3B (F6,D6)", "x":11.25, "y":3},
164 {"label":"K3C (F6,D7)", "x":12.25, "y":3, "w":1.75},
165 {"label":"K3D (F6,B4)", "x":14, "y":3},
166 {"label":"K3E (F6,B5)", "x":15, "y":3},
167 175
168 {"label":"K40 (F7,E6)", "x":0, "y":4, "w":1.25}, 176 {"matrix": [4, 12], "x": 13, "y": 4},
169 {"label":"K41 (F7,B1)", "x":1.25, "y":4, "w":1.25}, 177 {"matrix": [4, 13], "x": 14, "y": 4},
170 {"label":"K42 (F7,B3)", "x":2.5, "y":4, "w":1.25}, 178 {"matrix": [4, 14], "x": 15, "y": 4}
171 {"label":"K46 (F7,D3)", "x":3.75, "y":4, "w":6.25},
172 {"label":"K4A (F7,D4)", "x":10, "y":4, "w":1.25},
173 {"label":"K4B (F7,D6)", "x":11.25, "y":4, "w":1.25},
174 {"label":"K4C (F7,D7)", "x":13, "y":4},
175 {"label":"K4D (F7,B4)", "x":14, "y":4},
176 {"label":"K4E (F7,B5)", "x":15, "y":4}
177 ] 179 ]
178 } 180 }
179 } 181 }
diff --git a/keyboards/mechlovin/pisces/pisces.h b/keyboards/mechlovin/pisces/pisces.h
deleted file mode 100644
index 7ff54ecdde..0000000000
--- a/keyboards/mechlovin/pisces/pisces.h
+++ /dev/null
@@ -1,67 +0,0 @@
1/* Copyright 2020 Team Mechlovin'
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#include "quantum.h"
20
21#define XXX KC_NO
22
23/*
24 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───────┐
25 * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │ │0D │ 2u Backspace
26 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┐ └─┬─────┤
27 * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │ │ │
28 * 2.25u ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ ┌──┴┐2D │ ISO Enter
29 * LShift │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D │2E │ │2C │ │
30 * ┌────────┐ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ └───┴────┘
31 * │30 │ │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │
32 * └────────┘ ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
33 * │40 │41 │42 │46 │4A │4B │││4C │4D │4E │
34 * └────┴────┴────┴────────────────────────┴────┴────┘│└───┴───┴───┘
35 * ──────┴─────
36 * ┌──────────┐
37 * │3C │ 2.75u RShift
38 * └──────────┘
39 */
40
41#define LAYOUT_all( \
42 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
43 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
44 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
45 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
46 K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E \
47) { \
48 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
49 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
50 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
51 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
52 { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E }, \
53}
54
55#define LAYOUT( \
56 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
57 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
58 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \
59 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
60 K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E \
61) { \
62 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX }, \
63 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
64 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E }, \
65 { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
66 { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E }, \
67}
diff --git a/keyboards/meson/info.json b/keyboards/meson/info.json
index 41e3a6b4a2..62aa154c0b 100644
--- a/keyboards/meson/info.json
+++ b/keyboards/meson/info.json
@@ -23,100 +23,113 @@
23 "layouts": { 23 "layouts": {
24 "LAYOUT": { 24 "LAYOUT": {
25 "layout": [ 25 "layout": [
26 {"label": "", "x": 0, "y": 0}, 26 {"matrix": [0, 0], "x": 0, "y": 0},
27 {"label": "", "x": 1, "y": 0}, 27 {"matrix": [0, 1], "x": 1, "y": 0},
28 {"label": "", "x": 2, "y": 0}, 28 {"matrix": [0, 2], "x": 2, "y": 0},
29 {"label": "", "x": 3, "y": 0}, 29 {"matrix": [0, 3], "x": 3, "y": 0},
30 {"label": "", "x": 4, "y": 0}, 30 {"matrix": [0, 4], "x": 4, "y": 0},
31 {"label": "", "x": 5, "y": 0}, 31 {"matrix": [0, 5], "x": 5, "y": 0},
32 {"label": "", "x": 6, "y": 0}, 32 {"matrix": [0, 6], "x": 6, "y": 0},
33 {"label": "", "x": 8.5, "y": 0}, 33
34 {"label": "", "x": 9.5, "y": 0}, 34 {"matrix": [4, 6], "x": 8.5, "y": 0},
35 {"label": "", "x": 10.5, "y": 0}, 35 {"matrix": [4, 5], "x": 9.5, "y": 0},
36 {"label": "", "x": 11.5, "y": 0}, 36 {"matrix": [4, 4], "x": 10.5, "y": 0},
37 {"label": "", "x": 12.5, "y": 0}, 37 {"matrix": [4, 3], "x": 11.5, "y": 0},
38 {"label": "", "x": 13.5, "y": 0}, 38 {"matrix": [4, 2], "x": 12.5, "y": 0},
39 {"label": "", "x": 14.5, "y": 0}, 39 {"matrix": [4, 1], "x": 13.5, "y": 0},
40 {"label": "", "x": 0, "y": 1}, 40 {"matrix": [4, 0], "x": 14.5, "y": 0},
41 {"label": "", "x": 1, "y": 1}, 41
42 {"label": "", "x": 2, "y": 1}, 42 {"matrix": [1, 0], "x": 0, "y": 1},
43 {"label": "", "x": 3, "y": 1}, 43 {"matrix": [1, 1], "x": 1, "y": 1},
44 {"label": "", "x": 4, "y": 1}, 44 {"matrix": [1, 2], "x": 2, "y": 1},
45 {"label": "", "x": 5, "y": 1}, 45 {"matrix": [1, 3], "x": 3, "y": 1},
46 {"label": "", "x": 6, "y": 1}, 46 {"matrix": [1, 4], "x": 4, "y": 1},
47 {"label": "", "x": 8.5, "y": 1}, 47 {"matrix": [1, 5], "x": 5, "y": 1},
48 {"label": "", "x": 9.5, "y": 1}, 48 {"matrix": [1, 6], "x": 6, "y": 1},
49 {"label": "", "x": 10.5, "y": 1}, 49
50 {"label": "", "x": 11.5, "y": 1}, 50 {"matrix": [5, 6], "x": 8.5, "y": 1},
51 {"label": "", "x": 12.5, "y": 1}, 51 {"matrix": [5, 5], "x": 9.5, "y": 1},
52 {"label": "", "x": 13.5, "y": 1}, 52 {"matrix": [5, 4], "x": 10.5, "y": 1},
53 {"label": "", "x": 14.5, "y": 1}, 53 {"matrix": [5, 3], "x": 11.5, "y": 1},
54 {"label": "", "x": 0, "y": 2}, 54 {"matrix": [5, 2], "x": 12.5, "y": 1},
55 {"label": "", "x": 1, "y": 2}, 55 {"matrix": [5, 1], "x": 13.5, "y": 1},
56 {"label": "", "x": 2, "y": 2}, 56 {"matrix": [5, 0], "x": 14.5, "y": 1},
57 {"label": "", "x": 3, "y": 2}, 57
58 {"label": "", "x": 4, "y": 2}, 58 {"matrix": [2, 0], "x": 0, "y": 2},
59 {"label": "", "x": 5, "y": 2}, 59 {"matrix": [2, 1], "x": 1, "y": 2},
60 {"label": "", "x": 6, "y": 2}, 60 {"matrix": [2, 2], "x": 2, "y": 2},
61 {"label": "", "x": 8.5, "y": 2}, 61 {"matrix": [2, 3], "x": 3, "y": 2},
62 {"label": "", "x": 9.5, "y": 2}, 62 {"matrix": [2, 4], "x": 4, "y": 2},
63 {"label": "", "x": 10.5, "y": 2}, 63 {"matrix": [2, 5], "x": 5, "y": 2},
64 {"label": "", "x": 11.5, "y": 2}, 64 {"matrix": [2, 6], "x": 6, "y": 2},
65 {"label": "", "x": 12.5, "y": 2}, 65
66 {"label": "", "x": 13.5, "y": 2}, 66 {"matrix": [6, 6], "x": 8.5, "y": 2},
67 {"label": "", "x": 14.5, "y": 2}, 67 {"matrix": [6, 5], "x": 9.5, "y": 2},
68 {"label": "", "x": 4, "y": 3}, 68 {"matrix": [6, 4], "x": 10.5, "y": 2},
69 {"label": "", "x": 5, "y": 3}, 69 {"matrix": [6, 3], "x": 11.5, "y": 2},
70 {"label": "", "x": 9.5, "y": 3}, 70 {"matrix": [6, 2], "x": 12.5, "y": 2},
71 {"label": "", "x": 10.5, "y": 3} 71 {"matrix": [6, 1], "x": 13.5, "y": 2},
72 {"matrix": [6, 0], "x": 14.5, "y": 2},
73
74 {"matrix": [3, 4], "x": 4, "y": 3},
75 {"matrix": [3, 5], "x": 5, "y": 3},
76 {"matrix": [7, 5], "x": 9.5, "y": 3},
77 {"matrix": [7, 4], "x": 10.5, "y": 3}
72 ] 78 ]
73 }, 79 },
74 "LAYOUT_2u": { 80 "LAYOUT_2u": {
75 "layout": [ 81 "layout": [
76 {"label": "", "x": 0, "y": 0}, 82 {"matrix": [0, 0], "x": 0, "y": 0},
77 {"label": "", "x": 1, "y": 0}, 83 {"matrix": [0, 1], "x": 1, "y": 0},
78 {"label": "", "x": 2, "y": 0}, 84 {"matrix": [0, 2], "x": 2, "y": 0},
79 {"label": "", "x": 3, "y": 0}, 85 {"matrix": [0, 3], "x": 3, "y": 0},
80 {"label": "", "x": 4, "y": 0}, 86 {"matrix": [0, 4], "x": 4, "y": 0},
81 {"label": "", "x": 5, "y": 0}, 87 {"matrix": [0, 5], "x": 5, "y": 0},
82 {"label": "", "x": 6, "y": 0}, 88 {"matrix": [0, 6], "x": 6, "y": 0},
83 {"label": "", "x": 8.5, "y": 0}, 89
84 {"label": "", "x": 9.5, "y": 0}, 90 {"matrix": [4, 6], "x": 8.5, "y": 0},
85 {"label": "", "x": 10.5, "y": 0}, 91 {"matrix": [4, 5], "x": 9.5, "y": 0},
86 {"label": "", "x": 11.5, "y": 0}, 92 {"matrix": [4, 4], "x": 10.5, "y": 0},
87 {"label": "", "x": 12.5, "y": 0}, 93 {"matrix": [4, 3], "x": 11.5, "y": 0},
88 {"label": "", "x": 13.5, "y": 0}, 94 {"matrix": [4, 2], "x": 12.5, "y": 0},
89 {"label": "", "x": 14.5, "y": 0}, 95 {"matrix": [4, 1], "x": 13.5, "y": 0},
90 {"label": "", "x": 0, "y": 1}, 96 {"matrix": [4, 0], "x": 14.5, "y": 0},
91 {"label": "", "x": 1, "y": 1}, 97
92 {"label": "", "x": 2, "y": 1}, 98 {"matrix": [1, 0], "x": 0, "y": 1},
93 {"label": "", "x": 3, "y": 1}, 99 {"matrix": [1, 1], "x": 1, "y": 1},
94 {"label": "", "x": 4, "y": 1}, 100 {"matrix": [1, 2], "x": 2, "y": 1},
95 {"label": "", "x": 5, "y": 1}, 101 {"matrix": [1, 3], "x": 3, "y": 1},
96 {"label": "", "x": 6, "y": 1}, 102 {"matrix": [1, 4], "x": 4, "y": 1},
97 {"label": "", "x": 8.5, "y": 1}, 103 {"matrix": [1, 5], "x": 5, "y": 1},
98 {"label": "", "x": 9.5, "y": 1}, 104 {"matrix": [1, 6], "x": 6, "y": 1},
99 {"label": "", "x": 10.5, "y": 1}, 105
100 {"label": "", "x": 11.5, "y": 1}, 106 {"matrix": [5, 6], "x": 8.5, "y": 1},
101 {"label": "", "x": 12.5, "y": 1}, 107 {"matrix": [5, 5], "x": 9.5, "y": 1},
102 {"label": "", "x": 13.5, "y": 1}, 108 {"matrix": [5, 4], "x": 10.5, "y": 1},
103 {"label": "", "x": 14.5, "y": 1}, 109 {"matrix": [5, 3], "x": 11.5, "y": 1},
104 {"label": "", "x": 0, "y": 2}, 110 {"matrix": [5, 2], "x": 12.5, "y": 1},
105 {"label": "", "x": 1, "y": 2}, 111 {"matrix": [5, 1], "x": 13.5, "y": 1},
106 {"label": "", "x": 2, "y": 2}, 112 {"matrix": [5, 0], "x": 14.5, "y": 1},
107 {"label": "", "x": 3, "y": 2}, 113
108 {"label": "", "x": 4, "y": 2}, 114 {"matrix": [2, 0], "x": 0, "y": 2},
109 {"label": "", "x": 5, "y": 2}, 115 {"matrix": [2, 1], "x": 1, "y": 2},
110 {"label": "", "x": 6, "y": 2}, 116 {"matrix": [2, 2], "x": 2, "y": 2},
111 {"label": "", "x": 8.5, "y": 2}, 117 {"matrix": [2, 3], "x": 3, "y": 2},
112 {"label": "", "x": 9.5, "y": 2}, 118 {"matrix": [2, 4], "x": 4, "y": 2},
113 {"label": "", "x": 10.5, "y": 2}, 119 {"matrix": [2, 5], "x": 5, "y": 2},
114 {"label": "", "x": 11.5, "y": 2}, 120 {"matrix": [2, 6], "x": 6, "y": 2},
115 {"label": "", "x": 12.5, "y": 2}, 121
116 {"label": "", "x": 13.5, "y": 2}, 122 {"matrix": [6, 6], "x": 8.5, "y": 2},
117 {"label": "", "x": 14.5, "y": 2}, 123 {"matrix": [6, 5], "x": 9.5, "y": 2},
118 {"label": "", "x": 4, "y": 3, "w": 2}, 124 {"matrix": [6, 4], "x": 10.5, "y": 2},
119 {"label": "", "x": 9.5, "y": 3, "w": 2} 125 {"matrix": [6, 3], "x": 11.5, "y": 2},
126 {"matrix": [6, 2], "x": 12.5, "y": 2},
127 {"matrix": [6, 1], "x": 13.5, "y": 2},
128 {"matrix": [6, 0], "x": 14.5, "y": 2},
129
130 {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
131
132 {"matrix": [7, 4], "x": 9.5, "y": 3, "w": 2}
120 ] 133 ]
121 } 134 }
122 } 135 }
diff --git a/keyboards/meson/meson.h b/keyboards/meson/meson.h
deleted file mode 100644
index 5344d5410c..0000000000
--- a/keyboards/meson/meson.h
+++ /dev/null
@@ -1,56 +0,0 @@
1/* Copyright 2019 Luciano M
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18#include "quantum.h"
19
20#define ___ KC_NO
21
22#define LAYOUT( \
23 L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \
24 L10, L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, R10, \
25 L20, L21, L22, L23, L24, L25, L26, R26, R25, R24, R23, R22, R21, R20, \
26 L30, L31, R31, R30 \
27) \
28{ \
29 { L00, L01, L02, L03, L04, L05, L06}, \
30 { L10, L11, L12, L13, L14, L15, L16}, \
31 { L20, L21, L22, L23, L24, L25, L26}, \
32 { ___, ___, ___, ___, L30, L31, ___}, \
33 { R00, R01, R02, R03, R04, R05, R06}, \
34 { R10, R11, R12, R13, R14, R15, R16}, \
35 { R20, R21, R22, R23, R24, R25, R26}, \
36 { ___, ___, ___, ___, R30, R31, ___}, \
37}
38
39// 2u SPACEBAR LAYOUT, DON'T FORGET TO CHANGE NAME OF LAYOUTS IN KEYMAP.C
40
41#define LAYOUT_2u( \
42 L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \
43 L10, L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, R10, \
44 L20, L21, L22, L23, L24, L25, L26, R26, R25, R24, R23, R22, R21, R20, \
45 L30, R30 \
46) \
47{ \
48 { L00, L01, L02, L03, L04, L05, L06}, \
49 { L10, L11, L12, L13, L14, L15, L16}, \
50 { L20, L21, L22, L23, L24, L25, L26}, \
51 { ___, ___, ___, ___, L30, ___, ___},\
52 { R00, R01, R02, R03, R04, R05, R06}, \
53 { R10, R11, R12, R13, R14, R15, R16}, \
54 { R20, R21, R22, R23, R24, R25, R26}, \
55 { ___, ___, ___, ___, R30, ___, ___},\
56}
diff --git a/keyboards/mokey/mokey63/info.json b/keyboards/mokey/mokey63/info.json
index 6da3bc3133..1708e147d8 100644
--- a/keyboards/mokey/mokey63/info.json
+++ b/keyboards/mokey/mokey63/info.json
@@ -18,147 +18,147 @@
18 "layouts": { 18 "layouts": {
19 "LAYOUT": { 19 "LAYOUT": {
20 "layout": [ 20 "layout": [
21 {"label":"k00", "x":0, "y":0}, 21 {"matrix": [0, 0], "x": 0, "y": 0},
22 {"label":"k01", "x":1, "y":0}, 22 {"matrix": [0, 1], "x": 1, "y": 0},
23 {"label":"k02", "x":2, "y":0}, 23 {"matrix": [0, 2], "x": 2, "y": 0},
24 {"label":"k03", "x":3, "y":0}, 24 {"matrix": [0, 3], "x": 3, "y": 0},
25 {"label":"k04", "x":4, "y":0}, 25 {"matrix": [0, 4], "x": 4, "y": 0},
26 {"label":"k05", "x":5, "y":0}, 26 {"matrix": [0, 5], "x": 5, "y": 0},
27 {"label":"k06", "x":6, "y":0}, 27 {"matrix": [0, 6], "x": 6, "y": 0},
28 {"label":"k07", "x":7, "y":0}, 28 {"matrix": [0, 7], "x": 7, "y": 0},
29 {"label":"k08", "x":8, "y":0}, 29 {"matrix": [0, 8], "x": 8, "y": 0},
30 {"label":"k09", "x":9, "y":0}, 30 {"matrix": [0, 9], "x": 9, "y": 0},
31 {"label":"k0a", "x":10, "y":0}, 31 {"matrix": [0, 10], "x": 10, "y": 0},
32 {"label":"k0b", "x":11, "y":0}, 32 {"matrix": [0, 11], "x": 11, "y": 0},
33 {"label":"k0c", "x":12, "y":0}, 33 {"matrix": [0, 12], "x": 12, "y": 0},
34 {"label":"k0e", "x":13, "y":0, "w":2}, 34 {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
35
36 {"label":"k10", "x":0, "y":1, "w":1.5},
37 {"label":"k12", "x":1.5, "y":1},
38 {"label":"k13", "x":2.5, "y":1},
39 {"label":"k14", "x":3.5, "y":1},
40 {"label":"k15", "x":4.5, "y":1},
41 {"label":"k16", "x":5.5, "y":1},
42 {"label":"k17", "x":6.5, "y":1},
43 {"label":"k18", "x":7.5, "y":1},
44 {"label":"k19", "x":8.5, "y":1},
45 {"label":"k1a", "x":9.5, "y":1},
46 {"label":"k1b", "x":10.5, "y":1},
47 {"label":"k1c", "x":11.5, "y":1},
48 {"label":"k1d", "x":12.5, "y":1},
49 {"label":"k1e", "x":13.5, "y":1, "w":1.5},
50
51 {"label":"k20", "x":0, "y":2, "w":1.75},
52 {"label":"k22", "x":1.75, "y":2},
53 {"label":"k23", "x":2.75, "y":2},
54 {"label":"k24", "x":3.75, "y":2},
55 {"label":"k25", "x":4.75, "y":2},
56 {"label":"k26", "x":5.75, "y":2},
57 {"label":"k27", "x":6.75, "y":2},
58 {"label":"k28", "x":7.75, "y":2},
59 {"label":"k29", "x":8.75, "y":2},
60 {"label":"k2a", "x":9.75, "y":2},
61 {"label":"k2b", "x":10.75, "y":2},
62 {"label":"k2c", "x":11.75, "y":2},
63 {"label":"k2d", "x":12.75, "y":2, "w":2.25},
64
65 {"label":"k30", "x":0, "y":3, "w":2.25},
66 {"label":"k32", "x":2, "y":3},
67 {"label":"k33", "x":3, "y":3},
68 {"label":"k34", "x":4, "y":3},
69 {"label":"k35", "x":5, "y":3},
70 {"label":"k36", "x":6, "y":3},
71 {"label":"k37", "x":7, "y":3},
72 {"label":"k38", "x":8, "y":3},
73 {"label":"k39", "x":9, "y":3},
74 {"label":"k3a", "x":10, "y":3},
75 {"label":"k3c", "x":11, "y":3, "w":1.75},
76 {"label":"k3d", "x":12, "y":3},
77 {"label":"k3e", "x":13, "y":3},
78 35
79 {"label":"k40", "x":0, "y":4, "w":1.25}, 36 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
80 {"label":"k41", "x":1.25, "y":4, "w":1.25}, 37 {"matrix": [1, 2], "x": 1.5, "y": 1},
81 {"label":"k42", "x":2.5, "y":4, "w":1.25}, 38 {"matrix": [1, 3], "x": 2.5, "y": 1},
82 {"label":"k46", "x":3.75, "y":4, "w":6.25}, 39 {"matrix": [1, 4], "x": 3.5, "y": 1},
83 {"label":"k4a", "x":10, "y":4}, 40 {"matrix": [1, 5], "x": 4.5, "y": 1},
84 {"label":"k4b", "x":11, "y":4}, 41 {"matrix": [1, 6], "x": 5.5, "y": 1},
85 {"label":"k4c", "x":12, "y":4}, 42 {"matrix": [1, 7], "x": 6.5, "y": 1},
86 {"label":"k4d", "x":13, "y":4}, 43 {"matrix": [1, 8], "x": 7.5, "y": 1},
87 {"label":"k4e", "x":14, "y":4} 44 {"matrix": [1, 9], "x": 8.5, "y": 1},
45 {"matrix": [1, 10], "x": 9.5, "y": 1},
46 {"matrix": [1, 11], "x": 10.5, "y": 1},
47 {"matrix": [1, 12], "x": 11.5, "y": 1},
48 {"matrix": [1, 13], "x": 12.5, "y": 1},
49 {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
50
51 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
52 {"matrix": [2, 2], "x": 1.75, "y": 2},
53 {"matrix": [2, 3], "x": 2.75, "y": 2},
54 {"matrix": [2, 4], "x": 3.75, "y": 2},
55 {"matrix": [2, 5], "x": 4.75, "y": 2},
56 {"matrix": [2, 6], "x": 5.75, "y": 2},
57 {"matrix": [2, 7], "x": 6.75, "y": 2},
58 {"matrix": [2, 8], "x": 7.75, "y": 2},
59 {"matrix": [2, 9], "x": 8.75, "y": 2},
60 {"matrix": [2, 10], "x": 9.75, "y": 2},
61 {"matrix": [2, 11], "x": 10.75, "y": 2},
62 {"matrix": [2, 12], "x": 11.75, "y": 2},
63 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
64
65 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
66 {"matrix": [3, 2], "x": 2, "y": 3},
67 {"matrix": [3, 3], "x": 3, "y": 3},
68 {"matrix": [3, 4], "x": 4, "y": 3},
69 {"matrix": [3, 5], "x": 5, "y": 3},
70 {"matrix": [3, 6], "x": 6, "y": 3},
71 {"matrix": [3, 7], "x": 7, "y": 3},
72 {"matrix": [3, 8], "x": 8, "y": 3},
73 {"matrix": [3, 9], "x": 9, "y": 3},
74 {"matrix": [3, 10], "x": 10, "y": 3},
75 {"matrix": [3, 12], "x": 11, "y": 3, "w": 1.75},
76 {"matrix": [3, 13], "x": 12, "y": 3},
77 {"matrix": [3, 14], "x": 13, "y": 3},
78
79 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
80 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
81 {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
82 {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
83 {"matrix": [4, 10], "x": 10, "y": 4},
84 {"matrix": [4, 11], "x": 11, "y": 4},
85 {"matrix": [4, 12], "x": 12, "y": 4},
86 {"matrix": [4, 13], "x": 13, "y": 4},
87 {"matrix": [4, 14], "x": 14, "y": 4}
88 ] 88 ]
89 }, 89 },
90 "LAYOUT_division":{ 90 "LAYOUT_division": {
91 "layout": [ 91 "layout": [
92 {"label":"k00", "x":0, "y":0}, 92 {"matrix": [0, 0], "x": 0, "y": 0},
93 {"label":"k01", "x":1, "y":0}, 93 {"matrix": [0, 1], "x": 1, "y": 0},
94 {"label":"k02", "x":2, "y":0}, 94 {"matrix": [0, 2], "x": 2, "y": 0},
95 {"label":"k03", "x":3, "y":0}, 95 {"matrix": [0, 3], "x": 3, "y": 0},
96 {"label":"k04", "x":4, "y":0}, 96 {"matrix": [0, 4], "x": 4, "y": 0},
97 {"label":"k05", "x":5, "y":0}, 97 {"matrix": [0, 5], "x": 5, "y": 0},
98 {"label":"k06", "x":6, "y":0}, 98 {"matrix": [0, 6], "x": 6, "y": 0},
99 {"label":"k07", "x":7, "y":0}, 99 {"matrix": [0, 7], "x": 7, "y": 0},
100 {"label":"k08", "x":8, "y":0}, 100 {"matrix": [0, 8], "x": 8, "y": 0},
101 {"label":"k09", "x":9, "y":0}, 101 {"matrix": [0, 9], "x": 9, "y": 0},
102 {"label":"k0a", "x":10, "y":0}, 102 {"matrix": [0, 10], "x": 10, "y": 0},
103 {"label":"k0b", "x":11, "y":0}, 103 {"matrix": [0, 11], "x": 11, "y": 0},
104 {"label":"k0c", "x":12, "y":0}, 104 {"matrix": [0, 12], "x": 12, "y": 0},
105 {"label":"k0d", "x":13, "y":0}, 105 {"matrix": [0, 13], "x": 13, "y": 0},
106 {"label":"k0e", "x":14, "y":0}, 106 {"matrix": [0, 14], "x": 14, "y": 0},
107 107
108 {"label":"k10", "x":0, "y":1, "w":1.5}, 108 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
109 {"label":"k12", "x":1.5, "y":1}, 109 {"matrix": [1, 2], "x": 1.5, "y": 1},
110 {"label":"k13", "x":2.5, "y":1}, 110 {"matrix": [1, 3], "x": 2.5, "y": 1},
111 {"label":"k14", "x":3.5, "y":1}, 111 {"matrix": [1, 4], "x": 3.5, "y": 1},
112 {"label":"k15", "x":4.5, "y":1}, 112 {"matrix": [1, 5], "x": 4.5, "y": 1},
113 {"label":"k16", "x":5.5, "y":1}, 113 {"matrix": [1, 6], "x": 5.5, "y": 1},
114 {"label":"k17", "x":6.5, "y":1}, 114 {"matrix": [1, 7], "x": 6.5, "y": 1},
115 {"label":"k18", "x":7.5, "y":1}, 115 {"matrix": [1, 8], "x": 7.5, "y": 1},
116 {"label":"k19", "x":8.5, "y":1}, 116 {"matrix": [1, 9], "x": 8.5, "y": 1},
117 {"label":"k1a", "x":9.5, "y":1}, 117 {"matrix": [1, 10], "x": 9.5, "y": 1},
118 {"label":"k1b", "x":10.5, "y":1}, 118 {"matrix": [1, 11], "x": 10.5, "y": 1},
119 {"label":"k1c", "x":11.5, "y":1}, 119 {"matrix": [1, 12], "x": 11.5, "y": 1},
120 {"label":"k1d", "x":12.5, "y":1}, 120 {"matrix": [1, 13], "x": 12.5, "y": 1},
121 121
122 {"label":"k20", "x":0, "y":2, "w":1.75}, 122 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
123 {"label":"k22", "x":1.75, "y":2}, 123 {"matrix": [2, 2], "x": 1.75, "y": 2},
124 {"label":"k23", "x":2.75, "y":2}, 124 {"matrix": [2, 3], "x": 2.75, "y": 2},
125 {"label":"k24", "x":3.75, "y":2}, 125 {"matrix": [2, 4], "x": 3.75, "y": 2},
126 {"label":"k25", "x":4.75, "y":2}, 126 {"matrix": [2, 5], "x": 4.75, "y": 2},
127 {"label":"k26", "x":5.75, "y":2}, 127 {"matrix": [2, 6], "x": 5.75, "y": 2},
128 {"label":"k27", "x":6.75, "y":2}, 128 {"matrix": [2, 7], "x": 6.75, "y": 2},
129 {"label":"k28", "x":7.75, "y":2}, 129 {"matrix": [2, 8], "x": 7.75, "y": 2},
130 {"label":"k29", "x":8.75, "y":2}, 130 {"matrix": [2, 9], "x": 8.75, "y": 2},
131 {"label":"k2a", "x":9.75, "y":2}, 131 {"matrix": [2, 10], "x": 9.75, "y": 2},
132 {"label":"k2b", "x":10.75, "y":2}, 132 {"matrix": [2, 11], "x": 10.75, "y": 2},
133 {"label":"k2c", "x":11.75, "y":2}, 133 {"matrix": [2, 12], "x": 11.75, "y": 2},
134 {"label":"k1e", "x":12.75, "y":2}, 134 {"matrix": [2, 13], "x": 12.75, "y": 2},
135 {"label":"k2d", "x":13.75, "y":1, "w": 1.25, "h": 2}, 135 {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
136 136
137 {"label":"k30", "x":0, "y":3, "w":2.25}, 137 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
138 {"label":"k32", "x":2, "y":3}, 138 {"matrix": [3, 2], "x": 2, "y": 3},
139 {"label":"k33", "x":3, "y":3}, 139 {"matrix": [3, 3], "x": 3, "y": 3},
140 {"label":"k34", "x":4, "y":3}, 140 {"matrix": [3, 4], "x": 4, "y": 3},
141 {"label":"k35", "x":5, "y":3}, 141 {"matrix": [3, 5], "x": 5, "y": 3},
142 {"label":"k36", "x":6, "y":3}, 142 {"matrix": [3, 6], "x": 6, "y": 3},
143 {"label":"k37", "x":7, "y":3}, 143 {"matrix": [3, 7], "x": 7, "y": 3},
144 {"label":"k38", "x":8, "y":3}, 144 {"matrix": [3, 8], "x": 8, "y": 3},
145 {"label":"k39", "x":9, "y":3}, 145 {"matrix": [3, 9], "x": 9, "y": 3},
146 {"label":"k3a", "x":10, "y":3}, 146 {"matrix": [3, 10], "x": 10, "y": 3},
147 {"label":"k3c", "x":11, "y":3, "w":1.75}, 147 {"matrix": [3, 12], "x": 11, "y": 3, "w": 1.75},
148 {"label":"k3d", "x":12, "y":3}, 148 {"matrix": [3, 13], "x": 12, "y": 3},
149 {"label":"k3e", "x":13, "y":3}, 149 {"matrix": [3, 14], "x": 13, "y": 3},
150 150
151 {"label":"k40", "x":0, "y":4, "w":1.25}, 151 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
152 {"label":"k41", "x":1.25, "y":4, "w":1.25}, 152 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
153 {"label":"k43", "x":2.5, "y":4, "w":1.25}, 153 {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
154 {"label":"k44", "x":3.75, "y":4, "w":2.25}, 154 {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
155 {"label":"k46", "x":6, "y":4, "w":1.25}, 155 {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
156 {"label":"k48", "x":7.25, "y":4, "w":2.75}, 156 {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
157 {"label":"k4a", "x":10, "y":4}, 157 {"matrix": [4, 10], "x": 10, "y": 4},
158 {"label":"k4b", "x":11, "y":4}, 158 {"matrix": [4, 11], "x": 11, "y": 4},
159 {"label":"k4c", "x":12, "y":4}, 159 {"matrix": [4, 12], "x": 12, "y": 4},
160 {"label":"k4d", "x":13, "y":4}, 160 {"matrix": [4, 13], "x": 13, "y": 4},
161 {"label":"k4e", "x":14, "y":4} 161 {"matrix": [4, 14], "x": 14, "y": 4}
162 ] 162 ]
163 } 163 }
164 } 164 }
diff --git a/keyboards/mokey/mokey63/mokey63.h b/keyboards/mokey/mokey63/mokey63.h
deleted file mode 100644
index d91afed3fa..0000000000
--- a/keyboards/mokey/mokey63/mokey63.h
+++ /dev/null
@@ -1,75 +0,0 @@
1/* Copyright 2021 Ocean
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#include "quantum.h"
20
21#define XXX KC_NO
22/*
23 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
24 * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e │
25 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
26 * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │
27 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
28 * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │
29 * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┬───┤
30 * │30 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3c │3d │3e │
31 * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬───┼───┼───┤
32 * │40 │41 │43 │46 │4a │4b │4c │4d │4e │
33 * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
34 */
35#define LAYOUT( \
36 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, \
37 k10, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
38 k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
39 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3c, k3d, k3e, \
40 k40, k41, k43, k46, k4a, k4b, k4c, k4d, k4e \
41) { \
42 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, KC_NO, k0e }, \
43 { k10, KC_NO, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \
44 { k20, KC_NO, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, KC_NO }, \
45 { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, KC_NO, k3c, k3d, k3e }, \
46 { k40, k41, KC_NO, k43, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4a, k4b, k4c, k4d, k4e } \
47}
48
49
50/*
51 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
52 * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
53 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
54 * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │ │
55 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ 2d │
56 * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │1e │ │
57 * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬──┴┬───┤
58 * │30 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3c │3d │3e │
59 * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┴───┼───┴──┬┴──┬┴──┬───┼───┼───┤
60 * │40 │41 │43 │44 │46 │48 │4a │4b │4c │4d │4e │
61 * └────┴────┴────┴────────┴────────┴──────┴───┴───┴───┴───┴───┘
62*/
63#define LAYOUT_division( \
64 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
65 k10, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
66 k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k1e, k2d, \
67 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3c, k3d, k3e, \
68 k40, k41, k43, k44, k46, k48, k4a, k4b, k4c, k4d, k4e \
69) { \
70 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
71 { k10, KC_NO, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, KC_NO }, \
72 { k20, KC_NO, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k1e, k2d }, \
73 { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, KC_NO, k3c, k3d, k3e }, \
74 { k40, k41, KC_NO, k43, k44, KC_NO, k46, KC_NO, k48, KC_NO, k4a, k4b, k4c, k4d, k4e } \
75}
diff --git a/keyboards/mt/split75/info.json b/keyboards/mt/split75/info.json
index 53604882e3..dc57ef4a08 100644
--- a/keyboards/mt/split75/info.json
+++ b/keyboards/mt/split75/info.json
@@ -23,10 +23,237 @@
23 "bootloader": "bootloadhid", 23 "bootloader": "bootloadhid",
24 "layouts": { 24 "layouts": {
25 "LAYOUT": { 25 "LAYOUT": {
26 "layout": [{"label":"ESC", "x":2.25, "y":0}, {"label":"F1", "x":3.25, "y":0}, {"label":"F2", "x":4.25, "y":0}, {"label":"F3", "x":5.25, "y":0}, {"label":"F4", "x":6.25, "y":0}, {"label":"F5", "x":7.25, "y":0}, {"label":"F6", "x":8.25, "y":0}, {"label":"F7", "x":10.25, "y":0}, {"label":"F8", "x":11.25, "y":0}, {"label":"F9", "x":12.25, "y":0}, {"label":"F10", "x":13.25, "y":0}, {"label":"F11", "x":14.25, "y":0}, {"label":"F12", "x":15.25, "y":0}, {"label":"Prt", "x":16.25, "y":0}, {"label":"Ins", "x":17.25, "y":0}, {"label":"Del", "x":18.25, "y":0}, {"label":"8", "x":0, "y":1}, {"label":"9", "x":1, "y":1}, {"label":"~", "x":2.25, "y":1}, {"label":"!", "x":3.25, "y":1}, {"label":"@", "x":4.25, "y":1}, {"label":"#", "x":5.25, "y":1}, {"label":"$", "x":6.25, "y":1}, {"label":"%", "x":7.25, "y":1}, {"label":"^", "x":8.25, "y":1}, {"label":"&", "x":10.25, "y":1}, {"label":"*", "x":11.25, "y":1}, {"label":"(", "x":12.25, "y":1}, {"label":")", "x":13.25, "y":1}, {"label":"_", "x":14.25, "y":1}, {"label":"+", "x":15.25, "y":1}, {"label":"Backspace", "x":16.25, "y":1, "w":2}, {"label":"Home", "x":18.25, "y":1}, {"label":"6", "x":0, "y":2}, {"label":"7", "x":1, "y":2}, {"label":"Tab", "x":2.25, "y":2, "w":1.5}, {"label":"Q", "x":3.75, "y":2}, {"label":"W", "x":4.75, "y":2}, {"label":"E", "x":5.75, "y":2}, {"label":"R", "x":6.75, "y":2}, {"label":"T", "x":7.75, "y":2}, {"label":"Y", "x":9.75, "y":2}, {"label":"U", "x":10.75, "y":2}, {"label":"I", "x":11.75, "y":2}, {"label":"O", "x":12.75, "y":2}, {"label":"P", "x":13.75, "y":2}, {"label":"{", "x":14.75, "y":2}, {"label":"}", "x":15.75, "y":2}, {"label":"|", "x":16.75, "y":2, "w":1.5}, {"label":"PgUp", "x":18.25, "y":2}, {"label":"4", "x":0, "y":3}, {"label":"5", "x":1, "y":3}, {"label":"Caps Lock", "x":2.25, "y":3, "w":1.75}, {"label":"A", "x":4, "y":3}, {"label":"S", "x":5, "y":3}, {"label":"D", "x":6, "y":3}, {"label":"F", "x":7, "y":3}, {"label":"G", "x":8, "y":3}, {"label":"H", "x":10, "y":3}, {"label":"J", "x":11, "y":3}, {"label":"K", "x":12, "y":3}, {"label":"L", "x":13, "y":3}, {"label":":", "x":14, "y":3}, {"label":"\"", "x":15, "y":3}, {"label":"Enter", "x":16, "y":3, "w":2.25}, {"label":"PgDn", "x":18.25, "y":3}, {"label":"2", "x":0, "y":4}, {"label":"3", "x":1, "y":4}, {"label":"Shift", "x":2.25, "y":4, "w":2.25}, {"label":"Z", "x":4.5, "y":4}, {"label":"X", "x":5.5, "y":4}, {"label":"C", "x":6.5, "y":4}, {"label":"V", "x":7.5, "y":4}, {"label":"B", "x":8.5, "y":4}, {"label":"N", "x":10.5, "y":4}, {"label":"M", "x":11.5, "y":4}, {"label":"<", "x":12.5, "y":4}, {"label":">", "x":13.5, "y":4}, {"label":"?", "x":14.5, "y":4}, {"label":"Shift", "x":15.5, "y":4, "w":1.75}, {"label":"\u2191", "x":17.25, "y":4}, {"label":"End", "x":18.25, "y":4}, {"label":"0", "x":0, "y":5}, {"label":"1", "x":1, "y":5}, {"label":"Ctrl", "x":2.25, "y":5, "w":1.25}, {"label":"Win", "x":3.5, "y":5, "w":1.25}, {"label":"Alt", "x":4.75, "y":5, "w":1.25}, {"x":6, "y":5, "w":2}, {"x":8, "y":5}, {"x":10, "y":5, "w":2.75}, {"label":"Alt", "x":12.75, "y":5, "w":1.25}, {"label":"Fn", "x":14, "y":5}, {"label":"Ctrl", "x":15, "y":5, "w":1.25}, {"label":"\u2190", "x":16.25, "y":5}, {"label":"\u2193", "x":17.25, "y":5}, {"label":"\u2192", "x":18.25, "y":5}] 26 "layout": [
27 {"matrix": [5, 0], "x": 2.25, "y": 0},
28 {"matrix": [5, 1], "x": 3.25, "y": 0},
29 {"matrix": [5, 2], "x": 4.25, "y": 0},
30 {"matrix": [5, 3], "x": 5.25, "y": 0},
31 {"matrix": [5, 4], "x": 6.25, "y": 0},
32 {"matrix": [5, 5], "x": 7.25, "y": 0},
33 {"matrix": [5, 6], "x": 8.25, "y": 0},
34
35 {"matrix": [5, 7], "x": 10.25, "y": 0},
36 {"matrix": [5, 8], "x": 11.25, "y": 0},
37 {"matrix": [5, 9], "x": 12.25, "y": 0},
38 {"matrix": [5, 10], "x": 13.25, "y": 0},
39 {"matrix": [5, 11], "x": 14.25, "y": 0},
40 {"matrix": [5, 12], "x": 15.25, "y": 0},
41 {"matrix": [5, 13], "x": 16.25, "y": 0},
42 {"matrix": [6, 8], "x": 17.25, "y": 0},
43 {"matrix": [7, 8], "x": 18.25, "y": 0},
44
45 {"matrix": [7, 4], "x": 0, "y": 1},
46 {"matrix": [6, 4], "x": 1, "y": 1},
47
48 {"matrix": [4, 0], "x": 2.25, "y": 1},
49 {"matrix": [4, 1], "x": 3.25, "y": 1},
50 {"matrix": [4, 2], "x": 4.25, "y": 1},
51 {"matrix": [4, 3], "x": 5.25, "y": 1},
52 {"matrix": [4, 4], "x": 6.25, "y": 1},
53 {"matrix": [4, 5], "x": 7.25, "y": 1},
54 {"matrix": [4, 6], "x": 8.25, "y": 1},
55
56 {"matrix": [4, 7], "x": 10.25, "y": 1},
57 {"matrix": [4, 8], "x": 11.25, "y": 1},
58 {"matrix": [4, 9], "x": 12.25, "y": 1},
59 {"matrix": [4, 10], "x": 13.25, "y": 1},
60 {"matrix": [4, 11], "x": 14.25, "y": 1},
61 {"matrix": [4, 12], "x": 15.25, "y": 1},
62 {"matrix": [6, 9], "x": 16.25, "y": 1, "w": 2},
63 {"matrix": [7, 9], "x": 18.25, "y": 1},
64
65 {"matrix": [7, 3], "x": 0, "y": 2},
66 {"matrix": [6, 3], "x": 1, "y": 2},
67
68 {"matrix": [3, 0], "x": 2.25, "y": 2, "w": 1.5},
69 {"matrix": [3, 1], "x": 3.75, "y": 2},
70 {"matrix": [3, 2], "x": 4.75, "y": 2},
71 {"matrix": [3, 3], "x": 5.75, "y": 2},
72 {"matrix": [3, 4], "x": 6.75, "y": 2},
73 {"matrix": [3, 5], "x": 7.75, "y": 2},
74
75 {"matrix": [3, 7], "x": 9.75, "y": 2},
76 {"matrix": [3, 8], "x": 10.75, "y": 2},
77 {"matrix": [3, 9], "x": 11.75, "y": 2},
78 {"matrix": [3, 10], "x": 12.75, "y": 2},
79 {"matrix": [3, 11], "x": 13.75, "y": 2},
80 {"matrix": [3, 12], "x": 14.75, "y": 2},
81 {"matrix": [3, 13], "x": 15.75, "y": 2},
82 {"matrix": [6, 10], "x": 16.75, "y": 2, "w": 1.5},
83 {"matrix": [7, 10], "x": 18.25, "y": 2},
84
85 {"matrix": [7, 2], "x": 0, "y": 3},
86 {"matrix": [6, 2], "x": 1, "y": 3},
87
88 {"matrix": [2, 0], "x": 2.25, "y": 3, "w": 1.75},
89 {"matrix": [2, 1], "x": 4, "y": 3},
90 {"matrix": [2, 2], "x": 5, "y": 3},
91 {"matrix": [2, 3], "x": 6, "y": 3},
92 {"matrix": [2, 4], "x": 7, "y": 3},
93 {"matrix": [2, 5], "x": 8, "y": 3},
94
95 {"matrix": [2, 7], "x": 10, "y": 3},
96 {"matrix": [2, 8], "x": 11, "y": 3},
97 {"matrix": [2, 9], "x": 12, "y": 3},
98 {"matrix": [2, 10], "x": 13, "y": 3},
99 {"matrix": [2, 11], "x": 14, "y": 3},
100 {"matrix": [2, 12], "x": 15, "y": 3},
101 {"matrix": [6, 11], "x": 16, "y": 3, "w": 2.25},
102 {"matrix": [7, 11], "x": 18.25, "y": 3},
103
104 {"matrix": [7, 1], "x": 0, "y": 4},
105 {"matrix": [6, 1], "x": 1, "y": 4},
106
107 {"matrix": [1, 0], "x": 2.25, "y": 4, "w": 2.25},
108 {"matrix": [1, 2], "x": 4.5, "y": 4},
109 {"matrix": [1, 3], "x": 5.5, "y": 4},
110 {"matrix": [1, 4], "x": 6.5, "y": 4},
111 {"matrix": [1, 5], "x": 7.5, "y": 4},
112 {"matrix": [1, 6], "x": 8.5, "y": 4},
113
114 {"matrix": [1, 7], "x": 10.5, "y": 4},
115 {"matrix": [1, 8], "x": 11.5, "y": 4},
116 {"matrix": [1, 9], "x": 12.5, "y": 4},
117 {"matrix": [1, 10], "x": 13.5, "y": 4},
118 {"matrix": [1, 11], "x": 14.5, "y": 4},
119 {"matrix": [1, 13], "x": 15.5, "y": 4, "w": 1.75},
120 {"matrix": [6, 12], "x": 17.25, "y": 4},
121 {"matrix": [7, 12], "x": 18.25, "y": 4},
122
123 {"matrix": [7, 0], "x": 0, "y": 5},
124 {"matrix": [6, 0], "x": 1, "y": 5},
125
126 {"matrix": [0, 0], "x": 2.25, "y": 5, "w": 1.25},
127 {"matrix": [0, 1], "x": 3.5, "y": 5, "w": 1.25},
128 {"matrix": [0, 2], "x": 4.75, "y": 5, "w": 1.25},
129 {"matrix": [0, 3], "x": 6, "y": 5, "w": 2},
130 {"matrix": [0, 4], "x": 8, "y": 5},
131
132 {"matrix": [0, 7], "x": 10, "y": 5, "w": 2.75},
133 {"matrix": [0, 10], "x": 12.75, "y": 5, "w": 1.25},
134 {"matrix": [0, 11], "x": 14, "y": 5},
135 {"matrix": [0, 12], "x": 15, "y": 5, "w": 1.25},
136 {"matrix": [0, 13], "x": 16.25, "y": 5},
137 {"matrix": [6, 13], "x": 17.25, "y": 5},
138 {"matrix": [7, 13], "x": 18.25, "y": 5}
139 ]
27 }, 140 },
28 "LAYOUT_iso": { 141 "LAYOUT_iso": {
29 "layout": [{"label":"ESC", "x":2.25, "y":0}, {"label":"F1", "x":3.25, "y":0}, {"label":"F2", "x":4.25, "y":0}, {"label":"F3", "x":5.25, "y":0}, {"label":"F4", "x":6.25, "y":0}, {"label":"F5", "x":7.25, "y":0}, {"label":"F6", "x":8.25, "y":0}, {"label":"F7", "x":10.25, "y":0}, {"label":"F8", "x":11.25, "y":0}, {"label":"F9", "x":12.25, "y":0}, {"label":"F10", "x":13.25, "y":0}, {"label":"F11", "x":14.25, "y":0}, {"label":"F12", "x":15.25, "y":0}, {"label":"Prt", "x":16.25, "y":0}, {"label":"Ins", "x":17.25, "y":0}, {"label":"Del", "x":18.25, "y":0}, {"label":"8", "x":0, "y":1}, {"label":"9", "x":1, "y":1}, {"label":"~", "x":2.25, "y":1}, {"label":"!", "x":3.25, "y":1}, {"label":"@", "x":4.25, "y":1}, {"label":"#", "x":5.25, "y":1}, {"label":"$", "x":6.25, "y":1}, {"label":"%", "x":7.25, "y":1}, {"label":"^", "x":8.25, "y":1}, {"label":"&", "x":10.25, "y":1}, {"label":"*", "x":11.25, "y":1}, {"label":"(", "x":12.25, "y":1}, {"label":")", "x":13.25, "y":1}, {"label":"_", "x":14.25, "y":1}, {"label":"+", "x":15.25, "y":1}, {"label":"Backspace", "x":16.25, "y":1, "w":2}, {"label":"Home", "x":18.25, "y":1}, {"label":"6", "x":0, "y":2}, {"label":"7", "x":1, "y":2}, {"label":"Tab", "x":2.25, "y":2, "w":1.5}, {"label":"Q", "x":3.75, "y":2}, {"label":"W", "x":4.75, "y":2}, {"label":"E", "x":5.75, "y":2}, {"label":"R", "x":6.75, "y":2}, {"label":"T", "x":7.75, "y":2}, {"label":"Y", "x":9.75, "y":2}, {"label":"U", "x":10.75, "y":2}, {"label":"I", "x":11.75, "y":2}, {"label":"O", "x":12.75, "y":2}, {"label":"P", "x":13.75, "y":2}, {"label":"{", "x":14.75, "y":2}, {"label":"}", "x":15.75, "y":2}, {"label":"PgUp", "x":18.25, "y":2}, {"label":"4", "x":0, "y":3}, {"label":"5", "x":1, "y":3}, {"label":"Caps Lock", "x":2.25, "y":3, "w":1.75}, {"label":"A", "x":4, "y":3}, {"label":"S", "x":5, "y":3}, {"label":"D", "x":6, "y":3}, {"label":"F", "x":7, "y":3}, {"label":"G", "x":8, "y":3}, {"label":"H", "x":10, "y":3}, {"label":"J", "x":11, "y":3}, {"label":"K", "x":12, "y":3}, {"label":"L", "x":13, "y":3}, {"label":":", "x":14, "y":3}, {"label":"\"", "x":15, "y":3}, {"label":"'", "x":16, "y":3}, {"label":"Enter", "x":17, "y":2, "w":1.25, "h":2}, {"label":"PgDn", "x":18.25, "y":3}, {"label":"2", "x":0, "y":4}, {"label":"3", "x":1, "y":4}, {"label":"Shift", "x":2.25, "y":4, "w":1.25}, {"label":"|", "x":3.5, "y":4}, {"label":"Z", "x":4.5, "y":4}, {"label":"X", "x":5.5, "y":4}, {"label":"C", "x":6.5, "y":4}, {"label":"V", "x":7.5, "y":4}, {"label":"B", "x":8.5, "y":4}, {"label":"N", "x":10.5, "y":4}, {"label":"M", "x":11.5, "y":4}, {"label":"<", "x":12.5, "y":4}, {"label":">", "x":13.5, "y":4}, {"label":"?", "x":14.5, "y":4}, {"label":"Shift", "x":15.5, "y":4, "w":1.75}, {"label":"\u2191", "x":17.25, "y":4}, {"label":"End", "x":18.25, "y":4}, {"label":"0", "x":0, "y":5}, {"label":"1", "x":1, "y":5}, {"label":"Ctrl", "x":2.25, "y":5, "w":1.25}, {"label":"Win", "x":3.5, "y":5, "w":1.25}, {"label":"Alt", "x":4.75, "y":5, "w":1.25}, {"x":6, "y":5, "w":2}, {"x":8, "y":5}, {"x":10, "y":5, "w":2.75}, {"label":"Alt", "x":12.75, "y":5, "w":1.25}, {"label":"Fn", "x":14, "y":5}, {"label":"Ctrl", "x":15, "y":5, "w":1.25}, {"label":"\u2190", "x":16.25, "y":5}, {"label":"\u2193", "x":17.25, "y":5}, {"label":"\u2192", "x":18.25, "y":5}] 142 "layout": [
143 {"matrix": [5, 0], "x": 2.25, "y": 0},
144 {"matrix": [5, 1], "x": 3.25, "y": 0},
145 {"matrix": [5, 2], "x": 4.25, "y": 0},
146 {"matrix": [5, 3], "x": 5.25, "y": 0},
147 {"matrix": [5, 4], "x": 6.25, "y": 0},
148 {"matrix": [5, 5], "x": 7.25, "y": 0},
149 {"matrix": [5, 6], "x": 8.25, "y": 0},
150
151 {"matrix": [5, 7], "x": 10.25, "y": 0},
152 {"matrix": [5, 8], "x": 11.25, "y": 0},
153 {"matrix": [5, 9], "x": 12.25, "y": 0},
154 {"matrix": [5, 10], "x": 13.25, "y": 0},
155 {"matrix": [5, 11], "x": 14.25, "y": 0},
156 {"matrix": [5, 12], "x": 15.25, "y": 0},
157 {"matrix": [5, 13], "x": 16.25, "y": 0},
158 {"matrix": [6, 8], "x": 17.25, "y": 0},
159 {"matrix": [7, 8], "x": 18.25, "y": 0},
160
161 {"matrix": [7, 4], "x": 0, "y": 1},
162 {"matrix": [6, 4], "x": 1, "y": 1},
163
164 {"matrix": [4, 0], "x": 2.25, "y": 1},
165 {"matrix": [4, 1], "x": 3.25, "y": 1},
166 {"matrix": [4, 2], "x": 4.25, "y": 1},
167 {"matrix": [4, 3], "x": 5.25, "y": 1},
168 {"matrix": [4, 4], "x": 6.25, "y": 1},
169 {"matrix": [4, 5], "x": 7.25, "y": 1},
170 {"matrix": [4, 6], "x": 8.25, "y": 1},
171
172 {"matrix": [4, 7], "x": 10.25, "y": 1},
173 {"matrix": [4, 8], "x": 11.25, "y": 1},
174 {"matrix": [4, 9], "x": 12.25, "y": 1},
175 {"matrix": [4, 10], "x": 13.25, "y": 1},
176 {"matrix": [4, 11], "x": 14.25, "y": 1},
177 {"matrix": [4, 12], "x": 15.25, "y": 1},
178 {"matrix": [6, 9], "x": 16.25, "y": 1, "w": 2},
179 {"matrix": [7, 9], "x": 18.25, "y": 1},
180
181 {"matrix": [7, 3], "x": 0, "y": 2},
182 {"matrix": [6, 3], "x": 1, "y": 2},
183
184 {"matrix": [3, 0], "x": 2.25, "y": 2, "w": 1.5},
185 {"matrix": [3, 1], "x": 3.75, "y": 2},
186 {"matrix": [3, 2], "x": 4.75, "y": 2},
187 {"matrix": [3, 3], "x": 5.75, "y": 2},
188 {"matrix": [3, 4], "x": 6.75, "y": 2},
189 {"matrix": [3, 5], "x": 7.75, "y": 2},
190
191 {"matrix": [3, 7], "x": 9.75, "y": 2},
192 {"matrix": [3, 8], "x": 10.75, "y": 2},
193 {"matrix": [3, 9], "x": 11.75, "y": 2},
194 {"matrix": [3, 10], "x": 12.75, "y": 2},
195 {"matrix": [3, 11], "x": 13.75, "y": 2},
196 {"matrix": [3, 12], "x": 14.75, "y": 2},
197 {"matrix": [3, 13], "x": 15.75, "y": 2},
198 {"matrix": [7, 10], "x": 18.25, "y": 2},
199
200 {"matrix": [7, 2], "x": 0, "y": 3},
201 {"matrix": [6, 2], "x": 1, "y": 3},
202
203 {"matrix": [2, 0], "x": 2.25, "y": 3, "w": 1.75},
204 {"matrix": [2, 1], "x": 4, "y": 3},
205 {"matrix": [2, 2], "x": 5, "y": 3},
206 {"matrix": [2, 3], "x": 6, "y": 3},
207 {"matrix": [2, 4], "x": 7, "y": 3},
208 {"matrix": [2, 5], "x": 8, "y": 3},
209
210 {"matrix": [2, 7], "x": 10, "y": 3},
211 {"matrix": [2, 8], "x": 11, "y": 3},
212 {"matrix": [2, 9], "x": 12, "y": 3},
213 {"matrix": [2, 10], "x": 13, "y": 3},
214 {"matrix": [2, 11], "x": 14, "y": 3},
215 {"matrix": [2, 12], "x": 15, "y": 3},
216 {"matrix": [2, 13], "x": 16, "y": 3},
217 {"matrix": [6, 11], "x": 17, "y": 2, "w": 1.25, "h": 2},
218 {"matrix": [7, 11], "x": 18.25, "y": 3},
219
220 {"matrix": [7, 1], "x": 0, "y": 4},
221 {"matrix": [6, 1], "x": 1, "y": 4},
222
223 {"matrix": [1, 0], "x": 2.25, "y": 4, "w": 1.25},
224 {"matrix": [1, 1], "x": 3.5, "y": 4},
225 {"matrix": [1, 2], "x": 4.5, "y": 4},
226 {"matrix": [1, 3], "x": 5.5, "y": 4},
227 {"matrix": [1, 4], "x": 6.5, "y": 4},
228 {"matrix": [1, 5], "x": 7.5, "y": 4},
229 {"matrix": [1, 6], "x": 8.5, "y": 4},
230
231 {"matrix": [1, 7], "x": 10.5, "y": 4},
232 {"matrix": [1, 8], "x": 11.5, "y": 4},
233 {"matrix": [1, 9], "x": 12.5, "y": 4},
234 {"matrix": [1, 10], "x": 13.5, "y": 4},
235 {"matrix": [1, 11], "x": 14.5, "y": 4},
236 {"matrix": [1, 13], "x": 15.5, "y": 4, "w": 1.75},
237 {"matrix": [6, 12], "x": 17.25, "y": 4},
238 {"matrix": [7, 12], "x": 18.25, "y": 4},
239
240 {"matrix": [7, 0], "x": 0, "y": 5},
241 {"matrix": [6, 0], "x": 1, "y": 5},
242
243 {"matrix": [0, 0], "x": 2.25, "y": 5, "w": 1.25},
244 {"matrix": [0, 1], "x": 3.5, "y": 5, "w": 1.25},
245 {"matrix": [0, 2], "x": 4.75, "y": 5, "w": 1.25},
246 {"matrix": [0, 3], "x": 6, "y": 5, "w": 2},
247 {"matrix": [0, 4], "x": 8, "y": 5},
248
249 {"matrix": [0, 7], "x": 10, "y": 5, "w": 2.75},
250 {"matrix": [0, 10], "x": 12.75, "y": 5, "w": 1.25},
251 {"matrix": [0, 11], "x": 14, "y": 5},
252 {"matrix": [0, 12], "x": 15, "y": 5, "w": 1.25},
253 {"matrix": [0, 13], "x": 16.25, "y": 5},
254 {"matrix": [6, 13], "x": 17.25, "y": 5},
255 {"matrix": [7, 13], "x": 18.25, "y": 5}
256 ]
30 } 257 }
31 } 258 }
32} 259}
diff --git a/keyboards/mt/split75/matrix.c b/keyboards/mt/split75/matrix.c
index 9e86bfc376..196a543faa 100644
--- a/keyboards/mt/split75/matrix.c
+++ b/keyboards/mt/split75/matrix.c
@@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
19#include <stdio.h> 19#include <stdio.h>
20#include "quantum.h" 20#include "quantum.h"
21#include "i2c_master.h" 21#include "i2c_master.h"
22#include "split75.h"
23 22
24#define RIGHT_HALF 23#define RIGHT_HALF
25 24
diff --git a/keyboards/mt/split75/split75.h b/keyboards/mt/split75/split75.h
deleted file mode 100644
index a01db5188e..0000000000
--- a/keyboards/mt/split75/split75.h
+++ /dev/null
@@ -1,50 +0,0 @@
1// Copyright 2022 Artjoms Rizihs (@artjomsR)
2// SPDX-License-Identifier: GPL-2.0-or-later
3
4#pragma once
5
6#include "quantum.h"
7
8// Number of keys in rows
9// 0 + 7 / 9
10// 2 + 7 / 8
11// 2 + 6 / 9
12// 2 + 6 / 8
13// 2 + 6 / 8
14// 2 + 5 / 7
15
16#define LAYOUT( \
17 K05, K15, K25, K35, K45, K55, K65, K75, K85, K95, K105, K115, K125, K135, K86, K87, \
18 K47, K46, K04, K14, K24, K34, K44, K54, K64, K74, K84, K94, K104, K114, K124, K96, K97, \
19 K37, K36, K03, K13, K23, K33, K43, K53, K73, K83, K93, K103, K113, K123, K133, K106, K107, \
20 K27, K26, K02, K12, K22, K32, K42, K52, K72, K82, K92, K102, K112, K122, K116, K117, \
21 K17, K16, K01, K21, K31, K41, K51, K61, K71, K81, K91, K101, K111, K131, K126, K127, \
22 K07, K06, K00, K10, K20, K30, K40, K70, K100, K110, K120, K130, K136, K137 \
23){ \
24 { K00, K10, K20, K30, K40, KC_NO, KC_NO, K70, KC_NO, KC_NO, K100, K110, K120, K130 }, \
25 { K01, KC_NO, K21, K31, K41, K51, K61, K71, K81, K91, K101, K111, KC_NO, K131 }, \
26 { K02, K12, K22, K32, K42, K52, KC_NO, K72, K82, K92, K102, K112, K122, }, \
27 { K03, K13, K23, K33, K43, K53, KC_NO, K73, K83, K93, K103, K113, K123, K133 }, \
28 { K04, K14, K24, K34, K44, K54, K64, K74, K84, K94, K104, K114, K124, }, \
29 { K05, K15, K25, K35, K45, K55, K65, K75, K85, K95, K105, K115, K125, K135 }, \
30 { K06, K16, K26, K36, K46, KC_NO, KC_NO, KC_NO, K86, K96, K106, K116, K126, K136 }, \
31 { K07, K17, K27, K37, K47, KC_NO, KC_NO, KC_NO, K87, K97, K107, K117, K127, K137 } \
32}
33
34#define LAYOUT_iso( \
35 K05, K15, K25, K35, K45, K55, K65, K75, K85, K95, K105, K115, K125, K135, K86, K87, \
36 K47, K46, K04, K14, K24, K34, K44, K54, K64, K74, K84, K94, K104, K114, K124, K96, K97, \
37 K37, K36, K03, K13, K23, K33, K43, K53, K73, K83, K93, K103, K113, K123, K133, K107, \
38 K27, K26, K02, K12, K22, K32, K42, K52, K72, K82, K92, K102, K112, K122, K132, K116, K117, \
39 K17, K16, K01, K11, K21, K31, K41, K51, K61, K71, K81, K91, K101, K111, K131, K126, K127, \
40 K07, K06, K00, K10, K20, K30, K40, K70, K100, K110, K120, K130, K136, K137 \
41){ \
42 { K00, K10, K20, K30, K40, KC_NO, KC_NO, K70, KC_NO, KC_NO, K100, K110, K120, K130 }, \
43 { K01, K11, K21, K31, K41, K51, K61, K71, K81, K91, K101, K111, KC_NO, K131 }, \
44 { K02, K12, K22, K32, K42, K52, KC_NO, K72, K82, K92, K102, K112, K122, K132 }, \
45 { K03, K13, K23, K33, K43, K53, KC_NO, K73, K83, K93, K103, K113, K123, K133 }, \
46 { K04, K14, K24, K34, K44, K54, K64, K74, K84, K94, K104, K114, K124, }, \
47 { K05, K15, K25, K35, K45, K55, K65, K75, K85, K95, K105, K115, K125, K135 }, \
48 { K06, K16, K26, K36, K46, KC_NO, KC_NO, KC_NO, K86, K96, KC_NO, K116, K126, K136 }, \
49 { K07, K17, K27, K37, K47, KC_NO, KC_NO, KC_NO, K87, K97, K107, K117, K127, K137 } \
50}
diff --git a/keyboards/mxss/info.json b/keyboards/mxss/info.json
index a69292473e..a8c40c9d1d 100644
--- a/keyboards/mxss/info.json
+++ b/keyboards/mxss/info.json
@@ -20,40 +20,995 @@
20 "bootloader": "atmel-dfu", 20 "bootloader": "atmel-dfu",
21 "layouts": { 21 "layouts": {
22 "LAYOUT": { 22 "LAYOUT": {
23 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"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.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] 23 "layout": [
24 {"matrix": [0, 0], "x": 0, "y": 0},
25 {"matrix": [0, 1], "x": 1, "y": 0},
26 {"matrix": [0, 2], "x": 2, "y": 0},
27 {"matrix": [0, 3], "x": 3, "y": 0},
28 {"matrix": [0, 4], "x": 4, "y": 0},
29 {"matrix": [0, 5], "x": 5, "y": 0},
30 {"matrix": [0, 6], "x": 6, "y": 0},
31 {"matrix": [0, 7], "x": 7, "y": 0},
32 {"matrix": [0, 8], "x": 8, "y": 0},
33 {"matrix": [0, 9], "x": 9, "y": 0},
34 {"matrix": [0, 10], "x": 10, "y": 0},
35 {"matrix": [0, 11], "x": 11, "y": 0},
36 {"matrix": [0, 12], "x": 12, "y": 0},
37 {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
38
39 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
40 {"matrix": [1, 1], "x": 1.5, "y": 1},
41 {"matrix": [1, 2], "x": 2.5, "y": 1},
42 {"matrix": [1, 3], "x": 3.5, "y": 1},
43 {"matrix": [1, 4], "x": 4.5, "y": 1},
44 {"matrix": [1, 5], "x": 5.5, "y": 1},
45 {"matrix": [1, 6], "x": 6.5, "y": 1},
46 {"matrix": [1, 7], "x": 7.5, "y": 1},
47 {"matrix": [1, 8], "x": 8.5, "y": 1},
48 {"matrix": [1, 9], "x": 9.5, "y": 1},
49 {"matrix": [1, 10], "x": 10.5, "y": 1},
50 {"matrix": [1, 11], "x": 11.5, "y": 1},
51 {"matrix": [1, 12], "x": 12.5, "y": 1},
52 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
53 {"matrix": [1, 14], "x": 15, "y": 1},
54
55 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
56 {"matrix": [2, 1], "x": 1.75, "y": 2},
57 {"matrix": [2, 2], "x": 2.75, "y": 2},
58 {"matrix": [2, 3], "x": 3.75, "y": 2},
59 {"matrix": [2, 4], "x": 4.75, "y": 2},
60 {"matrix": [2, 5], "x": 5.75, "y": 2},
61 {"matrix": [2, 6], "x": 6.75, "y": 2},
62 {"matrix": [2, 7], "x": 7.75, "y": 2},
63 {"matrix": [2, 8], "x": 8.75, "y": 2},
64 {"matrix": [2, 9], "x": 9.75, "y": 2},
65 {"matrix": [2, 10], "x": 10.75, "y": 2},
66 {"matrix": [2, 11], "x": 11.75, "y": 2},
67 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
68 {"matrix": [2, 14], "x": 15, "y": 2},
69
70 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
71 {"matrix": [3, 2], "x": 2.25, "y": 3},
72 {"matrix": [3, 3], "x": 3.25, "y": 3},
73 {"matrix": [3, 4], "x": 4.25, "y": 3},
74 {"matrix": [3, 5], "x": 5.25, "y": 3},
75 {"matrix": [3, 6], "x": 6.25, "y": 3},
76 {"matrix": [3, 7], "x": 7.25, "y": 3},
77 {"matrix": [3, 8], "x": 8.25, "y": 3},
78 {"matrix": [3, 9], "x": 9.25, "y": 3},
79 {"matrix": [3, 10], "x": 10.25, "y": 3},
80 {"matrix": [3, 11], "x": 11.25, "y": 3},
81 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
82 {"matrix": [3, 13], "x": 14, "y": 3},
83 {"matrix": [3, 14], "x": 15, "y": 3},
84
85 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
86 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
87 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
88 {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
89 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
90 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
91
92 {"matrix": [4, 12], "x": 13, "y": 4},
93 {"matrix": [4, 13], "x": 14, "y": 4},
94 {"matrix": [4, 14], "x": 15, "y": 4}
95 ]
24 }, 96 },
25 "LAYOUT_7u": { 97 "LAYOUT_7u": {
26 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] 98 "layout": [
99 {"matrix": [0, 0], "x": 0, "y": 0},
100 {"matrix": [0, 1], "x": 1, "y": 0},
101 {"matrix": [0, 2], "x": 2, "y": 0},
102 {"matrix": [0, 3], "x": 3, "y": 0},
103 {"matrix": [0, 4], "x": 4, "y": 0},
104 {"matrix": [0, 5], "x": 5, "y": 0},
105 {"matrix": [0, 6], "x": 6, "y": 0},
106 {"matrix": [0, 7], "x": 7, "y": 0},
107 {"matrix": [0, 8], "x": 8, "y": 0},
108 {"matrix": [0, 9], "x": 9, "y": 0},
109 {"matrix": [0, 10], "x": 10, "y": 0},
110 {"matrix": [0, 11], "x": 11, "y": 0},
111 {"matrix": [0, 12], "x": 12, "y": 0},
112 {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
113
114 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
115 {"matrix": [1, 1], "x": 1.5, "y": 1},
116 {"matrix": [1, 2], "x": 2.5, "y": 1},
117 {"matrix": [1, 3], "x": 3.5, "y": 1},
118 {"matrix": [1, 4], "x": 4.5, "y": 1},
119 {"matrix": [1, 5], "x": 5.5, "y": 1},
120 {"matrix": [1, 6], "x": 6.5, "y": 1},
121 {"matrix": [1, 7], "x": 7.5, "y": 1},
122 {"matrix": [1, 8], "x": 8.5, "y": 1},
123 {"matrix": [1, 9], "x": 9.5, "y": 1},
124 {"matrix": [1, 10], "x": 10.5, "y": 1},
125 {"matrix": [1, 11], "x": 11.5, "y": 1},
126 {"matrix": [1, 12], "x": 12.5, "y": 1},
127 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
128 {"matrix": [1, 14], "x": 15, "y": 1},
129
130 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
131 {"matrix": [2, 1], "x": 1.75, "y": 2},
132 {"matrix": [2, 2], "x": 2.75, "y": 2},
133 {"matrix": [2, 3], "x": 3.75, "y": 2},
134 {"matrix": [2, 4], "x": 4.75, "y": 2},
135 {"matrix": [2, 5], "x": 5.75, "y": 2},
136 {"matrix": [2, 6], "x": 6.75, "y": 2},
137 {"matrix": [2, 7], "x": 7.75, "y": 2},
138 {"matrix": [2, 8], "x": 8.75, "y": 2},
139 {"matrix": [2, 9], "x": 9.75, "y": 2},
140 {"matrix": [2, 10], "x": 10.75, "y": 2},
141 {"matrix": [2, 11], "x": 11.75, "y": 2},
142 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
143 {"matrix": [2, 14], "x": 15, "y": 2},
144
145 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
146 {"matrix": [3, 2], "x": 2.25, "y": 3},
147 {"matrix": [3, 3], "x": 3.25, "y": 3},
148 {"matrix": [3, 4], "x": 4.25, "y": 3},
149 {"matrix": [3, 5], "x": 5.25, "y": 3},
150 {"matrix": [3, 6], "x": 6.25, "y": 3},
151 {"matrix": [3, 7], "x": 7.25, "y": 3},
152 {"matrix": [3, 8], "x": 8.25, "y": 3},
153 {"matrix": [3, 9], "x": 9.25, "y": 3},
154 {"matrix": [3, 10], "x": 10.25, "y": 3},
155 {"matrix": [3, 11], "x": 11.25, "y": 3},
156 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
157 {"matrix": [3, 13], "x": 14, "y": 3},
158 {"matrix": [3, 14], "x": 15, "y": 3},
159
160 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
161 {"matrix": [4, 1], "x": 1.5, "y": 4},
162 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
163 {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
164 {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
165
166 {"matrix": [4, 12], "x": 13, "y": 4},
167 {"matrix": [4, 13], "x": 14, "y": 4},
168 {"matrix": [4, 14], "x": 15, "y": 4}
169 ]
27 }, 170 },
28 "LAYOUT_splitspace": { 171 "LAYOUT_splitspace": {
29 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"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.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] 172 "layout": [
173 {"matrix": [0, 0], "x": 0, "y": 0},
174 {"matrix": [0, 1], "x": 1, "y": 0},
175 {"matrix": [0, 2], "x": 2, "y": 0},
176 {"matrix": [0, 3], "x": 3, "y": 0},
177 {"matrix": [0, 4], "x": 4, "y": 0},
178 {"matrix": [0, 5], "x": 5, "y": 0},
179 {"matrix": [0, 6], "x": 6, "y": 0},
180 {"matrix": [0, 7], "x": 7, "y": 0},
181 {"matrix": [0, 8], "x": 8, "y": 0},
182 {"matrix": [0, 9], "x": 9, "y": 0},
183 {"matrix": [0, 10], "x": 10, "y": 0},
184 {"matrix": [0, 11], "x": 11, "y": 0},
185 {"matrix": [0, 12], "x": 12, "y": 0},
186 {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
187
188 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
189 {"matrix": [1, 1], "x": 1.5, "y": 1},
190 {"matrix": [1, 2], "x": 2.5, "y": 1},
191 {"matrix": [1, 3], "x": 3.5, "y": 1},
192 {"matrix": [1, 4], "x": 4.5, "y": 1},
193 {"matrix": [1, 5], "x": 5.5, "y": 1},
194 {"matrix": [1, 6], "x": 6.5, "y": 1},
195 {"matrix": [1, 7], "x": 7.5, "y": 1},
196 {"matrix": [1, 8], "x": 8.5, "y": 1},
197 {"matrix": [1, 9], "x": 9.5, "y": 1},
198 {"matrix": [1, 10], "x": 10.5, "y": 1},
199 {"matrix": [1, 11], "x": 11.5, "y": 1},
200 {"matrix": [1, 12], "x": 12.5, "y": 1},
201 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
202 {"matrix": [1, 14], "x": 15, "y": 1},
203
204 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
205 {"matrix": [2, 1], "x": 1.75, "y": 2},
206 {"matrix": [2, 2], "x": 2.75, "y": 2},
207 {"matrix": [2, 3], "x": 3.75, "y": 2},
208 {"matrix": [2, 4], "x": 4.75, "y": 2},
209 {"matrix": [2, 5], "x": 5.75, "y": 2},
210 {"matrix": [2, 6], "x": 6.75, "y": 2},
211 {"matrix": [2, 7], "x": 7.75, "y": 2},
212 {"matrix": [2, 8], "x": 8.75, "y": 2},
213 {"matrix": [2, 9], "x": 9.75, "y": 2},
214 {"matrix": [2, 10], "x": 10.75, "y": 2},
215 {"matrix": [2, 11], "x": 11.75, "y": 2},
216 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
217 {"matrix": [2, 14], "x": 15, "y": 2},
218
219 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
220 {"matrix": [3, 2], "x": 2.25, "y": 3},
221 {"matrix": [3, 3], "x": 3.25, "y": 3},
222 {"matrix": [3, 4], "x": 4.25, "y": 3},
223 {"matrix": [3, 5], "x": 5.25, "y": 3},
224 {"matrix": [3, 6], "x": 6.25, "y": 3},
225 {"matrix": [3, 7], "x": 7.25, "y": 3},
226 {"matrix": [3, 8], "x": 8.25, "y": 3},
227 {"matrix": [3, 9], "x": 9.25, "y": 3},
228 {"matrix": [3, 10], "x": 10.25, "y": 3},
229 {"matrix": [3, 11], "x": 11.25, "y": 3},
230 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
231 {"matrix": [3, 13], "x": 14, "y": 3},
232 {"matrix": [3, 14], "x": 15, "y": 3},
233
234 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
235 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
236 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
237 {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
238 {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
239 {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
240 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
241 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
242
243 {"matrix": [4, 12], "x": 13, "y": 4},
244 {"matrix": [4, 13], "x": 14, "y": 4},
245 {"matrix": [4, 14], "x": 15, "y": 4}
246 ]
30 }, 247 },
31 "LAYOUT_splitbs": { 248 "LAYOUT_splitbs": {
32 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"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.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] 249 "layout": [
250 {"matrix": [0, 0], "x": 0, "y": 0},
251 {"matrix": [0, 1], "x": 1, "y": 0},
252 {"matrix": [0, 2], "x": 2, "y": 0},
253 {"matrix": [0, 3], "x": 3, "y": 0},
254 {"matrix": [0, 4], "x": 4, "y": 0},
255 {"matrix": [0, 5], "x": 5, "y": 0},
256 {"matrix": [0, 6], "x": 6, "y": 0},
257 {"matrix": [0, 7], "x": 7, "y": 0},
258 {"matrix": [0, 8], "x": 8, "y": 0},
259 {"matrix": [0, 9], "x": 9, "y": 0},
260 {"matrix": [0, 10], "x": 10, "y": 0},
261 {"matrix": [0, 11], "x": 11, "y": 0},
262 {"matrix": [0, 12], "x": 12, "y": 0},
263 {"matrix": [0, 13], "x": 13, "y": 0},
264 {"matrix": [0, 14], "x": 14, "y": 0},
265
266 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
267 {"matrix": [1, 1], "x": 1.5, "y": 1},
268 {"matrix": [1, 2], "x": 2.5, "y": 1},
269 {"matrix": [1, 3], "x": 3.5, "y": 1},
270 {"matrix": [1, 4], "x": 4.5, "y": 1},
271 {"matrix": [1, 5], "x": 5.5, "y": 1},
272 {"matrix": [1, 6], "x": 6.5, "y": 1},
273 {"matrix": [1, 7], "x": 7.5, "y": 1},
274 {"matrix": [1, 8], "x": 8.5, "y": 1},
275 {"matrix": [1, 9], "x": 9.5, "y": 1},
276 {"matrix": [1, 10], "x": 10.5, "y": 1},
277 {"matrix": [1, 11], "x": 11.5, "y": 1},
278 {"matrix": [1, 12], "x": 12.5, "y": 1},
279 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
280 {"matrix": [1, 14], "x": 15, "y": 1},
281
282 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
283 {"matrix": [2, 1], "x": 1.75, "y": 2},
284 {"matrix": [2, 2], "x": 2.75, "y": 2},
285 {"matrix": [2, 3], "x": 3.75, "y": 2},
286 {"matrix": [2, 4], "x": 4.75, "y": 2},
287 {"matrix": [2, 5], "x": 5.75, "y": 2},
288 {"matrix": [2, 6], "x": 6.75, "y": 2},
289 {"matrix": [2, 7], "x": 7.75, "y": 2},
290 {"matrix": [2, 8], "x": 8.75, "y": 2},
291 {"matrix": [2, 9], "x": 9.75, "y": 2},
292 {"matrix": [2, 10], "x": 10.75, "y": 2},
293 {"matrix": [2, 11], "x": 11.75, "y": 2},
294 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
295 {"matrix": [2, 14], "x": 15, "y": 2},
296
297 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
298 {"matrix": [3, 2], "x": 2.25, "y": 3},
299 {"matrix": [3, 3], "x": 3.25, "y": 3},
300 {"matrix": [3, 4], "x": 4.25, "y": 3},
301 {"matrix": [3, 5], "x": 5.25, "y": 3},
302 {"matrix": [3, 6], "x": 6.25, "y": 3},
303 {"matrix": [3, 7], "x": 7.25, "y": 3},
304 {"matrix": [3, 8], "x": 8.25, "y": 3},
305 {"matrix": [3, 9], "x": 9.25, "y": 3},
306 {"matrix": [3, 10], "x": 10.25, "y": 3},
307 {"matrix": [3, 11], "x": 11.25, "y": 3},
308 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
309 {"matrix": [3, 13], "x": 14, "y": 3},
310 {"matrix": [3, 14], "x": 15, "y": 3},
311
312 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
313 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
314 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
315 {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
316 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
317 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
318
319 {"matrix": [4, 12], "x": 13, "y": 4},
320 {"matrix": [4, 13], "x": 14, "y": 4},
321 {"matrix": [4, 14], "x": 15, "y": 4}
322 ]
33 }, 323 },
34 "LAYOUT_splitbs_7u": { 324 "LAYOUT_splitbs_7u": {
35 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] 325 "layout": [
326 {"matrix": [0, 0], "x": 0, "y": 0},
327 {"matrix": [0, 1], "x": 1, "y": 0},
328 {"matrix": [0, 2], "x": 2, "y": 0},
329 {"matrix": [0, 3], "x": 3, "y": 0},
330 {"matrix": [0, 4], "x": 4, "y": 0},
331 {"matrix": [0, 5], "x": 5, "y": 0},
332 {"matrix": [0, 6], "x": 6, "y": 0},
333 {"matrix": [0, 7], "x": 7, "y": 0},
334 {"matrix": [0, 8], "x": 8, "y": 0},
335 {"matrix": [0, 9], "x": 9, "y": 0},
336 {"matrix": [0, 10], "x": 10, "y": 0},
337 {"matrix": [0, 11], "x": 11, "y": 0},
338 {"matrix": [0, 12], "x": 12, "y": 0},
339 {"matrix": [0, 13], "x": 13, "y": 0},
340 {"matrix": [0, 14], "x": 14, "y": 0},
341
342 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
343 {"matrix": [1, 1], "x": 1.5, "y": 1},
344 {"matrix": [1, 2], "x": 2.5, "y": 1},
345 {"matrix": [1, 3], "x": 3.5, "y": 1},
346 {"matrix": [1, 4], "x": 4.5, "y": 1},
347 {"matrix": [1, 5], "x": 5.5, "y": 1},
348 {"matrix": [1, 6], "x": 6.5, "y": 1},
349 {"matrix": [1, 7], "x": 7.5, "y": 1},
350 {"matrix": [1, 8], "x": 8.5, "y": 1},
351 {"matrix": [1, 9], "x": 9.5, "y": 1},
352 {"matrix": [1, 10], "x": 10.5, "y": 1},
353 {"matrix": [1, 11], "x": 11.5, "y": 1},
354 {"matrix": [1, 12], "x": 12.5, "y": 1},
355 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
356 {"matrix": [1, 14], "x": 15, "y": 1},
357
358 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
359 {"matrix": [2, 1], "x": 1.75, "y": 2},
360 {"matrix": [2, 2], "x": 2.75, "y": 2},
361 {"matrix": [2, 3], "x": 3.75, "y": 2},
362 {"matrix": [2, 4], "x": 4.75, "y": 2},
363 {"matrix": [2, 5], "x": 5.75, "y": 2},
364 {"matrix": [2, 6], "x": 6.75, "y": 2},
365 {"matrix": [2, 7], "x": 7.75, "y": 2},
366 {"matrix": [2, 8], "x": 8.75, "y": 2},
367 {"matrix": [2, 9], "x": 9.75, "y": 2},
368 {"matrix": [2, 10], "x": 10.75, "y": 2},
369 {"matrix": [2, 11], "x": 11.75, "y": 2},
370 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
371 {"matrix": [2, 14], "x": 15, "y": 2},
372
373 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
374 {"matrix": [3, 2], "x": 2.25, "y": 3},
375 {"matrix": [3, 3], "x": 3.25, "y": 3},
376 {"matrix": [3, 4], "x": 4.25, "y": 3},
377 {"matrix": [3, 5], "x": 5.25, "y": 3},
378 {"matrix": [3, 6], "x": 6.25, "y": 3},
379 {"matrix": [3, 7], "x": 7.25, "y": 3},
380 {"matrix": [3, 8], "x": 8.25, "y": 3},
381 {"matrix": [3, 9], "x": 9.25, "y": 3},
382 {"matrix": [3, 10], "x": 10.25, "y": 3},
383 {"matrix": [3, 11], "x": 11.25, "y": 3},
384 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
385 {"matrix": [3, 13], "x": 14, "y": 3},
386 {"matrix": [3, 14], "x": 15, "y": 3},
387
388 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
389 {"matrix": [4, 1], "x": 1.5, "y": 4},
390 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
391 {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
392 {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
393
394 {"matrix": [4, 12], "x": 13, "y": 4},
395 {"matrix": [4, 13], "x": 14, "y": 4},
396 {"matrix": [4, 14], "x": 15, "y": 4}
397 ]
36 }, 398 },
37 "LAYOUT_splitbs_splitspace": { 399 "LAYOUT_splitbs_splitspace": {
38 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"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.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] 400 "layout": [
401 {"matrix": [0, 0], "x": 0, "y": 0},
402 {"matrix": [0, 1], "x": 1, "y": 0},
403 {"matrix": [0, 2], "x": 2, "y": 0},
404 {"matrix": [0, 3], "x": 3, "y": 0},
405 {"matrix": [0, 4], "x": 4, "y": 0},
406 {"matrix": [0, 5], "x": 5, "y": 0},
407 {"matrix": [0, 6], "x": 6, "y": 0},
408 {"matrix": [0, 7], "x": 7, "y": 0},
409 {"matrix": [0, 8], "x": 8, "y": 0},
410 {"matrix": [0, 9], "x": 9, "y": 0},
411 {"matrix": [0, 10], "x": 10, "y": 0},
412 {"matrix": [0, 11], "x": 11, "y": 0},
413 {"matrix": [0, 12], "x": 12, "y": 0},
414 {"matrix": [0, 13], "x": 13, "y": 0},
415 {"matrix": [0, 14], "x": 14, "y": 0},
416
417 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
418 {"matrix": [1, 1], "x": 1.5, "y": 1},
419 {"matrix": [1, 2], "x": 2.5, "y": 1},
420 {"matrix": [1, 3], "x": 3.5, "y": 1},
421 {"matrix": [1, 4], "x": 4.5, "y": 1},
422 {"matrix": [1, 5], "x": 5.5, "y": 1},
423 {"matrix": [1, 6], "x": 6.5, "y": 1},
424 {"matrix": [1, 7], "x": 7.5, "y": 1},
425 {"matrix": [1, 8], "x": 8.5, "y": 1},
426 {"matrix": [1, 9], "x": 9.5, "y": 1},
427 {"matrix": [1, 10], "x": 10.5, "y": 1},
428 {"matrix": [1, 11], "x": 11.5, "y": 1},
429 {"matrix": [1, 12], "x": 12.5, "y": 1},
430 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
431 {"matrix": [1, 14], "x": 15, "y": 1},
432
433 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
434 {"matrix": [2, 1], "x": 1.75, "y": 2},
435 {"matrix": [2, 2], "x": 2.75, "y": 2},
436 {"matrix": [2, 3], "x": 3.75, "y": 2},
437 {"matrix": [2, 4], "x": 4.75, "y": 2},
438 {"matrix": [2, 5], "x": 5.75, "y": 2},
439 {"matrix": [2, 6], "x": 6.75, "y": 2},
440 {"matrix": [2, 7], "x": 7.75, "y": 2},
441 {"matrix": [2, 8], "x": 8.75, "y": 2},
442 {"matrix": [2, 9], "x": 9.75, "y": 2},
443 {"matrix": [2, 10], "x": 10.75, "y": 2},
444 {"matrix": [2, 11], "x": 11.75, "y": 2},
445 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
446 {"matrix": [2, 14], "x": 15, "y": 2},
447
448 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
449 {"matrix": [3, 2], "x": 2.25, "y": 3},
450 {"matrix": [3, 3], "x": 3.25, "y": 3},
451 {"matrix": [3, 4], "x": 4.25, "y": 3},
452 {"matrix": [3, 5], "x": 5.25, "y": 3},
453 {"matrix": [3, 6], "x": 6.25, "y": 3},
454 {"matrix": [3, 7], "x": 7.25, "y": 3},
455 {"matrix": [3, 8], "x": 8.25, "y": 3},
456 {"matrix": [3, 9], "x": 9.25, "y": 3},
457 {"matrix": [3, 10], "x": 10.25, "y": 3},
458 {"matrix": [3, 11], "x": 11.25, "y": 3},
459 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
460 {"matrix": [3, 13], "x": 14, "y": 3},
461 {"matrix": [3, 14], "x": 15, "y": 3},
462
463 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
464 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
465 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
466 {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
467 {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
468 {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
469 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
470 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
471
472 {"matrix": [4, 12], "x": 13, "y": 4},
473 {"matrix": [4, 13], "x": 14, "y": 4},
474 {"matrix": [4, 14], "x": 15, "y": 4}
475 ]
39 }, 476 },
40 "LAYOUT_iso": { 477 "LAYOUT_iso": {
41 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":13.75, "y":1, "w":1.25, "h":2}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"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.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] 478 "layout": [
479 {"matrix": [0, 0], "x": 0, "y": 0},
480 {"matrix": [0, 1], "x": 1, "y": 0},
481 {"matrix": [0, 2], "x": 2, "y": 0},
482 {"matrix": [0, 3], "x": 3, "y": 0},
483 {"matrix": [0, 4], "x": 4, "y": 0},
484 {"matrix": [0, 5], "x": 5, "y": 0},
485 {"matrix": [0, 6], "x": 6, "y": 0},
486 {"matrix": [0, 7], "x": 7, "y": 0},
487 {"matrix": [0, 8], "x": 8, "y": 0},
488 {"matrix": [0, 9], "x": 9, "y": 0},
489 {"matrix": [0, 10], "x": 10, "y": 0},
490 {"matrix": [0, 11], "x": 11, "y": 0},
491 {"matrix": [0, 12], "x": 12, "y": 0},
492 {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
493
494 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
495 {"matrix": [1, 1], "x": 1.5, "y": 1},
496 {"matrix": [1, 2], "x": 2.5, "y": 1},
497 {"matrix": [1, 3], "x": 3.5, "y": 1},
498 {"matrix": [1, 4], "x": 4.5, "y": 1},
499 {"matrix": [1, 5], "x": 5.5, "y": 1},
500 {"matrix": [1, 6], "x": 6.5, "y": 1},
501 {"matrix": [1, 7], "x": 7.5, "y": 1},
502 {"matrix": [1, 8], "x": 8.5, "y": 1},
503 {"matrix": [1, 9], "x": 9.5, "y": 1},
504 {"matrix": [1, 10], "x": 10.5, "y": 1},
505 {"matrix": [1, 11], "x": 11.5, "y": 1},
506 {"matrix": [1, 12], "x": 12.5, "y": 1},
507 {"matrix": [1, 14], "x": 15, "y": 1},
508
509 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
510 {"matrix": [2, 1], "x": 1.75, "y": 2},
511 {"matrix": [2, 2], "x": 2.75, "y": 2},
512 {"matrix": [2, 3], "x": 3.75, "y": 2},
513 {"matrix": [2, 4], "x": 4.75, "y": 2},
514 {"matrix": [2, 5], "x": 5.75, "y": 2},
515 {"matrix": [2, 6], "x": 6.75, "y": 2},
516 {"matrix": [2, 7], "x": 7.75, "y": 2},
517 {"matrix": [2, 8], "x": 8.75, "y": 2},
518 {"matrix": [2, 9], "x": 9.75, "y": 2},
519 {"matrix": [2, 10], "x": 10.75, "y": 2},
520 {"matrix": [2, 11], "x": 11.75, "y": 2},
521 {"matrix": [2, 12], "x": 12.75, "y": 2},
522 {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
523 {"matrix": [2, 14], "x": 15, "y": 2},
524
525 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
526 {"matrix": [3, 1], "x": 1.25, "y": 3},
527 {"matrix": [3, 2], "x": 2.25, "y": 3},
528 {"matrix": [3, 3], "x": 3.25, "y": 3},
529 {"matrix": [3, 4], "x": 4.25, "y": 3},
530 {"matrix": [3, 5], "x": 5.25, "y": 3},
531 {"matrix": [3, 6], "x": 6.25, "y": 3},
532 {"matrix": [3, 7], "x": 7.25, "y": 3},
533 {"matrix": [3, 8], "x": 8.25, "y": 3},
534 {"matrix": [3, 9], "x": 9.25, "y": 3},
535 {"matrix": [3, 10], "x": 10.25, "y": 3},
536 {"matrix": [3, 11], "x": 11.25, "y": 3},
537 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
538 {"matrix": [3, 13], "x": 14, "y": 3},
539 {"matrix": [3, 14], "x": 15, "y": 3},
540
541 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
542 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
543 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
544 {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
545 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
546 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
547
548 {"matrix": [4, 12], "x": 13, "y": 4},
549 {"matrix": [4, 13], "x": 14, "y": 4},
550 {"matrix": [4, 14], "x": 15, "y": 4}
551 ]
42 }, 552 },
43 "LAYOUT_iso_7u": { 553 "LAYOUT_iso_7u": {
44 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":13.75, "y":1, "w":1.25, "h":2}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] 554 "layout": [
555 {"matrix": [0, 0], "x": 0, "y": 0},
556 {"matrix": [0, 1], "x": 1, "y": 0},
557 {"matrix": [0, 2], "x": 2, "y": 0},
558 {"matrix": [0, 3], "x": 3, "y": 0},
559 {"matrix": [0, 4], "x": 4, "y": 0},
560 {"matrix": [0, 5], "x": 5, "y": 0},
561 {"matrix": [0, 6], "x": 6, "y": 0},
562 {"matrix": [0, 7], "x": 7, "y": 0},
563 {"matrix": [0, 8], "x": 8, "y": 0},
564 {"matrix": [0, 9], "x": 9, "y": 0},
565 {"matrix": [0, 10], "x": 10, "y": 0},
566 {"matrix": [0, 11], "x": 11, "y": 0},
567 {"matrix": [0, 12], "x": 12, "y": 0},
568 {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
569
570 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
571 {"matrix": [1, 1], "x": 1.5, "y": 1},
572 {"matrix": [1, 2], "x": 2.5, "y": 1},
573 {"matrix": [1, 3], "x": 3.5, "y": 1},
574 {"matrix": [1, 4], "x": 4.5, "y": 1},
575 {"matrix": [1, 5], "x": 5.5, "y": 1},
576 {"matrix": [1, 6], "x": 6.5, "y": 1},
577 {"matrix": [1, 7], "x": 7.5, "y": 1},
578 {"matrix": [1, 8], "x": 8.5, "y": 1},
579 {"matrix": [1, 9], "x": 9.5, "y": 1},
580 {"matrix": [1, 10], "x": 10.5, "y": 1},
581 {"matrix": [1, 11], "x": 11.5, "y": 1},
582 {"matrix": [1, 12], "x": 12.5, "y": 1},
583 {"matrix": [1, 14], "x": 15, "y": 1},
584
585 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
586 {"matrix": [2, 1], "x": 1.75, "y": 2},
587 {"matrix": [2, 2], "x": 2.75, "y": 2},
588 {"matrix": [2, 3], "x": 3.75, "y": 2},
589 {"matrix": [2, 4], "x": 4.75, "y": 2},
590 {"matrix": [2, 5], "x": 5.75, "y": 2},
591 {"matrix": [2, 6], "x": 6.75, "y": 2},
592 {"matrix": [2, 7], "x": 7.75, "y": 2},
593 {"matrix": [2, 8], "x": 8.75, "y": 2},
594 {"matrix": [2, 9], "x": 9.75, "y": 2},
595 {"matrix": [2, 10], "x": 10.75, "y": 2},
596 {"matrix": [2, 11], "x": 11.75, "y": 2},
597 {"matrix": [2, 12], "x": 12.75, "y": 2},
598 {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
599 {"matrix": [2, 14], "x": 15, "y": 2},
600
601 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
602 {"matrix": [3, 1], "x": 1.25, "y": 3},
603 {"matrix": [3, 2], "x": 2.25, "y": 3},
604 {"matrix": [3, 3], "x": 3.25, "y": 3},
605 {"matrix": [3, 4], "x": 4.25, "y": 3},
606 {"matrix": [3, 5], "x": 5.25, "y": 3},
607 {"matrix": [3, 6], "x": 6.25, "y": 3},
608 {"matrix": [3, 7], "x": 7.25, "y": 3},
609 {"matrix": [3, 8], "x": 8.25, "y": 3},
610 {"matrix": [3, 9], "x": 9.25, "y": 3},
611 {"matrix": [3, 10], "x": 10.25, "y": 3},
612 {"matrix": [3, 11], "x": 11.25, "y": 3},
613 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
614 {"matrix": [3, 13], "x": 14, "y": 3},
615 {"matrix": [3, 14], "x": 15, "y": 3},
616
617 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
618 {"matrix": [4, 1], "x": 1.5, "y": 4},
619 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
620 {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
621 {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
622
623 {"matrix": [4, 12], "x": 13, "y": 4},
624 {"matrix": [4, 13], "x": 14, "y": 4},
625 {"matrix": [4, 14], "x": 15, "y": 4}
626 ]
45 }, 627 },
46 "LAYOUT_iso_splitspace": { 628 "LAYOUT_iso_splitspace": {
47 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":13.75, "y":1, "w":1.25, "h":2}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"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.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] 629 "layout": [
630 {"matrix": [0, 0], "x": 0, "y": 0},
631 {"matrix": [0, 1], "x": 1, "y": 0},
632 {"matrix": [0, 2], "x": 2, "y": 0},
633 {"matrix": [0, 3], "x": 3, "y": 0},
634 {"matrix": [0, 4], "x": 4, "y": 0},
635 {"matrix": [0, 5], "x": 5, "y": 0},
636 {"matrix": [0, 6], "x": 6, "y": 0},
637 {"matrix": [0, 7], "x": 7, "y": 0},
638 {"matrix": [0, 8], "x": 8, "y": 0},
639 {"matrix": [0, 9], "x": 9, "y": 0},
640 {"matrix": [0, 10], "x": 10, "y": 0},
641 {"matrix": [0, 11], "x": 11, "y": 0},
642 {"matrix": [0, 12], "x": 12, "y": 0},
643 {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
644
645 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
646 {"matrix": [1, 1], "x": 1.5, "y": 1},
647 {"matrix": [1, 2], "x": 2.5, "y": 1},
648 {"matrix": [1, 3], "x": 3.5, "y": 1},
649 {"matrix": [1, 4], "x": 4.5, "y": 1},
650 {"matrix": [1, 5], "x": 5.5, "y": 1},
651 {"matrix": [1, 6], "x": 6.5, "y": 1},
652 {"matrix": [1, 7], "x": 7.5, "y": 1},
653 {"matrix": [1, 8], "x": 8.5, "y": 1},
654 {"matrix": [1, 9], "x": 9.5, "y": 1},
655 {"matrix": [1, 10], "x": 10.5, "y": 1},
656 {"matrix": [1, 11], "x": 11.5, "y": 1},
657 {"matrix": [1, 12], "x": 12.5, "y": 1},
658 {"matrix": [1, 14], "x": 15, "y": 1},
659
660 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
661 {"matrix": [2, 1], "x": 1.75, "y": 2},
662 {"matrix": [2, 2], "x": 2.75, "y": 2},
663 {"matrix": [2, 3], "x": 3.75, "y": 2},
664 {"matrix": [2, 4], "x": 4.75, "y": 2},
665 {"matrix": [2, 5], "x": 5.75, "y": 2},
666 {"matrix": [2, 6], "x": 6.75, "y": 2},
667 {"matrix": [2, 7], "x": 7.75, "y": 2},
668 {"matrix": [2, 8], "x": 8.75, "y": 2},
669 {"matrix": [2, 9], "x": 9.75, "y": 2},
670 {"matrix": [2, 10], "x": 10.75, "y": 2},
671 {"matrix": [2, 11], "x": 11.75, "y": 2},
672 {"matrix": [2, 12], "x": 12.75, "y": 2},
673 {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
674 {"matrix": [2, 14], "x": 15, "y": 2},
675
676 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
677 {"matrix": [3, 1], "x": 1.25, "y": 3},
678 {"matrix": [3, 2], "x": 2.25, "y": 3},
679 {"matrix": [3, 3], "x": 3.25, "y": 3},
680 {"matrix": [3, 4], "x": 4.25, "y": 3},
681 {"matrix": [3, 5], "x": 5.25, "y": 3},
682 {"matrix": [3, 6], "x": 6.25, "y": 3},
683 {"matrix": [3, 7], "x": 7.25, "y": 3},
684 {"matrix": [3, 8], "x": 8.25, "y": 3},
685 {"matrix": [3, 9], "x": 9.25, "y": 3},
686 {"matrix": [3, 10], "x": 10.25, "y": 3},
687 {"matrix": [3, 11], "x": 11.25, "y": 3},
688 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
689 {"matrix": [3, 13], "x": 14, "y": 3},
690 {"matrix": [3, 14], "x": 15, "y": 3},
691
692 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
693 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
694 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
695 {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
696 {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
697 {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
698 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
699 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
700
701 {"matrix": [4, 12], "x": 13, "y": 4},
702 {"matrix": [4, 13], "x": 14, "y": 4},
703 {"matrix": [4, 14], "x": 15, "y": 4}
704 ]
48 }, 705 },
49 "LAYOUT_iso_splitbs": { 706 "LAYOUT_iso_splitbs": {
50 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":13.75, "y":1, "w":1.25, "h":2}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"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.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] 707 "layout": [
708 {"matrix": [0, 0], "x": 0, "y": 0},
709 {"matrix": [0, 1], "x": 1, "y": 0},
710 {"matrix": [0, 2], "x": 2, "y": 0},
711 {"matrix": [0, 3], "x": 3, "y": 0},
712 {"matrix": [0, 4], "x": 4, "y": 0},
713 {"matrix": [0, 5], "x": 5, "y": 0},
714 {"matrix": [0, 6], "x": 6, "y": 0},
715 {"matrix": [0, 7], "x": 7, "y": 0},
716 {"matrix": [0, 8], "x": 8, "y": 0},
717 {"matrix": [0, 9], "x": 9, "y": 0},
718 {"matrix": [0, 10], "x": 10, "y": 0},
719 {"matrix": [0, 11], "x": 11, "y": 0},
720 {"matrix": [0, 12], "x": 12, "y": 0},
721 {"matrix": [0, 13], "x": 13, "y": 0},
722 {"matrix": [0, 14], "x": 14, "y": 0},
723
724 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
725 {"matrix": [1, 1], "x": 1.5, "y": 1},
726 {"matrix": [1, 2], "x": 2.5, "y": 1},
727 {"matrix": [1, 3], "x": 3.5, "y": 1},
728 {"matrix": [1, 4], "x": 4.5, "y": 1},
729 {"matrix": [1, 5], "x": 5.5, "y": 1},
730 {"matrix": [1, 6], "x": 6.5, "y": 1},
731 {"matrix": [1, 7], "x": 7.5, "y": 1},
732 {"matrix": [1, 8], "x": 8.5, "y": 1},
733 {"matrix": [1, 9], "x": 9.5, "y": 1},
734 {"matrix": [1, 10], "x": 10.5, "y": 1},
735 {"matrix": [1, 11], "x": 11.5, "y": 1},
736 {"matrix": [1, 12], "x": 12.5, "y": 1},
737 {"matrix": [1, 14], "x": 15, "y": 1},
738
739 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
740 {"matrix": [2, 1], "x": 1.75, "y": 2},
741 {"matrix": [2, 2], "x": 2.75, "y": 2},
742 {"matrix": [2, 3], "x": 3.75, "y": 2},
743 {"matrix": [2, 4], "x": 4.75, "y": 2},
744 {"matrix": [2, 5], "x": 5.75, "y": 2},
745 {"matrix": [2, 6], "x": 6.75, "y": 2},
746 {"matrix": [2, 7], "x": 7.75, "y": 2},
747 {"matrix": [2, 8], "x": 8.75, "y": 2},
748 {"matrix": [2, 9], "x": 9.75, "y": 2},
749 {"matrix": [2, 10], "x": 10.75, "y": 2},
750 {"matrix": [2, 11], "x": 11.75, "y": 2},
751 {"matrix": [2, 12], "x": 12.75, "y": 2},
752 {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
753 {"matrix": [2, 14], "x": 15, "y": 2},
754
755 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
756 {"matrix": [3, 1], "x": 1.25, "y": 3},
757 {"matrix": [3, 2], "x": 2.25, "y": 3},
758 {"matrix": [3, 3], "x": 3.25, "y": 3},
759 {"matrix": [3, 4], "x": 4.25, "y": 3},
760 {"matrix": [3, 5], "x": 5.25, "y": 3},
761 {"matrix": [3, 6], "x": 6.25, "y": 3},
762 {"matrix": [3, 7], "x": 7.25, "y": 3},
763 {"matrix": [3, 8], "x": 8.25, "y": 3},
764 {"matrix": [3, 9], "x": 9.25, "y": 3},
765 {"matrix": [3, 10], "x": 10.25, "y": 3},
766 {"matrix": [3, 11], "x": 11.25, "y": 3},
767 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
768 {"matrix": [3, 13], "x": 14, "y": 3},
769 {"matrix": [3, 14], "x": 15, "y": 3},
770
771 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
772 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
773 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
774 {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
775 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
776 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
777
778 {"matrix": [4, 12], "x": 13, "y": 4},
779 {"matrix": [4, 13], "x": 14, "y": 4},
780 {"matrix": [4, 14], "x": 15, "y": 4}
781 ]
51 }, 782 },
52 "LAYOUT_iso_splitbs_7u": { 783 "LAYOUT_iso_splitbs_7u": {
53 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":13.75, "y":1, "w":1.25, "h":2}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] 784 "layout": [
785 {"matrix": [0, 0], "x": 0, "y": 0},
786 {"matrix": [0, 1], "x": 1, "y": 0},
787 {"matrix": [0, 2], "x": 2, "y": 0},
788 {"matrix": [0, 3], "x": 3, "y": 0},
789 {"matrix": [0, 4], "x": 4, "y": 0},
790 {"matrix": [0, 5], "x": 5, "y": 0},
791 {"matrix": [0, 6], "x": 6, "y": 0},
792 {"matrix": [0, 7], "x": 7, "y": 0},
793 {"matrix": [0, 8], "x": 8, "y": 0},
794 {"matrix": [0, 9], "x": 9, "y": 0},
795 {"matrix": [0, 10], "x": 10, "y": 0},
796 {"matrix": [0, 11], "x": 11, "y": 0},
797 {"matrix": [0, 12], "x": 12, "y": 0},
798 {"matrix": [0, 13], "x": 13, "y": 0},
799 {"matrix": [0, 14], "x": 14, "y": 0},
800
801 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
802 {"matrix": [1, 1], "x": 1.5, "y": 1},
803 {"matrix": [1, 2], "x": 2.5, "y": 1},
804 {"matrix": [1, 3], "x": 3.5, "y": 1},
805 {"matrix": [1, 4], "x": 4.5, "y": 1},
806 {"matrix": [1, 5], "x": 5.5, "y": 1},
807 {"matrix": [1, 6], "x": 6.5, "y": 1},
808 {"matrix": [1, 7], "x": 7.5, "y": 1},
809 {"matrix": [1, 8], "x": 8.5, "y": 1},
810 {"matrix": [1, 9], "x": 9.5, "y": 1},
811 {"matrix": [1, 10], "x": 10.5, "y": 1},
812 {"matrix": [1, 11], "x": 11.5, "y": 1},
813 {"matrix": [1, 12], "x": 12.5, "y": 1},
814 {"matrix": [1, 14], "x": 15, "y": 1},
815
816 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
817 {"matrix": [2, 1], "x": 1.75, "y": 2},
818 {"matrix": [2, 2], "x": 2.75, "y": 2},
819 {"matrix": [2, 3], "x": 3.75, "y": 2},
820 {"matrix": [2, 4], "x": 4.75, "y": 2},
821 {"matrix": [2, 5], "x": 5.75, "y": 2},
822 {"matrix": [2, 6], "x": 6.75, "y": 2},
823 {"matrix": [2, 7], "x": 7.75, "y": 2},
824 {"matrix": [2, 8], "x": 8.75, "y": 2},
825 {"matrix": [2, 9], "x": 9.75, "y": 2},
826 {"matrix": [2, 10], "x": 10.75, "y": 2},
827 {"matrix": [2, 11], "x": 11.75, "y": 2},
828 {"matrix": [2, 12], "x": 12.75, "y": 2},
829 {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
830 {"matrix": [2, 14], "x": 15, "y": 2},
831
832 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
833 {"matrix": [3, 1], "x": 1.25, "y": 3},
834 {"matrix": [3, 2], "x": 2.25, "y": 3},
835 {"matrix": [3, 3], "x": 3.25, "y": 3},
836 {"matrix": [3, 4], "x": 4.25, "y": 3},
837 {"matrix": [3, 5], "x": 5.25, "y": 3},
838 {"matrix": [3, 6], "x": 6.25, "y": 3},
839 {"matrix": [3, 7], "x": 7.25, "y": 3},
840 {"matrix": [3, 8], "x": 8.25, "y": 3},
841 {"matrix": [3, 9], "x": 9.25, "y": 3},
842 {"matrix": [3, 10], "x": 10.25, "y": 3},
843 {"matrix": [3, 11], "x": 11.25, "y": 3},
844 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
845 {"matrix": [3, 13], "x": 14, "y": 3},
846 {"matrix": [3, 14], "x": 15, "y": 3},
847
848 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
849 {"matrix": [4, 1], "x": 1.5, "y": 4},
850 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
851 {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
852 {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
853
854 {"matrix": [4, 12], "x": 13, "y": 4},
855 {"matrix": [4, 13], "x": 14, "y": 4},
856 {"matrix": [4, 14], "x": 15, "y": 4}
857 ]
54 }, 858 },
55 "LAYOUT_iso_splitbs_splitspace": { 859 "LAYOUT_iso_splitbs_splitspace": {
56 "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}, {"label":"Back Space", "x":14, "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":"Delete", "x":15, "y":1}, {"label":"Caps Lock", "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":"Pg Up", "x":15, "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":", &lt;", "x":9.25, "y":3}, {"label":".&gt;", "x":10.25, "y":3}, {"label":"/?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Up", "x":14, "y":3}, {"label":"Pg Dn", "x":15, "y":3}, {"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":"Space1", "x":3.75, "y":4, "w":2.25}, {"label":"Space2", "x":6, "y":4, "w":1.25}, {"label":"Space3", "x":7.25, "y":4, "w":2.75}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Fn", "x":11.25, "y":4, "w":1.25}, {"label":"Left", "x":13, "y":4}, {"label":"Down", "x":14, "y":4}, {"label":"Right", "x":15, "y":4}] 860 "layout": [
861 {"matrix": [0, 0], "x": 0, "y": 0},
862 {"matrix": [0, 1], "x": 1, "y": 0},
863 {"matrix": [0, 2], "x": 2, "y": 0},
864 {"matrix": [0, 3], "x": 3, "y": 0},
865 {"matrix": [0, 4], "x": 4, "y": 0},
866 {"matrix": [0, 5], "x": 5, "y": 0},
867 {"matrix": [0, 6], "x": 6, "y": 0},
868 {"matrix": [0, 7], "x": 7, "y": 0},
869 {"matrix": [0, 8], "x": 8, "y": 0},
870 {"matrix": [0, 9], "x": 9, "y": 0},
871 {"matrix": [0, 10], "x": 10, "y": 0},
872 {"matrix": [0, 11], "x": 11, "y": 0},
873 {"matrix": [0, 12], "x": 12, "y": 0},
874 {"matrix": [0, 13], "x": 13, "y": 0},
875 {"matrix": [0, 14], "x": 14, "y": 0},
876
877 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
878 {"matrix": [1, 1], "x": 1.5, "y": 1},
879 {"matrix": [1, 2], "x": 2.5, "y": 1},
880 {"matrix": [1, 3], "x": 3.5, "y": 1},
881 {"matrix": [1, 4], "x": 4.5, "y": 1},
882 {"matrix": [1, 5], "x": 5.5, "y": 1},
883 {"matrix": [1, 6], "x": 6.5, "y": 1},
884 {"matrix": [1, 7], "x": 7.5, "y": 1},
885 {"matrix": [1, 8], "x": 8.5, "y": 1},
886 {"matrix": [1, 9], "x": 9.5, "y": 1},
887 {"matrix": [1, 10], "x": 10.5, "y": 1},
888 {"matrix": [1, 11], "x": 11.5, "y": 1},
889 {"matrix": [1, 12], "x": 12.5, "y": 1},
890 {"matrix": [1, 14], "x": 15, "y": 1},
891
892 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
893 {"matrix": [2, 1], "x": 1.75, "y": 2},
894 {"matrix": [2, 2], "x": 2.75, "y": 2},
895 {"matrix": [2, 3], "x": 3.75, "y": 2},
896 {"matrix": [2, 4], "x": 4.75, "y": 2},
897 {"matrix": [2, 5], "x": 5.75, "y": 2},
898 {"matrix": [2, 6], "x": 6.75, "y": 2},
899 {"matrix": [2, 7], "x": 7.75, "y": 2},
900 {"matrix": [2, 8], "x": 8.75, "y": 2},
901 {"matrix": [2, 9], "x": 9.75, "y": 2},
902 {"matrix": [2, 10], "x": 10.75, "y": 2},
903 {"matrix": [2, 11], "x": 11.75, "y": 2},
904 {"matrix": [2, 12], "x": 12.75, "y": 2},
905 {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
906 {"matrix": [2, 14], "x": 15, "y": 2},
907
908 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
909 {"matrix": [3, 1], "x": 1.25, "y": 3},
910 {"matrix": [3, 2], "x": 2.25, "y": 3},
911 {"matrix": [3, 3], "x": 3.25, "y": 3},
912 {"matrix": [3, 4], "x": 4.25, "y": 3},
913 {"matrix": [3, 5], "x": 5.25, "y": 3},
914 {"matrix": [3, 6], "x": 6.25, "y": 3},
915 {"matrix": [3, 7], "x": 7.25, "y": 3},
916 {"matrix": [3, 8], "x": 8.25, "y": 3},
917 {"matrix": [3, 9], "x": 9.25, "y": 3},
918 {"matrix": [3, 10], "x": 10.25, "y": 3},
919 {"matrix": [3, 11], "x": 11.25, "y": 3},
920 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
921 {"matrix": [3, 13], "x": 14, "y": 3},
922 {"matrix": [3, 14], "x": 15, "y": 3},
923
924 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
925 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
926 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
927 {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
928 {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
929 {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
930 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
931 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
932
933 {"matrix": [4, 12], "x": 13, "y": 4},
934 {"matrix": [4, 13], "x": 14, "y": 4},
935 {"matrix": [4, 14], "x": 15, "y": 4}
936 ]
937 },
938 "LAYOUT_all": {
939 "layout": [
940 {"matrix": [0, 0], "x": 0, "y": 0},
941 {"matrix": [0, 1], "x": 1, "y": 0},
942 {"matrix": [0, 2], "x": 2, "y": 0},
943 {"matrix": [0, 3], "x": 3, "y": 0},
944 {"matrix": [0, 4], "x": 4, "y": 0},
945 {"matrix": [0, 5], "x": 5, "y": 0},
946 {"matrix": [0, 6], "x": 6, "y": 0},
947 {"matrix": [0, 7], "x": 7, "y": 0},
948 {"matrix": [0, 8], "x": 8, "y": 0},
949 {"matrix": [0, 9], "x": 9, "y": 0},
950 {"matrix": [0, 10], "x": 10, "y": 0},
951 {"matrix": [0, 11], "x": 11, "y": 0},
952 {"matrix": [0, 12], "x": 12, "y": 0},
953 {"matrix": [0, 13], "x": 13, "y": 0},
954 {"matrix": [0, 14], "x": 14, "y": 0},
955 {"matrix": [1, 0], "x": 15, "y": 0},
956 {"matrix": [1, 1], "x": 16, "y": 0},
957 {"matrix": [1, 2], "x": 17, "y": 0},
958 {"matrix": [1, 3], "x": 18, "y": 0},
959 {"matrix": [1, 4], "x": 19, "y": 0},
960 {"matrix": [1, 5], "x": 20, "y": 0},
961 {"matrix": [1, 6], "x": 21, "y": 0},
962 {"matrix": [1, 7], "x": 22, "y": 0},
963 {"matrix": [1, 8], "x": 23, "y": 0},
964 {"matrix": [1, 9], "x": 24, "y": 0},
965 {"matrix": [1, 10], "x": 25, "y": 0},
966 {"matrix": [1, 11], "x": 26, "y": 0},
967 {"matrix": [1, 12], "x": 27, "y": 0},
968 {"matrix": [1, 13], "x": 28, "y": 0},
969 {"matrix": [1, 14], "x": 29, "y": 0},
970 {"matrix": [2, 0], "x": 30, "y": 0},
971 {"matrix": [2, 1], "x": 31, "y": 0},
972 {"matrix": [2, 2], "x": 32, "y": 0},
973 {"matrix": [2, 3], "x": 33, "y": 0},
974 {"matrix": [2, 4], "x": 34, "y": 0},
975 {"matrix": [2, 5], "x": 35, "y": 0},
976 {"matrix": [2, 6], "x": 36, "y": 0},
977 {"matrix": [2, 7], "x": 37, "y": 0},
978 {"matrix": [2, 8], "x": 38, "y": 0},
979 {"matrix": [2, 9], "x": 39, "y": 0},
980 {"matrix": [2, 10], "x": 40, "y": 0},
981 {"matrix": [2, 11], "x": 41, "y": 0},
982 {"matrix": [2, 12], "x": 42, "y": 0},
983 {"matrix": [2, 13], "x": 43, "y": 0},
984 {"matrix": [2, 14], "x": 44, "y": 0},
985 {"matrix": [3, 0], "x": 45, "y": 0},
986 {"matrix": [3, 1], "x": 46, "y": 0},
987 {"matrix": [3, 2], "x": 47, "y": 0},
988 {"matrix": [3, 3], "x": 48, "y": 0},
989 {"matrix": [3, 4], "x": 49, "y": 0},
990 {"matrix": [3, 5], "x": 50, "y": 0},
991 {"matrix": [3, 6], "x": 51, "y": 0},
992 {"matrix": [3, 7], "x": 52, "y": 0},
993 {"matrix": [3, 8], "x": 53, "y": 0},
994 {"matrix": [3, 9], "x": 54, "y": 0},
995 {"matrix": [3, 10], "x": 55, "y": 0},
996 {"matrix": [3, 11], "x": 56, "y": 0},
997 {"matrix": [3, 12], "x": 57, "y": 0},
998 {"matrix": [3, 13], "x": 58, "y": 0},
999 {"matrix": [3, 14], "x": 59, "y": 0},
1000 {"matrix": [4, 0], "x": 60, "y": 0},
1001 {"matrix": [4, 1], "x": 61, "y": 0},
1002 {"matrix": [4, 2], "x": 62, "y": 0},
1003 {"matrix": [4, 3], "x": 63, "y": 0},
1004 {"matrix": [4, 6], "x": 64, "y": 0},
1005 {"matrix": [4, 8], "x": 65, "y": 0},
1006 {"matrix": [4, 10], "x": 66, "y": 0},
1007 {"matrix": [4, 11], "x": 67, "y": 0},
1008 {"matrix": [4, 12], "x": 68, "y": 0},
1009 {"matrix": [4, 13], "x": 69, "y": 0},
1010 {"matrix": [4, 14], "x": 70, "y": 0}
1011 ]
57 } 1012 }
58 } 1013 }
59} 1014}
diff --git a/keyboards/mxss/keymaps/default/keymap.c b/keyboards/mxss/keymaps/default/keymap.c
index e7f5181a69..06e73f4688 100644
--- a/keyboards/mxss/keymaps/default/keymap.c
+++ b/keyboards/mxss/keymaps/default/keymap.c
@@ -14,6 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16#include QMK_KEYBOARD_H 16#include QMK_KEYBOARD_H
17#include "mxss_frontled.h"
17 18
18hs_set caps_color = { .hue = 0, .sat = 255 }; 19hs_set caps_color = { .hue = 0, .sat = 255 };
19 20
diff --git a/keyboards/mxss/mxss.c b/keyboards/mxss/mxss.c
index 3bd3e639c9..021eb1de4e 100644
--- a/keyboards/mxss/mxss.c
+++ b/keyboards/mxss/mxss.c
@@ -16,11 +16,9 @@
16 * EEPROM management code from ../cannonkeys/stm32f072/keyboard.c 16 * EEPROM management code from ../cannonkeys/stm32f072/keyboard.c
17 */ 17 */
18 18
19#include "mxss.h" 19#include "quantum.h"
20#include "eeprom.h" 20#include "eeprom.h"
21#include "action_layer.h" 21#include "mxss_frontled.h"
22#include "rgblight.h"
23#include "via.h"
24#include "version.h" // for QMK_BUILDDATE used in EEPROM magic 22#include "version.h" // for QMK_BUILDDATE used in EEPROM magic
25 23
26void via_init_kb(void) { 24void via_init_kb(void) {
diff --git a/keyboards/mxss/mxss.h b/keyboards/mxss/mxss.h
deleted file mode 100644
index 4074d411cc..0000000000
--- a/keyboards/mxss/mxss.h
+++ /dev/null
@@ -1,220 +0,0 @@
1/* Copyright 2018 Jumail Mundekkat / MxBlue
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16#pragma once
17
18#include "quantum.h"
19#include "mxss_frontled.h"
20
21// This a shortcut to help you visually see your layout.
22// The following is an example using the Planck MIT layout
23// The first section contains all of the arguments
24// The second converts the arguments into a two-dimensional array
25
26#define LAYOUT( \
27 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, \
28 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
29 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k2E, \
30 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
31 k40, k41, k42, k46, k4A, k4B, k4C, k4D, k4E \
32) \
33{ \
34 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, KC_NO, k0E }, \
35 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
36 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, KC_NO, k2D, k2E }, \
37 { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
38 { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, k4C, k4D, k4E }, \
39}
40//ANSI, normalBS, 7u
41#define LAYOUT_7u( \
42 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, \
43 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
44 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k2E, \
45 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
46 k40, k41, k42, k46, k4B, k4C, k4D, k4E \
47) \
48{ \
49 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, KC_NO, k0E }, \
50 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
51 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, KC_NO, k2D, k2E }, \
52 { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
53 { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, KC_NO, k4B, k4C, k4D, k4E }, \
54}
55//ANSI, normalBS, split space
56#define LAYOUT_splitspace( \
57 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, \
58 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
59 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k2E, \
60 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
61 k40, k41, k42, k43, k46, k48, k4A, k4B, k4C, k4D, k4E \
62) \
63{ \
64 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, KC_NO, k0E }, \
65 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
66 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, KC_NO, k2D, k2E }, \
67 { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
68 { k40, k41, k42, k43, KC_NO, KC_NO, k46, KC_NO, k48, KC_NO, k4A, k4B, k4C, k4D, k4E }, \
69}
70//ANSI, splitBS, 6.25u
71#define LAYOUT_splitbs( \
72 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
73 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
74 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k2E, \
75 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
76 k40, k41, k42, k46, k4A, k4B, k4C, k4D, k4E \
77) \
78{ \
79 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
80 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
81 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, KC_NO, k2D, k2E }, \
82 { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
83 { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, k4C, k4D, k4E }, \
84}
85//ANSI, splitBS, 7u
86#define LAYOUT_splitbs_7u( \
87 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
88 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
89 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k2E, \
90 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
91 k40, k41, k42, k46, k4B, k4C, k4D, k4E \
92) \
93{ \
94 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
95 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
96 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, KC_NO, k2D, k2E }, \
97 { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
98 { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, KC_NO, k4B, k4C, k4D, k4E }, \
99}
100//ANSI, normalBS, split space
101#define LAYOUT_splitbs_splitspace( \
102 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
103 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
104 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k2E, \
105 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
106 k40, k41, k42, k43, k46, k48, k4A, k4B, k4C, k4D, k4E \
107) \
108{ \
109 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
110 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
111 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, KC_NO, k2D, k2E }, \
112 { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
113 { k40, k41, k42, k43, KC_NO, KC_NO, k46, KC_NO, k48, KC_NO, k4A, k4B, k4C, k4D, k4E }, \
114}
115//ISO, normalBS, 6.25u
116#define LAYOUT_iso( \
117 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, \
118 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1E, \
119 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
120 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
121 k40, k41, k42, k46, k4A, k4B, k4C, k4D, k4E \
122) \
123{ \
124 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, KC_NO, k0E }, \
125 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, KC_NO, k1E }, \
126 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
127 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
128 { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, k4C, k4D, k4E }, \
129}
130//ISO, normalBS, 7u
131#define LAYOUT_iso_7u( \
132 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, \
133 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1E, \
134 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
135 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
136 k40, k41, k42, k46, k4B, k4C, k4D, k4E \
137) \
138{ \
139 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, KC_NO, k0E }, \
140 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, KC_NO, k1E }, \
141 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
142 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
143 { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, KC_NO, k4B, k4C, k4D, k4E }, \
144}
145//ISO, normalBS, split space
146#define LAYOUT_iso_splitspace( \
147 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, \
148 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1E, \
149 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
150 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
151 k40, k41, k42, k43, k46, k48, k4A, k4B, k4C, k4D, k4E \
152) \
153{ \
154 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, KC_NO, k0E }, \
155 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, KC_NO, k1E }, \
156 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
157 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
158 { k40, k41, k42, k43, KC_NO, KC_NO, k46, KC_NO, k48, KC_NO, k4A, k4B, k4C, k4D, k4E }, \
159}
160//ISO, splitBS, 6.25u
161#define LAYOUT_iso_splitbs( \
162 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
163 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1E, \
164 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
165 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
166 k40, k41, k42, k46, k4A, k4B, k4C, k4D, k4E \
167) \
168{ \
169 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
170 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, KC_NO, k1E }, \
171 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
172 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
173 { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, k4C, k4D, k4E }, \
174}
175//ISO, splitBS, 7u
176#define LAYOUT_iso_splitbs_7u( \
177 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
178 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1E, \
179 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
180 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
181 k40, k41, k42, k46, k4B, k4C, k4D, k4E \
182) \
183{ \
184 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
185 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, KC_NO, k1E }, \
186 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
187 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
188 { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, KC_NO, k4B, k4C, k4D, k4E }, \
189}
190//ISO, splitBS, split space
191#define LAYOUT_iso_splitbs_splitspace( \
192 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
193 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1E, \
194 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
195 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
196 k40, k41, k42, k43, k46, k48, k4A, k4B, k4C, k4D, k4E \
197) \
198{ \
199 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
200 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, KC_NO, k1E }, \
201 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
202 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
203 { k40, k41, k42, k43, KC_NO, KC_NO, k46, KC_NO, k48, KC_NO, k4A, k4B, k4C, k4D, k4E }, \
204}
205
206// All the gubs
207#define LAYOUT_all( \
208 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
209 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
210 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
211 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
212 k40, k41, k42, k43, k46, k48, k4A, k4B, k4C, k4D, k4E \
213) \
214{ \
215 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
216 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
217 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
218 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
219 { k40, k41, k42, k43, KC_NO, KC_NO, k46, KC_NO, k48, KC_NO, k4A, k4B, k4C, k4D, k4E }, \
220}
diff --git a/keyboards/mxss/templates/keymap.c b/keyboards/mxss/templates/keymap.c
index 43e3c25932..e16cf44293 100644
--- a/keyboards/mxss/templates/keymap.c
+++ b/keyboards/mxss/templates/keymap.c
@@ -14,6 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16#include QMK_KEYBOARD_H 16#include QMK_KEYBOARD_H
17#include "mxss_frontled.h"
17 18
18hs_set caps_color = { .hue = 0, .sat = 255 }; 19hs_set caps_color = { .hue = 0, .sat = 255 };
19 20
diff --git a/keyboards/org60/info.json b/keyboards/org60/info.json
index e71474ae2d..80b54211f7 100644
--- a/keyboards/org60/info.json
+++ b/keyboards/org60/info.json
@@ -25,10 +25,148 @@
25 "community_layouts": ["60_ansi"], 25 "community_layouts": ["60_ansi"],
26 "layouts": { 26 "layouts": {
27 "LAYOUT": { 27 "LAYOUT": {
28 "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1, "y":0}, {"label":"K02", "x":2, "y":0}, {"label":"K03", "x":3, "y":0}, {"label":"K04", "x":4, "y":0}, {"label":"K05", "x":5, "y":0}, {"label":"K06", "x":6, "y":0}, {"label":"K07", "x":7, "y":0}, {"label":"K08", "x":8, "y":0}, {"label":"K09", "x":9, "y":0}, {"label":"K0A", "x":10, "y":0}, {"label":"K0B", "x":11, "y":0}, {"label":"K0C", "x":12, "y":0}, {"label":"K0D", "x":13, "y":0}, {"label":"K49", "x":14, "y":0}, {"label":"K10", "x":0, "y":1, "w":1.5}, {"label":"K11", "x":1.5, "y":1}, {"label":"K12", "x":2.5, "y":1}, {"label":"K13", "x":3.5, "y":1}, {"label":"K14", "x":4.5, "y":1}, {"label":"K15", "x":5.5, "y":1}, {"label":"K16", "x":6.5, "y":1}, {"label":"K17", "x":7.5, "y":1}, {"label":"K18", "x":8.5, "y":1}, {"label":"K19", "x":9.5, "y":1}, {"label":"K1A", "x":10.5, "y":1}, {"label":"K1B", "x":11.5, "y":1}, {"label":"K1C", "x":12.5, "y":1}, {"label":"K1D", "x":13.5, "y":1, "w":1.5}, {"label":"K20", "x":0, "y":2, "w":1.75}, {"label":"K21", "x":1.75, "y":2}, {"label":"K22", "x":2.75, "y":2}, {"label":"K23", "x":3.75, "y":2}, {"label":"K24", "x":4.75, "y":2}, {"label":"K25", "x":5.75, "y":2}, {"label":"K26", "x":6.75, "y":2}, {"label":"K27", "x":7.75, "y":2}, {"label":"K28", "x":8.75, "y":2}, {"label":"K29", "x":9.75, "y":2}, {"label":"K2A", "x":10.75, "y":2}, {"label":"K2B", "x":11.75, "y":2}, {"label":"K2C", "x":12.75, "y":2}, {"label":"K2D", "x":13.75, "y":2, "w":1.25}, {"label":"K30", "x":0, "y":3}, {"label":"K31", "x":1, "y":3}, {"label":"K32", "x":2, "y":3}, {"label":"K33", "x":3, "y":3}, {"label":"K34", "x":4, "y":3}, {"label":"K35", "x":5, "y":3}, {"label":"K36", "x":6, "y":3}, {"label":"K37", "x":7, "y":3}, {"label":"K38", "x":8, "y":3}, {"label":"K39", "x":9, "y":3}, {"label":"K3A", "x":10, "y":3}, {"label":"K3B", "x":11, "y":3}, {"label":"K47", "x":12, "y":3}, {"label":"K3D", "x":13, "y":3}, {"label":"K3C", "x":14, "y":3}, {"label":"K40", "x":0, "y":4, "w":1.25}, {"label":"K41", "x":1.25, "y":4, "w":1.25}, {"label":"K42", "x":2.5, "y":4, "w":1.25}, {"label":"K45", "x":3.75, "y":4, "w":6.25}, {"label":"K4A", "x":10, "y":4}, {"label":"K4B", "x":11, "y":4}, {"label":"K48", "x":12, "y":4}, {"label":"K4C", "x":13, "y":4}, {"label":"K4D", "x":14, "y":4}] 28 "layout": [
29 {"matrix": [0, 0], "x": 0, "y": 0},
30 {"matrix": [0, 1], "x": 1, "y": 0},
31 {"matrix": [0, 2], "x": 2, "y": 0},
32 {"matrix": [0, 3], "x": 3, "y": 0},
33 {"matrix": [0, 4], "x": 4, "y": 0},
34 {"matrix": [0, 5], "x": 5, "y": 0},
35 {"matrix": [0, 6], "x": 6, "y": 0},
36 {"matrix": [0, 7], "x": 7, "y": 0},
37 {"matrix": [0, 8], "x": 8, "y": 0},
38 {"matrix": [0, 9], "x": 9, "y": 0},
39 {"matrix": [0, 10], "x": 10, "y": 0},
40 {"matrix": [0, 11], "x": 11, "y": 0},
41 {"matrix": [0, 12], "x": 12, "y": 0},
42 {"matrix": [0, 13], "x": 13, "y": 0},
43 {"matrix": [4, 9], "x": 14, "y": 0},
44
45 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
46 {"matrix": [1, 1], "x": 1.5, "y": 1},
47 {"matrix": [1, 2], "x": 2.5, "y": 1},
48 {"matrix": [1, 3], "x": 3.5, "y": 1},
49 {"matrix": [1, 4], "x": 4.5, "y": 1},
50 {"matrix": [1, 5], "x": 5.5, "y": 1},
51 {"matrix": [1, 6], "x": 6.5, "y": 1},
52 {"matrix": [1, 7], "x": 7.5, "y": 1},
53 {"matrix": [1, 8], "x": 8.5, "y": 1},
54 {"matrix": [1, 9], "x": 9.5, "y": 1},
55 {"matrix": [1, 10], "x": 10.5, "y": 1},
56 {"matrix": [1, 11], "x": 11.5, "y": 1},
57 {"matrix": [1, 12], "x": 12.5, "y": 1},
58 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
59
60 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
61 {"matrix": [2, 1], "x": 1.75, "y": 2},
62 {"matrix": [2, 2], "x": 2.75, "y": 2},
63 {"matrix": [2, 3], "x": 3.75, "y": 2},
64 {"matrix": [2, 4], "x": 4.75, "y": 2},
65 {"matrix": [2, 5], "x": 5.75, "y": 2},
66 {"matrix": [2, 6], "x": 6.75, "y": 2},
67 {"matrix": [2, 7], "x": 7.75, "y": 2},
68 {"matrix": [2, 8], "x": 8.75, "y": 2},
69 {"matrix": [2, 9], "x": 9.75, "y": 2},
70 {"matrix": [2, 10], "x": 10.75, "y": 2},
71 {"matrix": [2, 11], "x": 11.75, "y": 2},
72 {"matrix": [2, 12], "x": 12.75, "y": 2},
73 {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
74
75 {"matrix": [3, 0], "x": 0, "y": 3},
76 {"matrix": [3, 1], "x": 1, "y": 3},
77 {"matrix": [3, 2], "x": 2, "y": 3},
78 {"matrix": [3, 3], "x": 3, "y": 3},
79 {"matrix": [3, 4], "x": 4, "y": 3},
80 {"matrix": [3, 5], "x": 5, "y": 3},
81 {"matrix": [3, 6], "x": 6, "y": 3},
82 {"matrix": [3, 7], "x": 7, "y": 3},
83 {"matrix": [3, 8], "x": 8, "y": 3},
84 {"matrix": [3, 9], "x": 9, "y": 3},
85 {"matrix": [3, 10], "x": 10, "y": 3},
86 {"matrix": [3, 11], "x": 11, "y": 3},
87 {"matrix": [4, 7], "x": 12, "y": 3},
88 {"matrix": [3, 13], "x": 13, "y": 3},
89 {"matrix": [3, 12], "x": 14, "y": 3},
90
91 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
92 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
93 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
94 {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
95 {"matrix": [4, 10], "x": 10, "y": 4},
96 {"matrix": [4, 11], "x": 11, "y": 4},
97 {"matrix": [4, 8], "x": 12, "y": 4},
98 {"matrix": [4, 12], "x": 13, "y": 4},
99 {"matrix": [4, 13], "x": 14, "y": 4}
100 ]
29 }, 101 },
30 "LAYOUT_60_ansi": { 102 "LAYOUT_60_ansi": {
31 "layout": [{"label":"~", "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":"Backspace", "x":13, "y":0, "w":2}, {"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":"Caps Lock", "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":"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":2.75}, {"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, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] 103 "layout": [
104 {"matrix": [0, 0], "x": 0, "y": 0},
105 {"matrix": [0, 1], "x": 1, "y": 0},
106 {"matrix": [0, 2], "x": 2, "y": 0},
107 {"matrix": [0, 3], "x": 3, "y": 0},
108 {"matrix": [0, 4], "x": 4, "y": 0},
109 {"matrix": [0, 5], "x": 5, "y": 0},
110 {"matrix": [0, 6], "x": 6, "y": 0},
111 {"matrix": [0, 7], "x": 7, "y": 0},
112 {"matrix": [0, 8], "x": 8, "y": 0},
113 {"matrix": [0, 9], "x": 9, "y": 0},
114 {"matrix": [0, 10], "x": 10, "y": 0},
115 {"matrix": [0, 11], "x": 11, "y": 0},
116 {"matrix": [0, 12], "x": 12, "y": 0},
117 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
118
119 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
120 {"matrix": [1, 1], "x": 1.5, "y": 1},
121 {"matrix": [1, 2], "x": 2.5, "y": 1},
122 {"matrix": [1, 3], "x": 3.5, "y": 1},
123 {"matrix": [1, 4], "x": 4.5, "y": 1},
124 {"matrix": [1, 5], "x": 5.5, "y": 1},
125 {"matrix": [1, 6], "x": 6.5, "y": 1},
126 {"matrix": [1, 7], "x": 7.5, "y": 1},
127 {"matrix": [1, 8], "x": 8.5, "y": 1},
128 {"matrix": [1, 9], "x": 9.5, "y": 1},
129 {"matrix": [1, 10], "x": 10.5, "y": 1},
130 {"matrix": [1, 11], "x": 11.5, "y": 1},
131 {"matrix": [1, 12], "x": 12.5, "y": 1},
132 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
133
134 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
135 {"matrix": [2, 1], "x": 1.75, "y": 2},
136 {"matrix": [2, 2], "x": 2.75, "y": 2},
137 {"matrix": [2, 3], "x": 3.75, "y": 2},
138 {"matrix": [2, 4], "x": 4.75, "y": 2},
139 {"matrix": [2, 5], "x": 5.75, "y": 2},
140 {"matrix": [2, 6], "x": 6.75, "y": 2},
141 {"matrix": [2, 7], "x": 7.75, "y": 2},
142 {"matrix": [2, 8], "x": 8.75, "y": 2},
143 {"matrix": [2, 9], "x": 9.75, "y": 2},
144 {"matrix": [2, 10], "x": 10.75, "y": 2},
145 {"matrix": [2, 11], "x": 11.75, "y": 2},
146 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
147
148 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
149 {"matrix": [3, 2], "x": 2.25, "y": 3},
150 {"matrix": [3, 3], "x": 3.25, "y": 3},
151 {"matrix": [3, 4], "x": 4.25, "y": 3},
152 {"matrix": [3, 5], "x": 5.25, "y": 3},
153 {"matrix": [3, 6], "x": 6.25, "y": 3},
154 {"matrix": [3, 7], "x": 7.25, "y": 3},
155 {"matrix": [3, 8], "x": 8.25, "y": 3},
156 {"matrix": [3, 9], "x": 9.25, "y": 3},
157 {"matrix": [3, 10], "x": 10.25, "y": 3},
158 {"matrix": [3, 11], "x": 11.25, "y": 3},
159 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
160
161 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
162 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
163 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
164 {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
165 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
166 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
167 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
168 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
169 ]
32 } 170 }
33 } 171 }
34} 172}
diff --git a/keyboards/org60/org60.h b/keyboards/org60/org60.h
index 34a41571f8..49687c8716 100644
--- a/keyboards/org60/org60.h
+++ b/keyboards/org60/org60.h
@@ -17,34 +17,3 @@ inline void org60_bl_led_on(void) { DDRF |= (1<<5); PORTF &= ~(1<<5); }
17 17
18inline void org60_caps_led_off(void) { DDRB &= ~(1<<2); PORTB &= ~(1<<2); } 18inline void org60_caps_led_off(void) { DDRB &= ~(1<<2); PORTB &= ~(1<<2); }
19inline void org60_bl_led_off(void) { DDRF &= ~(1<<5); PORTF &= ~(1<<5); } 19inline void org60_bl_led_off(void) { DDRF &= ~(1<<5); PORTF &= ~(1<<5); }
20
21#define XXX KC_NO
22
23/* Org60 Keymap Definition Macro */
24#define LAYOUT( \
25 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k49, \
26 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
27 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \
28 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k47, k3D, k3C, \
29 k40, k41, k42, k45, k4A, k4B, k48, k4C, k4D \
30) { \
31 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
32 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
33 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \
34 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \
35 { k40, k41, k42, XXX, XXX, k45, XXX, k47, k48, k49, k4A, k4B, k4C, k4D } \
36}
37
38#define LAYOUT_60_ansi( \
39 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
40 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
41 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, \
42 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, \
43 k40, k41, k42, k45, k4A, k4B, k4C, k4D \
44) { \
45 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
46 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
47 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D }, \
48 { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D }, \
49 { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4A, k4B, k4C, k4D } \
50}
diff --git a/keyboards/retro_75/info.json b/keyboards/retro_75/info.json
index a9645528cb..c61a79bbe1 100644
--- a/keyboards/retro_75/info.json
+++ b/keyboards/retro_75/info.json
@@ -20,10 +20,191 @@
20 "bootloader": "stm32-dfu", 20 "bootloader": "stm32-dfu",
21 "layouts": { 21 "layouts": {
22 "LAYOUT": { 22 "LAYOUT": {
23 "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.5, "y":0}, {"label":"F2", "x":2.5, "y":0}, {"label":"F3", "x":3.5, "y":0}, {"label":"F4", "x":4.5, "y":0}, {"label":"F5", "x":6, "y":0}, {"label":"F6", "x":7, "y":0}, {"label":"F7", "x":8, "y":0}, {"label":"F8", "x":9, "y":0}, {"label":"F9", "x":10.5, "y":0}, {"label":"F10", "x":11.5, "y":0}, {"label":"F11", "x":12.5, "y":0}, {"label":"F12", "x":13.5, "y":0}, {"label":"Prt Sc", "x":15, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"x":13, "y":1.25, "w":2}, {"label":"Delete", "x":15, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Page Up", "x":15, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Page Down", "x":15, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"label":"\u2191", "x":14, "y":4.25}, {"label":"Fn", "x":15, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.5}, {"label":"Alt", "x":2.25, "y":5.25, "w":1.5}, {"x":3.75, "y":5.25, "w":7}, {"label":"Alt", "x":10.75, "y":5.25, "w":1.5}, {"label":"\u2190", "x":13, "y":5.25}, {"label":"\u2193", "x":14, "y":5.25}, {"label":"\u2192", "x":15, "y":5.25}] 23 "layout": [
24 {"matrix": [0, 0], "x": 0, "y": 0},
25
26 {"matrix": [0, 2], "x": 1.5, "y": 0},
27 {"matrix": [0, 3], "x": 2.5, "y": 0},
28 {"matrix": [0, 4], "x": 3.5, "y": 0},
29 {"matrix": [0, 5], "x": 4.5, "y": 0},
30
31 {"matrix": [0, 6], "x": 6, "y": 0},
32 {"matrix": [0, 7], "x": 7, "y": 0},
33 {"matrix": [0, 8], "x": 8, "y": 0},
34 {"matrix": [0, 9], "x": 9, "y": 0},
35
36 {"matrix": [0, 11], "x": 10.5, "y": 0},
37 {"matrix": [0, 12], "x": 11.5, "y": 0},
38 {"matrix": [0, 13], "x": 12.5, "y": 0},
39 {"matrix": [0, 14], "x": 13.5, "y": 0},
40
41 {"matrix": [0, 15], "x": 15, "y": 0},
42
43 {"matrix": [1, 0], "x": 0, "y": 1.25},
44 {"matrix": [1, 1], "x": 1, "y": 1.25},
45 {"matrix": [1, 2], "x": 2, "y": 1.25},
46 {"matrix": [1, 3], "x": 3, "y": 1.25},
47 {"matrix": [1, 4], "x": 4, "y": 1.25},
48 {"matrix": [1, 5], "x": 5, "y": 1.25},
49 {"matrix": [1, 6], "x": 6, "y": 1.25},
50 {"matrix": [1, 7], "x": 7, "y": 1.25},
51 {"matrix": [1, 8], "x": 8, "y": 1.25},
52 {"matrix": [1, 9], "x": 9, "y": 1.25},
53 {"matrix": [1, 10], "x": 10, "y": 1.25},
54 {"matrix": [1, 11], "x": 11, "y": 1.25},
55 {"matrix": [1, 12], "x": 12, "y": 1.25},
56 {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
57 {"matrix": [1, 15], "x": 15, "y": 1.25},
58
59 {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
60 {"matrix": [2, 1], "x": 1.5, "y": 2.25},
61 {"matrix": [2, 2], "x": 2.5, "y": 2.25},
62 {"matrix": [2, 3], "x": 3.5, "y": 2.25},
63 {"matrix": [2, 4], "x": 4.5, "y": 2.25},
64 {"matrix": [2, 5], "x": 5.5, "y": 2.25},
65 {"matrix": [2, 6], "x": 6.5, "y": 2.25},
66 {"matrix": [2, 7], "x": 7.5, "y": 2.25},
67 {"matrix": [2, 8], "x": 8.5, "y": 2.25},
68 {"matrix": [2, 9], "x": 9.5, "y": 2.25},
69 {"matrix": [2, 10], "x": 10.5, "y": 2.25},
70 {"matrix": [2, 11], "x": 11.5, "y": 2.25},
71 {"matrix": [2, 12], "x": 12.5, "y": 2.25},
72 {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
73 {"matrix": [2, 15], "x": 15, "y": 2.25},
74
75 {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
76 {"matrix": [3, 1], "x": 1.75, "y": 3.25},
77 {"matrix": [3, 2], "x": 2.75, "y": 3.25},
78 {"matrix": [3, 3], "x": 3.75, "y": 3.25},
79 {"matrix": [3, 4], "x": 4.75, "y": 3.25},
80 {"matrix": [3, 5], "x": 5.75, "y": 3.25},
81 {"matrix": [3, 6], "x": 6.75, "y": 3.25},
82 {"matrix": [3, 7], "x": 7.75, "y": 3.25},
83 {"matrix": [3, 8], "x": 8.75, "y": 3.25},
84 {"matrix": [3, 9], "x": 9.75, "y": 3.25},
85 {"matrix": [3, 10], "x": 10.75, "y": 3.25},
86 {"matrix": [3, 11], "x": 11.75, "y": 3.25},
87 {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
88 {"matrix": [3, 15], "x": 15, "y": 3.25},
89
90 {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
91 {"matrix": [4, 1], "x": 2.25, "y": 4.25},
92 {"matrix": [4, 2], "x": 3.25, "y": 4.25},
93 {"matrix": [4, 3], "x": 4.25, "y": 4.25},
94 {"matrix": [4, 4], "x": 5.25, "y": 4.25},
95 {"matrix": [4, 5], "x": 6.25, "y": 4.25},
96 {"matrix": [4, 6], "x": 7.25, "y": 4.25},
97 {"matrix": [4, 7], "x": 8.25, "y": 4.25},
98 {"matrix": [4, 8], "x": 9.25, "y": 4.25},
99 {"matrix": [4, 9], "x": 10.25, "y": 4.25},
100 {"matrix": [4, 10], "x": 11.25, "y": 4.25},
101 {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
102 {"matrix": [4, 12], "x": 14, "y": 4.25},
103 {"matrix": [4, 15], "x": 15, "y": 4.25},
104
105 {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
106 {"matrix": [5, 1], "x": 2.25, "y": 5.25, "w": 1.5},
107 {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 7},
108 {"matrix": [5, 9], "x": 10.75, "y": 5.25, "w": 1.5},
109
110 {"matrix": [5, 11], "x": 13, "y": 5.25},
111 {"matrix": [5, 12], "x": 14, "y": 5.25},
112 {"matrix": [5, 15], "x": 15, "y": 5.25}
113 ]
24 }, 114 },
25 "LAYOUT_split_bs": { 115 "LAYOUT_split_bs": {
26 "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.5, "y":0}, {"label":"F2", "x":2.5, "y":0}, {"label":"F3", "x":3.5, "y":0}, {"label":"F4", "x":4.5, "y":0}, {"label":"F5", "x":6, "y":0}, {"label":"F6", "x":7, "y":0}, {"label":"F7", "x":8, "y":0}, {"label":"F8", "x":9, "y":0}, {"label":"F9", "x":10.5, "y":0}, {"label":"F10", "x":11.5, "y":0}, {"label":"F11", "x":12.5, "y":0}, {"label":"F12", "x":13.5, "y":0}, {"label":"Prt Sc", "x":15, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"x":13, "y":1.25}, {"x":14, "y":1.25}, {"label":"Delete", "x":15, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Page Up", "x":15, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Page Down", "x":15, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"label":"\u2191", "x":14, "y":4.25}, {"label":"Fn", "x":15, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.5}, {"label":"Alt", "x":2.25, "y":5.25, "w":1.5}, {"x":3.75, "y":5.25, "w":7}, {"label":"Alt", "x":10.75, "y":5.25, "w":1.5}, {"label":"\u2190", "x":13, "y":5.25}, {"label":"\u2193", "x":14, "y":5.25}, {"label":"\u2192", "x":15, "y":5.25}] 116 "layout": [
117 {"matrix": [0, 0], "x": 0, "y": 0},
118
119 {"matrix": [0, 2], "x": 1.5, "y": 0},
120 {"matrix": [0, 3], "x": 2.5, "y": 0},
121 {"matrix": [0, 4], "x": 3.5, "y": 0},
122 {"matrix": [0, 5], "x": 4.5, "y": 0},
123
124 {"matrix": [0, 6], "x": 6, "y": 0},
125 {"matrix": [0, 7], "x": 7, "y": 0},
126 {"matrix": [0, 8], "x": 8, "y": 0},
127 {"matrix": [0, 9], "x": 9, "y": 0},
128
129 {"matrix": [0, 11], "x": 10.5, "y": 0},
130 {"matrix": [0, 12], "x": 11.5, "y": 0},
131 {"matrix": [0, 13], "x": 12.5, "y": 0},
132 {"matrix": [0, 14], "x": 13.5, "y": 0},
133
134 {"matrix": [0, 15], "x": 15, "y": 0},
135
136 {"matrix": [1, 0], "x": 0, "y": 1.25},
137 {"matrix": [1, 1], "x": 1, "y": 1.25},
138 {"matrix": [1, 2], "x": 2, "y": 1.25},
139 {"matrix": [1, 3], "x": 3, "y": 1.25},
140 {"matrix": [1, 4], "x": 4, "y": 1.25},
141 {"matrix": [1, 5], "x": 5, "y": 1.25},
142 {"matrix": [1, 6], "x": 6, "y": 1.25},
143 {"matrix": [1, 7], "x": 7, "y": 1.25},
144 {"matrix": [1, 8], "x": 8, "y": 1.25},
145 {"matrix": [1, 9], "x": 9, "y": 1.25},
146 {"matrix": [1, 10], "x": 10, "y": 1.25},
147 {"matrix": [1, 11], "x": 11, "y": 1.25},
148 {"matrix": [1, 12], "x": 12, "y": 1.25},
149 {"matrix": [1, 13], "x": 13, "y": 1.25},
150 {"matrix": [1, 14], "x": 14, "y": 1.25},
151 {"matrix": [1, 15], "x": 15, "y": 1.25},
152
153 {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
154 {"matrix": [2, 1], "x": 1.5, "y": 2.25},
155 {"matrix": [2, 2], "x": 2.5, "y": 2.25},
156 {"matrix": [2, 3], "x": 3.5, "y": 2.25},
157 {"matrix": [2, 4], "x": 4.5, "y": 2.25},
158 {"matrix": [2, 5], "x": 5.5, "y": 2.25},
159 {"matrix": [2, 6], "x": 6.5, "y": 2.25},
160 {"matrix": [2, 7], "x": 7.5, "y": 2.25},
161 {"matrix": [2, 8], "x": 8.5, "y": 2.25},
162 {"matrix": [2, 9], "x": 9.5, "y": 2.25},
163 {"matrix": [2, 10], "x": 10.5, "y": 2.25},
164 {"matrix": [2, 11], "x": 11.5, "y": 2.25},
165 {"matrix": [2, 12], "x": 12.5, "y": 2.25},
166 {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
167 {"matrix": [2, 15], "x": 15, "y": 2.25},
168
169 {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
170 {"matrix": [3, 1], "x": 1.75, "y": 3.25},
171 {"matrix": [3, 2], "x": 2.75, "y": 3.25},
172 {"matrix": [3, 3], "x": 3.75, "y": 3.25},
173 {"matrix": [3, 4], "x": 4.75, "y": 3.25},
174 {"matrix": [3, 5], "x": 5.75, "y": 3.25},
175 {"matrix": [3, 6], "x": 6.75, "y": 3.25},
176 {"matrix": [3, 7], "x": 7.75, "y": 3.25},
177 {"matrix": [3, 8], "x": 8.75, "y": 3.25},
178 {"matrix": [3, 9], "x": 9.75, "y": 3.25},
179 {"matrix": [3, 10], "x": 10.75, "y": 3.25},
180 {"matrix": [3, 11], "x": 11.75, "y": 3.25},
181 {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
182 {"matrix": [3, 15], "x": 15, "y": 3.25},
183
184 {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
185 {"matrix": [4, 1], "x": 2.25, "y": 4.25},
186 {"matrix": [4, 2], "x": 3.25, "y": 4.25},
187 {"matrix": [4, 3], "x": 4.25, "y": 4.25},
188 {"matrix": [4, 4], "x": 5.25, "y": 4.25},
189 {"matrix": [4, 5], "x": 6.25, "y": 4.25},
190 {"matrix": [4, 6], "x": 7.25, "y": 4.25},
191 {"matrix": [4, 7], "x": 8.25, "y": 4.25},
192 {"matrix": [4, 8], "x": 9.25, "y": 4.25},
193 {"matrix": [4, 9], "x": 10.25, "y": 4.25},
194 {"matrix": [4, 10], "x": 11.25, "y": 4.25},
195 {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
196 {"matrix": [4, 12], "x": 14, "y": 4.25},
197 {"matrix": [4, 15], "x": 15, "y": 4.25},
198
199 {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
200 {"matrix": [5, 1], "x": 2.25, "y": 5.25, "w": 1.5},
201 {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 7},
202 {"matrix": [5, 9], "x": 10.75, "y": 5.25, "w": 1.5},
203
204 {"matrix": [5, 11], "x": 13, "y": 5.25},
205 {"matrix": [5, 12], "x": 14, "y": 5.25},
206 {"matrix": [5, 15], "x": 15, "y": 5.25}
207 ]
27 } 208 }
28 } 209 }
29} 210}
diff --git a/keyboards/retro_75/retro_75.h b/keyboards/retro_75/retro_75.h
deleted file mode 100644
index 7a7d10e42e..0000000000
--- a/keyboards/retro_75/retro_75.h
+++ /dev/null
@@ -1,61 +0,0 @@
1/* Copyright 2019 zvecr<git@zvecr.com>
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16#pragma once
17
18#include "quantum.h"
19#define ____ KC_NO
20
21/* This a shortcut to help you visually see your layout.
22 *
23 * The first section contains all of the arguments representing the physical
24 * layout of the board and position of the keys.
25 *
26 * The second converts the arguments into a two-dimensional array which
27 * represents the switch matrix.
28 */
29#define LAYOUT( \
30 K000, K002, K003, K004, K005, K006, K007, K008, K009, K011, K012, K013, K014, K015, \
31 K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K115, \
32 K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K215, \
33 K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K315, \
34 K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K415, \
35 K500, K501, K505, K509, K511, K512, K515 \
36) \
37{ \
38 { K000, ____, K002, K003, K004, K005, K006, K007, K008, K009, ____, K011, K012, K013, K014, K015}, \
39 { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, ____, K115}, \
40 { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, ____, K215}, \
41 { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, ____, ____, K315}, \
42 { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, ____, ____, K415}, \
43 { K500, K501, ____, ____, ____, K505, ____, ____, ____, K509, ____, K511, K512, ____, ____, K515}, \
44}
45
46#define LAYOUT_split_bs( \
47 K000, K002, K003, K004, K005, K006, K007, K008, K009, K011, K012, K013, K014, K015, \
48 K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
49 K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K215, \
50 K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K315, \
51 K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K415, \
52 K500, K501, K505, K509, K511, K512, K515 \
53) \
54{ \
55 { K000, ____, K002, K003, K004, K005, K006, K007, K008, K009, ____, K011, K012, K013, K014, K015}, \
56 { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115}, \
57 { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, ____, K215}, \
58 { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, ____, ____, K315}, \
59 { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, ____, ____, K415}, \
60 { K500, K501, ____, ____, ____, K505, ____, ____, ____, K509, ____, K511, K512, ____, ____, K515}, \
61}
diff --git a/keyboards/rotor/info.json b/keyboards/rotor/info.json
index d9494ccdf4..471a41ce1e 100644
--- a/keyboards/rotor/info.json
+++ b/keyboards/rotor/info.json
@@ -17,7 +17,180 @@
17 "bootloader": "atmel-dfu", 17 "bootloader": "atmel-dfu",
18 "layouts": { 18 "layouts": {
19 "LAYOUT": { 19 "LAYOUT": {
20 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"label":"Esc", "x":2.25, "y":0}, {"label":"!", "x":3.25, "y":0}, {"label":"@", "x":4.25, "y":0}, {"label":"#", "x":5.25, "y":0}, {"label":"$", "x":6.25, "y":0}, {"label":"%", "x":7.25, "y":0}, {"label":"^", "x":8.25, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Backspace", "x":15.25, "y":0, "w":2}, {"label":"Home", "x":17.25, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"label":"Tab", "x":2.25, "y":1, "w":1.5}, {"label":"Q", "x":3.75, "y":1}, {"label":"W", "x":4.75, "y":1}, {"label":"E", "x":5.75, "y":1}, {"label":"R", "x":6.75, "y":1}, {"label":"T", "x":7.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"|", "x":15.75, "y":1, "w":1.5}, {"label":"PgUp", "x":17.25, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"label":"Caps Lock", "x":2.25, "y":2, "w":1.75}, {"label":"A", "x":4, "y":2}, {"label":"S", "x":5, "y":2}, {"label":"D", "x":6, "y":2}, {"label":"F", "x":7, "y":2}, {"label":"G", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"PgDn", "x":17.25, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"label":"Shift", "x":2.25, "y":3, "w":2.25}, {"label":"Z", "x":4.5, "y":3}, {"label":"X", "x":5.5, "y":3}, {"label":"C", "x":6.5, "y":3}, {"label":"V", "x":7.5, "y":3}, {"label":"B", "x":8.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"End", "x":17.25, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"label":"Ctrl", "x":2.25, "y":4, "w":1.5}, {"x":3.75, "y":4}, {"label":"Alt", "x":4.75, "y":4, "w":1.5}, {"label":"7u", "x":6.25, "y":4, "w":7}, {"label":"Ctrl", "x":13.25, "y":4, "w":1.5}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}] 20 "layout": [
21 {"matrix": [0, 0], "x": 0, "y": 0},
22 {"matrix": [0, 1], "x": 1, "y": 0},
23
24 {"matrix": [0, 2], "x": 2.25, "y": 0},
25 {"matrix": [0, 3], "x": 3.25, "y": 0},
26 {"matrix": [0, 4], "x": 4.25, "y": 0},
27 {"matrix": [0, 5], "x": 5.25, "y": 0},
28 {"matrix": [0, 6], "x": 6.25, "y": 0},
29 {"matrix": [0, 7], "x": 7.25, "y": 0},
30 {"matrix": [0, 8], "x": 8.25, "y": 0},
31 {"matrix": [0, 9], "x": 9.25, "y": 0},
32 {"matrix": [0, 10], "x": 10.25, "y": 0},
33 {"matrix": [0, 11], "x": 11.25, "y": 0},
34 {"matrix": [0, 12], "x": 12.25, "y": 0},
35 {"matrix": [0, 13], "x": 13.25, "y": 0},
36 {"matrix": [0, 14], "x": 14.25, "y": 0},
37 {"matrix": [0, 16], "x": 15.25, "y": 0, "w": 2},
38 {"matrix": [0, 17], "x": 17.25, "y": 0},
39
40 {"matrix": [1, 0], "x": 0, "y": 1},
41 {"matrix": [1, 1], "x": 1, "y": 1},
42
43 {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
44 {"matrix": [1, 3], "x": 3.75, "y": 1},
45 {"matrix": [1, 4], "x": 4.75, "y": 1},
46 {"matrix": [1, 5], "x": 5.75, "y": 1},
47 {"matrix": [1, 6], "x": 6.75, "y": 1},
48 {"matrix": [1, 7], "x": 7.75, "y": 1},
49 {"matrix": [1, 8], "x": 8.75, "y": 1},
50 {"matrix": [1, 9], "x": 9.75, "y": 1},
51 {"matrix": [1, 10], "x": 10.75, "y": 1},
52 {"matrix": [1, 11], "x": 11.75, "y": 1},
53 {"matrix": [1, 12], "x": 12.75, "y": 1},
54 {"matrix": [1, 13], "x": 13.75, "y": 1},
55 {"matrix": [1, 14], "x": 14.75, "y": 1},
56 {"matrix": [1, 16], "x": 15.75, "y": 1, "w": 1.5},
57 {"matrix": [1, 17], "x": 17.25, "y": 1},
58
59 {"matrix": [2, 0], "x": 0, "y": 2},
60 {"matrix": [2, 1], "x": 1, "y": 2},
61
62 {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
63 {"matrix": [2, 3], "x": 4, "y": 2},
64 {"matrix": [2, 4], "x": 5, "y": 2},
65 {"matrix": [2, 5], "x": 6, "y": 2},
66 {"matrix": [2, 6], "x": 7, "y": 2},
67 {"matrix": [2, 7], "x": 8, "y": 2},
68 {"matrix": [2, 8], "x": 9, "y": 2},
69 {"matrix": [2, 9], "x": 10, "y": 2},
70 {"matrix": [2, 10], "x": 11, "y": 2},
71 {"matrix": [2, 11], "x": 12, "y": 2},
72 {"matrix": [2, 12], "x": 13, "y": 2},
73 {"matrix": [2, 13], "x": 14, "y": 2},
74 {"matrix": [2, 16], "x": 15, "y": 2, "w": 2.25},
75 {"matrix": [2, 17], "x": 17.25, "y": 2},
76
77 {"matrix": [3, 0], "x": 0, "y": 3},
78 {"matrix": [3, 1], "x": 1, "y": 3},
79
80 {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
81 {"matrix": [3, 4], "x": 4.5, "y": 3},
82 {"matrix": [3, 5], "x": 5.5, "y": 3},
83 {"matrix": [3, 6], "x": 6.5, "y": 3},
84 {"matrix": [3, 7], "x": 7.5, "y": 3},
85 {"matrix": [3, 8], "x": 8.5, "y": 3},
86 {"matrix": [3, 9], "x": 9.5, "y": 3},
87 {"matrix": [3, 10], "x": 10.5, "y": 3},
88 {"matrix": [3, 11], "x": 11.5, "y": 3},
89 {"matrix": [3, 12], "x": 12.5, "y": 3},
90 {"matrix": [3, 13], "x": 13.5, "y": 3},
91 {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
92 {"matrix": [3, 16], "x": 16.25, "y": 3},
93 {"matrix": [3, 17], "x": 17.25, "y": 3},
94
95 {"matrix": [4, 0], "x": 0, "y": 4},
96 {"matrix": [4, 1], "x": 1, "y": 4},
97
98 {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
99 {"matrix": [4, 3], "x": 3.75, "y": 4},
100 {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
101 {"matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
102 {"matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
103
104 {"matrix": [4, 14], "x": 15.25, "y": 4},
105 {"matrix": [4, 16], "x": 16.25, "y": 4},
106 {"matrix": [4, 17], "x": 17.25, "y": 4}
107 ]
108 },
109 "LAYOUT_all": {
110 "layout": [
111 {"matrix": [0, 0], "x": 0, "y": 0},
112 {"matrix": [0, 1], "x": 1, "y": 0},
113 {"matrix": [0, 2], "x": 2, "y": 0},
114 {"matrix": [0, 3], "x": 3, "y": 0},
115 {"matrix": [0, 4], "x": 4, "y": 0},
116 {"matrix": [0, 5], "x": 5, "y": 0},
117 {"matrix": [0, 6], "x": 6, "y": 0},
118 {"matrix": [0, 7], "x": 7, "y": 0},
119 {"matrix": [0, 8], "x": 8, "y": 0},
120 {"matrix": [0, 9], "x": 9, "y": 0},
121 {"matrix": [0, 10], "x": 10, "y": 0},
122 {"matrix": [0, 11], "x": 11, "y": 0},
123 {"matrix": [0, 12], "x": 12, "y": 0},
124 {"matrix": [0, 13], "x": 13, "y": 0},
125 {"matrix": [0, 14], "x": 14, "y": 0},
126 {"matrix": [0, 15], "x": 15, "y": 0},
127 {"matrix": [0, 16], "x": 16, "y": 0},
128 {"matrix": [0, 17], "x": 17, "y": 0},
129 {"matrix": [1, 0], "x": 18, "y": 0},
130 {"matrix": [1, 1], "x": 19, "y": 0},
131 {"matrix": [1, 2], "x": 20, "y": 0},
132 {"matrix": [1, 3], "x": 21, "y": 0},
133 {"matrix": [1, 4], "x": 22, "y": 0},
134 {"matrix": [1, 5], "x": 23, "y": 0},
135 {"matrix": [1, 6], "x": 24, "y": 0},
136 {"matrix": [1, 7], "x": 25, "y": 0},
137 {"matrix": [1, 8], "x": 26, "y": 0},
138 {"matrix": [1, 9], "x": 27, "y": 0},
139 {"matrix": [1, 10], "x": 28, "y": 0},
140 {"matrix": [1, 11], "x": 29, "y": 0},
141 {"matrix": [1, 12], "x": 30, "y": 0},
142 {"matrix": [1, 13], "x": 31, "y": 0},
143 {"matrix": [1, 14], "x": 32, "y": 0},
144 {"matrix": [1, 16], "x": 33, "y": 0},
145 {"matrix": [1, 17], "x": 34, "y": 0},
146 {"matrix": [2, 0], "x": 35, "y": 0},
147 {"matrix": [2, 1], "x": 36, "y": 0},
148 {"matrix": [2, 2], "x": 37, "y": 0},
149 {"matrix": [2, 3], "x": 38, "y": 0},
150 {"matrix": [2, 4], "x": 39, "y": 0},
151 {"matrix": [2, 5], "x": 40, "y": 0},
152 {"matrix": [2, 6], "x": 41, "y": 0},
153 {"matrix": [2, 7], "x": 42, "y": 0},
154 {"matrix": [2, 8], "x": 43, "y": 0},
155 {"matrix": [2, 9], "x": 44, "y": 0},
156 {"matrix": [2, 10], "x": 45, "y": 0},
157 {"matrix": [2, 11], "x": 46, "y": 0},
158 {"matrix": [2, 12], "x": 47, "y": 0},
159 {"matrix": [2, 13], "x": 48, "y": 0},
160 {"matrix": [2, 14], "x": 49, "y": 0},
161 {"matrix": [2, 16], "x": 50, "y": 0},
162 {"matrix": [2, 17], "x": 51, "y": 0},
163 {"matrix": [3, 0], "x": 52, "y": 0},
164 {"matrix": [3, 1], "x": 53, "y": 0},
165 {"matrix": [3, 2], "x": 54, "y": 0},
166 {"matrix": [3, 3], "x": 55, "y": 0},
167 {"matrix": [3, 4], "x": 56, "y": 0},
168 {"matrix": [3, 5], "x": 57, "y": 0},
169 {"matrix": [3, 6], "x": 58, "y": 0},
170 {"matrix": [3, 7], "x": 59, "y": 0},
171 {"matrix": [3, 8], "x": 60, "y": 0},
172 {"matrix": [3, 9], "x": 61, "y": 0},
173 {"matrix": [3, 10], "x": 62, "y": 0},
174 {"matrix": [3, 11], "x": 63, "y": 0},
175 {"matrix": [3, 12], "x": 64, "y": 0},
176 {"matrix": [3, 13], "x": 65, "y": 0},
177 {"matrix": [3, 14], "x": 66, "y": 0},
178 {"matrix": [3, 16], "x": 67, "y": 0},
179 {"matrix": [3, 17], "x": 68, "y": 0},
180 {"matrix": [4, 0], "x": 69, "y": 0},
181 {"matrix": [4, 1], "x": 70, "y": 0},
182 {"matrix": [4, 2], "x": 71, "y": 0},
183 {"matrix": [4, 3], "x": 72, "y": 0},
184 {"matrix": [4, 4], "x": 73, "y": 0},
185 {"matrix": [4, 6], "x": 74, "y": 0},
186 {"matrix": [4, 8], "x": 75, "y": 0},
187 {"matrix": [4, 10], "x": 76, "y": 0},
188 {"matrix": [4, 12], "x": 77, "y": 0},
189 {"matrix": [4, 13], "x": 78, "y": 0},
190 {"matrix": [4, 14], "x": 79, "y": 0},
191 {"matrix": [4, 16], "x": 80, "y": 0},
192 {"matrix": [4, 17], "x": 81, "y": 0}
193 ]
21 } 194 }
22 } 195 }
23} \ No newline at end of file 196} \ No newline at end of file
diff --git a/keyboards/rotor/rotor.h b/keyboards/rotor/rotor.h
deleted file mode 100644
index 0a29bc2fe3..0000000000
--- a/keyboards/rotor/rotor.h
+++ /dev/null
@@ -1,58 +0,0 @@
1/* Copyright 2021 Densus Design and Basekeys.jp
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16#pragma once
17
18#include "quantum.h"
19
20#define XXX KC_NO//readabilty
21
22/* This a shortcut to help you visually see your layout.
23 *
24 * The first section contains all of the arguments representing the physical
25 * layout of the board and position of the keys.
26 *
27 * The second converts the arguments into a two-dimensional array which
28 * represents the switch matrix.
29 */
30#define LAYOUT( \
31 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0G, k0H, \
32 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1G, k1H, \
33 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2G, k2H, \
34 k30, k31, k32, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3G, k3H, \
35 k40, k41, k42, k43, k44, k48, k4D, k4E, k4G, k4H \
36) \
37{ \
38 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, XXX, k0G, k0H}, \
39 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, XXX, k1G, k1H}, \
40 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, k2G, k2H}, \
41 { k30, k31, k32, XXX, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, XXX, k3G, k3H}, \
42 { k40, k41, k42, k43, k44, XXX, XXX, XXX, k48, XXX, XXX, XXX, XXX, k4D, k4E, XXX, k4G, k4H} \
43}
44
45#define LAYOUT_all( \
46 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, \
47 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1G, k1H, \
48 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2G, k2H, \
49 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3G, k3H, \
50 k40, k41, k42, k43, k44, k46, k48, k4A, k4C, k4D, k4E, k4G, k4H \
51) \
52{ \
53 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H}, \
54 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, XXX, k1G, k1H}, \
55 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, XXX, k2G, k2H}, \
56 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, XXX, k3G, k3H}, \
57 { k40, k41, k42, k43, k44, XXX, k46, XXX, k48, XXX, k4A, XXX, k4C, k4D, k4E, XXX, k4G, k4H} \
58}
diff --git a/keyboards/ryloo_studio/m0110/info.json b/keyboards/ryloo_studio/m0110/info.json
index ef523dcc18..31640b3a28 100644
--- a/keyboards/ryloo_studio/m0110/info.json
+++ b/keyboards/ryloo_studio/m0110/info.json
@@ -26,215 +26,215 @@
26 "layouts": { 26 "layouts": {
27 "LAYOUT": { 27 "LAYOUT": {
28 "layout": [ 28 "layout": [
29 {"x": 0, "y": 0}, 29 {"matrix": [0, 0], "x": 0, "y": 0},
30 {"x": 1, "y": 0}, 30 {"matrix": [0, 1], "x": 1, "y": 0},
31 {"x": 2, "y": 0}, 31 {"matrix": [0, 2], "x": 2, "y": 0},
32 {"x": 3, "y": 0}, 32 {"matrix": [0, 3], "x": 3, "y": 0},
33 {"x": 4, "y": 0}, 33 {"matrix": [0, 4], "x": 4, "y": 0},
34 {"x": 5, "y": 0}, 34 {"matrix": [0, 5], "x": 5, "y": 0},
35 {"x": 6, "y": 0}, 35 {"matrix": [0, 6], "x": 6, "y": 0},
36 {"x": 7, "y": 0}, 36 {"matrix": [0, 7], "x": 7, "y": 0},
37 {"x": 8, "y": 0}, 37 {"matrix": [0, 8], "x": 8, "y": 0},
38 {"x": 9, "y": 0}, 38 {"matrix": [0, 9], "x": 9, "y": 0},
39 {"x": 10, "y": 0}, 39 {"matrix": [0, 10], "x": 10, "y": 0},
40 {"x": 11, "y": 0}, 40 {"matrix": [0, 11], "x": 11, "y": 0},
41 {"x": 12, "y": 0}, 41 {"matrix": [0, 12], "x": 12, "y": 0},
42 {"x": 13, "y": 0}, 42 {"matrix": [0, 13], "x": 13, "y": 0},
43 {"x": 14, "y": 0}, 43 {"matrix": [0, 14], "x": 14, "y": 0},
44 44
45 {"x": 0, "y": 1, "w": 1.5}, 45 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
46 {"x": 1.5, "y": 1}, 46 {"matrix": [1, 1], "x": 1.5, "y": 1},
47 {"x": 2.5, "y": 1}, 47 {"matrix": [1, 2], "x": 2.5, "y": 1},
48 {"x": 3.5, "y": 1}, 48 {"matrix": [1, 3], "x": 3.5, "y": 1},
49 {"x": 4.5, "y": 1}, 49 {"matrix": [1, 4], "x": 4.5, "y": 1},
50 {"x": 5.5, "y": 1}, 50 {"matrix": [1, 5], "x": 5.5, "y": 1},
51 {"x": 6.5, "y": 1}, 51 {"matrix": [1, 6], "x": 6.5, "y": 1},
52 {"x": 7.5, "y": 1}, 52 {"matrix": [1, 7], "x": 7.5, "y": 1},
53 {"x": 8.5, "y": 1}, 53 {"matrix": [1, 8], "x": 8.5, "y": 1},
54 {"x": 9.5, "y": 1}, 54 {"matrix": [1, 9], "x": 9.5, "y": 1},
55 {"x": 10.5, "y": 1}, 55 {"matrix": [1, 10], "x": 10.5, "y": 1},
56 {"x": 11.5, "y": 1}, 56 {"matrix": [1, 11], "x": 11.5, "y": 1},
57 {"x": 12.5, "y": 1}, 57 {"matrix": [1, 12], "x": 12.5, "y": 1},
58 {"x": 13.5, "y": 1, "w": 1.5}, 58 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
59 59
60 {"x": 0, "y": 2, "w": 1.75}, 60 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
61 {"x": 1.75, "y": 2}, 61 {"matrix": [2, 1], "x": 1.75, "y": 2},
62 {"x": 2.75, "y": 2}, 62 {"matrix": [2, 2], "x": 2.75, "y": 2},
63 {"x": 3.75, "y": 2}, 63 {"matrix": [2, 3], "x": 3.75, "y": 2},
64 {"x": 4.75, "y": 2}, 64 {"matrix": [2, 4], "x": 4.75, "y": 2},
65 {"x": 5.75, "y": 2}, 65 {"matrix": [2, 5], "x": 5.75, "y": 2},
66 {"x": 6.75, "y": 2}, 66 {"matrix": [2, 6], "x": 6.75, "y": 2},
67 {"x": 7.75, "y": 2}, 67 {"matrix": [2, 7], "x": 7.75, "y": 2},
68 {"x": 8.75, "y": 2}, 68 {"matrix": [2, 8], "x": 8.75, "y": 2},
69 {"x": 9.75, "y": 2}, 69 {"matrix": [2, 9], "x": 9.75, "y": 2},
70 {"x": 10.75, "y": 2}, 70 {"matrix": [2, 10], "x": 10.75, "y": 2},
71 {"x": 11.75, "y": 2}, 71 {"matrix": [2, 11], "x": 11.75, "y": 2},
72 {"x": 12.75, "y": 2}, 72 {"matrix": [2, 12], "x": 12.75, "y": 2},
73 {"x": 13.75, "y": 2, "w": 1.25}, 73 {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
74 74
75 {"x": 0, "y": 3, "w": 1.25}, 75 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
76 {"x": 1.25, "y": 3}, 76 {"matrix": [3, 1], "x": 1.25, "y": 3},
77 {"x": 2.25, "y": 3}, 77 {"matrix": [3, 2], "x": 2.25, "y": 3},
78 {"x": 3.25, "y": 3}, 78 {"matrix": [3, 3], "x": 3.25, "y": 3},
79 {"x": 4.25, "y": 3}, 79 {"matrix": [3, 4], "x": 4.25, "y": 3},
80 {"x": 5.25, "y": 3}, 80 {"matrix": [3, 5], "x": 5.25, "y": 3},
81 {"x": 6.25, "y": 3}, 81 {"matrix": [3, 6], "x": 6.25, "y": 3},
82 {"x": 7.25, "y": 3}, 82 {"matrix": [3, 7], "x": 7.25, "y": 3},
83 {"x": 8.25, "y": 3}, 83 {"matrix": [3, 8], "x": 8.25, "y": 3},
84 {"x": 9.25, "y": 3}, 84 {"matrix": [3, 9], "x": 9.25, "y": 3},
85 {"x": 10.25, "y": 3}, 85 {"matrix": [3, 10], "x": 10.25, "y": 3},
86 {"x": 11.25, "y": 3}, 86 {"matrix": [3, 11], "x": 11.25, "y": 3},
87 {"x": 12.25, "y": 3, "w": 1.75}, 87 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
88 {"x": 14, "y": 3}, 88 {"matrix": [3, 14], "x": 14, "y": 3},
89 89
90 {"x": 0, "y": 4, "w": 1.25}, 90 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
91 {"x": 1.25, "y": 4, "w": 1.25}, 91 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
92 {"x": 2.5, "y": 4, "w": 1.25}, 92 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
93 {"x": 3.75, "y": 4, "w": 2.25}, 93 {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
94 {"x": 6, "y": 4, "w": 1.25}, 94 {"matrix": [4, 7], "x": 6, "y": 4, "w": 1.25},
95 {"x": 7.25, "y": 4, "w": 2.75}, 95 {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
96 {"x": 10, "y": 4}, 96 {"matrix": [4, 9], "x": 10, "y": 4},
97 {"x": 11, "y": 4}, 97 {"matrix": [4, 10], "x": 11, "y": 4},
98 {"x": 12, "y": 4}, 98 {"matrix": [4, 11], "x": 12, "y": 4},
99 {"x": 13, "y": 4}, 99 {"matrix": [4, 12], "x": 13, "y": 4},
100 {"x": 14, "y": 4} 100 {"matrix": [4, 13], "x": 14, "y": 4}
101 ] 101 ]
102 }, 102 },
103 "LAYOUT_60_ansi": { 103 "LAYOUT_60_ansi": {
104 "layout": [ 104 "layout": [
105 {"x": 0, "y": 0}, 105 {"matrix": [0, 0], "x": 0, "y": 0},
106 {"x": 1, "y": 0}, 106 {"matrix": [0, 1], "x": 1, "y": 0},
107 {"x": 2, "y": 0}, 107 {"matrix": [0, 2], "x": 2, "y": 0},
108 {"x": 3, "y": 0}, 108 {"matrix": [0, 3], "x": 3, "y": 0},
109 {"x": 4, "y": 0}, 109 {"matrix": [0, 4], "x": 4, "y": 0},
110 {"x": 5, "y": 0}, 110 {"matrix": [0, 5], "x": 5, "y": 0},
111 {"x": 6, "y": 0}, 111 {"matrix": [0, 6], "x": 6, "y": 0},
112 {"x": 7, "y": 0}, 112 {"matrix": [0, 7], "x": 7, "y": 0},
113 {"x": 8, "y": 0}, 113 {"matrix": [0, 8], "x": 8, "y": 0},
114 {"x": 9, "y": 0}, 114 {"matrix": [0, 9], "x": 9, "y": 0},
115 {"x": 10, "y": 0}, 115 {"matrix": [0, 10], "x": 10, "y": 0},
116 {"x": 11, "y": 0}, 116 {"matrix": [0, 11], "x": 11, "y": 0},
117 {"x": 12, "y": 0}, 117 {"matrix": [0, 12], "x": 12, "y": 0},
118 {"x": 13, "y": 0, "w": 2}, 118 {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
119 119
120 {"x": 0, "y": 1, "w": 1.5}, 120 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
121 {"x": 1.5, "y": 1}, 121 {"matrix": [1, 1], "x": 1.5, "y": 1},
122 {"x": 2.5, "y": 1}, 122 {"matrix": [1, 2], "x": 2.5, "y": 1},
123 {"x": 3.5, "y": 1}, 123 {"matrix": [1, 3], "x": 3.5, "y": 1},
124 {"x": 4.5, "y": 1}, 124 {"matrix": [1, 4], "x": 4.5, "y": 1},
125 {"x": 5.5, "y": 1}, 125 {"matrix": [1, 5], "x": 5.5, "y": 1},
126 {"x": 6.5, "y": 1}, 126 {"matrix": [1, 6], "x": 6.5, "y": 1},
127 {"x": 7.5, "y": 1}, 127 {"matrix": [1, 7], "x": 7.5, "y": 1},
128 {"x": 8.5, "y": 1}, 128 {"matrix": [1, 8], "x": 8.5, "y": 1},
129 {"x": 9.5, "y": 1}, 129 {"matrix": [1, 9], "x": 9.5, "y": 1},
130 {"x": 10.5, "y": 1}, 130 {"matrix": [1, 10], "x": 10.5, "y": 1},
131 {"x": 11.5, "y": 1}, 131 {"matrix": [1, 11], "x": 11.5, "y": 1},
132 {"x": 12.5, "y": 1}, 132 {"matrix": [1, 12], "x": 12.5, "y": 1},
133 {"x": 13.5, "y": 1, "w": 1.5}, 133 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
134 134
135 {"x": 0, "y": 2, "w": 1.75}, 135 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
136 {"x": 1.75, "y": 2}, 136 {"matrix": [2, 1], "x": 1.75, "y": 2},
137 {"x": 2.75, "y": 2}, 137 {"matrix": [2, 2], "x": 2.75, "y": 2},
138 {"x": 3.75, "y": 2}, 138 {"matrix": [2, 3], "x": 3.75, "y": 2},
139 {"x": 4.75, "y": 2}, 139 {"matrix": [2, 4], "x": 4.75, "y": 2},
140 {"x": 5.75, "y": 2}, 140 {"matrix": [2, 5], "x": 5.75, "y": 2},
141 {"x": 6.75, "y": 2}, 141 {"matrix": [2, 6], "x": 6.75, "y": 2},
142 {"x": 7.75, "y": 2}, 142 {"matrix": [2, 7], "x": 7.75, "y": 2},
143 {"x": 8.75, "y": 2}, 143 {"matrix": [2, 8], "x": 8.75, "y": 2},
144 {"x": 9.75, "y": 2}, 144 {"matrix": [2, 9], "x": 9.75, "y": 2},
145 {"x": 10.75, "y": 2}, 145 {"matrix": [2, 10], "x": 10.75, "y": 2},
146 {"x": 11.75, "y": 2}, 146 {"matrix": [2, 11], "x": 11.75, "y": 2},
147 {"x": 12.75, "y": 2, "w": 2.25}, 147 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
148 148
149 {"x": 0, "y": 3, "w": 2.25}, 149 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
150 {"x": 2.25, "y": 3}, 150 {"matrix": [3, 2], "x": 2.25, "y": 3},
151 {"x": 3.25, "y": 3}, 151 {"matrix": [3, 3], "x": 3.25, "y": 3},
152 {"x": 4.25, "y": 3}, 152 {"matrix": [3, 4], "x": 4.25, "y": 3},
153 {"x": 5.25, "y": 3}, 153 {"matrix": [3, 5], "x": 5.25, "y": 3},
154 {"x": 6.25, "y": 3}, 154 {"matrix": [3, 6], "x": 6.25, "y": 3},
155 {"x": 7.25, "y": 3}, 155 {"matrix": [3, 7], "x": 7.25, "y": 3},
156 {"x": 8.25, "y": 3}, 156 {"matrix": [3, 8], "x": 8.25, "y": 3},
157 {"x": 9.25, "y": 3}, 157 {"matrix": [3, 9], "x": 9.25, "y": 3},
158 {"x": 10.25, "y": 3}, 158 {"matrix": [3, 10], "x": 10.25, "y": 3},
159 {"x": 11.25, "y": 3}, 159 {"matrix": [3, 11], "x": 11.25, "y": 3},
160 {"x": 12.25, "y": 3, "w": 2.75}, 160 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
161 161
162 {"x": 0, "y": 4, "w": 1.25}, 162 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
163 {"x": 1.25, "y": 4, "w": 1.25}, 163 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
164 {"x": 2.5, "y": 4, "w": 1.25}, 164 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
165 {"x": 3.75, "y": 4, "w": 6.25}, 165 {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
166 {"x": 10, "y": 4, "w": 1.25}, 166 {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
167 {"x": 11.25, "y": 4, "w": 1.25}, 167 {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
168 {"x": 12.5, "y": 4, "w": 1.25}, 168 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
169 {"x": 13.75, "y": 4, "w": 1.25} 169 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
170 ] 170 ]
171 }, 171 },
172 "LAYOUT_60_hhkb": { 172 "LAYOUT_60_hhkb": {
173 "layout": [ 173 "layout": [
174 {"x": 0, "y": 0}, 174 {"matrix": [0, 0], "x": 0, "y": 0},
175 {"x": 1, "y": 0}, 175 {"matrix": [0, 1], "x": 1, "y": 0},
176 {"x": 2, "y": 0}, 176 {"matrix": [0, 2], "x": 2, "y": 0},
177 {"x": 3, "y": 0}, 177 {"matrix": [0, 3], "x": 3, "y": 0},
178 {"x": 4, "y": 0}, 178 {"matrix": [0, 4], "x": 4, "y": 0},
179 {"x": 5, "y": 0}, 179 {"matrix": [0, 5], "x": 5, "y": 0},
180 {"x": 6, "y": 0}, 180 {"matrix": [0, 6], "x": 6, "y": 0},
181 {"x": 7, "y": 0}, 181 {"matrix": [0, 7], "x": 7, "y": 0},
182 {"x": 8, "y": 0}, 182 {"matrix": [0, 8], "x": 8, "y": 0},
183 {"x": 9, "y": 0}, 183 {"matrix": [0, 9], "x": 9, "y": 0},
184 {"x": 10, "y": 0}, 184 {"matrix": [0, 10], "x": 10, "y": 0},
185 {"x": 11, "y": 0}, 185 {"matrix": [0, 11], "x": 11, "y": 0},
186 {"x": 12, "y": 0}, 186 {"matrix": [0, 12], "x": 12, "y": 0},
187 {"x": 13, "y": 0}, 187 {"matrix": [0, 13], "x": 13, "y": 0},
188 {"x": 14, "y": 0}, 188 {"matrix": [0, 14], "x": 14, "y": 0},
189 189
190 {"x": 0, "y": 1, "w": 1.5}, 190 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
191 {"x": 1.5, "y": 1}, 191 {"matrix": [1, 1], "x": 1.5, "y": 1},
192 {"x": 2.5, "y": 1}, 192 {"matrix": [1, 2], "x": 2.5, "y": 1},
193 {"x": 3.5, "y": 1}, 193 {"matrix": [1, 3], "x": 3.5, "y": 1},
194 {"x": 4.5, "y": 1}, 194 {"matrix": [1, 4], "x": 4.5, "y": 1},
195 {"x": 5.5, "y": 1}, 195 {"matrix": [1, 5], "x": 5.5, "y": 1},
196 {"x": 6.5, "y": 1}, 196 {"matrix": [1, 6], "x": 6.5, "y": 1},
197 {"x": 7.5, "y": 1}, 197 {"matrix": [1, 7], "x": 7.5, "y": 1},
198 {"x": 8.5, "y": 1}, 198 {"matrix": [1, 8], "x": 8.5, "y": 1},
199 {"x": 9.5, "y": 1}, 199 {"matrix": [1, 9], "x": 9.5, "y": 1},
200 {"x": 10.5, "y": 1}, 200 {"matrix": [1, 10], "x": 10.5, "y": 1},
201 {"x": 11.5, "y": 1}, 201 {"matrix": [1, 11], "x": 11.5, "y": 1},
202 {"x": 12.5, "y": 1}, 202 {"matrix": [1, 12], "x": 12.5, "y": 1},
203 {"x": 13.5, "y": 1, "w": 1.5}, 203 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
204 204
205 {"x": 0, "y": 2, "w": 1.75}, 205 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
206 {"x": 1.75, "y": 2}, 206 {"matrix": [2, 1], "x": 1.75, "y": 2},
207 {"x": 2.75, "y": 2}, 207 {"matrix": [2, 2], "x": 2.75, "y": 2},
208 {"x": 3.75, "y": 2}, 208 {"matrix": [2, 3], "x": 3.75, "y": 2},
209 {"x": 4.75, "y": 2}, 209 {"matrix": [2, 4], "x": 4.75, "y": 2},
210 {"x": 5.75, "y": 2}, 210 {"matrix": [2, 5], "x": 5.75, "y": 2},
211 {"x": 6.75, "y": 2}, 211 {"matrix": [2, 6], "x": 6.75, "y": 2},
212 {"x": 7.75, "y": 2}, 212 {"matrix": [2, 7], "x": 7.75, "y": 2},
213 {"x": 8.75, "y": 2}, 213 {"matrix": [2, 8], "x": 8.75, "y": 2},
214 {"x": 9.75, "y": 2}, 214 {"matrix": [2, 9], "x": 9.75, "y": 2},
215 {"x": 10.75, "y": 2}, 215 {"matrix": [2, 10], "x": 10.75, "y": 2},
216 {"x": 11.75, "y": 2}, 216 {"matrix": [2, 11], "x": 11.75, "y": 2},
217 {"x": 12.75, "y": 2, "w": 2.25}, 217 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
218 218
219 {"x": 0, "y": 3, "w": 2.25}, 219 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
220 {"x": 2.25, "y": 3}, 220 {"matrix": [3, 2], "x": 2.25, "y": 3},
221 {"x": 3.25, "y": 3}, 221 {"matrix": [3, 3], "x": 3.25, "y": 3},
222 {"x": 4.25, "y": 3}, 222 {"matrix": [3, 4], "x": 4.25, "y": 3},
223 {"x": 5.25, "y": 3}, 223 {"matrix": [3, 5], "x": 5.25, "y": 3},
224 {"x": 6.25, "y": 3}, 224 {"matrix": [3, 6], "x": 6.25, "y": 3},
225 {"x": 7.25, "y": 3}, 225 {"matrix": [3, 7], "x": 7.25, "y": 3},
226 {"x": 8.25, "y": 3}, 226 {"matrix": [3, 8], "x": 8.25, "y": 3},
227 {"x": 9.25, "y": 3}, 227 {"matrix": [3, 9], "x": 9.25, "y": 3},
228 {"x": 10.25, "y": 3}, 228 {"matrix": [3, 10], "x": 10.25, "y": 3},
229 {"x": 11.25, "y": 3}, 229 {"matrix": [3, 11], "x": 11.25, "y": 3},
230 {"x": 12.25, "y": 3, "w": 1.75}, 230 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
231 {"x": 14, "y": 3}, 231 {"matrix": [3, 14], "x": 14, "y": 3},
232 232
233 {"x": 1.5, "y": 4}, 233 {"matrix": [4, 1], "x": 1.5, "y": 4},
234 {"x": 2.5, "y": 4, "w": 1.5}, 234 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
235 {"x": 4, "y": 4, "w": 7}, 235 {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
236 {"x": 11, "y": 4, "w": 1.5}, 236 {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
237 {"x": 12.5, "y": 4} 237 {"matrix": [4, 12], "x": 12.5, "y": 4}
238 ] 238 ]
239 } 239 }
240 } 240 }
diff --git a/keyboards/ryloo_studio/m0110/m0110.h b/keyboards/ryloo_studio/m0110/m0110.h
deleted file mode 100755
index f988b3cb01..0000000000
--- a/keyboards/ryloo_studio/m0110/m0110.h
+++ /dev/null
@@ -1,103 +0,0 @@
1/*
2Copyright 2020 newtonapple
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18
19#pragma once
20
21#include "quantum.h"
22
23
24/* Standard arrangement / LAYOUT
25 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
26 * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
27 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
28 * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │
29 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
30 * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │
31 * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
32 * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │3e │
33 * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┼───┤
34 * │40 │41 │42 │43 │47 │48 │49 │4a │4b │4c │4d │
35 * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┘
36*/
37#define LAYOUT( \
38 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
39 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
40 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
41 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \
42 k40, k41, k42, k43, k47, k48, k49, k4a, k4b, k4c, k4d \
43) { \
44 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
45 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, KC_NO }, \
46 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, KC_NO }, \
47 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, KC_NO, k3d, k3e }, \
48 { k40, k41, k42, k43, KC_NO, KC_NO, KC_NO, k47, k48, k49, k4a, k4b, k4c, k4d, KC_NO } \
49}
50
51/* LAYOUT_60_ansi
52 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
53 * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e │
54 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
55 * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │
56 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
57 * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2d │
58 * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
59 * │30 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │
60 * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
61 * │40 │41 │42 │47 │49 │4a │4c │4d │
62 * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
63*/
64#define LAYOUT_60_ansi( \
65 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, \
66 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
67 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
68 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \
69 k40, k41, k42, k47, k49, k4a, k4c, k4d \
70) { \
71 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, KC_NO, k0e }, \
72 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, KC_NO }, \
73 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, KC_NO, k2d, KC_NO }, \
74 { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, KC_NO, k3d, KC_NO }, \
75 { k40, k41, k42, KC_NO, KC_NO, KC_NO, KC_NO, k47, KC_NO, k49, k4a, KC_NO, k4c, k4d, KC_NO } \
76}
77
78/* LAYOUT_60_hhkb
79 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
80 * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
81 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
82 * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │
83 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
84 * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2d │
85 * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
86 * │30 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │3e │
87 * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
88 * │▓▓▓▓▓│41 │42 │47 (7u) │4a │4c │▓▓▓▓▓│
89 * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
90*/
91#define LAYOUT_60_hhkb( \
92 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
93 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
94 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
95 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \
96 k41, k42, k47, k4a, k4c \
97) { \
98 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
99 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, KC_NO }, \
100 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, KC_NO, k2d, KC_NO }, \
101 { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, KC_NO, k3d, k3e }, \
102 { KC_NO, k41, k42, KC_NO, KC_NO, KC_NO, KC_NO, k47, KC_NO, KC_NO, k4a, KC_NO, k4c, KC_NO, KC_NO } \
103}
diff --git a/keyboards/salicylic_acid3/naked48/rev1/info.json b/keyboards/salicylic_acid3/naked48/rev1/info.json
index 968965e51c..9a50c83ad7 100644
--- a/keyboards/salicylic_acid3/naked48/rev1/info.json
+++ b/keyboards/salicylic_acid3/naked48/rev1/info.json
@@ -33,244 +33,192 @@
33 "layouts": { 33 "layouts": {
34 "LAYOUT": { 34 "LAYOUT": {
35 "layout": [ 35 "layout": [
36 { 36 {"matrix": [0, 0], "x": 0, "y": 0},
37 "label":"Tab", 37 {"matrix": [0, 1], "x": 1, "y": 0},
38 "x":0, 38 {"matrix": [0, 2], "x": 2, "y": 0},
39 "y":0 39 {"matrix": [0, 3], "x": 3, "y": 0},
40 }, 40 {"matrix": [0, 4], "x": 4, "y": 0},
41 { 41 {"matrix": [0, 5], "x": 5, "y": 0},
42 "label":"Q", 42
43 "x":1, 43 {"matrix": [0, 6], "x": 8, "y": 0},
44 "y":0 44 {"matrix": [0, 7], "x": 9, "y": 0},
45 }, 45 {"matrix": [0, 8], "x": 10, "y": 0},
46 { 46 {"matrix": [0, 9], "x": 11, "y": 0},
47 "label":"W", 47 {"matrix": [0, 10], "x": 12, "y": 0},
48 "x":2, 48 {"matrix": [0, 11], "x": 13, "y": 0},
49 "y":0 49
50 }, 50 {"matrix": [1, 0], "x": 0, "y": 1},
51 { 51 {"matrix": [1, 1], "x": 1, "y": 1},
52 "label":"E", 52 {"matrix": [1, 2], "x": 2, "y": 1},
53 "x":3, 53 {"matrix": [1, 3], "x": 3, "y": 1},
54 "y":0 54 {"matrix": [1, 4], "x": 4, "y": 1},
55 }, 55 {"matrix": [1, 5], "x": 5, "y": 1},
56 { 56
57 "label":"R", 57 {"matrix": [1, 6], "x": 8, "y": 1},
58 "x":4, 58 {"matrix": [1, 7], "x": 9, "y": 1},
59 "y":0 59 {"matrix": [1, 8], "x": 10, "y": 1},
60 }, 60 {"matrix": [1, 9], "x": 11, "y": 1},
61 { 61 {"matrix": [1, 10], "x": 12, "y": 1},
62 "label":"T", 62 {"matrix": [1, 11], "x": 13, "y": 1},
63 "x":5, 63
64 "y":0 64 {"matrix": [2, 0], "x": 0, "y": 2},
65 }, 65 {"matrix": [2, 1], "x": 1, "y": 2},
66 { 66 {"matrix": [2, 2], "x": 2, "y": 2},
67 "label":"Y", 67 {"matrix": [2, 3], "x": 3, "y": 2},
68 "x":8, 68 {"matrix": [2, 4], "x": 4, "y": 2},
69 "y":0 69 {"matrix": [2, 5], "x": 5, "y": 2},
70 }, 70
71 { 71 {"matrix": [2, 6], "x": 8, "y": 2},
72 "label":"U", 72 {"matrix": [2, 7], "x": 9, "y": 2},
73 "x":9, 73 {"matrix": [2, 8], "x": 10, "y": 2},
74 "y":0 74 {"matrix": [2, 9], "x": 11, "y": 2},
75 }, 75 {"matrix": [2, 10], "x": 12, "y": 2},
76 { 76 {"matrix": [2, 11], "x": 13, "y": 2},
77 "label":"I", 77
78 "x":10, 78 {"matrix": [3, 0], "x": 1, "y": 3},
79 "y":0 79 {"matrix": [3, 1], "x": 2, "y": 3},
80 }, 80 {"matrix": [3, 2], "x": 3, "y": 3},
81 { 81 {"matrix": [3, 3], "x": 4, "y": 3},
82 "label":"O", 82 {"matrix": [3, 4], "x": 5, "y": 3},
83 "x":11, 83 {"matrix": [3, 5], "x": 6, "y": 3},
84 "y":0 84 {"matrix": [3, 6], "x": 7, "y": 3},
85 }, 85 {"matrix": [3, 7], "x": 8, "y": 3},
86 { 86 {"matrix": [3, 8], "x": 9, "y": 3},
87 "label":"P", 87 {"matrix": [3, 9], "x": 10, "y": 3},
88 "x":12, 88 {"matrix": [3, 10], "x": 11, "y": 3},
89 "y":0 89 {"matrix": [3, 11], "x": 12, "y": 3}
90 }, 90 ]
91 { 91 },
92 "label":"Back Space", 92 "LAYOUT_with_nafuda": {
93 "x":13, 93 "layout": [
94 "y":0 94 {"matrix": [0, 0], "x": 0, "y": 0},
95 }, 95 {"matrix": [0, 1], "x": 1, "y": 0},
96 { 96 {"matrix": [0, 2], "x": 2, "y": 0},
97 "label":"Esc", 97 {"matrix": [0, 3], "x": 3, "y": 0},
98 "x":0, 98 {"matrix": [0, 4], "x": 4, "y": 0},
99 "y":1 99 {"matrix": [0, 5], "x": 5, "y": 0},
100 }, 100 {"matrix": [0, 6], "x": 6, "y": 0},
101 { 101 {"matrix": [0, 7], "x": 7, "y": 0},
102 "label":"A", 102 {"matrix": [0, 8], "x": 8, "y": 0},
103 "x":1, 103 {"matrix": [0, 9], "x": 9, "y": 0},
104 "y":1 104 {"matrix": [0, 10], "x": 10, "y": 0},
105 }, 105 {"matrix": [0, 11], "x": 11, "y": 0},
106 { 106 {"matrix": [4, 1], "x": 12, "y": 0},
107 "label":"S", 107 {"matrix": [1, 0], "x": 13, "y": 0},
108 "x":2, 108 {"matrix": [1, 1], "x": 14, "y": 0},
109 "y":1 109 {"matrix": [1, 2], "x": 15, "y": 0},
110 }, 110 {"matrix": [1, 3], "x": 16, "y": 0},
111 { 111 {"matrix": [1, 4], "x": 17, "y": 0},
112 "label":"D", 112 {"matrix": [1, 5], "x": 18, "y": 0},
113 "x":3, 113 {"matrix": [1, 6], "x": 19, "y": 0},
114 "y":1 114 {"matrix": [1, 7], "x": 20, "y": 0},
115 }, 115 {"matrix": [1, 8], "x": 21, "y": 0},
116 { 116 {"matrix": [1, 9], "x": 22, "y": 0},
117 "label":"F", 117 {"matrix": [1, 10], "x": 23, "y": 0},
118 "x":4, 118 {"matrix": [1, 11], "x": 24, "y": 0},
119 "y":1 119 {"matrix": [5, 0], "x": 25, "y": 0},
120 }, 120 {"matrix": [5, 1], "x": 26, "y": 0},
121 { 121 {"matrix": [5, 2], "x": 27, "y": 0},
122 "label":"G", 122 {"matrix": [2, 0], "x": 28, "y": 0},
123 "x":5, 123 {"matrix": [2, 1], "x": 29, "y": 0},
124 "y":1 124 {"matrix": [2, 2], "x": 30, "y": 0},
125 }, 125 {"matrix": [2, 3], "x": 31, "y": 0},
126 { 126 {"matrix": [2, 4], "x": 32, "y": 0},
127 "label":"H", 127 {"matrix": [2, 5], "x": 33, "y": 0},
128 "x":8, 128 {"matrix": [2, 6], "x": 34, "y": 0},
129 "y":1 129 {"matrix": [2, 7], "x": 35, "y": 0},
130 }, 130 {"matrix": [2, 8], "x": 36, "y": 0},
131 { 131 {"matrix": [2, 9], "x": 37, "y": 0},
132 "label":"J", 132 {"matrix": [2, 10], "x": 38, "y": 0},
133 "x":9, 133 {"matrix": [2, 11], "x": 39, "y": 0},
134 "y":1 134 {"matrix": [6, 0], "x": 40, "y": 0},
135 }, 135 {"matrix": [6, 1], "x": 41, "y": 0},
136 { 136 {"matrix": [6, 2], "x": 42, "y": 0},
137 "label":"K", 137 {"matrix": [3, 0], "x": 43, "y": 0},
138 "x":10, 138 {"matrix": [3, 1], "x": 44, "y": 0},
139 "y":1 139 {"matrix": [3, 2], "x": 45, "y": 0},
140 }, 140 {"matrix": [3, 3], "x": 46, "y": 0},
141 { 141 {"matrix": [3, 4], "x": 47, "y": 0},
142 "label":"L", 142 {"matrix": [3, 5], "x": 48, "y": 0},
143 "x":11, 143 {"matrix": [3, 6], "x": 49, "y": 0},
144 "y":1 144 {"matrix": [3, 7], "x": 50, "y": 0},
145 }, 145 {"matrix": [3, 8], "x": 51, "y": 0},
146 { 146 {"matrix": [3, 9], "x": 52, "y": 0},
147 "label":";", 147 {"matrix": [3, 10], "x": 53, "y": 0},
148 "x":12, 148 {"matrix": [3, 11], "x": 54, "y": 0}
149 "y":1 149 ]
150 }, 150 },
151 { 151 "LAYOUT_with_setta21": {
152 "label":"'", 152 "layout": [
153 "x":13, 153 {"matrix": [0, 0], "x": 0, "y": 0},
154 "y":1 154 {"matrix": [0, 1], "x": 1, "y": 0},
155 }, 155 {"matrix": [0, 2], "x": 2, "y": 0},
156 { 156 {"matrix": [0, 3], "x": 3, "y": 0},
157 "label":"Shift", 157 {"matrix": [0, 4], "x": 4, "y": 0},
158 "x":0, 158 {"matrix": [0, 5], "x": 5, "y": 0},
159 "y":2 159 {"matrix": [0, 6], "x": 6, "y": 0},
160 }, 160 {"matrix": [0, 7], "x": 7, "y": 0},
161 { 161 {"matrix": [0, 8], "x": 8, "y": 0},
162 "label":"Z", 162 {"matrix": [0, 9], "x": 9, "y": 0},
163 "x":1, 163 {"matrix": [0, 10], "x": 10, "y": 0},
164 "y":2 164 {"matrix": [0, 11], "x": 11, "y": 0},
165 }, 165 {"matrix": [4, 0], "x": 12, "y": 0},
166 { 166 {"matrix": [4, 1], "x": 13, "y": 0},
167 "label":"X", 167 {"matrix": [4, 2], "x": 14, "y": 0},
168 "x":2, 168 {"matrix": [4, 3], "x": 15, "y": 0},
169 "y":2 169 {"matrix": [4, 4], "x": 16, "y": 0},
170 }, 170 {"matrix": [4, 5], "x": 17, "y": 0},
171 { 171 {"matrix": [1, 0], "x": 18, "y": 0},
172 "label":"C", 172 {"matrix": [1, 1], "x": 19, "y": 0},
173 "x":3, 173 {"matrix": [1, 2], "x": 20, "y": 0},
174 "y":2 174 {"matrix": [1, 3], "x": 21, "y": 0},
175 }, 175 {"matrix": [1, 4], "x": 22, "y": 0},
176 { 176 {"matrix": [1, 5], "x": 23, "y": 0},
177 "label":"V", 177 {"matrix": [1, 6], "x": 24, "y": 0},
178 "x":4, 178 {"matrix": [1, 7], "x": 25, "y": 0},
179 "y":2 179 {"matrix": [1, 8], "x": 26, "y": 0},
180 }, 180 {"matrix": [1, 9], "x": 27, "y": 0},
181 { 181 {"matrix": [1, 10], "x": 28, "y": 0},
182 "label":"B", 182 {"matrix": [1, 11], "x": 29, "y": 0},
183 "x":5, 183 {"matrix": [5, 1], "x": 30, "y": 0},
184 "y":2 184 {"matrix": [5, 2], "x": 31, "y": 0},
185 }, 185 {"matrix": [5, 3], "x": 32, "y": 0},
186 { 186 {"matrix": [5, 4], "x": 33, "y": 0},
187 "label":"N", 187 {"matrix": [5, 5], "x": 34, "y": 0},
188 "x":8, 188 {"matrix": [2, 0], "x": 35, "y": 0},
189 "y":2 189 {"matrix": [2, 1], "x": 36, "y": 0},
190 }, 190 {"matrix": [2, 2], "x": 37, "y": 0},
191 { 191 {"matrix": [2, 3], "x": 38, "y": 0},
192 "label":"M", 192 {"matrix": [2, 4], "x": 39, "y": 0},
193 "x":9, 193 {"matrix": [2, 5], "x": 40, "y": 0},
194 "y":2 194 {"matrix": [2, 6], "x": 41, "y": 0},
195 }, 195 {"matrix": [2, 7], "x": 42, "y": 0},
196 { 196 {"matrix": [2, 8], "x": 43, "y": 0},
197 "label":",", 197 {"matrix": [2, 9], "x": 44, "y": 0},
198 "x":10, 198 {"matrix": [2, 10], "x": 45, "y": 0},
199 "y":2 199 {"matrix": [2, 11], "x": 46, "y": 0},
200 }, 200 {"matrix": [6, 0], "x": 47, "y": 0},
201 { 201 {"matrix": [6, 1], "x": 48, "y": 0},
202 "label":".", 202 {"matrix": [6, 2], "x": 49, "y": 0},
203 "x":11, 203 {"matrix": [6, 3], "x": 50, "y": 0},
204 "y":2 204 {"matrix": [6, 4], "x": 51, "y": 0},
205 }, 205 {"matrix": [6, 5], "x": 52, "y": 0},
206 { 206 {"matrix": [3, 0], "x": 53, "y": 0},
207 "label":"/", 207 {"matrix": [3, 1], "x": 54, "y": 0},
208 "x":12, 208 {"matrix": [3, 2], "x": 55, "y": 0},
209 "y":2 209 {"matrix": [3, 3], "x": 56, "y": 0},
210 }, 210 {"matrix": [3, 4], "x": 57, "y": 0},
211 { 211 {"matrix": [3, 5], "x": 58, "y": 0},
212 "label":"Enter", 212 {"matrix": [3, 6], "x": 59, "y": 0},
213 "x":13, 213 {"matrix": [3, 7], "x": 60, "y": 0},
214 "y":2 214 {"matrix": [3, 8], "x": 61, "y": 0},
215 }, 215 {"matrix": [3, 9], "x": 62, "y": 0},
216 { 216 {"matrix": [3, 10], "x": 63, "y": 0},
217 "label":"Adjust", 217 {"matrix": [3, 11], "x": 64, "y": 0},
218 "x":1, 218 {"matrix": [7, 0], "x": 65, "y": 0},
219 "y":3 219 {"matrix": [7, 2], "x": 66, "y": 0},
220 }, 220 {"matrix": [7, 4], "x": 67, "y": 0},
221 { 221 {"matrix": [7, 5], "x": 68, "y": 0}
222 "label":"Ctrl",
223 "x":2,
224 "y":3
225 },
226 {
227 "label":"Alt",
228 "x":3,
229 "y":3
230 },
231 {
232 "label":"GUI",
233 "x":4,
234 "y":3
235 },
236 {
237 "label":"&dArr;",
238 "x":5,
239 "y":3
240 },
241 {
242 "x":6,
243 "y":3
244 },
245 {
246 "x":7,
247 "y":3
248 },
249 {
250 "label":"&uArr;",
251 "x":8,
252 "y":3
253 },
254 {
255 "label":"&larr;",
256 "x":9,
257 "y":3
258 },
259 {
260 "label":"&darr;",
261 "x":10,
262 "y":3
263 },
264 {
265 "label":"&uarr;",
266 "x":11,
267 "y":3
268 },
269 {
270 "label":"&rarr;",
271 "x":12,
272 "y":3
273 }
274 ] 222 ]
275 } 223 }
276 } 224 }
diff --git a/keyboards/salicylic_acid3/naked48/rev1/rev1.c b/keyboards/salicylic_acid3/naked48/rev1/rev1.c
index 5c9d8035c0..d4da157a56 100644
--- a/keyboards/salicylic_acid3/naked48/rev1/rev1.c
+++ b/keyboards/salicylic_acid3/naked48/rev1/rev1.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>. 15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/ 16*/
17 17
18#include "rev1.h" 18#include "quantum.h"
19 19
20#ifdef RGB_MATRIX_ENABLE 20#ifdef RGB_MATRIX_ENABLE
21 led_config_t g_led_config = { { 21 led_config_t g_led_config = { {
diff --git a/keyboards/salicylic_acid3/naked48/rev1/rev1.h b/keyboards/salicylic_acid3/naked48/rev1/rev1.h
deleted file mode 100644
index d43e9f4fb3..0000000000
--- a/keyboards/salicylic_acid3/naked48/rev1/rev1.h
+++ /dev/null
@@ -1,99 +0,0 @@
1/*
2Copyright 2021 Salicylic_Acid
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
19
20#include "quantum.h"
21#ifdef RGBLIGHT_ENABLE
22//rgb led driver
23#include "ws2812.h"
24#endif
25
26//////////////////////////////////////////////////////////////////////////////
27// When only use Naked48.
28//////////////////////////////////////////////////////////////////////////////
29/*
30 * ,------------------------------------ ------------------------------------.
31 * | L00 | L01 | L02 | L03 | L04 | L05 | | L06 | L07 | L08 | L09 | L0A | L0B |
32 * |------------------------------------ ------------------------------------+
33 * | L10 | L11 | L12 | L13 | L14 | L15 | | L16 | L17 | L18 | L19 | L1A | L1B |
34 * |------------------------------------ ------------------------------------+
35 * | L20 | L21 | L22 | L23 | L24 | L25 | | L26 | L17 | L28 | L29 | L2A | L2B |
36 * |-----------------------------------------------------------------------------------+
37 * | L30 | L32 | L33 | L34 | L35 | L36 | L37 | L38 | L39 | L3A | L3B | L3D |
38 * |-----------------------------------------------------------------------'
39 */
40
41#define LAYOUT( \
42 L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B, \
43 L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B, \
44 L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B, \
45 L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B \
46 ) \
47 { \
48 { L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B }, \
49 { L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B }, \
50 { L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B }, \
51 { L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B }, \
52 {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
53 {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
54 {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
55 {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO } \
56 }
57
58//////////////////////////////////////////////////////////////////////////////
59// When connecting Setta21 to Naked48.
60//////////////////////////////////////////////////////////////////////////////
61
62#define LAYOUT_with_setta21( \
63 L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B, R00, R01, R02, R03, R04, R05, \
64 L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B, R11, R12, R13, R14, R15, \
65 L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B, R20, R21, R22, R23, R24, R25, \
66 L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B, R30, R32, R34, R35 \
67 ) \
68 { \
69 { L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B }, \
70 { L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B }, \
71 { L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B }, \
72 { L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B }, \
73 { R00, R01, R02, R03, R04, R05,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
74 {KC_NO, R11, R12, R13, R14, R15,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
75 { R20, R21, R22, R23, R24, R25,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
76 { R30,KC_NO, R32,KC_NO, R34, R35,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO } \
77 }
78
79//////////////////////////////////////////////////////////////////////////////
80// When connecting Nafuda to Naked48.
81//////////////////////////////////////////////////////////////////////////////
82
83#define LAYOUT_with_nafuda( \
84 L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B, R01, \
85 L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B, R10, R11, R12, \
86 L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B, R20, R21, R22, \
87 L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B \
88 ) \
89 { \
90 { L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B }, \
91 { L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B }, \
92 { L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B }, \
93 { L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B }, \
94 {KC_NO, R01,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
95 { R10, R11, R12,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
96 { R20, R21, R22,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
97 {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO } \
98 }
99
diff --git a/keyboards/salicylic_acid3/naked60/rev1/info.json b/keyboards/salicylic_acid3/naked60/rev1/info.json
index 92da4070a5..8021bf747f 100644
--- a/keyboards/salicylic_acid3/naked60/rev1/info.json
+++ b/keyboards/salicylic_acid3/naked60/rev1/info.json
@@ -27,66 +27,230 @@
27 "layouts": { 27 "layouts": {
28 "LAYOUT": { 28 "LAYOUT": {
29 "layout": [ 29 "layout": [
30 {"label":"ESC", "x":0, "y":0}, 30 {"matrix": [0, 0], "x": 0, "y": 0},
31 {"label":"1", "x":1, "y":0}, 31 {"matrix": [0, 1], "x": 1, "y": 0},
32 {"label":"2", "x":2, "y":0}, 32 {"matrix": [0, 2], "x": 2, "y": 0},
33 {"label":"3", "x":3, "y":0}, 33 {"matrix": [0, 3], "x": 3, "y": 0},
34 {"label":"4", "x":4, "y":0}, 34 {"matrix": [0, 4], "x": 4, "y": 0},
35 {"label":"5", "x":5, "y":0}, 35 {"matrix": [0, 5], "x": 5, "y": 0},
36 {"label":"6", "x":8, "y":0}, 36
37 {"label":"7", "x":9, "y":0}, 37 {"matrix": [0, 6], "x": 8, "y": 0},
38 {"label":"8", "x":10, "y":0}, 38 {"matrix": [0, 7], "x": 9, "y": 0},
39 {"label":"9", "x":11, "y":0}, 39 {"matrix": [0, 8], "x": 10, "y": 0},
40 {"label":"0", "x":12, "y":0}, 40 {"matrix": [0, 9], "x": 11, "y": 0},
41 {"label":"Back Space", "x":13, "y":0}, 41 {"matrix": [0, 10], "x": 12, "y": 0},
42 {"label":"Tab", "x":0, "y":1}, 42 {"matrix": [0, 11], "x": 13, "y": 0},
43 {"label":"Q", "x":1, "y":1}, 43
44 {"label":"W", "x":2, "y":1}, 44 {"matrix": [1, 0], "x": 0, "y": 1},
45 {"label":"E", "x":3, "y":1}, 45 {"matrix": [1, 1], "x": 1, "y": 1},
46 {"label":"R", "x":4, "y":1}, 46 {"matrix": [1, 2], "x": 2, "y": 1},
47 {"label":"T", "x":5, "y":1}, 47 {"matrix": [1, 3], "x": 3, "y": 1},
48 {"label":"Y", "x":8, "y":1}, 48 {"matrix": [1, 4], "x": 4, "y": 1},
49 {"label":"U", "x":9, "y":1}, 49 {"matrix": [1, 5], "x": 5, "y": 1},
50 {"label":"I", "x":10, "y":1}, 50
51 {"label":"O", "x":11, "y":1}, 51 {"matrix": [1, 6], "x": 8, "y": 1},
52 {"label":"P", "x":12, "y":1}, 52 {"matrix": [1, 7], "x": 9, "y": 1},
53 {"label":"\\", "x":13, "y":1}, 53 {"matrix": [1, 8], "x": 10, "y": 1},
54 {"label":"Esc", "x":0, "y":2}, 54 {"matrix": [1, 9], "x": 11, "y": 1},
55 {"label":"A", "x":1, "y":2}, 55 {"matrix": [1, 10], "x": 12, "y": 1},
56 {"label":"S", "x":2, "y":2}, 56 {"matrix": [1, 11], "x": 13, "y": 1},
57 {"label":"D", "x":3, "y":2}, 57
58 {"label":"F", "x":4, "y":2}, 58 {"matrix": [2, 0], "x": 0, "y": 2},
59 {"label":"G", "x":5, "y":2}, 59 {"matrix": [2, 1], "x": 1, "y": 2},
60 {"label":"H", "x":8, "y":2}, 60 {"matrix": [2, 2], "x": 2, "y": 2},
61 {"label":"J", "x":9, "y":2}, 61 {"matrix": [2, 3], "x": 3, "y": 2},
62 {"label":"K", "x":10, "y":2}, 62 {"matrix": [2, 4], "x": 4, "y": 2},
63 {"label":"L", "x":11, "y":2}, 63 {"matrix": [2, 5], "x": 5, "y": 2},
64 {"label":";", "x":12, "y":2}, 64
65 {"label":"'", "x":13, "y":2}, 65 {"matrix": [2, 6], "x": 8, "y": 2},
66 {"label":"Shift", "x":0, "y":3}, 66 {"matrix": [2, 7], "x": 9, "y": 2},
67 {"label":"Z", "x":1, "y":3}, 67 {"matrix": [2, 8], "x": 10, "y": 2},
68 {"label":"X", "x":2, "y":3}, 68 {"matrix": [2, 9], "x": 11, "y": 2},
69 {"label":"C", "x":3, "y":3}, 69 {"matrix": [2, 10], "x": 12, "y": 2},
70 {"label":"V", "x":4, "y":3}, 70 {"matrix": [2, 11], "x": 13, "y": 2},
71 {"label":"B", "x":5, "y":3}, 71
72 {"label":"N", "x":8, "y":3}, 72 {"matrix": [3, 0], "x": 0, "y": 3},
73 {"label":"M", "x":9, "y":3}, 73 {"matrix": [3, 1], "x": 1, "y": 3},
74 {"label":",", "x":10, "y":3}, 74 {"matrix": [3, 2], "x": 2, "y": 3},
75 {"label":".", "x":11, "y":3}, 75 {"matrix": [3, 3], "x": 3, "y": 3},
76 {"label":"/", "x":12, "y":3}, 76 {"matrix": [3, 4], "x": 4, "y": 3},
77 {"label":"Enter", "x":13, "y":3}, 77 {"matrix": [3, 5], "x": 5, "y": 3},
78 {"label":"Adjust", "x":1, "y":4}, 78
79 {"label":"Ctrl", "x":2, "y":4}, 79 {"matrix": [3, 6], "x": 8, "y": 3},
80 {"label":"Alt", "x":3, "y":4}, 80 {"matrix": [3, 7], "x": 9, "y": 3},
81 {"label":"GUI", "x":4, "y":4}, 81 {"matrix": [3, 8], "x": 10, "y": 3},
82 {"label":"&dArr;", "x":5, "y":4}, 82 {"matrix": [3, 9], "x": 11, "y": 3},
83 {"x":6, "y":4}, 83 {"matrix": [3, 10], "x": 12, "y": 3},
84 {"x":7, "y":4}, 84 {"matrix": [3, 11], "x": 13, "y": 3},
85 {"label":"&uArr;", "x":8, "y":4}, 85
86 {"label":"&larr;", "x":9, "y":4}, 86 {"matrix": [4, 0], "x": 1, "y": 4},
87 {"label":"&darr;", "x":10, "y":4}, 87 {"matrix": [4, 1], "x": 2, "y": 4},
88 {"label":"&uarr;", "x":11, "y":4}, 88 {"matrix": [4, 2], "x": 3, "y": 4},
89 {"label":"&rarr;", "x":12, "y":4} 89 {"matrix": [4, 3], "x": 4, "y": 4},
90 {"matrix": [4, 4], "x": 5, "y": 4},
91 {"matrix": [4, 5], "x": 6, "y": 4},
92 {"matrix": [4, 6], "x": 7, "y": 4},
93 {"matrix": [4, 7], "x": 8, "y": 4},
94 {"matrix": [4, 8], "x": 9, "y": 4},
95 {"matrix": [4, 9], "x": 10, "y": 4},
96 {"matrix": [4, 10], "x": 11, "y": 4},
97 {"matrix": [4, 11], "x": 12, "y": 4}
98 ]
99 },
100 "LAYOUT_with_nafuda": {
101 "layout": [
102 {"matrix": [0, 0], "x": 0, "y": 0},
103 {"matrix": [0, 1], "x": 1, "y": 0},
104 {"matrix": [0, 2], "x": 2, "y": 0},
105 {"matrix": [0, 3], "x": 3, "y": 0},
106 {"matrix": [0, 4], "x": 4, "y": 0},
107 {"matrix": [0, 5], "x": 5, "y": 0},
108 {"matrix": [0, 6], "x": 6, "y": 0},
109 {"matrix": [0, 7], "x": 7, "y": 0},
110 {"matrix": [0, 8], "x": 8, "y": 0},
111 {"matrix": [0, 9], "x": 9, "y": 0},
112 {"matrix": [0, 10], "x": 10, "y": 0},
113 {"matrix": [0, 11], "x": 11, "y": 0},
114 {"matrix": [5, 1], "x": 12, "y": 0},
115 {"matrix": [1, 0], "x": 13, "y": 0},
116 {"matrix": [1, 1], "x": 14, "y": 0},
117 {"matrix": [1, 2], "x": 15, "y": 0},
118 {"matrix": [1, 3], "x": 16, "y": 0},
119 {"matrix": [1, 4], "x": 17, "y": 0},
120 {"matrix": [1, 5], "x": 18, "y": 0},
121 {"matrix": [1, 6], "x": 19, "y": 0},
122 {"matrix": [1, 7], "x": 20, "y": 0},
123 {"matrix": [1, 8], "x": 21, "y": 0},
124 {"matrix": [1, 9], "x": 22, "y": 0},
125 {"matrix": [1, 10], "x": 23, "y": 0},
126 {"matrix": [1, 11], "x": 24, "y": 0},
127 {"matrix": [6, 0], "x": 25, "y": 0},
128 {"matrix": [6, 1], "x": 26, "y": 0},
129 {"matrix": [6, 2], "x": 27, "y": 0},
130 {"matrix": [2, 0], "x": 28, "y": 0},
131 {"matrix": [2, 1], "x": 29, "y": 0},
132 {"matrix": [2, 2], "x": 30, "y": 0},
133 {"matrix": [2, 3], "x": 31, "y": 0},
134 {"matrix": [2, 4], "x": 32, "y": 0},
135 {"matrix": [2, 5], "x": 33, "y": 0},
136 {"matrix": [2, 6], "x": 34, "y": 0},
137 {"matrix": [2, 7], "x": 35, "y": 0},
138 {"matrix": [2, 8], "x": 36, "y": 0},
139 {"matrix": [2, 9], "x": 37, "y": 0},
140 {"matrix": [2, 10], "x": 38, "y": 0},
141 {"matrix": [2, 11], "x": 39, "y": 0},
142 {"matrix": [7, 0], "x": 40, "y": 0},
143 {"matrix": [7, 1], "x": 41, "y": 0},
144 {"matrix": [7, 2], "x": 42, "y": 0},
145 {"matrix": [3, 0], "x": 43, "y": 0},
146 {"matrix": [3, 1], "x": 44, "y": 0},
147 {"matrix": [3, 2], "x": 45, "y": 0},
148 {"matrix": [3, 3], "x": 46, "y": 0},
149 {"matrix": [3, 4], "x": 47, "y": 0},
150 {"matrix": [3, 5], "x": 48, "y": 0},
151 {"matrix": [3, 6], "x": 49, "y": 0},
152 {"matrix": [3, 7], "x": 50, "y": 0},
153 {"matrix": [3, 8], "x": 51, "y": 0},
154 {"matrix": [3, 9], "x": 52, "y": 0},
155 {"matrix": [3, 10], "x": 53, "y": 0},
156 {"matrix": [3, 11], "x": 54, "y": 0},
157 {"matrix": [4, 0], "x": 55, "y": 0},
158 {"matrix": [4, 1], "x": 56, "y": 0},
159 {"matrix": [4, 2], "x": 57, "y": 0},
160 {"matrix": [4, 3], "x": 58, "y": 0},
161 {"matrix": [4, 4], "x": 59, "y": 0},
162 {"matrix": [4, 5], "x": 60, "y": 0},
163 {"matrix": [4, 6], "x": 61, "y": 0},
164 {"matrix": [4, 7], "x": 62, "y": 0},
165 {"matrix": [4, 8], "x": 63, "y": 0},
166 {"matrix": [4, 9], "x": 64, "y": 0},
167 {"matrix": [4, 10], "x": 65, "y": 0},
168 {"matrix": [4, 11], "x": 66, "y": 0}
169 ]
170 },
171 "LAYOUT_with_setta21": {
172 "layout": [
173 {"matrix": [0, 0], "x": 0, "y": 0},
174 {"matrix": [0, 1], "x": 1, "y": 0},
175 {"matrix": [0, 2], "x": 2, "y": 0},
176 {"matrix": [0, 3], "x": 3, "y": 0},
177 {"matrix": [0, 4], "x": 4, "y": 0},
178 {"matrix": [0, 5], "x": 5, "y": 0},
179 {"matrix": [0, 6], "x": 6, "y": 0},
180 {"matrix": [0, 7], "x": 7, "y": 0},
181 {"matrix": [0, 8], "x": 8, "y": 0},
182 {"matrix": [0, 9], "x": 9, "y": 0},
183 {"matrix": [0, 10], "x": 10, "y": 0},
184 {"matrix": [0, 11], "x": 11, "y": 0},
185 {"matrix": [5, 0], "x": 12, "y": 0},
186 {"matrix": [5, 1], "x": 13, "y": 0},
187 {"matrix": [5, 2], "x": 14, "y": 0},
188 {"matrix": [5, 3], "x": 15, "y": 0},
189 {"matrix": [5, 4], "x": 16, "y": 0},
190 {"matrix": [5, 5], "x": 17, "y": 0},
191 {"matrix": [1, 0], "x": 18, "y": 0},
192 {"matrix": [1, 1], "x": 19, "y": 0},
193 {"matrix": [1, 2], "x": 20, "y": 0},
194 {"matrix": [1, 3], "x": 21, "y": 0},
195 {"matrix": [1, 4], "x": 22, "y": 0},
196 {"matrix": [1, 5], "x": 23, "y": 0},
197 {"matrix": [1, 6], "x": 24, "y": 0},
198 {"matrix": [1, 7], "x": 25, "y": 0},
199 {"matrix": [1, 8], "x": 26, "y": 0},
200 {"matrix": [1, 9], "x": 27, "y": 0},
201 {"matrix": [1, 10], "x": 28, "y": 0},
202 {"matrix": [1, 11], "x": 29, "y": 0},
203 {"matrix": [6, 1], "x": 30, "y": 0},
204 {"matrix": [6, 2], "x": 31, "y": 0},
205 {"matrix": [6, 3], "x": 32, "y": 0},
206 {"matrix": [6, 4], "x": 33, "y": 0},
207 {"matrix": [6, 5], "x": 34, "y": 0},
208 {"matrix": [2, 0], "x": 35, "y": 0},
209 {"matrix": [2, 1], "x": 36, "y": 0},
210 {"matrix": [2, 2], "x": 37, "y": 0},
211 {"matrix": [2, 3], "x": 38, "y": 0},
212 {"matrix": [2, 4], "x": 39, "y": 0},
213 {"matrix": [2, 5], "x": 40, "y": 0},
214 {"matrix": [2, 6], "x": 41, "y": 0},
215 {"matrix": [2, 7], "x": 42, "y": 0},
216 {"matrix": [2, 8], "x": 43, "y": 0},
217 {"matrix": [2, 9], "x": 44, "y": 0},
218 {"matrix": [2, 10], "x": 45, "y": 0},
219 {"matrix": [2, 11], "x": 46, "y": 0},
220 {"matrix": [7, 0], "x": 47, "y": 0},
221 {"matrix": [7, 1], "x": 48, "y": 0},
222 {"matrix": [7, 2], "x": 49, "y": 0},
223 {"matrix": [7, 3], "x": 50, "y": 0},
224 {"matrix": [7, 4], "x": 51, "y": 0},
225 {"matrix": [7, 5], "x": 52, "y": 0},
226 {"matrix": [3, 0], "x": 53, "y": 0},
227 {"matrix": [3, 1], "x": 54, "y": 0},
228 {"matrix": [3, 2], "x": 55, "y": 0},
229 {"matrix": [3, 3], "x": 56, "y": 0},
230 {"matrix": [3, 4], "x": 57, "y": 0},
231 {"matrix": [3, 5], "x": 58, "y": 0},
232 {"matrix": [3, 6], "x": 59, "y": 0},
233 {"matrix": [3, 7], "x": 60, "y": 0},
234 {"matrix": [3, 8], "x": 61, "y": 0},
235 {"matrix": [3, 9], "x": 62, "y": 0},
236 {"matrix": [3, 10], "x": 63, "y": 0},
237 {"matrix": [3, 11], "x": 64, "y": 0},
238 {"matrix": [8, 0], "x": 65, "y": 0},
239 {"matrix": [8, 2], "x": 66, "y": 0},
240 {"matrix": [8, 4], "x": 67, "y": 0},
241 {"matrix": [8, 5], "x": 68, "y": 0},
242 {"matrix": [4, 0], "x": 69, "y": 0},
243 {"matrix": [4, 1], "x": 70, "y": 0},
244 {"matrix": [4, 2], "x": 71, "y": 0},
245 {"matrix": [4, 3], "x": 72, "y": 0},
246 {"matrix": [4, 4], "x": 73, "y": 0},
247 {"matrix": [4, 5], "x": 74, "y": 0},
248 {"matrix": [4, 6], "x": 75, "y": 0},
249 {"matrix": [4, 7], "x": 76, "y": 0},
250 {"matrix": [4, 8], "x": 77, "y": 0},
251 {"matrix": [4, 9], "x": 78, "y": 0},
252 {"matrix": [4, 10], "x": 79, "y": 0},
253 {"matrix": [4, 11], "x": 80, "y": 0}
90 ] 254 ]
91 } 255 }
92 } 256 }
diff --git a/keyboards/salicylic_acid3/naked60/rev1/rev1.h b/keyboards/salicylic_acid3/naked60/rev1/rev1.h
deleted file mode 100644
index fcb26d5fc2..0000000000
--- a/keyboards/salicylic_acid3/naked60/rev1/rev1.h
+++ /dev/null
@@ -1,107 +0,0 @@
1/*
2Copyright 2021 Salicylic_Acid
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
19
20#include "quantum.h"
21
22
23//////////////////////////////////////////////////////////////////////////////
24// When only use naked60.
25//////////////////////////////////////////////////////////////////////////////
26/*
27 * ,------------------------------------ ------------------------------------.
28 * | L00 | L01 | L02 | L03 | L04 | L05 | | L06 | L07 | L08 | L09 | L0A | L0B |
29 * |------------------------------------ ------------------------------------+
30 * | L10 | L11 | L12 | L13 | L14 | L15 | | L16 | L17 | L18 | L19 | L1A | L1B |
31 * |------------------------------------ ------------------------------------+
32 * | L20 | L21 | L22 | L23 | L24 | L25 | | L26 | L17 | L28 | L29 | L2A | L2B |
33 * |------------------------------------ ------------------------------------+
34 * | L30 | L31 | L32 | L33 | L34 | L35 | | L36 | L37 | L38 | L39 | L3A | L3B |
35 * |-----------------------------------------------------------------------'
36 * | L40 | L41 | L42 | L43 | L44 | L45 | L46 | L47 | L48 | L49 | L4A | L4B |
37 * |-----------------------------------------------------------------------'
38 */
39
40#define LAYOUT( \
41 L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B, \
42 L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B, \
43 L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B, \
44 L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B, \
45 L40, L41, L42, L43, L44, L45, L46, L47, L48, L49, L4A, L4B \
46 ) \
47 { \
48 { L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B }, \
49 { L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B }, \
50 { L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B }, \
51 { L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B }, \
52 { L40, L41, L42, L43, L44, L45, L46, L47, L48, L49, L4A, L4B }, \
53 {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
54 {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
55 {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
56 {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
57 {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO } \
58 }
59
60//////////////////////////////////////////////////////////////////////////////
61// When connecting Setta21 to naked60.
62//////////////////////////////////////////////////////////////////////////////
63
64#define LAYOUT_with_setta21( \
65 L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B, R00, R01, R02, R03, R04, R05, \
66 L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B, R11, R12, R13, R14, R15, \
67 L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B, R20, R21, R22, R23, R24, R25, \
68 L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B, R30, R32, R34, R35, \
69 L40, L41, L42, L43, L44, L45, L46, L47, L48, L49, L4A, L4B \
70 ) \
71 { \
72 { L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B }, \
73 { L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B }, \
74 { L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B }, \
75 { L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B }, \
76 { L40, L41, L42, L43, L44, L45, L46, L47, L48, L49, L4A, L4B }, \
77 { R00, R01, R02, R03, R04, R05,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
78 {KC_NO, R11, R12, R13, R14, R15,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
79 { R20, R21, R22, R23, R24, R25,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
80 { R30,KC_NO, R32,KC_NO, R34, R35,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
81 {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO } \
82 }
83
84//////////////////////////////////////////////////////////////////////////////
85// When connecting Nafuda to naked60.
86//////////////////////////////////////////////////////////////////////////////
87
88#define LAYOUT_with_nafuda( \
89 L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B, R01, \
90 L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B, R10, R11, R12, \
91 L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B, R20, R21, R22, \
92 L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B, \
93 L40, L41, L42, L43, L44, L45, L46, L47, L48, L49, L4A, L4B \
94 ) \
95 { \
96 { L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B }, \
97 { L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B }, \
98 { L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B }, \
99 { L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B }, \
100 { L40, L41, L42, L43, L44, L45, L46, L47, L48, L49, L4A, L4B }, \
101 {KC_NO, R01,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
102 { R10, R11, R12,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
103 { R20, R21, R22,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
104 {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
105 {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO } \
106 }
107
diff --git a/keyboards/salicylic_acid3/naked64/rev1/info.json b/keyboards/salicylic_acid3/naked64/rev1/info.json
index 7eed51635b..999f1e98c0 100644
--- a/keyboards/salicylic_acid3/naked64/rev1/info.json
+++ b/keyboards/salicylic_acid3/naked64/rev1/info.json
@@ -30,170 +30,189 @@
30 "layouts": { 30 "layouts": {
31 "LAYOUT": { 31 "LAYOUT": {
32 "layout": [ 32 "layout": [
33 {"label":"pgup", "x":0.25, "y":0}, 33 {"matrix": [0, 0], "x": 0.25, "y": 0},
34 {"label":"ESC", "x":1.75, "y":0}, 34
35 {"label":"1", "x":2.75, "y":0}, 35 {"matrix": [2, 0], "x": 1.75, "y": 0},
36 {"label":"2", "x":4, "y":0}, 36 {"matrix": [7, 0], "x": 2.75, "y": 0},
37 {"label":"3", "x":5, "y":0}, 37 {"matrix": [3, 1], "x": 4, "y": 0},
38 {"label":"4", "x":6, "y":0}, 38 {"matrix": [0, 2], "x": 5, "y": 0},
39 {"label":"5", "x":7, "y":0}, 39 {"matrix": [5, 2], "x": 6, "y": 0},
40 {"label":"6", "x":9.25, "y":0}, 40 {"matrix": [1, 3], "x": 7, "y": 0},
41 {"label":"7", "x":10.25, "y":0}, 41
42 {"label":"8", "x":11.25, "y":0}, 42 {"matrix": [6, 3], "x": 9.25, "y": 0},
43 {"label":"9", "x":12.25, "y":0}, 43 {"matrix": [3, 4], "x": 10.25, "y": 0},
44 {"label":"0", "x":13.5, "y":0}, 44 {"matrix": [0, 5], "x": 11.25, "y": 0},
45 {"label":"-", "x":14.5, "y":0}, 45 {"matrix": [4, 5], "x": 12.25, "y": 0},
46 {"label":"Back Space", "x":15.5, "y":0}, 46 {"matrix": [1, 6], "x": 13.5, "y": 0},
47 {"label":"pgdn", "x":0, "y":1}, 47 {"matrix": [6, 6], "x": 14.5, "y": 0},
48 {"label":"Tab", "x":1.25, "y":1, "w":1.5}, 48 {"matrix": [3, 7], "x": 15.5, "y": 0},
49 {"label":"Q", "x":2.75, "y":1}, 49
50 {"label":"W", "x":4, "y":1}, 50 {"matrix": [1, 0], "x": 0, "y": 1},
51 {"label":"E", "x":5, "y":1}, 51
52 {"label":"R", "x":6, "y":1}, 52 {"matrix": [3, 0], "x": 1.25, "y": 1, "w": 1.5},
53 {"label":"T", "x":7, "y":1}, 53 {"matrix": [0, 1], "x": 2.75, "y": 1},
54 {"label":"Y", "x":9.25, "y":1}, 54 {"matrix": [4, 1], "x": 4, "y": 1},
55 {"label":"U", "x":10.25, "y":1}, 55 {"matrix": [1, 2], "x": 5, "y": 1},
56 {"label":"I", "x":11.25, "y":1}, 56 {"matrix": [6, 2], "x": 6, "y": 1},
57 {"label":"O", "x":12.25, "y":1}, 57 {"matrix": [2, 3], "x": 7, "y": 1},
58 {"label":"P", "x":13.5, "y":1}, 58
59 {"label":"[", "x":14.5, "y":1}, 59 {"matrix": [7, 3], "x": 9.25, "y": 1},
60 {"label":"]", "x":15.5, "y":1}, 60 {"matrix": [4, 4], "x": 10.25, "y": 1},
61 {"label":"Control", "x":1, "y":2, "w":1.75}, 61 {"matrix": [1, 5], "x": 11.25, "y": 1},
62 {"label":"A", "x":2.75, "y":2}, 62 {"matrix": [5, 5], "x": 12.25, "y": 1},
63 {"label":"S", "x":4, "y":2}, 63 {"matrix": [2, 6], "x": 13.5, "y": 1},
64 {"label":"D", "x":5, "y":2}, 64 {"matrix": [7, 6], "x": 14.5, "y": 1},
65 {"label":"F", "x":6, "y":2}, 65 {"matrix": [4, 7], "x": 15.5, "y": 1},
66 {"label":"G", "x":7, "y":2}, 66
67 {"label":"H", "x":9.25, "y":2}, 67 {"matrix": [4, 0], "x": 1, "y": 2, "w": 1.75},
68 {"label":"J", "x":10.25, "y":2}, 68 {"matrix": [1, 1], "x": 2.75, "y": 2},
69 {"label":"K", "x":11.25, "y":2}, 69 {"matrix": [5, 1], "x": 4, "y": 2},
70 {"label":"L", "x":12.25, "y":2}, 70 {"matrix": [2, 2], "x": 5, "y": 2},
71 {"label":";", "x":13.5, "y":2}, 71 {"matrix": [7, 2], "x": 6, "y": 2},
72 {"label":"'", "x":14.5, "y":2}, 72 {"matrix": [3, 3], "x": 7, "y": 2},
73 {"label":"Return", "x":15.5, "y":2}, 73
74 {"label":"Shift", "x":0.5, "y":3, "w":2.25}, 74 {"matrix": [0, 4], "x": 9.25, "y": 2},
75 {"label":"Z", "x":2.75, "y":3}, 75 {"matrix": [5, 4], "x": 10.25, "y": 2},
76 {"label":"X", "x":4, "y":3}, 76 {"matrix": [2, 5], "x": 11.25, "y": 2},
77 {"label":"C", "x":5, "y":3}, 77 {"matrix": [6, 5], "x": 12.25, "y": 2},
78 {"label":"V", "x":6, "y":3}, 78 {"matrix": [3, 6], "x": 13.5, "y": 2},
79 {"label":"B", "x":7, "y":3}, 79 {"matrix": [0, 7], "x": 14.5, "y": 2},
80 {"label":"N", "x":9.25, "y":3}, 80 {"matrix": [5, 7], "x": 15.5, "y": 2},
81 {"label":"M", "x":10.25, "y":3}, 81
82 {"label":",", "x":11.25, "y":3}, 82 {"matrix": [5, 0], "x": 0.5, "y": 3, "w": 2.25},
83 {"label":".", "x":12.25, "y":3}, 83 {"matrix": [2, 1], "x": 2.75, "y": 3},
84 {"label":"/", "x":13.5, "y":3}, 84 {"matrix": [6, 1], "x": 4, "y": 3},
85 {"label":"&uarr;", "x":14.5, "y":3}, 85 {"matrix": [3, 2], "x": 5, "y": 3},
86 {"label":"Shift", "x":15.5, "y":3}, 86 {"matrix": [0, 3], "x": 6, "y": 3},
87 {"label":"Adjust", "x":1.25, "y":4, "w":1.75}, 87 {"matrix": [4, 3], "x": 7, "y": 3},
88 {"label":"Alt", "x":3.75, "y":4.25}, 88
89 {"x":4.75, "y":4.25, "w":2.25}, 89 {"matrix": [1, 4], "x": 9.25, "y": 3},
90 {"label":"&dArr;", "x":7, "y":4.25}, 90 {"matrix": [6, 4], "x": 10.25, "y": 3},
91 {"label":"&uArr;", "x":9.25, "y":4.25}, 91 {"matrix": [3, 5], "x": 11.25, "y": 3},
92 {"x":10.25, "y":4.25, "w":2}, 92 {"matrix": [7, 5], "x": 12.25, "y": 3},
93 {"label":"GUI", "x":12.25, "y":4.25}, 93 {"matrix": [4, 6], "x": 13.5, "y": 3},
94 {"label":"&larr;", "x":13.5, "y":4}, 94 {"matrix": [1, 7], "x": 14.5, "y": 3},
95 {"label":"&darr;", "x":14.5, "y":4}, 95 {"matrix": [6, 7], "x": 15.5, "y": 3},
96 {"label":"&rarr;", "x":15.5, "y":4} 96
97 {"matrix": [6, 0], "x": 1.25, "y": 4, "w": 1.75},
98 {"matrix": [7, 1], "x": 3.75, "y": 4.25},
99 {"matrix": [4, 2], "x": 4.75, "y": 4.25, "w": 2.25},
100 {"matrix": [5, 3], "x": 7, "y": 4.25},
101
102 {"matrix": [2, 4], "x": 9.25, "y": 4.25},
103 {"matrix": [7, 4], "x": 10.25, "y": 4.25, "w": 2},
104 {"matrix": [0, 6], "x": 12.25, "y": 4.25},
105 {"matrix": [5, 6], "x": 13.5, "y": 4},
106 {"matrix": [2, 7], "x": 14.5, "y": 4},
107 {"matrix": [7, 7], "x": 15.5, "y": 4}
97 ] 108 ]
98 }, 109 },
99 "LAYOUT_with_setta21": { 110 "LAYOUT_with_setta21": {
100 "layout": [ 111 "layout": [
101 {"label":"pgup", "x":0.25, "y":0}, 112 {"matrix": [0, 0], "x": 0.25, "y": 0},
102 {"label":"ESC", "x":1.75, "y":0}, 113
103 {"label":"1", "x":2.75, "y":0}, 114 {"matrix": [2, 0], "x": 1.75, "y": 0},
104 {"label":"2", "x":4, "y":0}, 115 {"matrix": [7, 0], "x": 2.75, "y": 0},
105 {"label":"3", "x":5, "y":0}, 116 {"matrix": [3, 1], "x": 4, "y": 0},
106 {"label":"4", "x":6, "y":0}, 117 {"matrix": [0, 2], "x": 5, "y": 0},
107 {"label":"5", "x":7, "y":0}, 118 {"matrix": [5, 2], "x": 6, "y": 0},
108 {"label":"6", "x":9.25, "y":0}, 119 {"matrix": [1, 3], "x": 7, "y": 0},
109 {"label":"7", "x":10.25, "y":0}, 120
110 {"label":"8", "x":11.25, "y":0}, 121 {"matrix": [6, 3], "x": 9.25, "y": 0},
111 {"label":"9", "x":12.25, "y":0}, 122 {"matrix": [3, 4], "x": 10.25, "y": 0},
112 {"label":"0", "x":13.5, "y":0}, 123 {"matrix": [0, 5], "x": 11.25, "y": 0},
113 {"label":"-", "x":14.5, "y":0}, 124 {"matrix": [4, 5], "x": 12.25, "y": 0},
114 {"label":"Back Space", "x":15.5, "y":0}, 125 {"matrix": [1, 6], "x": 13.5, "y": 0},
115 126 {"matrix": [6, 6], "x": 14.5, "y": 0},
116 {"label":"Esc", "x": 17.5, "y":0}, 127 {"matrix": [3, 7], "x": 15.5, "y": 0},
117 {"label":"F2", "x": 18.5, "y":0}, 128
118 {"label":"=", "x": 19.5, "y":0}, 129 {"matrix": [8, 5], "x": 17.5, "y": 0},
119 {"label":"Delete", "x": 20.5, "y":0}, 130 {"matrix": [9, 5], "x": 18.5, "y": 0},
120 131 {"matrix": [10, 5], "x": 19.5, "y": 0},
121 {"label":"pgdn", "x":0, "y":1}, 132 {"matrix": [11, 5], "x": 20.5, "y": 0},
122 {"label":"Tab", "x":1.25, "y":1, "w":1.5}, 133
123 {"label":"Q", "x":2.75, "y":1}, 134 {"matrix": [1, 0], "x": 0, "y": 1},
124 {"label":"W", "x":4, "y":1}, 135
125 {"label":"E", "x":5, "y":1}, 136 {"matrix": [3, 0], "x": 1.25, "y": 1, "w": 1.5},
126 {"label":"R", "x":6, "y":1}, 137 {"matrix": [0, 1], "x": 2.75, "y": 1},
127 {"label":"T", "x":7, "y":1}, 138 {"matrix": [4, 1], "x": 4, "y": 1},
128 {"label":"Y", "x":9.25, "y":1}, 139 {"matrix": [1, 2], "x": 5, "y": 1},
129 {"label":"U", "x":10.25, "y":1}, 140 {"matrix": [6, 2], "x": 6, "y": 1},
130 {"label":"I", "x":11.25, "y":1}, 141 {"matrix": [2, 3], "x": 7, "y": 1},
131 {"label":"O", "x":12.25, "y":1}, 142
132 {"label":"P", "x":13.5, "y":1}, 143 {"matrix": [7, 3], "x": 9.25, "y": 1},
133 {"label":"[", "x":14.5, "y":1}, 144 {"matrix": [4, 4], "x": 10.25, "y": 1},
134 {"label":"]", "x":15.5, "y":1}, 145 {"matrix": [1, 5], "x": 11.25, "y": 1},
135 146 {"matrix": [5, 5], "x": 12.25, "y": 1},
136 {"label":"Num Lock", "x": 17.5, "y":1.25}, 147 {"matrix": [2, 6], "x": 13.5, "y": 1},
137 {"label":"/", "x": 18.5, "y":1.25}, 148 {"matrix": [7, 6], "x": 14.5, "y": 1},
138 {"label":"*", "x": 19.5, "y":1.25}, 149 {"matrix": [4, 7], "x": 15.5, "y": 1},
139 {"label":"-", "x": 20.5, "y":1.25}, 150
140 151 {"matrix": [8, 4], "x": 17.5, "y": 1.25},
141 {"label":"Control", "x":1, "y":2, "w":1.75}, 152 {"matrix": [9, 4], "x": 18.5, "y": 1.25},
142 {"label":"A", "x":2.75, "y":2}, 153 {"matrix": [10, 4], "x": 19.5, "y": 1.25},
143 {"label":"S", "x":4, "y":2}, 154 {"matrix": [11, 4], "x": 20.5, "y": 1.25},
144 {"label":"D", "x":5, "y":2}, 155
145 {"label":"F", "x":6, "y":2}, 156 {"matrix": [4, 0], "x": 1, "y": 2, "w": 1.75},
146 {"label":"G", "x":7, "y":2}, 157 {"matrix": [1, 1], "x": 2.75, "y": 2},
147 {"label":"H", "x":9.25, "y":2}, 158 {"matrix": [5, 1], "x": 4, "y": 2},
148 {"label":"J", "x":10.25, "y":2}, 159 {"matrix": [2, 2], "x": 5, "y": 2},
149 {"label":"K", "x":11.25, "y":2}, 160 {"matrix": [7, 2], "x": 6, "y": 2},
150 {"label":"L", "x":12.25, "y":2}, 161 {"matrix": [3, 3], "x": 7, "y": 2},
151 {"label":";", "x":13.5, "y":2}, 162
152 {"label":"'", "x":14.5, "y":2}, 163 {"matrix": [0, 4], "x": 9.25, "y": 2},
153 {"label":"Return", "x":15.5, "y":2}, 164 {"matrix": [5, 4], "x": 10.25, "y": 2},
154 165 {"matrix": [2, 5], "x": 11.25, "y": 2},
155 {"label":"7", "x": 17.5, "y":2.25}, 166 {"matrix": [6, 5], "x": 12.25, "y": 2},
156 {"label":"8", "x": 18.5, "y":2.25}, 167 {"matrix": [3, 6], "x": 13.5, "y": 2},
157 {"label":"9", "x": 19.5, "y":2.25}, 168 {"matrix": [0, 7], "x": 14.5, "y": 2},
158 169 {"matrix": [5, 7], "x": 15.5, "y": 2},
159 {"label":"Shift", "x":0.5, "y":3, "w":2.25}, 170
160 {"label":"Z", "x":2.75, "y":3}, 171 {"matrix": [8, 3], "x": 17.5, "y": 2.25},
161 {"label":"X", "x":4, "y":3}, 172 {"matrix": [9, 3], "x": 18.5, "y": 2.25},
162 {"label":"C", "x":5, "y":3}, 173 {"matrix": [10, 3], "x": 19.5, "y": 2.25},
163 {"label":"V", "x":6, "y":3}, 174
164 {"label":"B", "x":7, "y":3}, 175 {"matrix": [5, 0], "x": 0.5, "y": 3, "w": 2.25},
165 {"label":"N", "x":9.25, "y":3}, 176 {"matrix": [2, 1], "x": 2.75, "y": 3},
166 {"label":"M", "x":10.25, "y":3}, 177 {"matrix": [6, 1], "x": 4, "y": 3},
167 {"label":",", "x":11.25, "y":3}, 178 {"matrix": [3, 2], "x": 5, "y": 3},
168 {"label":".", "x":12.25, "y":3}, 179 {"matrix": [0, 3], "x": 6, "y": 3},
169 {"label":"/", "x":13.5, "y":3}, 180 {"matrix": [4, 3], "x": 7, "y": 3},
170 {"label":"&uarr;", "x":14.5, "y":3}, 181
171 {"label":"Shift", "x":15.5, "y":3}, 182 {"matrix": [1, 4], "x": 9.25, "y": 3},
172 183 {"matrix": [6, 4], "x": 10.25, "y": 3},
173 {"label":"4", "x": 17.5, "y":3.25}, 184 {"matrix": [3, 5], "x": 11.25, "y": 3},
174 {"label":"5", "x": 18.5, "y":3.25}, 185 {"matrix": [7, 5], "x": 12.25, "y": 3},
175 {"label":"6", "x": 19.5, "y":3.25}, 186 {"matrix": [4, 6], "x": 13.5, "y": 3},
176 {"label":"+", "x": 20.5, "y":2.25, "h":2}, 187 {"matrix": [1, 7], "x": 14.5, "y": 3},
177 188 {"matrix": [6, 7], "x": 15.5, "y": 3},
178 {"label":"Adjust", "x":1.25, "y":4, "w":1.75}, 189
179 {"label":"Alt", "x":3.75, "y":4.25}, 190 {"matrix": [8, 2], "x": 17.5, "y": 3.25},
180 {"x":4.75, "y":4.25, "w":2.25}, 191 {"matrix": [9, 2], "x": 18.5, "y": 3.25},
181 {"label":"&dArr;", "x":7, "y":4.25}, 192 {"matrix": [10, 2], "x": 19.5, "y": 3.25},
182 {"label":"&uArr;", "x":9.25, "y":4.25}, 193 {"matrix": [11, 2], "x": 20.5, "y": 2.25, "h": 2},
183 {"x":10.25, "y":4.25, "w":2}, 194
184 {"label":"GUI", "x":12.25, "y":4.25}, 195 {"matrix": [6, 0], "x": 1.25, "y": 4, "w": 1.75},
185 {"label":"&larr;", "x":13.5, "y":4}, 196 {"matrix": [7, 1], "x": 3.75, "y": 4.25},
186 {"label":"&darr;", "x":14.5, "y":4}, 197 {"matrix": [4, 2], "x": 4.75, "y": 4.25, "w": 2.25},
187 {"label":"&rarr;", "x":15.5, "y":4}, 198 {"matrix": [5, 3], "x": 7, "y": 4.25},
188 199
189 {"label":"1", "x": 17.5, "y":4.25}, 200 {"matrix": [2, 4], "x": 9.25, "y": 4.25},
190 {"label":"2", "x": 18.5, "y":4.25}, 201 {"matrix": [7, 4], "x": 10.25, "y": 4.25, "w": 2},
191 {"label":"3", "x": 19.5, "y":4.25}, 202 {"matrix": [0, 6], "x": 12.25, "y": 4.25},
192 203 {"matrix": [5, 6], "x": 13.5, "y": 4},
193 {"label":"Lower / 0", "x": 17.5, "y":5.25, "w":2}, 204 {"matrix": [2, 7], "x": 14.5, "y": 4},
194 {"label":"Raise / .", "x": 19.5, "y":5.25}, 205 {"matrix": [7, 7], "x": 15.5, "y": 4},
195 {"label":"Enter", "x": 20.5, "y":4.25, "h":2} 206
207 {"matrix": [8, 1], "x": 17.5, "y": 4.25},
208 {"matrix": [9, 1], "x": 18.5, "y": 4.25},
209 {"matrix": [10, 1], "x": 19.5, "y": 4.25},
210
211 {"matrix": [8, 0], "x": 17.5, "y": 5.25, "w": 2},
212 {"matrix": [10, 0], "x": 19.5, "y": 5.25},
213 {"matrix": [11, 0], "x": 20.5, "y": 4.25, "h": 2}
196 ] 214 ]
197 } 215 }
198 } 216 }
217
199} 218}
diff --git a/keyboards/salicylic_acid3/naked64/rev1/rev1.h b/keyboards/salicylic_acid3/naked64/rev1/rev1.h
deleted file mode 100644
index d8965556c7..0000000000
--- a/keyboards/salicylic_acid3/naked64/rev1/rev1.h
+++ /dev/null
@@ -1,79 +0,0 @@
1#pragma once
2
3#include "quantum.h"
4
5
6//////////////////////////////////////////////////////////////////////////////
7// When only use Naked64.
8//////////////////////////////////////////////////////////////////////////////
9/*
10 * ,------------------------------------------ -----------------------------------------.
11 * | L00 | L20 | L70 | L31 | L02 | L52 | L13 | | L63 | L34 | L05 | L45 | L16 | L66 | L37 |
12 * |------------------------------------------ ------------------------------------------+
13 * | L10 | L30 | L01 | L41 | L12 | L62 | L23 | | L73 | L44 | L15 | L55 | L26 | L76 | L47 |
14 * |------------------------------------------ ------------------------------------------+
15 * | L40 | L11 | L51 | L22 | L72 | L33 | | L04 | L54 | L25 | L65 | L36 | L07 | L57 |
16 * |------------------------------------ ------------------------------------------+
17 * | L50 | L21 | L61 | L32 | L03 | L43 | | L14 | L64 | L35 | L75 | L46 | L17 | L67 |
18 * |------------------------------------ ------------------------------------------+
19 * | L60 | | L71 | L42 | | L53 | | L24 | L74 | | L06 | L56 | L27 | L77 |
20 * |------------------------------------ ------------------------------------------'
21 */
22
23#define LAYOUT( \
24 L00, L20, L70, L31, L02, L52, L13, L63, L34, L05, L45, L16, L66, L37, \
25 L10, L30, L01, L41, L12, L62, L23, L73, L44, L15, L55, L26, L76, L47, \
26 L40, L11, L51, L22, L72, L33, L04, L54, L25, L65, L36, L07, L57, \
27 L50, L21, L61, L32, L03, L43, L14, L64, L35, L75, L46, L17, L67, \
28 L60, L71, L42, L53, L24, L74, L06, L56, L27, L77 \
29 ) \
30 { \
31 { L00, L01, L02, L03, L04, L05, L06, L07 }, \
32 { L10, L11, L12, L13, L14, L15, L16, L17 }, \
33 { L20, L21, L22, L23, L24, L25, L26, L27 }, \
34 { L30, L31, L32, L33, L34, L35, L36, L37 }, \
35 { L40, L41, L42, L43, L44, L45, L46, L47 }, \
36 { L50, L51, L52, L53, L54, L55, L56, L57 }, \
37 { L60, L61, L62, L63, L64, L65, L66, L67 }, \
38 { L70, L71, L72, L73, L74, L75, L76, L77 }, \
39 {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
40 {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
41 {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
42 {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
43 {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
44 {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
45 {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
46 {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO } \
47 }
48
49//////////////////////////////////////////////////////////////////////////////
50// When connecting Setta21 to Naked64.
51//////////////////////////////////////////////////////////////////////////////
52
53#define LAYOUT_with_setta21( \
54 L00, L20, L70, L31, L02, L52, L13, L63, L34, L05, L45, L16, L66, L37, R05, R15, R25, R35, \
55 L10, L30, L01, L41, L12, L62, L23, L73, L44, L15, L55, L26, L76, L47, R04, R14, R24, R34, \
56 L40, L11, L51, L22, L72, L33, L04, L54, L25, L65, L36, L07, L57, R03, R13, R23, \
57 L50, L21, L61, L32, L03, L43, L14, L64, L35, L75, L46, L17, L67, R02, R12, R22, R32, \
58 L60, L71, L42, L53, L24, L74, L06, L56, L27, L77, R01, R11, R21, \
59 R00, R20, R30 \
60 ) \
61 { \
62 { L00, L01, L02, L03, L04, L05, L06, L07 }, \
63 { L10, L11, L12, L13, L14, L15, L16, L17 }, \
64 { L20, L21, L22, L23, L24, L25, L26, L27 }, \
65 { L30, L31, L32, L33, L34, L35, L36, L37 }, \
66 { L40, L41, L42, L43, L44, L45, L46, L47 }, \
67 { L50, L51, L52, L53, L54, L55, L56, L57 }, \
68 { L60, L61, L62, L63, L64, L65, L66, L67 }, \
69 { L70, L71, L72, L73, L74, L75, L76, L77 }, \
70 { R00, R01, R02, R03, R04, R05,KC_NO,KC_NO }, \
71 {KC_NO, R11, R12, R13, R14, R15,KC_NO,KC_NO }, \
72 { R20, R21, R22, R23, R24, R25,KC_NO,KC_NO }, \
73 { R30,KC_NO, R32,KC_NO, R34, R35,KC_NO,KC_NO }, \
74 {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
75 {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
76 {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
77 {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO } \
78 }
79
diff --git a/keyboards/sam/sg81m/info.json b/keyboards/sam/sg81m/info.json
index f4d6c5749b..baa1cec9a7 100644
--- a/keyboards/sam/sg81m/info.json
+++ b/keyboards/sam/sg81m/info.json
@@ -21,179 +21,194 @@
21 }, 21 },
22 "processor": "atmega32u4", 22 "processor": "atmega32u4",
23 "bootloader": "atmel-dfu", 23 "bootloader": "atmel-dfu",
24 "layout_aliases": {
25 "LAYOUT": "LAYOUT_7u_space"
26 },
24 "layouts": { 27 "layouts": {
25 "LAYOUT_7u_space": { 28 "LAYOUT_7u_space": {
26 "layout": [ 29 "layout": [
27 {"label":"K00 (F0,B7)", "x":0, "y":0}, 30 {"matrix": [0, 0], "x": 0, "y": 0},
28 {"label":"K01 (F0,B6)", "x":1, "y":0}, 31 {"matrix": [0, 1], "x": 1, "y": 0},
29 {"label":"K02 (F0,B5)", "x":2, "y":0}, 32 {"matrix": [0, 2], "x": 2, "y": 0},
30 {"label":"K03 (F0,B4)", "x":3, "y":0}, 33 {"matrix": [0, 3], "x": 3, "y": 0},
31 {"label":"K04 (F0,C7)", "x":4, "y":0}, 34 {"matrix": [0, 4], "x": 4, "y": 0},
32 {"label":"K05 (F0,C6)", "x":5, "y":0}, 35 {"matrix": [0, 5], "x": 5, "y": 0},
33 {"label":"K06 (F0,D0)", "x":6, "y":0}, 36 {"matrix": [0, 6], "x": 6, "y": 0},
34 {"label":"K07 (F0,D1)", "x":7, "y":0}, 37 {"matrix": [0, 7], "x": 7, "y": 0},
35 {"label":"K08 (F0,D2)", "x":8, "y":0}, 38 {"matrix": [0, 8], "x": 8, "y": 0},
36 {"label":"K09 (F0,D3)", "x":9, "y":0}, 39 {"matrix": [0, 9], "x": 9, "y": 0},
37 {"label":"K0A (F0,D4)", "x":10, "y":0}, 40 {"matrix": [0, 10], "x": 10, "y": 0},
38 {"label":"K0B (F0,D5)", "x":11, "y":0}, 41 {"matrix": [0, 11], "x": 11, "y": 0},
39 {"label":"K0C (F0,D6)", "x":12, "y":0}, 42 {"matrix": [0, 12], "x": 12, "y": 0},
40 {"label":"K0D (F0,D7)", "x":13, "y":0, "w":2}, 43 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
41 {"label":"K2D (F4,D7)", "x":15.5, "y":0}, 44
42 {"label":"K3D (F5,D7)", "x":16.5, "y":0}, 45 {"matrix": [2, 13], "x": 15.5, "y": 0},
43 {"label":"K4D (F6,D7)", "x":17.5, "y":0}, 46 {"matrix": [3, 13], "x": 16.5, "y": 0},
44 47 {"matrix": [4, 13], "x": 17.5, "y": 0},
45 {"label":"K10 (F1,B7)", "x":0, "y":1.25, "w":1.5}, 48
46 {"label":"K11 (F1,B6)", "x":1.5, "y":1.25}, 49 {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
47 {"label":"K12 (F1,B5)", "x":2.5, "y":1.25}, 50 {"matrix": [1, 1], "x": 1.5, "y": 1.25},
48 {"label":"K13 (F1,B4)", "x":3.5, "y":1.25}, 51 {"matrix": [1, 2], "x": 2.5, "y": 1.25},
49 {"label":"K14 (F1,C7)", "x":4.5, "y":1.25}, 52 {"matrix": [1, 3], "x": 3.5, "y": 1.25},
50 {"label":"K15 (F1,C6)", "x":5.5, "y":1.25}, 53 {"matrix": [1, 4], "x": 4.5, "y": 1.25},
51 {"label":"K16 (F1,D0)", "x":6.5, "y":1.25}, 54 {"matrix": [1, 5], "x": 5.5, "y": 1.25},
52 {"label":"K17 (F1,D1)", "x":7.5, "y":1.25}, 55 {"matrix": [1, 6], "x": 6.5, "y": 1.25},
53 {"label":"K18 (F1,D2)", "x":8.5, "y":1.25}, 56 {"matrix": [1, 7], "x": 7.5, "y": 1.25},
54 {"label":"K19 (F1,D3)", "x":9.5, "y":1.25}, 57 {"matrix": [1, 8], "x": 8.5, "y": 1.25},
55 {"label":"K1A (F1,D4)", "x":10.5, "y":1.25}, 58 {"matrix": [1, 9], "x": 9.5, "y": 1.25},
56 {"label":"K1B (F1,D5)", "x":11.5, "y":1.25}, 59 {"matrix": [1, 10], "x": 10.5, "y": 1.25},
57 {"label":"K1C (F1,D6)", "x":12.5, "y":1.25}, 60 {"matrix": [1, 11], "x": 11.5, "y": 1.25},
58 {"label":"K1D (F1,D7)", "x":13.5, "y":1.25, "w":1.5}, 61 {"matrix": [1, 12], "x": 12.5, "y": 1.25},
59 {"label":"K56 (F7,D0)", "x":15.5, "y":1.25}, 62 {"matrix": [1, 13], "x": 13.5, "y": 1.25, "w": 1.5},
60 {"label":"K57 (F7,D1)", "x":16.5, "y":1.25}, 63
61 {"label":"K58 (F7,D2)", "x":17.5, "y":1.25}, 64 {"matrix": [5, 6], "x": 15.5, "y": 1.25},
62 65 {"matrix": [5, 7], "x": 16.5, "y": 1.25},
63 {"label":"K20 (F4,B7)", "x":0, "y":2.25, "w":1.75}, 66 {"matrix": [5, 8], "x": 17.5, "y": 1.25},
64 {"label":"K21 (F4,B6)", "x":1.75, "y":2.25}, 67
65 {"label":"K22 (F4,B5)", "x":2.75, "y":2.25}, 68 {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
66 {"label":"K23 (F4,B4)", "x":3.75, "y":2.25}, 69 {"matrix": [2, 1], "x": 1.75, "y": 2.25},
67 {"label":"K24 (F4,C7)", "x":4.75, "y":2.25}, 70 {"matrix": [2, 2], "x": 2.75, "y": 2.25},
68 {"label":"K25 (F4,C6)", "x":5.75, "y":2.25}, 71 {"matrix": [2, 3], "x": 3.75, "y": 2.25},
69 {"label":"K26 (F4,D0)", "x":6.75, "y":2.25}, 72 {"matrix": [2, 4], "x": 4.75, "y": 2.25},
70 {"label":"K27 (F4,D1)", "x":7.75, "y":2.25}, 73 {"matrix": [2, 5], "x": 5.75, "y": 2.25},
71 {"label":"K28 (F4,D2)", "x":8.75, "y":2.25}, 74 {"matrix": [2, 6], "x": 6.75, "y": 2.25},
72 {"label":"K29 (F4,D3)", "x":9.75, "y":2.25}, 75 {"matrix": [2, 7], "x": 7.75, "y": 2.25},
73 {"label":"K2A (F4,D4)", "x":10.75, "y":2.25}, 76 {"matrix": [2, 8], "x": 8.75, "y": 2.25},
74 {"label":"K2B (F4,D5)", "x":11.75, "y":2.25}, 77 {"matrix": [2, 9], "x": 9.75, "y": 2.25},
75 {"label":"K2C (F4,D6)", "x":12.75, "y":2.25, "w":2.25}, 78 {"matrix": [2, 10], "x": 10.75, "y": 2.25},
76 {"label":"K53 (F7,B4)", "x":15.5, "y":2.25}, 79 {"matrix": [2, 11], "x": 11.75, "y": 2.25},
77 {"label":"K54 (F7,C7)", "x":16.5, "y":2.25}, 80 {"matrix": [2, 12], "x": 12.75, "y": 2.25, "w": 2.25},
78 {"label":"K55 (F7,C6)", "x":17.5, "y":2.25}, 81
79 82 {"matrix": [5, 3], "x": 15.5, "y": 2.25},
80 {"label":"K30 (F5,B7)", "x":0, "y":3.25, "w":2.25}, 83 {"matrix": [5, 4], "x": 16.5, "y": 2.25},
81 {"label":"K31 (F5,B6)", "x":2.25, "y":3.25}, 84 {"matrix": [5, 5], "x": 17.5, "y": 2.25},
82 {"label":"K32 (F5,B5)", "x":3.25, "y":3.25}, 85
83 {"label":"K33 (F5,B4)", "x":4.25, "y":3.25}, 86 {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
84 {"label":"K34 (F5,C7)", "x":5.25, "y":3.25}, 87 {"matrix": [3, 1], "x": 2.25, "y": 3.25},
85 {"label":"K35 (F5,C6)", "x":6.25, "y":3.25}, 88 {"matrix": [3, 2], "x": 3.25, "y": 3.25},
86 {"label":"K36 (F5,D0)", "x":7.25, "y":3.25}, 89 {"matrix": [3, 3], "x": 4.25, "y": 3.25},
87 {"label":"K37 (F5,D1)", "x":8.25, "y":3.25}, 90 {"matrix": [3, 4], "x": 5.25, "y": 3.25},
88 {"label":"K38 (F5,D2)", "x":9.25, "y":3.25}, 91 {"matrix": [3, 5], "x": 6.25, "y": 3.25},
89 {"label":"K39 (F5,D3)", "x":10.25, "y":3.25}, 92 {"matrix": [3, 6], "x": 7.25, "y": 3.25},
90 {"label":"K3A (F5,D4)", "x":11.25, "y":3.25}, 93 {"matrix": [3, 7], "x": 8.25, "y": 3.25},
91 {"label":"K3B (F5,D5)", "x":12.25, "y":3.25, "w":1.75}, 94 {"matrix": [3, 8], "x": 9.25, "y": 3.25},
92 {"label":"K3C (F5,D6)", "x":14.25, "y":3.5}, 95 {"matrix": [3, 9], "x": 10.25, "y": 3.25},
93 {"label":"K50 (F7,B7)", "x":15.5, "y":3.25}, 96 {"matrix": [3, 10], "x": 11.25, "y": 3.25},
94 {"label":"K51 (F7,B6)", "x":16.5, "y":3.25}, 97 {"matrix": [3, 11], "x": 12.25, "y": 3.25, "w": 1.75},
95 {"label":"K52 (F7,B5)", "x":17.5, "y":3.25}, 98
96 99 {"matrix": [3, 12], "x": 14.25, "y": 3.5},
97 {"label":"K40 (F6,B7)", "x":0, "y":4.25, "w":1.5}, 100
98 {"label":"K41 (F6,B6)", "x":1.5, "y":4.25}, 101 {"matrix": [5, 0], "x": 15.5, "y": 3.25},
99 {"label":"K42 (F6,B5)", "x":2.5, "y":4.25, "w":1.5}, 102 {"matrix": [5, 1], "x": 16.5, "y": 3.25},
100 {"label":"K45 (F6,C6)", "x":4, "y":4.25, "w":7}, 103 {"matrix": [5, 2], "x": 17.5, "y": 3.25},
101 {"label":"K48 (F6,D2)", "x":11, "y":4.25}, 104
102 {"label":"K49 (F6,D3)", "x":12, "y":4.25}, 105 {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5},
103 {"label":"K4A (F6,D4)", "x":13.25, "y":4.5}, 106 {"matrix": [4, 1], "x": 1.5, "y": 4.25},
104 {"label":"K4B (F6,D5)", "x":14.25, "y":4.5}, 107 {"matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.5},
105 {"label":"K4C (F6,D6)", "x":15.25, "y":4.5}, 108 {"matrix": [4, 5], "x": 4, "y": 4.25, "w": 7},
106 {"label":"K59 (F7,D3)", "x":16.5, "y":4.25}, 109 {"matrix": [4, 8], "x": 11, "y": 4.25},
107 {"label":"K5A (F7,D4)", "x":17.5, "y":4.25} 110 {"matrix": [4, 9], "x": 12, "y": 4.25},
108 ] 111
112 {"matrix": [4, 10], "x": 13.25, "y": 4.5},
113 {"matrix": [4, 11], "x": 14.25, "y": 4.5},
114 {"matrix": [4, 12], "x": 15.25, "y": 4.5},
109 115
116 {"matrix": [5, 9], "x": 16.5, "y": 4.25},
117 {"matrix": [5, 10], "x": 17.5, "y": 4.25}
118 ]
110 }, 119 },
111 "LAYOUT_6_25u_space": { 120 "LAYOUT_6_25u_space": {
112 "layout": [ 121 "layout": [
113 {"label":"K00 (F0,B7)", "x":0, "y":0}, 122 {"matrix": [0, 0], "x": 0, "y": 0},
114 {"label":"K01 (F0,B6)", "x":1, "y":0}, 123 {"matrix": [0, 1], "x": 1, "y": 0},
115 {"label":"K02 (F0,B5)", "x":2, "y":0}, 124 {"matrix": [0, 2], "x": 2, "y": 0},
116 {"label":"K03 (F0,B4)", "x":3, "y":0}, 125 {"matrix": [0, 3], "x": 3, "y": 0},
117 {"label":"K04 (F0,C7)", "x":4, "y":0}, 126 {"matrix": [0, 4], "x": 4, "y": 0},
118 {"label":"K05 (F0,C6)", "x":5, "y":0}, 127 {"matrix": [0, 5], "x": 5, "y": 0},
119 {"label":"K06 (F0,D0)", "x":6, "y":0}, 128 {"matrix": [0, 6], "x": 6, "y": 0},
120 {"label":"K07 (F0,D1)", "x":7, "y":0}, 129 {"matrix": [0, 7], "x": 7, "y": 0},
121 {"label":"K08 (F0,D2)", "x":8, "y":0}, 130 {"matrix": [0, 8], "x": 8, "y": 0},
122 {"label":"K09 (F0,D3)", "x":9, "y":0}, 131 {"matrix": [0, 9], "x": 9, "y": 0},
123 {"label":"K0A (F0,D4)", "x":10, "y":0}, 132 {"matrix": [0, 10], "x": 10, "y": 0},
124 {"label":"K0B (F0,D5)", "x":11, "y":0}, 133 {"matrix": [0, 11], "x": 11, "y": 0},
125 {"label":"K0C (F0,D6)", "x":12, "y":0}, 134 {"matrix": [0, 12], "x": 12, "y": 0},
126 {"label":"K0D (F0,D7)", "x":13, "y":0, "w":2}, 135 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
127 {"label":"K2D (F4,D7)", "x":15.5, "y":0}, 136
128 {"label":"K3D (F5,D7)", "x":16.5, "y":0}, 137 {"matrix": [2, 13], "x": 15.5, "y": 0},
129 {"label":"K4D (F6,D7)", "x":17.5, "y":0}, 138 {"matrix": [3, 13], "x": 16.5, "y": 0},
130 139 {"matrix": [4, 13], "x": 17.5, "y": 0},
131 {"label":"K10 (F1,B7)", "x":0, "y":1.25, "w":1.5}, 140
132 {"label":"K11 (F1,B6)", "x":1.5, "y":1.25}, 141 {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
133 {"label":"K12 (F1,B5)", "x":2.5, "y":1.25}, 142 {"matrix": [1, 1], "x": 1.5, "y": 1.25},
134 {"label":"K13 (F1,B4)", "x":3.5, "y":1.25}, 143 {"matrix": [1, 2], "x": 2.5, "y": 1.25},
135 {"label":"K14 (F1,C7)", "x":4.5, "y":1.25}, 144 {"matrix": [1, 3], "x": 3.5, "y": 1.25},
136 {"label":"K15 (F1,C6)", "x":5.5, "y":1.25}, 145 {"matrix": [1, 4], "x": 4.5, "y": 1.25},
137 {"label":"K16 (F1,D0)", "x":6.5, "y":1.25}, 146 {"matrix": [1, 5], "x": 5.5, "y": 1.25},
138 {"label":"K17 (F1,D1)", "x":7.5, "y":1.25}, 147 {"matrix": [1, 6], "x": 6.5, "y": 1.25},
139 {"label":"K18 (F1,D2)", "x":8.5, "y":1.25}, 148 {"matrix": [1, 7], "x": 7.5, "y": 1.25},
140 {"label":"K19 (F1,D3)", "x":9.5, "y":1.25}, 149 {"matrix": [1, 8], "x": 8.5, "y": 1.25},
141 {"label":"K1A (F1,D4)", "x":10.5, "y":1.25}, 150 {"matrix": [1, 9], "x": 9.5, "y": 1.25},
142 {"label":"K1B (F1,D5)", "x":11.5, "y":1.25}, 151 {"matrix": [1, 10], "x": 10.5, "y": 1.25},
143 {"label":"K1C (F1,D6)", "x":12.5, "y":1.25}, 152 {"matrix": [1, 11], "x": 11.5, "y": 1.25},
144 {"label":"K1D (F1,D7)", "x":13.5, "y":1.25, "w":1.5}, 153 {"matrix": [1, 12], "x": 12.5, "y": 1.25},
145 {"label":"K56 (F7,D0)", "x":15.5, "y":1.25}, 154 {"matrix": [1, 13], "x": 13.5, "y": 1.25, "w": 1.5},
146 {"label":"K57 (F7,D1)", "x":16.5, "y":1.25}, 155
147 {"label":"K58 (F7,D2)", "x":17.5, "y":1.25}, 156 {"matrix": [5, 6], "x": 15.5, "y": 1.25},
148 157 {"matrix": [5, 7], "x": 16.5, "y": 1.25},
149 {"label":"K20 (F4,B7)", "x":0, "y":2.25, "w":1.75}, 158 {"matrix": [5, 8], "x": 17.5, "y": 1.25},
150 {"label":"K21 (F4,B6)", "x":1.75, "y":2.25}, 159
151 {"label":"K22 (F4,B5)", "x":2.75, "y":2.25}, 160 {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
152 {"label":"K23 (F4,B4)", "x":3.75, "y":2.25}, 161 {"matrix": [2, 1], "x": 1.75, "y": 2.25},
153 {"label":"K24 (F4,C7)", "x":4.75, "y":2.25}, 162 {"matrix": [2, 2], "x": 2.75, "y": 2.25},
154 {"label":"K25 (F4,C6)", "x":5.75, "y":2.25}, 163 {"matrix": [2, 3], "x": 3.75, "y": 2.25},
155 {"label":"K26 (F4,D0)", "x":6.75, "y":2.25}, 164 {"matrix": [2, 4], "x": 4.75, "y": 2.25},
156 {"label":"K27 (F4,D1)", "x":7.75, "y":2.25}, 165 {"matrix": [2, 5], "x": 5.75, "y": 2.25},
157 {"label":"K28 (F4,D2)", "x":8.75, "y":2.25}, 166 {"matrix": [2, 6], "x": 6.75, "y": 2.25},
158 {"label":"K29 (F4,D3)", "x":9.75, "y":2.25}, 167 {"matrix": [2, 7], "x": 7.75, "y": 2.25},
159 {"label":"K2A (F4,D4)", "x":10.75, "y":2.25}, 168 {"matrix": [2, 8], "x": 8.75, "y": 2.25},
160 {"label":"K2B (F4,D5)", "x":11.75, "y":2.25}, 169 {"matrix": [2, 9], "x": 9.75, "y": 2.25},
161 {"label":"K2C (F4,D6)", "x":12.75, "y":2.25, "w":2.25}, 170 {"matrix": [2, 10], "x": 10.75, "y": 2.25},
162 {"label":"K53 (F7,B4)", "x":15.5, "y":2.25}, 171 {"matrix": [2, 11], "x": 11.75, "y": 2.25},
163 {"label":"K54 (F7,C7)", "x":16.5, "y":2.25}, 172 {"matrix": [2, 12], "x": 12.75, "y": 2.25, "w": 2.25},
164 {"label":"K55 (F7,C6)", "x":17.5, "y":2.25}, 173
165 174 {"matrix": [5, 3], "x": 15.5, "y": 2.25},
166 {"label":"K30 (F5,B7)", "x":0, "y":3.25, "w":2.25}, 175 {"matrix": [5, 4], "x": 16.5, "y": 2.25},
167 {"label":"K31 (F5,B6)", "x":2.25, "y":3.25}, 176 {"matrix": [5, 5], "x": 17.5, "y": 2.25},
168 {"label":"K32 (F5,B5)", "x":3.25, "y":3.25}, 177
169 {"label":"K33 (F5,B4)", "x":4.25, "y":3.25}, 178 {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
170 {"label":"K34 (F5,C7)", "x":5.25, "y":3.25}, 179 {"matrix": [3, 1], "x": 2.25, "y": 3.25},
171 {"label":"K35 (F5,C6)", "x":6.25, "y":3.25}, 180 {"matrix": [3, 2], "x": 3.25, "y": 3.25},
172 {"label":"K36 (F5,D0)", "x":7.25, "y":3.25}, 181 {"matrix": [3, 3], "x": 4.25, "y": 3.25},
173 {"label":"K37 (F5,D1)", "x":8.25, "y":3.25}, 182 {"matrix": [3, 4], "x": 5.25, "y": 3.25},
174 {"label":"K38 (F5,D2)", "x":9.25, "y":3.25}, 183 {"matrix": [3, 5], "x": 6.25, "y": 3.25},
175 {"label":"K39 (F5,D3)", "x":10.25, "y":3.25}, 184 {"matrix": [3, 6], "x": 7.25, "y": 3.25},
176 {"label":"K3A (F5,D4)", "x":11.25, "y":3.25}, 185 {"matrix": [3, 7], "x": 8.25, "y": 3.25},
177 {"label":"K3B (F5,D5)", "x":12.25, "y":3.25, "w":1.75}, 186 {"matrix": [3, 8], "x": 9.25, "y": 3.25},
178 {"label":"K3C (F5,D6)", "x":14.25, "y":3.5}, 187 {"matrix": [3, 9], "x": 10.25, "y": 3.25},
179 {"label":"K50 (F7,B7)", "x":15.5, "y":3.25}, 188 {"matrix": [3, 10], "x": 11.25, "y": 3.25},
180 {"label":"K51 (F7,B6)", "x":16.5, "y":3.25}, 189 {"matrix": [3, 11], "x": 12.25, "y": 3.25, "w": 1.75},
181 {"label":"K52 (F7,B5)", "x":17.5, "y":3.25}, 190
182 191 {"matrix": [3, 12], "x": 14.25, "y": 3.5},
183 {"label":"K40 (F6,B7)", "x":0, "y":4.25, "w":1.25}, 192
184 {"label":"K41 (F6,B6)", "x":1.25, "y":4.25, "w":1.25}, 193 {"matrix": [5, 0], "x": 15.5, "y": 3.25},
185 {"label":"K42 (F6,B5)", "x":2.5, "y":4.25, "w":1.25}, 194 {"matrix": [5, 1], "x": 16.5, "y": 3.25},
186 {"label":"K45 (F6,C6)", "x":3.75, "y":4.25, "w":6.25}, 195 {"matrix": [5, 2], "x": 17.5, "y": 3.25},
187 {"label":"K47 (F6,D1)", "x":10, "y":4.25}, 196
188 {"label":"K48 (F6,D2)", "x":11, "y":4.25}, 197 {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
189 {"label":"K49 (F6,D3)", "x":12, "y":4.25}, 198 {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
190 {"label":"K4A (F6,D4)", "x":13.25, "y":4.5}, 199 {"matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
191 {"label":"K4B (F6,D5)", "x":14.25, "y":4.5}, 200 {"matrix": [4, 5], "x": 3.75, "y": 4.25, "w": 6.25},
192 {"label":"K4C (F6,D6)", "x":15.25, "y":4.5}, 201 {"matrix": [4, 7], "x": 10, "y": 4.25},
193 {"label":"K59 (F7,D3)", "x":16.5, "y":4.25}, 202 {"matrix": [4, 8], "x": 11, "y": 4.25},
194 {"label":"K5A (F7,D4)", "x":17.5, "y":4.25} 203 {"matrix": [4, 9], "x": 12, "y": 4.25},
204
205 {"matrix": [4, 10], "x": 13.25, "y": 4.5},
206 {"matrix": [4, 11], "x": 14.25, "y": 4.5},
207 {"matrix": [4, 12], "x": 15.25, "y": 4.5},
208
209 {"matrix": [5, 9], "x": 16.5, "y": 4.25},
210 {"matrix": [5, 10], "x": 17.5, "y": 4.25}
195 ] 211 ]
196
197 } 212 }
198 } 213 }
199} 214}
diff --git a/keyboards/sam/sg81m/sg81m.h b/keyboards/sam/sg81m/sg81m.h
deleted file mode 100644
index d128adf746..0000000000
--- a/keyboards/sam/sg81m/sg81m.h
+++ /dev/null
@@ -1,51 +0,0 @@
1/* Copyright 2021 CMM.Studio Freather
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#include "quantum.h"
20
21#define LAYOUT_7u_space( \
22 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, K3D, K4D, \
23 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K56, K57, K58, \
24 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K53, K54, K55, \
25 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K50, K51, K52, \
26 K40, K41, K42, K45, K48, K49, K4A, K4B, K4C, K59, K5A \
27) { \
28 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
29 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
30 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
31 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
32 { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, K48, K49, K4A, K4B, K4C, K4D }, \
33 { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, KC_NO, KC_NO, KC_NO }, \
34}
35
36#define LAYOUT_6_25u_space( \
37 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, K3D, K4D, \
38 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K56, K57, K58, \
39 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K53, K54, K55, \
40 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K50, K51, K52, \
41 K40, K41, K42, K45, K47, K48, K49, K4A, K4B, K4C, K59, K5A \
42) { \
43 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
44 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
45 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
46 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
47 { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, K47, K48, K49, K4A, K4B, K4C, K4D }, \
48 { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, KC_NO, KC_NO, KC_NO }, \
49}
50
51#define LAYOUT LAYOUT_7u_space
diff --git a/keyboards/sentraq/s60_x/default/default.h b/keyboards/sentraq/s60_x/default/default.h
deleted file mode 100644
index 04f284171b..0000000000
--- a/keyboards/sentraq/s60_x/default/default.h
+++ /dev/null
@@ -1,105 +0,0 @@
1/*
2Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
3Copyright 2015 Vin�cius Nery Cordeiro <vinicius.nery.cordeiro@gmail.com>
4Copyright 2016 Felix Uhl <ifreilicht@gmail.com>
5
6This program is free software: you can redistribute it and/or modify
7it under the terms of the GNU General Public License as published by
8the Free Software Foundation, either version 2 of the License, or
9(at your option) any later version.
10
11This program is distributed in the hope that it will be useful,
12but WITHOUT ANY WARRANTY; without even the implied warranty of
13MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14GNU General Public License for more details.
15
16You should have received a copy of the GNU General Public License
17along with this program. If not, see <http://www.gnu.org/licenses/>.
18*/
19
20#pragma once
21
22#include "quantum.h"
23
24/* S60-X keymap definition macro
25* K31 is the extra key next to short left ISO shift
26* K2C is the moved key next to enter on ISO boards
27* K3C is the extra key next to short right JIS shift
28* K0D is extra key from split backspace
29* K3E is extra key from HHKB-style split right shift
30*/
31
32#define XXX KC_NO
33
34
35#define LAYOUT( \
36 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
37 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
38 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
39 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
40 K40, K41, K42, K46, K4A, K4B, K4C, K4D \
41) { \
42 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
43 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX }, \
44 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX }, \
45 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E }, \
46 { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, XXX } \
47}
48
49
50#define LAYOUT_60_ansi( \
51 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \
52 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
53 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
54 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
55 K40, K41, K42, K46, K4A, K4B, K4C, K4D \
56) { \
57 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, }, \
58 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, }, \
59 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, XXX, }, \
60 { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, }, \
61 { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, XXX, } \
62}
63
64#define LAYOUT_60_hhkb( \
65 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
66 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
67 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
68 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
69 K41, K42, K46, K4B, K4C \
70) { \
71 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, }, \
72 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, }, \
73 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, XXX, }, \
74 { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, }, \
75 { XXX, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, K4C, XXX, XXX, } \
76}
77
78#define LAYOUT_60_ansi_split_bs_rshift( \
79 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
80 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
81 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
82 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
83 K40, K41, K42, K46, K4A, K4B, K4C, K4D \
84) { \
85 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, }, \
86 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, }, \
87 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, XXX, }, \
88 { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, }, \
89 { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, XXX, } \
90}
91
92
93#define LAYOUT_60_iso( \
94 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \
95 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
96 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
97 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
98 K40, K41, K42, K46, K4A, K4B, K4C, K4D \
99) { \
100 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, }, \
101 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, XXX, }, \
102 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, }, \
103 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, }, \
104 { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, XXX, } \
105}
diff --git a/keyboards/sentraq/s60_x/default/info.json b/keyboards/sentraq/s60_x/default/info.json
index 78e8827c00..70ec42fd9e 100644
--- a/keyboards/sentraq/s60_x/default/info.json
+++ b/keyboards/sentraq/s60_x/default/info.json
@@ -10,5 +10,358 @@
10 "breathing": true 10 "breathing": true
11 }, 11 },
12 "processor": "atmega32u4", 12 "processor": "atmega32u4",
13 "bootloader": "atmel-dfu" 13 "bootloader": "atmel-dfu",
14 "layouts": {
15 "LAYOUT": {
16 "layout": [
17 {"matrix": [0, 0], "x": 0, "y": 0},
18 {"matrix": [0, 1], "x": 1, "y": 0},
19 {"matrix": [0, 2], "x": 2, "y": 0},
20 {"matrix": [0, 3], "x": 3, "y": 0},
21 {"matrix": [0, 4], "x": 4, "y": 0},
22 {"matrix": [0, 5], "x": 5, "y": 0},
23 {"matrix": [0, 6], "x": 6, "y": 0},
24 {"matrix": [0, 7], "x": 7, "y": 0},
25 {"matrix": [0, 8], "x": 8, "y": 0},
26 {"matrix": [0, 9], "x": 9, "y": 0},
27 {"matrix": [0, 10], "x": 10, "y": 0},
28 {"matrix": [0, 11], "x": 11, "y": 0},
29 {"matrix": [0, 12], "x": 12, "y": 0},
30 {"matrix": [0, 13], "x": 13, "y": 0},
31 {"matrix": [0, 14], "x": 14, "y": 0},
32
33 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
34 {"matrix": [1, 1], "x": 1.5, "y": 1},
35 {"matrix": [1, 2], "x": 2.5, "y": 1},
36 {"matrix": [1, 3], "x": 3.5, "y": 1},
37 {"matrix": [1, 4], "x": 4.5, "y": 1},
38 {"matrix": [1, 5], "x": 5.5, "y": 1},
39 {"matrix": [1, 6], "x": 6.5, "y": 1},
40 {"matrix": [1, 7], "x": 7.5, "y": 1},
41 {"matrix": [1, 8], "x": 8.5, "y": 1},
42 {"matrix": [1, 9], "x": 9.5, "y": 1},
43 {"matrix": [1, 10], "x": 10.5, "y": 1},
44 {"matrix": [1, 11], "x": 11.5, "y": 1},
45 {"matrix": [1, 12], "x": 12.5, "y": 1},
46 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
47
48 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
49 {"matrix": [2, 1], "x": 1.75, "y": 2},
50 {"matrix": [2, 2], "x": 2.75, "y": 2},
51 {"matrix": [2, 3], "x": 3.75, "y": 2},
52 {"matrix": [2, 4], "x": 4.75, "y": 2},
53 {"matrix": [2, 5], "x": 5.75, "y": 2},
54 {"matrix": [2, 6], "x": 6.75, "y": 2},
55 {"matrix": [2, 7], "x": 7.75, "y": 2},
56 {"matrix": [2, 8], "x": 8.75, "y": 2},
57 {"matrix": [2, 9], "x": 9.75, "y": 2},
58 {"matrix": [2, 10], "x": 10.75, "y": 2},
59 {"matrix": [2, 11], "x": 11.75, "y": 2},
60 {"matrix": [2, 12], "x": 12.75, "y": 2},
61 {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
62
63 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
64 {"matrix": [3, 1], "x": 1.25, "y": 3},
65 {"matrix": [3, 2], "x": 2.25, "y": 3},
66 {"matrix": [3, 3], "x": 3.25, "y": 3},
67 {"matrix": [3, 4], "x": 4.25, "y": 3},
68 {"matrix": [3, 5], "x": 5.25, "y": 3},
69 {"matrix": [3, 6], "x": 6.25, "y": 3},
70 {"matrix": [3, 7], "x": 7.25, "y": 3},
71 {"matrix": [3, 8], "x": 8.25, "y": 3},
72 {"matrix": [3, 9], "x": 9.25, "y": 3},
73 {"matrix": [3, 10], "x": 10.25, "y": 3},
74 {"matrix": [3, 11], "x": 11.25, "y": 3},
75 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
76 {"matrix": [3, 14], "x": 14, "y": 3},
77
78 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
79 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
80 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
81 {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
82 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
83 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
84 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
85 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
86 ]
87 },
88 "LAYOUT_60_ansi": {
89 "layout": [
90 {"matrix": [0, 0], "x": 0, "y": 0},
91 {"matrix": [0, 1], "x": 1, "y": 0},
92 {"matrix": [0, 2], "x": 2, "y": 0},
93 {"matrix": [0, 3], "x": 3, "y": 0},
94 {"matrix": [0, 4], "x": 4, "y": 0},
95 {"matrix": [0, 5], "x": 5, "y": 0},
96 {"matrix": [0, 6], "x": 6, "y": 0},
97 {"matrix": [0, 7], "x": 7, "y": 0},
98 {"matrix": [0, 8], "x": 8, "y": 0},
99 {"matrix": [0, 9], "x": 9, "y": 0},
100 {"matrix": [0, 10], "x": 10, "y": 0},
101 {"matrix": [0, 11], "x": 11, "y": 0},
102 {"matrix": [0, 12], "x": 12, "y": 0},
103 {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
104
105 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
106 {"matrix": [1, 1], "x": 1.5, "y": 1},
107 {"matrix": [1, 2], "x": 2.5, "y": 1},
108 {"matrix": [1, 3], "x": 3.5, "y": 1},
109 {"matrix": [1, 4], "x": 4.5, "y": 1},
110 {"matrix": [1, 5], "x": 5.5, "y": 1},
111 {"matrix": [1, 6], "x": 6.5, "y": 1},
112 {"matrix": [1, 7], "x": 7.5, "y": 1},
113 {"matrix": [1, 8], "x": 8.5, "y": 1},
114 {"matrix": [1, 9], "x": 9.5, "y": 1},
115 {"matrix": [1, 10], "x": 10.5, "y": 1},
116 {"matrix": [1, 11], "x": 11.5, "y": 1},
117 {"matrix": [1, 12], "x": 12.5, "y": 1},
118 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
119
120 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
121 {"matrix": [2, 1], "x": 1.75, "y": 2},
122 {"matrix": [2, 2], "x": 2.75, "y": 2},
123 {"matrix": [2, 3], "x": 3.75, "y": 2},
124 {"matrix": [2, 4], "x": 4.75, "y": 2},
125 {"matrix": [2, 5], "x": 5.75, "y": 2},
126 {"matrix": [2, 6], "x": 6.75, "y": 2},
127 {"matrix": [2, 7], "x": 7.75, "y": 2},
128 {"matrix": [2, 8], "x": 8.75, "y": 2},
129 {"matrix": [2, 9], "x": 9.75, "y": 2},
130 {"matrix": [2, 10], "x": 10.75, "y": 2},
131 {"matrix": [2, 11], "x": 11.75, "y": 2},
132 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
133
134 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
135 {"matrix": [3, 2], "x": 2.25, "y": 3},
136 {"matrix": [3, 3], "x": 3.25, "y": 3},
137 {"matrix": [3, 4], "x": 4.25, "y": 3},
138 {"matrix": [3, 5], "x": 5.25, "y": 3},
139 {"matrix": [3, 6], "x": 6.25, "y": 3},
140 {"matrix": [3, 7], "x": 7.25, "y": 3},
141 {"matrix": [3, 8], "x": 8.25, "y": 3},
142 {"matrix": [3, 9], "x": 9.25, "y": 3},
143 {"matrix": [3, 10], "x": 10.25, "y": 3},
144 {"matrix": [3, 11], "x": 11.25, "y": 3},
145 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
146
147 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
148 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
149 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
150 {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
151 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
152 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
153 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
154 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
155 ]
156 },
157 "LAYOUT_60_ansi_split_bs_rshift": {
158 "layout": [
159 {"matrix": [0, 0], "x": 0, "y": 0},
160 {"matrix": [0, 1], "x": 1, "y": 0},
161 {"matrix": [0, 2], "x": 2, "y": 0},
162 {"matrix": [0, 3], "x": 3, "y": 0},
163 {"matrix": [0, 4], "x": 4, "y": 0},
164 {"matrix": [0, 5], "x": 5, "y": 0},
165 {"matrix": [0, 6], "x": 6, "y": 0},
166 {"matrix": [0, 7], "x": 7, "y": 0},
167 {"matrix": [0, 8], "x": 8, "y": 0},
168 {"matrix": [0, 9], "x": 9, "y": 0},
169 {"matrix": [0, 10], "x": 10, "y": 0},
170 {"matrix": [0, 11], "x": 11, "y": 0},
171 {"matrix": [0, 12], "x": 12, "y": 0},
172 {"matrix": [0, 13], "x": 13, "y": 0},
173 {"matrix": [0, 14], "x": 14, "y": 0},
174
175 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
176 {"matrix": [1, 1], "x": 1.5, "y": 1},
177 {"matrix": [1, 2], "x": 2.5, "y": 1},
178 {"matrix": [1, 3], "x": 3.5, "y": 1},
179 {"matrix": [1, 4], "x": 4.5, "y": 1},
180 {"matrix": [1, 5], "x": 5.5, "y": 1},
181 {"matrix": [1, 6], "x": 6.5, "y": 1},
182 {"matrix": [1, 7], "x": 7.5, "y": 1},
183 {"matrix": [1, 8], "x": 8.5, "y": 1},
184 {"matrix": [1, 9], "x": 9.5, "y": 1},
185 {"matrix": [1, 10], "x": 10.5, "y": 1},
186 {"matrix": [1, 11], "x": 11.5, "y": 1},
187 {"matrix": [1, 12], "x": 12.5, "y": 1},
188 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
189
190 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
191 {"matrix": [2, 1], "x": 1.75, "y": 2},
192 {"matrix": [2, 2], "x": 2.75, "y": 2},
193 {"matrix": [2, 3], "x": 3.75, "y": 2},
194 {"matrix": [2, 4], "x": 4.75, "y": 2},
195 {"matrix": [2, 5], "x": 5.75, "y": 2},
196 {"matrix": [2, 6], "x": 6.75, "y": 2},
197 {"matrix": [2, 7], "x": 7.75, "y": 2},
198 {"matrix": [2, 8], "x": 8.75, "y": 2},
199 {"matrix": [2, 9], "x": 9.75, "y": 2},
200 {"matrix": [2, 10], "x": 10.75, "y": 2},
201 {"matrix": [2, 11], "x": 11.75, "y": 2},
202 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
203
204 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
205 {"matrix": [3, 2], "x": 2.25, "y": 3},
206 {"matrix": [3, 3], "x": 3.25, "y": 3},
207 {"matrix": [3, 4], "x": 4.25, "y": 3},
208 {"matrix": [3, 5], "x": 5.25, "y": 3},
209 {"matrix": [3, 6], "x": 6.25, "y": 3},
210 {"matrix": [3, 7], "x": 7.25, "y": 3},
211 {"matrix": [3, 8], "x": 8.25, "y": 3},
212 {"matrix": [3, 9], "x": 9.25, "y": 3},
213 {"matrix": [3, 10], "x": 10.25, "y": 3},
214 {"matrix": [3, 11], "x": 11.25, "y": 3},
215 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
216 {"matrix": [3, 14], "x": 14, "y": 3},
217
218 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
219 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
220 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
221 {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
222 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
223 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
224 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
225 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
226 ]
227 },
228 "LAYOUT_60_hhkb": {
229 "layout": [
230 {"matrix": [0, 0], "x": 0, "y": 0},
231 {"matrix": [0, 1], "x": 1, "y": 0},
232 {"matrix": [0, 2], "x": 2, "y": 0},
233 {"matrix": [0, 3], "x": 3, "y": 0},
234 {"matrix": [0, 4], "x": 4, "y": 0},
235 {"matrix": [0, 5], "x": 5, "y": 0},
236 {"matrix": [0, 6], "x": 6, "y": 0},
237 {"matrix": [0, 7], "x": 7, "y": 0},
238 {"matrix": [0, 8], "x": 8, "y": 0},
239 {"matrix": [0, 9], "x": 9, "y": 0},
240 {"matrix": [0, 10], "x": 10, "y": 0},
241 {"matrix": [0, 11], "x": 11, "y": 0},
242 {"matrix": [0, 12], "x": 12, "y": 0},
243 {"matrix": [0, 13], "x": 13, "y": 0},
244 {"matrix": [0, 14], "x": 14, "y": 0},
245
246 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
247 {"matrix": [1, 1], "x": 1.5, "y": 1},
248 {"matrix": [1, 2], "x": 2.5, "y": 1},
249 {"matrix": [1, 3], "x": 3.5, "y": 1},
250 {"matrix": [1, 4], "x": 4.5, "y": 1},
251 {"matrix": [1, 5], "x": 5.5, "y": 1},
252 {"matrix": [1, 6], "x": 6.5, "y": 1},
253 {"matrix": [1, 7], "x": 7.5, "y": 1},
254 {"matrix": [1, 8], "x": 8.5, "y": 1},
255 {"matrix": [1, 9], "x": 9.5, "y": 1},
256 {"matrix": [1, 10], "x": 10.5, "y": 1},
257 {"matrix": [1, 11], "x": 11.5, "y": 1},
258 {"matrix": [1, 12], "x": 12.5, "y": 1},
259 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
260
261 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
262 {"matrix": [2, 1], "x": 1.75, "y": 2},
263 {"matrix": [2, 2], "x": 2.75, "y": 2},
264 {"matrix": [2, 3], "x": 3.75, "y": 2},
265 {"matrix": [2, 4], "x": 4.75, "y": 2},
266 {"matrix": [2, 5], "x": 5.75, "y": 2},
267 {"matrix": [2, 6], "x": 6.75, "y": 2},
268 {"matrix": [2, 7], "x": 7.75, "y": 2},
269 {"matrix": [2, 8], "x": 8.75, "y": 2},
270 {"matrix": [2, 9], "x": 9.75, "y": 2},
271 {"matrix": [2, 10], "x": 10.75, "y": 2},
272 {"matrix": [2, 11], "x": 11.75, "y": 2},
273 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
274
275 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
276 {"matrix": [3, 2], "x": 2.25, "y": 3},
277 {"matrix": [3, 3], "x": 3.25, "y": 3},
278 {"matrix": [3, 4], "x": 4.25, "y": 3},
279 {"matrix": [3, 5], "x": 5.25, "y": 3},
280 {"matrix": [3, 6], "x": 6.25, "y": 3},
281 {"matrix": [3, 7], "x": 7.25, "y": 3},
282 {"matrix": [3, 8], "x": 8.25, "y": 3},
283 {"matrix": [3, 9], "x": 9.25, "y": 3},
284 {"matrix": [3, 10], "x": 10.25, "y": 3},
285 {"matrix": [3, 11], "x": 11.25, "y": 3},
286 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
287 {"matrix": [3, 14], "x": 14, "y": 3},
288
289 {"matrix": [4, 1], "x": 1.5, "y": 4},
290 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
291 {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
292 {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
293 {"matrix": [4, 12], "x": 12.5, "y": 4}
294 ]
295 },
296 "LAYOUT_60_iso": {
297 "layout": [
298 {"matrix": [0, 0], "x": 0, "y": 0},
299 {"matrix": [0, 1], "x": 1, "y": 0},
300 {"matrix": [0, 2], "x": 2, "y": 0},
301 {"matrix": [0, 3], "x": 3, "y": 0},
302 {"matrix": [0, 4], "x": 4, "y": 0},
303 {"matrix": [0, 5], "x": 5, "y": 0},
304 {"matrix": [0, 6], "x": 6, "y": 0},
305 {"matrix": [0, 7], "x": 7, "y": 0},
306 {"matrix": [0, 8], "x": 8, "y": 0},
307 {"matrix": [0, 9], "x": 9, "y": 0},
308 {"matrix": [0, 10], "x": 10, "y": 0},
309 {"matrix": [0, 11], "x": 11, "y": 0},
310 {"matrix": [0, 12], "x": 12, "y": 0},
311 {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
312
313 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
314 {"matrix": [1, 1], "x": 1.5, "y": 1},
315 {"matrix": [1, 2], "x": 2.5, "y": 1},
316 {"matrix": [1, 3], "x": 3.5, "y": 1},
317 {"matrix": [1, 4], "x": 4.5, "y": 1},
318 {"matrix": [1, 5], "x": 5.5, "y": 1},
319 {"matrix": [1, 6], "x": 6.5, "y": 1},
320 {"matrix": [1, 7], "x": 7.5, "y": 1},
321 {"matrix": [1, 8], "x": 8.5, "y": 1},
322 {"matrix": [1, 9], "x": 9.5, "y": 1},
323 {"matrix": [1, 10], "x": 10.5, "y": 1},
324 {"matrix": [1, 11], "x": 11.5, "y": 1},
325 {"matrix": [1, 12], "x": 12.5, "y": 1},
326
327 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
328 {"matrix": [2, 1], "x": 1.75, "y": 2},
329 {"matrix": [2, 2], "x": 2.75, "y": 2},
330 {"matrix": [2, 3], "x": 3.75, "y": 2},
331 {"matrix": [2, 4], "x": 4.75, "y": 2},
332 {"matrix": [2, 5], "x": 5.75, "y": 2},
333 {"matrix": [2, 6], "x": 6.75, "y": 2},
334 {"matrix": [2, 7], "x": 7.75, "y": 2},
335 {"matrix": [2, 8], "x": 8.75, "y": 2},
336 {"matrix": [2, 9], "x": 9.75, "y": 2},
337 {"matrix": [2, 10], "x": 10.75, "y": 2},
338 {"matrix": [2, 11], "x": 11.75, "y": 2},
339 {"matrix": [2, 12], "x": 12.75, "y": 2},
340 {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
341
342 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
343 {"matrix": [3, 1], "x": 1.25, "y": 3},
344 {"matrix": [3, 2], "x": 2.25, "y": 3},
345 {"matrix": [3, 3], "x": 3.25, "y": 3},
346 {"matrix": [3, 4], "x": 4.25, "y": 3},
347 {"matrix": [3, 5], "x": 5.25, "y": 3},
348 {"matrix": [3, 6], "x": 6.25, "y": 3},
349 {"matrix": [3, 7], "x": 7.25, "y": 3},
350 {"matrix": [3, 8], "x": 8.25, "y": 3},
351 {"matrix": [3, 9], "x": 9.25, "y": 3},
352 {"matrix": [3, 10], "x": 10.25, "y": 3},
353 {"matrix": [3, 11], "x": 11.25, "y": 3},
354 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
355
356 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
357 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
358 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
359 {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
360 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
361 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
362 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
363 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
364 ]
365 }
366 }
14} 367}
diff --git a/keyboards/sentraq/s60_x/info.json b/keyboards/sentraq/s60_x/info.json
index 35572ee230..11ebdcd7d1 100644
--- a/keyboards/sentraq/s60_x/info.json
+++ b/keyboards/sentraq/s60_x/info.json
@@ -7,22 +7,5 @@
7 "pid": "0x6060", 7 "pid": "0x6060",
8 "device_version": "0.0.1" 8 "device_version": "0.0.1"
9 }, 9 },
10 "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_hhkb"], 10 "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_hhkb"]
11 "layouts": {
12 "LAYOUT": {
13 "layout": [{"label":"~", "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}, {"x":13, "y":0}, {"x":14, "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":"Caps Lock", "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}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"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}, {"x":14, "y":3}, {"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, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
14 },
15 "LAYOUT_60_ansi": {
16 "layout": [{"label":"~", "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":"Backspace", "x":13, "y":0, "w":2}, {"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":"Caps Lock", "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":"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":2.75}, {"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, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
17 },
18 "LAYOUT_60_hhkb": {
19 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":12.5, "y":4}]
20 },
21 "LAYOUT_60_ansi_split_bs_rshift": {
22 "layout": [{"label":"~", "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}, {"x":13, "y":0}, {"x":14, "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":"Caps Lock", "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":"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}, {"x":14, "y":3}, {"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, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
23 },
24 "LAYOUT_60_iso": {
25 "layout": [{"label":"\u00ac", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "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":"Backspace", "x":13, "y":0, "w":2}, {"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":"Caps Lock", "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":"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":2.75}, {"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":"AltGr", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
26 }
27 }
28} 11}
diff --git a/keyboards/sentraq/s60_x/rgb/info.json b/keyboards/sentraq/s60_x/rgb/info.json
index 9d224d2c85..17cecb778c 100644
--- a/keyboards/sentraq/s60_x/rgb/info.json
+++ b/keyboards/sentraq/s60_x/rgb/info.json
@@ -13,5 +13,358 @@
13 "pin": "F6" 13 "pin": "F6"
14 }, 14 },
15 "processor": "atmega32u4", 15 "processor": "atmega32u4",
16 "bootloader": "atmel-dfu" 16 "bootloader": "atmel-dfu",
17 "layouts": {
18 "LAYOUT": {
19 "layout": [
20 {"matrix": [0, 0], "x": 0, "y": 0},
21 {"matrix": [0, 1], "x": 1, "y": 0},
22 {"matrix": [0, 2], "x": 2, "y": 0},
23 {"matrix": [0, 3], "x": 3, "y": 0},
24 {"matrix": [0, 4], "x": 4, "y": 0},
25 {"matrix": [0, 5], "x": 5, "y": 0},
26 {"matrix": [0, 6], "x": 6, "y": 0},
27 {"matrix": [0, 7], "x": 7, "y": 0},
28 {"matrix": [0, 8], "x": 8, "y": 0},
29 {"matrix": [0, 9], "x": 9, "y": 0},
30 {"matrix": [0, 10], "x": 10, "y": 0},
31 {"matrix": [0, 11], "x": 11, "y": 0},
32 {"matrix": [0, 12], "x": 12, "y": 0},
33 {"matrix": [0, 13], "x": 13, "y": 0},
34 {"matrix": [0, 14], "x": 14, "y": 0},
35
36 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
37 {"matrix": [1, 1], "x": 1.5, "y": 1},
38 {"matrix": [1, 2], "x": 2.5, "y": 1},
39 {"matrix": [1, 3], "x": 3.5, "y": 1},
40 {"matrix": [1, 4], "x": 4.5, "y": 1},
41 {"matrix": [1, 5], "x": 5.5, "y": 1},
42 {"matrix": [1, 6], "x": 6.5, "y": 1},
43 {"matrix": [1, 7], "x": 7.5, "y": 1},
44 {"matrix": [1, 8], "x": 8.5, "y": 1},
45 {"matrix": [1, 9], "x": 9.5, "y": 1},
46 {"matrix": [1, 10], "x": 10.5, "y": 1},
47 {"matrix": [1, 11], "x": 11.5, "y": 1},
48 {"matrix": [1, 12], "x": 12.5, "y": 1},
49 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
50
51 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
52 {"matrix": [2, 1], "x": 1.75, "y": 2},
53 {"matrix": [2, 2], "x": 2.75, "y": 2},
54 {"matrix": [2, 3], "x": 3.75, "y": 2},
55 {"matrix": [2, 4], "x": 4.75, "y": 2},
56 {"matrix": [2, 5], "x": 5.75, "y": 2},
57 {"matrix": [2, 6], "x": 6.75, "y": 2},
58 {"matrix": [2, 7], "x": 7.75, "y": 2},
59 {"matrix": [2, 8], "x": 8.75, "y": 2},
60 {"matrix": [2, 9], "x": 9.75, "y": 2},
61 {"matrix": [2, 10], "x": 10.75, "y": 2},
62 {"matrix": [2, 11], "x": 11.75, "y": 2},
63 {"matrix": [2, 12], "x": 12.75, "y": 2},
64 {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
65
66 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
67 {"matrix": [3, 1], "x": 1.25, "y": 3},
68 {"matrix": [3, 2], "x": 2.25, "y": 3},
69 {"matrix": [3, 3], "x": 3.25, "y": 3},
70 {"matrix": [3, 4], "x": 4.25, "y": 3},
71 {"matrix": [3, 5], "x": 5.25, "y": 3},
72 {"matrix": [3, 6], "x": 6.25, "y": 3},
73 {"matrix": [3, 7], "x": 7.25, "y": 3},
74 {"matrix": [3, 8], "x": 8.25, "y": 3},
75 {"matrix": [3, 9], "x": 9.25, "y": 3},
76 {"matrix": [3, 10], "x": 10.25, "y": 3},
77 {"matrix": [3, 11], "x": 11.25, "y": 3},
78 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
79 {"matrix": [3, 14], "x": 14, "y": 3},
80
81 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
82 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
83 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
84 {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
85 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
86 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
87 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
88 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
89 ]
90 },
91 "LAYOUT_60_ansi": {
92 "layout": [
93 {"matrix": [0, 0], "x": 0, "y": 0},
94 {"matrix": [0, 1], "x": 1, "y": 0},
95 {"matrix": [0, 2], "x": 2, "y": 0},
96 {"matrix": [0, 3], "x": 3, "y": 0},
97 {"matrix": [0, 4], "x": 4, "y": 0},
98 {"matrix": [0, 5], "x": 5, "y": 0},
99 {"matrix": [0, 6], "x": 6, "y": 0},
100 {"matrix": [0, 7], "x": 7, "y": 0},
101 {"matrix": [0, 8], "x": 8, "y": 0},
102 {"matrix": [0, 9], "x": 9, "y": 0},
103 {"matrix": [0, 10], "x": 10, "y": 0},
104 {"matrix": [0, 11], "x": 11, "y": 0},
105 {"matrix": [0, 12], "x": 12, "y": 0},
106 {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
107
108 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
109 {"matrix": [1, 1], "x": 1.5, "y": 1},
110 {"matrix": [1, 2], "x": 2.5, "y": 1},
111 {"matrix": [1, 3], "x": 3.5, "y": 1},
112 {"matrix": [1, 4], "x": 4.5, "y": 1},
113 {"matrix": [1, 5], "x": 5.5, "y": 1},
114 {"matrix": [1, 6], "x": 6.5, "y": 1},
115 {"matrix": [1, 7], "x": 7.5, "y": 1},
116 {"matrix": [1, 8], "x": 8.5, "y": 1},
117 {"matrix": [1, 9], "x": 9.5, "y": 1},
118 {"matrix": [1, 10], "x": 10.5, "y": 1},
119 {"matrix": [1, 11], "x": 11.5, "y": 1},
120 {"matrix": [1, 12], "x": 12.5, "y": 1},
121 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
122
123 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
124 {"matrix": [2, 1], "x": 1.75, "y": 2},
125 {"matrix": [2, 2], "x": 2.75, "y": 2},
126 {"matrix": [2, 3], "x": 3.75, "y": 2},
127 {"matrix": [2, 4], "x": 4.75, "y": 2},
128 {"matrix": [2, 5], "x": 5.75, "y": 2},
129 {"matrix": [2, 6], "x": 6.75, "y": 2},
130 {"matrix": [2, 7], "x": 7.75, "y": 2},
131 {"matrix": [2, 8], "x": 8.75, "y": 2},
132 {"matrix": [2, 9], "x": 9.75, "y": 2},
133 {"matrix": [2, 10], "x": 10.75, "y": 2},
134 {"matrix": [2, 11], "x": 11.75, "y": 2},
135 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
136
137 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
138 {"matrix": [3, 2], "x": 2.25, "y": 3},
139 {"matrix": [3, 3], "x": 3.25, "y": 3},
140 {"matrix": [3, 4], "x": 4.25, "y": 3},
141 {"matrix": [3, 5], "x": 5.25, "y": 3},
142 {"matrix": [3, 6], "x": 6.25, "y": 3},
143 {"matrix": [3, 7], "x": 7.25, "y": 3},
144 {"matrix": [3, 8], "x": 8.25, "y": 3},
145 {"matrix": [3, 9], "x": 9.25, "y": 3},
146 {"matrix": [3, 10], "x": 10.25, "y": 3},
147 {"matrix": [3, 11], "x": 11.25, "y": 3},
148 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
149
150 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
151 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
152 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
153 {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
154 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
155 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
156 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
157 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
158 ]
159 },
160 "LAYOUT_60_ansi_split_bs_rshift": {
161 "layout": [
162 {"matrix": [0, 0], "x": 0, "y": 0},
163 {"matrix": [0, 1], "x": 1, "y": 0},
164 {"matrix": [0, 2], "x": 2, "y": 0},
165 {"matrix": [0, 3], "x": 3, "y": 0},
166 {"matrix": [0, 4], "x": 4, "y": 0},
167 {"matrix": [0, 5], "x": 5, "y": 0},
168 {"matrix": [0, 6], "x": 6, "y": 0},
169 {"matrix": [0, 7], "x": 7, "y": 0},
170 {"matrix": [0, 8], "x": 8, "y": 0},
171 {"matrix": [0, 9], "x": 9, "y": 0},
172 {"matrix": [0, 10], "x": 10, "y": 0},
173 {"matrix": [0, 11], "x": 11, "y": 0},
174 {"matrix": [0, 12], "x": 12, "y": 0},
175 {"matrix": [0, 13], "x": 13, "y": 0},
176 {"matrix": [0, 14], "x": 14, "y": 0},
177
178 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
179 {"matrix": [1, 1], "x": 1.5, "y": 1},
180 {"matrix": [1, 2], "x": 2.5, "y": 1},
181 {"matrix": [1, 3], "x": 3.5, "y": 1},
182 {"matrix": [1, 4], "x": 4.5, "y": 1},
183 {"matrix": [1, 5], "x": 5.5, "y": 1},
184 {"matrix": [1, 6], "x": 6.5, "y": 1},
185 {"matrix": [1, 7], "x": 7.5, "y": 1},
186 {"matrix": [1, 8], "x": 8.5, "y": 1},
187 {"matrix": [1, 9], "x": 9.5, "y": 1},
188 {"matrix": [1, 10], "x": 10.5, "y": 1},
189 {"matrix": [1, 11], "x": 11.5, "y": 1},
190 {"matrix": [1, 12], "x": 12.5, "y": 1},
191 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
192
193 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
194 {"matrix": [2, 1], "x": 1.75, "y": 2},
195 {"matrix": [2, 2], "x": 2.75, "y": 2},
196 {"matrix": [2, 3], "x": 3.75, "y": 2},
197 {"matrix": [2, 4], "x": 4.75, "y": 2},
198 {"matrix": [2, 5], "x": 5.75, "y": 2},
199 {"matrix": [2, 6], "x": 6.75, "y": 2},
200 {"matrix": [2, 7], "x": 7.75, "y": 2},
201 {"matrix": [2, 8], "x": 8.75, "y": 2},
202 {"matrix": [2, 9], "x": 9.75, "y": 2},
203 {"matrix": [2, 10], "x": 10.75, "y": 2},
204 {"matrix": [2, 11], "x": 11.75, "y": 2},
205 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
206
207 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
208 {"matrix": [3, 2], "x": 2.25, "y": 3},
209 {"matrix": [3, 3], "x": 3.25, "y": 3},
210 {"matrix": [3, 4], "x": 4.25, "y": 3},
211 {"matrix": [3, 5], "x": 5.25, "y": 3},
212 {"matrix": [3, 6], "x": 6.25, "y": 3},
213 {"matrix": [3, 7], "x": 7.25, "y": 3},
214 {"matrix": [3, 8], "x": 8.25, "y": 3},
215 {"matrix": [3, 9], "x": 9.25, "y": 3},
216 {"matrix": [3, 10], "x": 10.25, "y": 3},
217 {"matrix": [3, 11], "x": 11.25, "y": 3},
218 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
219 {"matrix": [3, 14], "x": 14, "y": 3},
220
221 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
222 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
223 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
224 {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
225 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
226 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
227 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
228 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
229 ]
230 },
231 "LAYOUT_60_hhkb": {
232 "layout": [
233 {"matrix": [0, 0], "x": 0, "y": 0},
234 {"matrix": [0, 1], "x": 1, "y": 0},
235 {"matrix": [0, 2], "x": 2, "y": 0},
236 {"matrix": [0, 3], "x": 3, "y": 0},
237 {"matrix": [0, 4], "x": 4, "y": 0},
238 {"matrix": [0, 5], "x": 5, "y": 0},
239 {"matrix": [0, 6], "x": 6, "y": 0},
240 {"matrix": [0, 7], "x": 7, "y": 0},
241 {"matrix": [0, 8], "x": 8, "y": 0},
242 {"matrix": [0, 9], "x": 9, "y": 0},
243 {"matrix": [0, 10], "x": 10, "y": 0},
244 {"matrix": [0, 11], "x": 11, "y": 0},
245 {"matrix": [0, 12], "x": 12, "y": 0},
246 {"matrix": [0, 13], "x": 13, "y": 0},
247 {"matrix": [0, 14], "x": 14, "y": 0},
248
249 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
250 {"matrix": [1, 1], "x": 1.5, "y": 1},
251 {"matrix": [1, 2], "x": 2.5, "y": 1},
252 {"matrix": [1, 3], "x": 3.5, "y": 1},
253 {"matrix": [1, 4], "x": 4.5, "y": 1},
254 {"matrix": [1, 5], "x": 5.5, "y": 1},
255 {"matrix": [1, 6], "x": 6.5, "y": 1},
256 {"matrix": [1, 7], "x": 7.5, "y": 1},
257 {"matrix": [1, 8], "x": 8.5, "y": 1},
258 {"matrix": [1, 9], "x": 9.5, "y": 1},
259 {"matrix": [1, 10], "x": 10.5, "y": 1},
260 {"matrix": [1, 11], "x": 11.5, "y": 1},
261 {"matrix": [1, 12], "x": 12.5, "y": 1},
262 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
263
264 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
265 {"matrix": [2, 1], "x": 1.75, "y": 2},
266 {"matrix": [2, 2], "x": 2.75, "y": 2},
267 {"matrix": [2, 3], "x": 3.75, "y": 2},
268 {"matrix": [2, 4], "x": 4.75, "y": 2},
269 {"matrix": [2, 5], "x": 5.75, "y": 2},
270 {"matrix": [2, 6], "x": 6.75, "y": 2},
271 {"matrix": [2, 7], "x": 7.75, "y": 2},
272 {"matrix": [2, 8], "x": 8.75, "y": 2},
273 {"matrix": [2, 9], "x": 9.75, "y": 2},
274 {"matrix": [2, 10], "x": 10.75, "y": 2},
275 {"matrix": [2, 11], "x": 11.75, "y": 2},
276 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
277
278 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
279 {"matrix": [3, 2], "x": 2.25, "y": 3},
280 {"matrix": [3, 3], "x": 3.25, "y": 3},
281 {"matrix": [3, 4], "x": 4.25, "y": 3},
282 {"matrix": [3, 5], "x": 5.25, "y": 3},
283 {"matrix": [3, 6], "x": 6.25, "y": 3},
284 {"matrix": [3, 7], "x": 7.25, "y": 3},
285 {"matrix": [3, 8], "x": 8.25, "y": 3},
286 {"matrix": [3, 9], "x": 9.25, "y": 3},
287 {"matrix": [3, 10], "x": 10.25, "y": 3},
288 {"matrix": [3, 11], "x": 11.25, "y": 3},
289 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
290 {"matrix": [3, 14], "x": 14, "y": 3},
291
292 {"matrix": [4, 1], "x": 1.5, "y": 4},
293 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
294 {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
295 {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
296 {"matrix": [4, 12], "x": 12.5, "y": 4}
297 ]
298 },
299 "LAYOUT_60_iso": {
300 "layout": [
301 {"matrix": [0, 0], "x": 0, "y": 0},
302 {"matrix": [0, 1], "x": 1, "y": 0},
303 {"matrix": [0, 2], "x": 2, "y": 0},
304 {"matrix": [0, 3], "x": 3, "y": 0},
305 {"matrix": [0, 4], "x": 4, "y": 0},
306 {"matrix": [0, 5], "x": 5, "y": 0},
307 {"matrix": [0, 6], "x": 6, "y": 0},
308 {"matrix": [0, 7], "x": 7, "y": 0},
309 {"matrix": [0, 8], "x": 8, "y": 0},
310 {"matrix": [0, 9], "x": 9, "y": 0},
311 {"matrix": [0, 10], "x": 10, "y": 0},
312 {"matrix": [0, 11], "x": 11, "y": 0},
313 {"matrix": [0, 12], "x": 12, "y": 0},
314 {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
315
316 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
317 {"matrix": [1, 1], "x": 1.5, "y": 1},
318 {"matrix": [1, 2], "x": 2.5, "y": 1},
319 {"matrix": [1, 3], "x": 3.5, "y": 1},
320 {"matrix": [1, 4], "x": 4.5, "y": 1},
321 {"matrix": [1, 5], "x": 5.5, "y": 1},
322 {"matrix": [1, 6], "x": 6.5, "y": 1},
323 {"matrix": [1, 7], "x": 7.5, "y": 1},
324 {"matrix": [1, 8], "x": 8.5, "y": 1},
325 {"matrix": [1, 9], "x": 9.5, "y": 1},
326 {"matrix": [1, 10], "x": 10.5, "y": 1},
327 {"matrix": [1, 11], "x": 11.5, "y": 1},
328 {"matrix": [1, 12], "x": 12.5, "y": 1},
329
330 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
331 {"matrix": [2, 1], "x": 1.75, "y": 2},
332 {"matrix": [2, 2], "x": 2.75, "y": 2},
333 {"matrix": [2, 3], "x": 3.75, "y": 2},
334 {"matrix": [2, 4], "x": 4.75, "y": 2},
335 {"matrix": [2, 5], "x": 5.75, "y": 2},
336 {"matrix": [2, 6], "x": 6.75, "y": 2},
337 {"matrix": [2, 7], "x": 7.75, "y": 2},
338 {"matrix": [2, 8], "x": 8.75, "y": 2},
339 {"matrix": [2, 9], "x": 9.75, "y": 2},
340 {"matrix": [2, 10], "x": 10.75, "y": 2},
341 {"matrix": [2, 11], "x": 11.75, "y": 2},
342 {"matrix": [2, 12], "x": 12.75, "y": 2},
343 {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
344
345 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
346 {"matrix": [3, 1], "x": 1.25, "y": 3},
347 {"matrix": [3, 2], "x": 2.25, "y": 3},
348 {"matrix": [3, 3], "x": 3.25, "y": 3},
349 {"matrix": [3, 4], "x": 4.25, "y": 3},
350 {"matrix": [3, 5], "x": 5.25, "y": 3},
351 {"matrix": [3, 6], "x": 6.25, "y": 3},
352 {"matrix": [3, 7], "x": 7.25, "y": 3},
353 {"matrix": [3, 8], "x": 8.25, "y": 3},
354 {"matrix": [3, 9], "x": 9.25, "y": 3},
355 {"matrix": [3, 10], "x": 10.25, "y": 3},
356 {"matrix": [3, 11], "x": 11.25, "y": 3},
357 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
358
359 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
360 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
361 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
362 {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
363 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
364 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
365 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
366 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
367 ]
368 }
369 }
17} 370}
diff --git a/keyboards/sentraq/s60_x/rgb/rgb.h b/keyboards/sentraq/s60_x/rgb/rgb.h
deleted file mode 100644
index 932aca6243..0000000000
--- a/keyboards/sentraq/s60_x/rgb/rgb.h
+++ /dev/null
@@ -1,78 +0,0 @@
1#pragma once
2
3#include "quantum.h"
4
5#define XXX KC_NO
6
7
8#define LAYOUT( \
9 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
10 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
11 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
12 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
13 K40, K41, K42, K46, K4A, K4B, K4C, K4D \
14) { \
15 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
16 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX }, \
17 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX }, \
18 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E }, \
19 { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, XXX } \
20}
21
22
23#define LAYOUT_60_ansi( \
24 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \
25 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
26 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
27 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
28 K40, K41, K42, K46, K4A, K4B, K4C, K4D \
29) { \
30 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, }, \
31 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, }, \
32 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, XXX, }, \
33 { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, }, \
34 { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, XXX, } \
35}
36
37#define LAYOUT_60_hhkb( \
38 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
39 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
40 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
41 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
42 K41, K42, K46, K4B, K4C \
43) { \
44 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, }, \
45 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, }, \
46 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, XXX, }, \
47 { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, }, \
48 { XXX, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, K4C, XXX, XXX, } \
49}
50
51#define LAYOUT_60_ansi_split_bs_rshift( \
52 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
53 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
54 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
55 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
56 K40, K41, K42, K46, K4A, K4B, K4C, K4D \
57) { \
58 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, }, \
59 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, }, \
60 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, XXX, }, \
61 { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, }, \
62 { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, XXX, } \
63}
64
65
66#define LAYOUT_60_iso( \
67 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \
68 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
69 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
70 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
71 K40, K41, K42, K46, K4A, K4B, K4C, K4D \
72) { \
73 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, }, \
74 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, XXX, }, \
75 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, }, \
76 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, }, \
77 { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, XXX, } \
78}
diff --git a/keyboards/singa/info.json b/keyboards/singa/info.json
index 6b3148b6ef..4c582df858 100644
--- a/keyboards/singa/info.json
+++ b/keyboards/singa/info.json
@@ -26,31 +26,657 @@
26 "bootloader": "bootloadhid", 26 "bootloader": "bootloadhid",
27 "layouts": { 27 "layouts": {
28 "LAYOUT": { 28 "LAYOUT": {
29 "layout": [{"label":"K05", "x":0, "y":0}, {"label":"K25", "x":1, "y":0}, {"label":"K35", "x":2, "y":0}, {"label":"K45", "x":3, "y":0}, {"label":"K55", "x":4, "y":0}, {"label":"K06", "x":5, "y":0}, {"label":"KA6", "x":6, "y":0}, {"label":"KA7", "x":7, "y":0}, {"label":"K07", "x":8, "y":0}, {"label":"KB5", "x":9, "y":0}, {"label":"KC5", "x":10, "y":0}, {"label":"KD5", "x":11, "y":0}, {"label":"KE5", "x":12, "y":0}, {"label":"KD1", "x":13, "y":0}, {"label":"KE1", "x":14, "y":0}, {"label":"KE2", "x":15, "y":0}, {"label":"K04", "x":0, "y":1}, {"label":"K14", "x":1, "y":1}, {"label":"K24", "x":2, "y":1}, {"label":"K34", "x":3, "y":1}, {"label":"K44", "x":4, "y":1}, {"label":"K54", "x":5, "y":1}, {"label":"K16", "x":6, "y":1}, {"label":"KB6", "x":7, "y":1}, {"label":"KB7", "x":8, "y":1}, {"label":"K17", "x":9, "y":1}, {"label":"KA4", "x":10, "y":1}, {"label":"KB4", "x":11, "y":1}, {"label":"KC4", "x":12, "y":1}, {"label":"KE4", "x":13, "y":1}, {"label":"KE4", "x":14, "y":1}, {"label":"KD0", "x":15, "y":1}, {"label":"K03", "x":0, "y":2, "w":1.5}, {"label":"K13", "x":1.5, "y":2}, {"label":"K23", "x":2.5, "y":2}, {"label":"K33", "x":3.5, "y":2}, {"label":"K43", "x":4.5, "y":2}, {"label":"K53", "x":5.5, "y":2}, {"label":"K26", "x":6.5, "y":2}, {"label":"KC6", "x":7.5, "y":2}, {"label":"KC7", "x":8.5, "y":2}, {"label":"K27", "x":9.5, "y":2}, {"label":"KA3", "x":10.5, "y":2}, {"label":"KB3", "x":11.5, "y":2}, {"label":"KC3", "x":12.5, "y":2}, {"label":"KD3", "x":13.5, "y":2, "w":1.5}, {"label":"K67", "x":15, "y":2}, {"label":"K02", "x":0, "y":3, "w":1.75}, {"label":"K12", "x":1.75, "y":3}, {"label":"K22", "x":2.75, "y":3}, {"label":"K32", "x":3.75, "y":3}, {"label":"K42", "x":4.75, "y":3}, {"label":"K52", "x":5.75, "y":3}, {"label":"K36", "x":6.75, "y":3}, {"label":"KD6", "x":7.75, "y":3}, {"label":"KD7", "x":8.75, "y":3}, {"label":"K37", "x":9.75, "y":3}, {"label":"KA2", "x":10.75, "y":3}, {"label":"KB2", "x":11.75, "y":3}, {"label":"KD2", "x":12.75, "y":3}, {"label":"KD2", "x":13.75, "y":3, "w":1.25}, {"label":"KE0", "x":15, "y":3}, {"label":"K01", "x":0, "y":4, "w":1.25}, {"label":"K01", "x":1.25, "y":4}, {"label":"K11", "x":2.25, "y":4}, {"label":"K21", "x":3.25, "y":4}, {"label":"K31", "x":4.25, "y":4}, {"label":"K41", "x":5.25, "y":4}, {"label":"K51", "x":6.25, "y":4}, {"label":"K46", "x":7.25, "y":4}, {"label":"KE6", "x":8.25, "y":4}, {"label":"KE7", "x":9.25, "y":4}, {"label":"K47", "x":10.25, "y":4}, {"label":"KA1", "x":11.25, "y":4}, {"label":"KB1", "x":12.25, "y":4, "w":1.75}, {"label":"K86", "x":14, "y":4}, {"label":"K77", "x":15, "y":4}, {"label":"K00", "x":0, "y":5, "w":1.25}, {"label":"K00", "x":1.25, "y":5, "w":1.25}, {"label":"K20", "x":2.5, "y":5, "w":1.25}, {"label":"K56", "x":3.75, "y":5}, {"label":"K56", "x":4.75, "y":5, "w":1.25}, {"label":"K20", "x":6, "y":5, "w":1.75}, {"label":"K56", "x":7.75, "y":5, "w":1.25}, {"label":"K56", "x":9, "y":5}, {"label":"K57", "x":10, "y":5}, {"label":"K57", "x":11, "y":5}, {"label":"K57", "x":12, "y":5}, {"label":"K66", "x":13, "y":5}, {"label":"K76", "x":14, "y":5}, {"label":"K96", "x":15, "y":5}] 29 "layout": [
30 }, 30 {"label": "K05", "matrix": [0, 0], "x": 0, "y": 0},
31 {"label": "K25", "matrix": [0, 1], "x": 1, "y": 0},
32 {"label": "K35", "matrix": [0, 2], "x": 2, "y": 0},
33 {"label": "K45", "matrix": [0, 3], "x": 3, "y": 0},
34 {"label": "K55", "matrix": [0, 4], "x": 4, "y": 0},
35 {"label": "K06", "matrix": [0, 5], "x": 5, "y": 0},
36 {"label": "KA6", "matrix": [0, 6], "x": 6, "y": 0},
37 {"label": "KA7", "matrix": [0, 7], "x": 7, "y": 0},
38 {"label": "K07", "matrix": [0, 8], "x": 8, "y": 0},
39 {"label": "KB5", "matrix": [0, 9], "x": 9, "y": 0},
40 {"label": "KC5", "matrix": [0, 10], "x": 10, "y": 0},
41 {"label": "KD5", "matrix": [0, 11], "x": 11, "y": 0},
42 {"label": "KE5", "matrix": [0, 12], "x": 12, "y": 0},
43 {"label": "KD1", "matrix": [0, 13], "x": 13, "y": 0},
44 {"label": "KE1", "matrix": [0, 14], "x": 14, "y": 0},
45 {"label": "KE2", "matrix": [6, 13], "x": 15, "y": 0},
31 46
32 "LAYOUT_wkl": { 47 {"label": "K04", "matrix": [1, 0], "x": 0, "y": 1},
33 "layout": [{"label":"K05", "x":0, "y":0}, {"label":"K25", "x":1, "y":0}, {"label":"K35", "x":2, "y":0}, {"label":"K45", "x":3, "y":0}, {"label":"K55", "x":4, "y":0}, {"label":"K06", "x":5, "y":0}, {"label":"KA6", "x":6, "y":0}, {"label":"KA7", "x":7, "y":0}, {"label":"K07", "x":8, "y":0}, {"label":"KB5", "x":9, "y":0}, {"label":"KC5", "x":10, "y":0}, {"label":"KD5", "x":11, "y":0}, {"label":"KE5", "x":12, "y":0}, {"label":"KD1", "x":13, "y":0}, {"label":"KE1", "x":14, "y":0}, {"label":"KE2", "x":15, "y":0}, {"label":"K04", "x":0, "y":1}, {"label":"K14", "x":1, "y":1}, {"label":"K24", "x":2, "y":1}, {"label":"K34", "x":3, "y":1}, {"label":"K44", "x":4, "y":1}, {"label":"K54", "x":5, "y":1}, {"label":"K16", "x":6, "y":1}, {"label":"KB6", "x":7, "y":1}, {"label":"KB7", "x":8, "y":1}, {"label":"K17", "x":9, "y":1}, {"label":"KA4", "x":10, "y":1}, {"label":"KB4", "x":11, "y":1}, {"label":"KC4", "x":12, "y":1}, {"label":"KE4", "x":13, "y":1, "w":2}, {"label":"KD0", "x":15, "y":1}, {"label":"K03", "x":0, "y":2, "w":1.5}, {"label":"K13", "x":1.5, "y":2}, {"label":"K23", "x":2.5, "y":2}, {"label":"K33", "x":3.5, "y":2}, {"label":"K43", "x":4.5, "y":2}, {"label":"K53", "x":5.5, "y":2}, {"label":"K26", "x":6.5, "y":2}, {"label":"KC6", "x":7.5, "y":2}, {"label":"KC7", "x":8.5, "y":2}, {"label":"K27", "x":9.5, "y":2}, {"label":"KA3", "x":10.5, "y":2}, {"label":"KB3", "x":11.5, "y":2}, {"label":"KC3", "x":12.5, "y":2}, {"label":"KD3", "x":13.5, "y":2, "w":1.5}, {"label":"K67", "x":15, "y":2}, {"label":"K02", "x":0, "y":3, "w":1.75}, {"label":"K12", "x":1.75, "y":3}, {"label":"K22", "x":2.75, "y":3}, {"label":"K32", "x":3.75, "y":3}, {"label":"K42", "x":4.75, "y":3}, {"label":"K52", "x":5.75, "y":3}, {"label":"K36", "x":6.75, "y":3}, {"label":"KD6", "x":7.75, "y":3}, {"label":"KD7", "x":8.75, "y":3}, {"label":"K37", "x":9.75, "y":3}, {"label":"KA2", "x":10.75, "y":3}, {"label":"KB2", "x":11.75, "y":3}, {"label":"KD2", "x":12.75, "y":3, "w":2.25}, {"label":"KE0", "x":15, "y":3}, {"label":"K01", "x":0, "y":4, "w":2.25}, {"label":"K11", "x":2.25, "y":4}, {"label":"K21", "x":3.25, "y":4}, {"label":"K31", "x":4.25, "y":4}, {"label":"K41", "x":5.25, "y":4}, {"label":"K51", "x":6.25, "y":4}, {"label":"K46", "x":7.25, "y":4}, {"label":"KE6", "x":8.25, "y":4}, {"label":"KE7", "x":9.25, "y":4}, {"label":"K47", "x":10.25, "y":4}, {"label":"KA1", "x":11.25, "y":4}, {"label":"KB1", "x":12.25, "y":4, "w":1.75}, {"label":"K86", "x":14, "y":4}, {"label":"K77", "x":15, "y":4}, {"label":"K00", "x":0, "y":5, "w":1.5}, {"label":"K20", "x":2.5, "y":5, "w":1.5}, {"label":"K56", "x":4, "y":5, "w":7}, {"label":"K57", "x":11, "y":5, "w":1.5}, {"label":"K66", "x":13, "y":5}, {"label":"K76", "x":14, "y":5}, {"label":"K96", "x":15, "y":5}] 48 {"label": "K14", "matrix": [1, 1], "x": 1, "y": 1},
49 {"label": "K24", "matrix": [1, 2], "x": 2, "y": 1},
50 {"label": "K34", "matrix": [1, 3], "x": 3, "y": 1},
51 {"label": "K44", "matrix": [1, 4], "x": 4, "y": 1},
52 {"label": "K54", "matrix": [1, 5], "x": 5, "y": 1},
53 {"label": "K16", "matrix": [1, 6], "x": 6, "y": 1},
54 {"label": "KB6", "matrix": [1, 7], "x": 7, "y": 1},
55 {"label": "KB7", "matrix": [1, 8], "x": 8, "y": 1},
56 {"label": "K17", "matrix": [1, 9], "x": 9, "y": 1},
57 {"label": "KA4", "matrix": [1, 10], "x": 10, "y": 1},
58 {"label": "KB4", "matrix": [1, 11], "x": 11, "y": 1},
59 {"label": "KC4", "matrix": [1, 12], "x": 12, "y": 1},
60 {"label": "KE4", "matrix": [1, 13], "x": 13, "y": 1},
61 {"label": "KE4", "matrix": [1, 14], "x": 14, "y": 1},
62 {"label": "KD0", "matrix": [6, 14], "x": 15, "y": 1},
63
64 {"label": "K03", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
65 {"label": "K13", "matrix": [2, 1], "x": 1.5, "y": 2},
66 {"label": "K23", "matrix": [2, 2], "x": 2.5, "y": 2},
67 {"label": "K33", "matrix": [2, 3], "x": 3.5, "y": 2},
68 {"label": "K43", "matrix": [2, 4], "x": 4.5, "y": 2},
69 {"label": "K53", "matrix": [2, 5], "x": 5.5, "y": 2},
70 {"label": "K26", "matrix": [2, 6], "x": 6.5, "y": 2},
71 {"label": "KC6", "matrix": [2, 7], "x": 7.5, "y": 2},
72 {"label": "KC7", "matrix": [2, 8], "x": 8.5, "y": 2},
73 {"label": "K27", "matrix": [2, 9], "x": 9.5, "y": 2},
74 {"label": "KA3", "matrix": [2, 10], "x": 10.5, "y": 2},
75 {"label": "KB3", "matrix": [2, 11], "x": 11.5, "y": 2},
76 {"label": "KC3", "matrix": [2, 12], "x": 12.5, "y": 2},
77 {"label": "KD3", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
78 {"label": "K67", "matrix": [2, 14], "x": 15, "y": 2},
79
80 {"label": "K02", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
81 {"label": "K12", "matrix": [3, 1], "x": 1.75, "y": 3},
82 {"label": "K22", "matrix": [3, 2], "x": 2.75, "y": 3},
83 {"label": "K32", "matrix": [3, 3], "x": 3.75, "y": 3},
84 {"label": "K42", "matrix": [3, 4], "x": 4.75, "y": 3},
85 {"label": "K52", "matrix": [3, 5], "x": 5.75, "y": 3},
86 {"label": "K36", "matrix": [3, 6], "x": 6.75, "y": 3},
87 {"label": "KD6", "matrix": [3, 7], "x": 7.75, "y": 3},
88 {"label": "KD7", "matrix": [3, 8], "x": 8.75, "y": 3},
89 {"label": "K37", "matrix": [3, 9], "x": 9.75, "y": 3},
90 {"label": "KA2", "matrix": [3, 10], "x": 10.75, "y": 3},
91 {"label": "KB2", "matrix": [3, 11], "x": 11.75, "y": 3},
92 {"label": "KD2", "matrix": [3, 12], "x": 12.75, "y": 3},
93 {"label": "KD2", "matrix": [3, 13], "x": 13.75, "y": 3, "w": 1.25},
94 {"label": "KE0", "matrix": [3, 14], "x": 15, "y": 3},
95
96 {"label": "K01", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
97 {"label": "K01", "matrix": [4, 1], "x": 1.25, "y": 4},
98 {"label": "K11", "matrix": [4, 2], "x": 2.25, "y": 4},
99 {"label": "K21", "matrix": [4, 3], "x": 3.25, "y": 4},
100 {"label": "K31", "matrix": [4, 4], "x": 4.25, "y": 4},
101 {"label": "K41", "matrix": [4, 5], "x": 5.25, "y": 4},
102 {"label": "K51", "matrix": [4, 6], "x": 6.25, "y": 4},
103 {"label": "K46", "matrix": [4, 7], "x": 7.25, "y": 4},
104 {"label": "KE6", "matrix": [4, 8], "x": 8.25, "y": 4},
105 {"label": "KE7", "matrix": [4, 9], "x": 9.25, "y": 4},
106 {"label": "K47", "matrix": [4, 10], "x": 10.25, "y": 4},
107 {"label": "KA1", "matrix": [4, 11], "x": 11.25, "y": 4},
108 {"label": "KB1", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
109 {"label": "K86", "matrix": [4, 13], "x": 14, "y": 4},
110 {"label": "K77", "matrix": [4, 14], "x": 15, "y": 4},
111
112 {"label": "K00", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
113 {"label": "K00", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
114 {"label": "K20", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
115 {"label": "K56", "matrix": [5, 3], "x": 3.75, "y": 5},
116 {"label": "K56", "matrix": [5, 4], "x": 4.75, "y": 5, "w": 1.25},
117 {"label": "K20", "matrix": [5, 5], "x": 6, "y": 5, "w": 1.75},
118 {"label": "K56", "matrix": [5, 7], "x": 7.75, "y": 5, "w": 1.25},
119 {"label": "K56", "matrix": [5, 8], "x": 9, "y": 5},
120 {"label": "K57", "matrix": [5, 9], "x": 10, "y": 5},
121 {"label": "K57", "matrix": [5, 10], "x": 11, "y": 5},
122 {"label": "K57", "matrix": [5, 11], "x": 12, "y": 5},
123 {"label": "K66", "matrix": [5, 12], "x": 13, "y": 5},
124 {"label": "K76", "matrix": [5, 13], "x": 14, "y": 5},
125 {"label": "K96", "matrix": [5, 14], "x": 15, "y": 5}
126 ]
34 }, 127 },
128 "LAYOUT_wkl": {
129 "layout": [
130 {"label": "K05", "matrix": [0, 0], "x": 0, "y": 0},
131 {"label": "K25", "matrix": [0, 1], "x": 1, "y": 0},
132 {"label": "K35", "matrix": [0, 2], "x": 2, "y": 0},
133 {"label": "K45", "matrix": [0, 3], "x": 3, "y": 0},
134 {"label": "K55", "matrix": [0, 4], "x": 4, "y": 0},
135 {"label": "K06", "matrix": [0, 5], "x": 5, "y": 0},
136 {"label": "KA6", "matrix": [0, 6], "x": 6, "y": 0},
137 {"label": "KA7", "matrix": [0, 7], "x": 7, "y": 0},
138 {"label": "K07", "matrix": [0, 8], "x": 8, "y": 0},
139 {"label": "KB5", "matrix": [0, 9], "x": 9, "y": 0},
140 {"label": "KC5", "matrix": [0, 10], "x": 10, "y": 0},
141 {"label": "KD5", "matrix": [0, 11], "x": 11, "y": 0},
142 {"label": "KE5", "matrix": [0, 12], "x": 12, "y": 0},
143 {"label": "KD1", "matrix": [0, 13], "x": 13, "y": 0},
144 {"label": "KE1", "matrix": [0, 14], "x": 14, "y": 0},
145 {"label": "KE2", "matrix": [6, 13], "x": 15, "y": 0},
35 146
36 "LAYOUT_wkl_split_bs": { 147 {"label": "K04", "matrix": [1, 0], "x": 0, "y": 1},
37 "layout": [{"label":"K05", "x":0, "y":0}, {"label":"K25", "x":1, "y":0}, {"label":"K35", "x":2, "y":0}, {"label":"K45", "x":3, "y":0}, {"label":"K55", "x":4, "y":0}, {"label":"K06", "x":5, "y":0}, {"label":"KA6", "x":6, "y":0}, {"label":"KA7", "x":7, "y":0}, {"label":"K07", "x":8, "y":0}, {"label":"KB5", "x":9, "y":0}, {"label":"KC5", "x":10, "y":0}, {"label":"KD5", "x":11, "y":0}, {"label":"KE5", "x":12, "y":0}, {"label":"KD1", "x":13, "y":0}, {"label":"KE1", "x":14, "y":0}, {"label":"KE2", "x":15, "y":0}, {"label":"K04", "x":0, "y":1}, {"label":"K14", "x":1, "y":1}, {"label":"K24", "x":2, "y":1}, {"label":"K34", "x":3, "y":1}, {"label":"K44", "x":4, "y":1}, {"label":"K54", "x":5, "y":1}, {"label":"K16", "x":6, "y":1}, {"label":"KB6", "x":7, "y":1}, {"label":"KB7", "x":8, "y":1}, {"label":"K17", "x":9, "y":1}, {"label":"KA4", "x":10, "y":1}, {"label":"KB4", "x":11, "y":1}, {"label":"KC4", "x":12, "y":1}, {"label":"KE4", "x":13, "y":1}, {"label":"KE4", "x":14, "y":1}, {"label":"KD0", "x":15, "y":1}, {"label":"K03", "x":0, "y":2, "w":1.5}, {"label":"K13", "x":1.5, "y":2}, {"label":"K23", "x":2.5, "y":2}, {"label":"K33", "x":3.5, "y":2}, {"label":"K43", "x":4.5, "y":2}, {"label":"K53", "x":5.5, "y":2}, {"label":"K26", "x":6.5, "y":2}, {"label":"KC6", "x":7.5, "y":2}, {"label":"KC7", "x":8.5, "y":2}, {"label":"K27", "x":9.5, "y":2}, {"label":"KA3", "x":10.5, "y":2}, {"label":"KB3", "x":11.5, "y":2}, {"label":"KC3", "x":12.5, "y":2}, {"label":"KD3", "x":13.5, "y":2, "w":1.5}, {"label":"K67", "x":15, "y":2}, {"label":"K02", "x":0, "y":3, "w":1.75}, {"label":"K12", "x":1.75, "y":3}, {"label":"K22", "x":2.75, "y":3}, {"label":"K32", "x":3.75, "y":3}, {"label":"K42", "x":4.75, "y":3}, {"label":"K52", "x":5.75, "y":3}, {"label":"K36", "x":6.75, "y":3}, {"label":"KD6", "x":7.75, "y":3}, {"label":"KD7", "x":8.75, "y":3}, {"label":"K37", "x":9.75, "y":3}, {"label":"KA2", "x":10.75, "y":3}, {"label":"KB2", "x":11.75, "y":3}, {"label":"KD2", "x":12.75, "y":3, "w":2.25}, {"label":"KE0", "x":15, "y":3}, {"label":"K01", "x":0, "y":4, "w":2.25}, {"label":"K11", "x":2.25, "y":4}, {"label":"K21", "x":3.25, "y":4}, {"label":"K31", "x":4.25, "y":4}, {"label":"K41", "x":5.25, "y":4}, {"label":"K51", "x":6.25, "y":4}, {"label":"K46", "x":7.25, "y":4}, {"label":"KE6", "x":8.25, "y":4}, {"label":"KE7", "x":9.25, "y":4}, {"label":"K47", "x":10.25, "y":4}, {"label":"KA1", "x":11.25, "y":4}, {"label":"KB1", "x":12.25, "y":4, "w":1.75}, {"label":"K86", "x":14, "y":4}, {"label":"K77", "x":15, "y":4}, {"label":"K00", "x":0, "y":5, "w":1.5}, {"label":"K20", "x":2.5, "y":5, "w":1.5}, {"label":"K56", "x":4, "y":5, "w":7}, {"label":"K57", "x":11, "y":5, "w":1.5}, {"label":"K66", "x":13, "y":5}, {"label":"K76", "x":14, "y":5}, {"label":"K96", "x":15, "y":5}] 148 {"label": "K14", "matrix": [1, 1], "x": 1, "y": 1},
149 {"label": "K24", "matrix": [1, 2], "x": 2, "y": 1},
150 {"label": "K34", "matrix": [1, 3], "x": 3, "y": 1},
151 {"label": "K44", "matrix": [1, 4], "x": 4, "y": 1},
152 {"label": "K54", "matrix": [1, 5], "x": 5, "y": 1},
153 {"label": "K16", "matrix": [1, 6], "x": 6, "y": 1},
154 {"label": "KB6", "matrix": [1, 7], "x": 7, "y": 1},
155 {"label": "KB7", "matrix": [1, 8], "x": 8, "y": 1},
156 {"label": "K17", "matrix": [1, 9], "x": 9, "y": 1},
157 {"label": "KA4", "matrix": [1, 10], "x": 10, "y": 1},
158 {"label": "KB4", "matrix": [1, 11], "x": 11, "y": 1},
159 {"label": "KC4", "matrix": [1, 12], "x": 12, "y": 1},
160 {"label": "KE4", "matrix": [1, 13], "x": 13, "y": 1, "w": 2},
161 {"label": "KD0", "matrix": [6, 14], "x": 15, "y": 1},
162
163 {"label": "K03", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
164 {"label": "K13", "matrix": [2, 1], "x": 1.5, "y": 2},
165 {"label": "K23", "matrix": [2, 2], "x": 2.5, "y": 2},
166 {"label": "K33", "matrix": [2, 3], "x": 3.5, "y": 2},
167 {"label": "K43", "matrix": [2, 4], "x": 4.5, "y": 2},
168 {"label": "K53", "matrix": [2, 5], "x": 5.5, "y": 2},
169 {"label": "K26", "matrix": [2, 6], "x": 6.5, "y": 2},
170 {"label": "KC6", "matrix": [2, 7], "x": 7.5, "y": 2},
171 {"label": "KC7", "matrix": [2, 8], "x": 8.5, "y": 2},
172 {"label": "K27", "matrix": [2, 9], "x": 9.5, "y": 2},
173 {"label": "KA3", "matrix": [2, 10], "x": 10.5, "y": 2},
174 {"label": "KB3", "matrix": [2, 11], "x": 11.5, "y": 2},
175 {"label": "KC3", "matrix": [2, 12], "x": 12.5, "y": 2},
176 {"label": "KD3", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
177 {"label": "K67", "matrix": [2, 14], "x": 15, "y": 2},
178
179 {"label": "K02", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
180 {"label": "K12", "matrix": [3, 1], "x": 1.75, "y": 3},
181 {"label": "K22", "matrix": [3, 2], "x": 2.75, "y": 3},
182 {"label": "K32", "matrix": [3, 3], "x": 3.75, "y": 3},
183 {"label": "K42", "matrix": [3, 4], "x": 4.75, "y": 3},
184 {"label": "K52", "matrix": [3, 5], "x": 5.75, "y": 3},
185 {"label": "K36", "matrix": [3, 6], "x": 6.75, "y": 3},
186 {"label": "KD6", "matrix": [3, 7], "x": 7.75, "y": 3},
187 {"label": "KD7", "matrix": [3, 8], "x": 8.75, "y": 3},
188 {"label": "K37", "matrix": [3, 9], "x": 9.75, "y": 3},
189 {"label": "KA2", "matrix": [3, 10], "x": 10.75, "y": 3},
190 {"label": "KB2", "matrix": [3, 11], "x": 11.75, "y": 3},
191 {"label": "KD2", "matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
192 {"label": "KE0", "matrix": [3, 14], "x": 15, "y": 3},
193
194 {"label": "K01", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
195 {"label": "K11", "matrix": [4, 2], "x": 2.25, "y": 4},
196 {"label": "K21", "matrix": [4, 3], "x": 3.25, "y": 4},
197 {"label": "K31", "matrix": [4, 4], "x": 4.25, "y": 4},
198 {"label": "K41", "matrix": [4, 5], "x": 5.25, "y": 4},
199 {"label": "K51", "matrix": [4, 6], "x": 6.25, "y": 4},
200 {"label": "K46", "matrix": [4, 7], "x": 7.25, "y": 4},
201 {"label": "KE6", "matrix": [4, 8], "x": 8.25, "y": 4},
202 {"label": "KE7", "matrix": [4, 9], "x": 9.25, "y": 4},
203 {"label": "K47", "matrix": [4, 10], "x": 10.25, "y": 4},
204 {"label": "KA1", "matrix": [4, 11], "x": 11.25, "y": 4},
205 {"label": "KB1", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
206 {"label": "K86", "matrix": [4, 13], "x": 14, "y": 4},
207 {"label": "K77", "matrix": [4, 14], "x": 15, "y": 4},
208
209 {"label": "K00", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
210 {"label": "K20", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.5},
211 {"label": "K56", "matrix": [5, 5], "x": 4, "y": 5, "w": 7},
212 {"label": "K57", "matrix": [5, 8], "x": 11, "y": 5, "w": 1.5},
213
214 {"label": "K66", "matrix": [5, 12], "x": 13, "y": 5},
215 {"label": "K76", "matrix": [5, 13], "x": 14, "y": 5},
216 {"label": "K96", "matrix": [5, 14], "x": 15, "y": 5}
217 ]
38 }, 218 },
219 "LAYOUT_wkl_split_bs": {
220 "layout": [
221 {"label": "K05", "matrix": [0, 0], "x": 0, "y": 0},
222 {"label": "K25", "matrix": [0, 1], "x": 1, "y": 0},
223 {"label": "K35", "matrix": [0, 2], "x": 2, "y": 0},
224 {"label": "K45", "matrix": [0, 3], "x": 3, "y": 0},
225 {"label": "K55", "matrix": [0, 4], "x": 4, "y": 0},
226 {"label": "K06", "matrix": [0, 5], "x": 5, "y": 0},
227 {"label": "KA6", "matrix": [0, 6], "x": 6, "y": 0},
228 {"label": "KA7", "matrix": [0, 7], "x": 7, "y": 0},
229 {"label": "K07", "matrix": [0, 8], "x": 8, "y": 0},
230 {"label": "KB5", "matrix": [0, 9], "x": 9, "y": 0},
231 {"label": "KC5", "matrix": [0, 10], "x": 10, "y": 0},
232 {"label": "KD5", "matrix": [0, 11], "x": 11, "y": 0},
233 {"label": "KE5", "matrix": [0, 12], "x": 12, "y": 0},
234 {"label": "KD1", "matrix": [0, 13], "x": 13, "y": 0},
235 {"label": "KE1", "matrix": [0, 14], "x": 14, "y": 0},
236 {"label": "KE2", "matrix": [6, 13], "x": 15, "y": 0},
39 237
40 "LAYOUT_tsangan": { 238 {"label": "K04", "matrix": [1, 0], "x": 0, "y": 1},
41 "layout": [{"label":"K05", "x":0, "y":0}, {"label":"K25", "x":1, "y":0}, {"label":"K35", "x":2, "y":0}, {"label":"K45", "x":3, "y":0}, {"label":"K55", "x":4, "y":0}, {"label":"K06", "x":5, "y":0}, {"label":"KA6", "x":6, "y":0}, {"label":"KA7", "x":7, "y":0}, {"label":"K07", "x":8, "y":0}, {"label":"KB5", "x":9, "y":0}, {"label":"KC5", "x":10, "y":0}, {"label":"KD5", "x":11, "y":0}, {"label":"KE5", "x":12, "y":0}, {"label":"KD1", "x":13, "y":0}, {"label":"KE1", "x":14, "y":0}, {"label":"KE2", "x":15, "y":0}, {"label":"K04", "x":0, "y":1}, {"label":"K14", "x":1, "y":1}, {"label":"K24", "x":2, "y":1}, {"label":"K34", "x":3, "y":1}, {"label":"K44", "x":4, "y":1}, {"label":"K54", "x":5, "y":1}, {"label":"K16", "x":6, "y":1}, {"label":"KB6", "x":7, "y":1}, {"label":"KB7", "x":8, "y":1}, {"label":"K17", "x":9, "y":1}, {"label":"KA4", "x":10, "y":1}, {"label":"KB4", "x":11, "y":1}, {"label":"KC4", "x":12, "y":1}, {"label":"KE4", "x":13, "y":1, "w":2}, {"label":"KD0", "x":15, "y":1}, {"label":"K03", "x":0, "y":2, "w":1.5}, {"label":"K13", "x":1.5, "y":2}, {"label":"K23", "x":2.5, "y":2}, {"label":"K33", "x":3.5, "y":2}, {"label":"K43", "x":4.5, "y":2}, {"label":"K53", "x":5.5, "y":2}, {"label":"K26", "x":6.5, "y":2}, {"label":"KC6", "x":7.5, "y":2}, {"label":"KC7", "x":8.5, "y":2}, {"label":"K27", "x":9.5, "y":2}, {"label":"KA3", "x":10.5, "y":2}, {"label":"KB3", "x":11.5, "y":2}, {"label":"KC3", "x":12.5, "y":2}, {"label":"KD3", "x":13.5, "y":2, "w":1.5}, {"label":"K67", "x":15, "y":2}, {"label":"K02", "x":0, "y":3, "w":1.75}, {"label":"K12", "x":1.75, "y":3}, {"label":"K22", "x":2.75, "y":3}, {"label":"K32", "x":3.75, "y":3}, {"label":"K42", "x":4.75, "y":3}, {"label":"K52", "x":5.75, "y":3}, {"label":"K36", "x":6.75, "y":3}, {"label":"KD6", "x":7.75, "y":3}, {"label":"KD7", "x":8.75, "y":3}, {"label":"K37", "x":9.75, "y":3}, {"label":"KA2", "x":10.75, "y":3}, {"label":"KB2", "x":11.75, "y":3}, {"label":"KD2", "x":12.75, "y":3, "w":2.25}, {"label":"KE0", "x":15, "y":3}, {"label":"K01", "x":0, "y":4, "w":2.25}, {"label":"K11", "x":2.25, "y":4}, {"label":"K21", "x":3.25, "y":4}, {"label":"K31", "x":4.25, "y":4}, {"label":"K41", "x":5.25, "y":4}, {"label":"K51", "x":6.25, "y":4}, {"label":"K46", "x":7.25, "y":4}, {"label":"KE6", "x":8.25, "y":4}, {"label":"KE7", "x":9.25, "y":4}, {"label":"K47", "x":10.25, "y":4}, {"label":"KA1", "x":11.25, "y":4}, {"label":"KB1", "x":12.25, "y":4, "w":1.75}, {"label":"K86", "x":14, "y":4}, {"label":"K77", "x":15, "y":4}, {"label":"K00", "x":0, "y":5, "w":1.5}, {"label":"K00", "x":1.5, "y":5}, {"label":"K20", "x":2.5, "y":5, "w":1.5}, {"label":"K56", "x":4, "y":5, "w":7}, {"label":"K57", "x":11, "y":5, "w":1.5}, {"label":"K66", "x":13, "y":5}, {"label":"K76", "x":14, "y":5}, {"label":"K96", "x":15, "y":5}] 239 {"label": "K14", "matrix": [1, 1], "x": 1, "y": 1},
240 {"label": "K24", "matrix": [1, 2], "x": 2, "y": 1},
241 {"label": "K34", "matrix": [1, 3], "x": 3, "y": 1},
242 {"label": "K44", "matrix": [1, 4], "x": 4, "y": 1},
243 {"label": "K54", "matrix": [1, 5], "x": 5, "y": 1},
244 {"label": "K16", "matrix": [1, 6], "x": 6, "y": 1},
245 {"label": "KB6", "matrix": [1, 7], "x": 7, "y": 1},
246 {"label": "KB7", "matrix": [1, 8], "x": 8, "y": 1},
247 {"label": "K17", "matrix": [1, 9], "x": 9, "y": 1},
248 {"label": "KA4", "matrix": [1, 10], "x": 10, "y": 1},
249 {"label": "KB4", "matrix": [1, 11], "x": 11, "y": 1},
250 {"label": "KC4", "matrix": [1, 12], "x": 12, "y": 1},
251 {"label": "KE4", "matrix": [1, 13], "x": 13, "y": 1},
252 {"label": "KE4", "matrix": [1, 14], "x": 14, "y": 1},
253 {"label": "KD0", "matrix": [6, 14], "x": 15, "y": 1},
254
255 {"label": "K03", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
256 {"label": "K13", "matrix": [2, 1], "x": 1.5, "y": 2},
257 {"label": "K23", "matrix": [2, 2], "x": 2.5, "y": 2},
258 {"label": "K33", "matrix": [2, 3], "x": 3.5, "y": 2},
259 {"label": "K43", "matrix": [2, 4], "x": 4.5, "y": 2},
260 {"label": "K53", "matrix": [2, 5], "x": 5.5, "y": 2},
261 {"label": "K26", "matrix": [2, 6], "x": 6.5, "y": 2},
262 {"label": "KC6", "matrix": [2, 7], "x": 7.5, "y": 2},
263 {"label": "KC7", "matrix": [2, 8], "x": 8.5, "y": 2},
264 {"label": "K27", "matrix": [2, 9], "x": 9.5, "y": 2},
265 {"label": "KA3", "matrix": [2, 10], "x": 10.5, "y": 2},
266 {"label": "KB3", "matrix": [2, 11], "x": 11.5, "y": 2},
267 {"label": "KC3", "matrix": [2, 12], "x": 12.5, "y": 2},
268 {"label": "KD3", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
269 {"label": "K67", "matrix": [2, 14], "x": 15, "y": 2},
270
271 {"label": "K02", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
272 {"label": "K12", "matrix": [3, 1], "x": 1.75, "y": 3},
273 {"label": "K22", "matrix": [3, 2], "x": 2.75, "y": 3},
274 {"label": "K32", "matrix": [3, 3], "x": 3.75, "y": 3},
275 {"label": "K42", "matrix": [3, 4], "x": 4.75, "y": 3},
276 {"label": "K52", "matrix": [3, 5], "x": 5.75, "y": 3},
277 {"label": "K36", "matrix": [3, 6], "x": 6.75, "y": 3},
278 {"label": "KD6", "matrix": [3, 7], "x": 7.75, "y": 3},
279 {"label": "KD7", "matrix": [3, 8], "x": 8.75, "y": 3},
280 {"label": "K37", "matrix": [3, 9], "x": 9.75, "y": 3},
281 {"label": "KA2", "matrix": [3, 10], "x": 10.75, "y": 3},
282 {"label": "KB2", "matrix": [3, 11], "x": 11.75, "y": 3},
283 {"label": "KD2", "matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
284 {"label": "KE0", "matrix": [3, 14], "x": 15, "y": 3},
285
286 {"label": "K01", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
287 {"label": "K11", "matrix": [4, 2], "x": 2.25, "y": 4},
288 {"label": "K21", "matrix": [4, 3], "x": 3.25, "y": 4},
289 {"label": "K31", "matrix": [4, 4], "x": 4.25, "y": 4},
290 {"label": "K41", "matrix": [4, 5], "x": 5.25, "y": 4},
291 {"label": "K51", "matrix": [4, 6], "x": 6.25, "y": 4},
292 {"label": "K46", "matrix": [4, 7], "x": 7.25, "y": 4},
293 {"label": "KE6", "matrix": [4, 8], "x": 8.25, "y": 4},
294 {"label": "KE7", "matrix": [4, 9], "x": 9.25, "y": 4},
295 {"label": "K47", "matrix": [4, 10], "x": 10.25, "y": 4},
296 {"label": "KA1", "matrix": [4, 11], "x": 11.25, "y": 4},
297 {"label": "KB1", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
298 {"label": "K86", "matrix": [4, 13], "x": 14, "y": 4},
299 {"label": "K77", "matrix": [4, 14], "x": 15, "y": 4},
300
301 {"label": "K00", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
302 {"label": "K20", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.5},
303 {"label": "K56", "matrix": [5, 5], "x": 4, "y": 5, "w": 7},
304 {"label": "K57", "matrix": [5, 8], "x": 11, "y": 5, "w": 1.5},
305
306 {"label": "K66", "matrix": [5, 12], "x": 13, "y": 5},
307 {"label": "K76", "matrix": [5, 13], "x": 14, "y": 5},
308 {"label": "K96", "matrix": [5, 14], "x": 15, "y": 5}
309 ]
42 }, 310 },
311 "LAYOUT_tsangan": {
312 "layout": [
313 {"label": "K05", "matrix": [0, 0], "x": 0, "y": 0},
314 {"label": "K25", "matrix": [0, 1], "x": 1, "y": 0},
315 {"label": "K35", "matrix": [0, 2], "x": 2, "y": 0},
316 {"label": "K45", "matrix": [0, 3], "x": 3, "y": 0},
317 {"label": "K55", "matrix": [0, 4], "x": 4, "y": 0},
318 {"label": "K06", "matrix": [0, 5], "x": 5, "y": 0},
319 {"label": "KA6", "matrix": [0, 6], "x": 6, "y": 0},
320 {"label": "KA7", "matrix": [0, 7], "x": 7, "y": 0},
321 {"label": "K07", "matrix": [0, 8], "x": 8, "y": 0},
322 {"label": "KB5", "matrix": [0, 9], "x": 9, "y": 0},
323 {"label": "KC5", "matrix": [0, 10], "x": 10, "y": 0},
324 {"label": "KD5", "matrix": [0, 11], "x": 11, "y": 0},
325 {"label": "KE5", "matrix": [0, 12], "x": 12, "y": 0},
326 {"label": "KD1", "matrix": [0, 13], "x": 13, "y": 0},
327 {"label": "KE1", "matrix": [0, 14], "x": 14, "y": 0},
328 {"label": "KE2", "matrix": [6, 13], "x": 15, "y": 0},
43 329
44 "LAYOUT_tsangan_split_bs": { 330 {"label": "K04", "matrix": [1, 0], "x": 0, "y": 1},
45 "layout": [{"label":"K05", "x":0, "y":0}, {"label":"K25", "x":1, "y":0}, {"label":"K35", "x":2, "y":0}, {"label":"K45", "x":3, "y":0}, {"label":"K55", "x":4, "y":0}, {"label":"K06", "x":5, "y":0}, {"label":"KA6", "x":6, "y":0}, {"label":"KA7", "x":7, "y":0}, {"label":"K07", "x":8, "y":0}, {"label":"KB5", "x":9, "y":0}, {"label":"KC5", "x":10, "y":0}, {"label":"KD5", "x":11, "y":0}, {"label":"KE5", "x":12, "y":0}, {"label":"KD1", "x":13, "y":0}, {"label":"KE1", "x":14, "y":0}, {"label":"KE2", "x":15, "y":0}, {"label":"K04", "x":0, "y":1}, {"label":"K14", "x":1, "y":1}, {"label":"K24", "x":2, "y":1}, {"label":"K34", "x":3, "y":1}, {"label":"K44", "x":4, "y":1}, {"label":"K54", "x":5, "y":1}, {"label":"K16", "x":6, "y":1}, {"label":"KB6", "x":7, "y":1}, {"label":"KB7", "x":8, "y":1}, {"label":"K17", "x":9, "y":1}, {"label":"KA4", "x":10, "y":1}, {"label":"KB4", "x":11, "y":1}, {"label":"KC4", "x":12, "y":1}, {"label":"KE4", "x":13, "y":1}, {"label":"KE4", "x":14, "y":1}, {"label":"KD0", "x":15, "y":1}, {"label":"K03", "x":0, "y":2, "w":1.5}, {"label":"K13", "x":1.5, "y":2}, {"label":"K23", "x":2.5, "y":2}, {"label":"K33", "x":3.5, "y":2}, {"label":"K43", "x":4.5, "y":2}, {"label":"K53", "x":5.5, "y":2}, {"label":"K26", "x":6.5, "y":2}, {"label":"KC6", "x":7.5, "y":2}, {"label":"KC7", "x":8.5, "y":2}, {"label":"K27", "x":9.5, "y":2}, {"label":"KA3", "x":10.5, "y":2}, {"label":"KB3", "x":11.5, "y":2}, {"label":"KC3", "x":12.5, "y":2}, {"label":"KD3", "x":13.5, "y":2, "w":1.5}, {"label":"K67", "x":15, "y":2}, {"label":"K02", "x":0, "y":3, "w":1.75}, {"label":"K12", "x":1.75, "y":3}, {"label":"K22", "x":2.75, "y":3}, {"label":"K32", "x":3.75, "y":3}, {"label":"K42", "x":4.75, "y":3}, {"label":"K52", "x":5.75, "y":3}, {"label":"K36", "x":6.75, "y":3}, {"label":"KD6", "x":7.75, "y":3}, {"label":"KD7", "x":8.75, "y":3}, {"label":"K37", "x":9.75, "y":3}, {"label":"KA2", "x":10.75, "y":3}, {"label":"KB2", "x":11.75, "y":3}, {"label":"KD2", "x":12.75, "y":3, "w":2.25}, {"label":"KE0", "x":15, "y":3}, {"label":"K01", "x":0, "y":4, "w":2.25}, {"label":"K11", "x":2.25, "y":4}, {"label":"K21", "x":3.25, "y":4}, {"label":"K31", "x":4.25, "y":4}, {"label":"K41", "x":5.25, "y":4}, {"label":"K51", "x":6.25, "y":4}, {"label":"K46", "x":7.25, "y":4}, {"label":"KE6", "x":8.25, "y":4}, {"label":"KE7", "x":9.25, "y":4}, {"label":"K47", "x":10.25, "y":4}, {"label":"KA1", "x":11.25, "y":4}, {"label":"KB1", "x":12.25, "y":4, "w":1.75}, {"label":"K86", "x":14, "y":4}, {"label":"K77", "x":15, "y":4}, {"label":"K00", "x":0, "y":5, "w":1.5}, {"label":"K00", "x":1.5, "y":5}, {"label":"K20", "x":2.5, "y":5, "w":1.5}, {"label":"K56", "x":4, "y":5, "w":7}, {"label":"K57", "x":11, "y":5, "w":1.5}, {"label":"K66", "x":13, "y":5}, {"label":"K76", "x":14, "y":5}, {"label":"K96", "x":15, "y":5}] 331 {"label": "K14", "matrix": [1, 1], "x": 1, "y": 1},
332 {"label": "K24", "matrix": [1, 2], "x": 2, "y": 1},
333 {"label": "K34", "matrix": [1, 3], "x": 3, "y": 1},
334 {"label": "K44", "matrix": [1, 4], "x": 4, "y": 1},
335 {"label": "K54", "matrix": [1, 5], "x": 5, "y": 1},
336 {"label": "K16", "matrix": [1, 6], "x": 6, "y": 1},
337 {"label": "KB6", "matrix": [1, 7], "x": 7, "y": 1},
338 {"label": "KB7", "matrix": [1, 8], "x": 8, "y": 1},
339 {"label": "K17", "matrix": [1, 9], "x": 9, "y": 1},
340 {"label": "KA4", "matrix": [1, 10], "x": 10, "y": 1},
341 {"label": "KB4", "matrix": [1, 11], "x": 11, "y": 1},
342 {"label": "KC4", "matrix": [1, 12], "x": 12, "y": 1},
343 {"label": "KE4", "matrix": [1, 13], "x": 13, "y": 1, "w": 2},
344 {"label": "KD0", "matrix": [6, 14], "x": 15, "y": 1},
345
346 {"label": "K03", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
347 {"label": "K13", "matrix": [2, 1], "x": 1.5, "y": 2},
348 {"label": "K23", "matrix": [2, 2], "x": 2.5, "y": 2},
349 {"label": "K33", "matrix": [2, 3], "x": 3.5, "y": 2},
350 {"label": "K43", "matrix": [2, 4], "x": 4.5, "y": 2},
351 {"label": "K53", "matrix": [2, 5], "x": 5.5, "y": 2},
352 {"label": "K26", "matrix": [2, 6], "x": 6.5, "y": 2},
353 {"label": "KC6", "matrix": [2, 7], "x": 7.5, "y": 2},
354 {"label": "KC7", "matrix": [2, 8], "x": 8.5, "y": 2},
355 {"label": "K27", "matrix": [2, 9], "x": 9.5, "y": 2},
356 {"label": "KA3", "matrix": [2, 10], "x": 10.5, "y": 2},
357 {"label": "KB3", "matrix": [2, 11], "x": 11.5, "y": 2},
358 {"label": "KC3", "matrix": [2, 12], "x": 12.5, "y": 2},
359 {"label": "KD3", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
360 {"label": "K67", "matrix": [2, 14], "x": 15, "y": 2},
361
362 {"label": "K02", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
363 {"label": "K12", "matrix": [3, 1], "x": 1.75, "y": 3},
364 {"label": "K22", "matrix": [3, 2], "x": 2.75, "y": 3},
365 {"label": "K32", "matrix": [3, 3], "x": 3.75, "y": 3},
366 {"label": "K42", "matrix": [3, 4], "x": 4.75, "y": 3},
367 {"label": "K52", "matrix": [3, 5], "x": 5.75, "y": 3},
368 {"label": "K36", "matrix": [3, 6], "x": 6.75, "y": 3},
369 {"label": "KD6", "matrix": [3, 7], "x": 7.75, "y": 3},
370 {"label": "KD7", "matrix": [3, 8], "x": 8.75, "y": 3},
371 {"label": "K37", "matrix": [3, 9], "x": 9.75, "y": 3},
372 {"label": "KA2", "matrix": [3, 10], "x": 10.75, "y": 3},
373 {"label": "KB2", "matrix": [3, 11], "x": 11.75, "y": 3},
374 {"label": "KD2", "matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
375 {"label": "KE0", "matrix": [3, 14], "x": 15, "y": 3},
376
377 {"label": "K01", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
378 {"label": "K11", "matrix": [4, 2], "x": 2.25, "y": 4},
379 {"label": "K21", "matrix": [4, 3], "x": 3.25, "y": 4},
380 {"label": "K31", "matrix": [4, 4], "x": 4.25, "y": 4},
381 {"label": "K41", "matrix": [4, 5], "x": 5.25, "y": 4},
382 {"label": "K51", "matrix": [4, 6], "x": 6.25, "y": 4},
383 {"label": "K46", "matrix": [4, 7], "x": 7.25, "y": 4},
384 {"label": "KE6", "matrix": [4, 8], "x": 8.25, "y": 4},
385 {"label": "KE7", "matrix": [4, 9], "x": 9.25, "y": 4},
386 {"label": "K47", "matrix": [4, 10], "x": 10.25, "y": 4},
387 {"label": "KA1", "matrix": [4, 11], "x": 11.25, "y": 4},
388 {"label": "KB1", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
389 {"label": "K86", "matrix": [4, 13], "x": 14, "y": 4},
390 {"label": "K77", "matrix": [4, 14], "x": 15, "y": 4},
391
392 {"label": "K00", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
393 {"label": "K00", "matrix": [5, 1], "x": 1.5, "y": 5},
394 {"label": "K20", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.5},
395 {"label": "K56", "matrix": [5, 5], "x": 4, "y": 5, "w": 7},
396 {"label": "K57", "matrix": [5, 8], "x": 11, "y": 5, "w": 1.5},
397
398 {"label": "K66", "matrix": [5, 12], "x": 13, "y": 5},
399 {"label": "K76", "matrix": [5, 13], "x": 14, "y": 5},
400 {"label": "K96", "matrix": [5, 14], "x": 15, "y": 5}
401 ]
46 }, 402 },
403 "LAYOUT_tsangan_split_bs": {
404 "layout": [
405 {"label": "K05", "matrix": [0, 0], "x": 0, "y": 0},
406 {"label": "K25", "matrix": [0, 1], "x": 1, "y": 0},
407 {"label": "K35", "matrix": [0, 2], "x": 2, "y": 0},
408 {"label": "K45", "matrix": [0, 3], "x": 3, "y": 0},
409 {"label": "K55", "matrix": [0, 4], "x": 4, "y": 0},
410 {"label": "K06", "matrix": [0, 5], "x": 5, "y": 0},
411 {"label": "KA6", "matrix": [0, 6], "x": 6, "y": 0},
412 {"label": "KA7", "matrix": [0, 7], "x": 7, "y": 0},
413 {"label": "K07", "matrix": [0, 8], "x": 8, "y": 0},
414 {"label": "KB5", "matrix": [0, 9], "x": 9, "y": 0},
415 {"label": "KC5", "matrix": [0, 10], "x": 10, "y": 0},
416 {"label": "KD5", "matrix": [0, 11], "x": 11, "y": 0},
417 {"label": "KE5", "matrix": [0, 12], "x": 12, "y": 0},
418 {"label": "KD1", "matrix": [0, 13], "x": 13, "y": 0},
419 {"label": "KE1", "matrix": [0, 14], "x": 14, "y": 0},
420 {"label": "KE2", "matrix": [6, 13], "x": 15, "y": 0},
47 421
48 "LAYOUT_wk": { 422 {"label": "K04", "matrix": [1, 0], "x": 0, "y": 1},
49 "layout": [{"label":"K05", "x":0, "y":0}, {"label":"K25", "x":1, "y":0}, {"label":"K35", "x":2, "y":0}, {"label":"K45", "x":3, "y":0}, {"label":"K55", "x":4, "y":0}, {"label":"K06", "x":5, "y":0}, {"label":"KA6", "x":6, "y":0}, {"label":"KA7", "x":7, "y":0}, {"label":"K07", "x":8, "y":0}, {"label":"KB5", "x":9, "y":0}, {"label":"KC5", "x":10, "y":0}, {"label":"KD5", "x":11, "y":0}, {"label":"KE5", "x":12, "y":0}, {"label":"KD1", "x":13, "y":0}, {"label":"KE1", "x":14, "y":0}, {"label":"KE2", "x":15, "y":0}, {"label":"K04", "x":0, "y":1}, {"label":"K14", "x":1, "y":1}, {"label":"K24", "x":2, "y":1}, {"label":"K34", "x":3, "y":1}, {"label":"K44", "x":4, "y":1}, {"label":"K54", "x":5, "y":1}, {"label":"K16", "x":6, "y":1}, {"label":"KB6", "x":7, "y":1}, {"label":"KB7", "x":8, "y":1}, {"label":"K17", "x":9, "y":1}, {"label":"KA4", "x":10, "y":1}, {"label":"KB4", "x":11, "y":1}, {"label":"KC4", "x":12, "y":1}, {"label":"KE4", "x":13, "y":1, "w":2}, {"label":"KD0", "x":15, "y":1}, {"label":"K03", "x":0, "y":2, "w":1.5}, {"label":"K13", "x":1.5, "y":2}, {"label":"K23", "x":2.5, "y":2}, {"label":"K33", "x":3.5, "y":2}, {"label":"K43", "x":4.5, "y":2}, {"label":"K53", "x":5.5, "y":2}, {"label":"K26", "x":6.5, "y":2}, {"label":"KC6", "x":7.5, "y":2}, {"label":"KC7", "x":8.5, "y":2}, {"label":"K27", "x":9.5, "y":2}, {"label":"KA3", "x":10.5, "y":2}, {"label":"KB3", "x":11.5, "y":2}, {"label":"KC3", "x":12.5, "y":2}, {"label":"KD3", "x":13.5, "y":2, "w":1.5}, {"label":"K67", "x":15, "y":2}, {"label":"K02", "x":0, "y":3, "w":1.75}, {"label":"K12", "x":1.75, "y":3}, {"label":"K22", "x":2.75, "y":3}, {"label":"K32", "x":3.75, "y":3}, {"label":"K42", "x":4.75, "y":3}, {"label":"K52", "x":5.75, "y":3}, {"label":"K36", "x":6.75, "y":3}, {"label":"KD6", "x":7.75, "y":3}, {"label":"KD7", "x":8.75, "y":3}, {"label":"K37", "x":9.75, "y":3}, {"label":"KA2", "x":10.75, "y":3}, {"label":"KB2", "x":11.75, "y":3}, {"label":"KD2", "x":12.75, "y":3, "w":2.25}, {"label":"KE0", "x":15, "y":3}, {"label":"K01", "x":0, "y":4, "w":2.25}, {"label":"K11", "x":2.25, "y":4}, {"label":"K21", "x":3.25, "y":4}, {"label":"K31", "x":4.25, "y":4}, {"label":"K41", "x":5.25, "y":4}, {"label":"K51", "x":6.25, "y":4}, {"label":"K46", "x":7.25, "y":4}, {"label":"KE6", "x":8.25, "y":4}, {"label":"KE7", "x":9.25, "y":4}, {"label":"K47", "x":10.25, "y":4}, {"label":"KA1", "x":11.25, "y":4}, {"label":"KB1", "x":12.25, "y":4, "w":1.75}, {"label":"K86", "x":14, "y":4}, {"label":"K77", "x":15, "y":4}, {"label":"K00", "x":0, "y":5, "w":1.25}, {"label":"K00", "x":1.25, "y":5, "w":1.25}, {"label":"K20", "x":2.5, "y":5, "w":1.25}, {"label":"K56", "x":3.75, "y":5, "w":6.25}, {"label":"K57", "x":10, "y":5, "w":1.5}, {"label":"K57", "x":11.5, "y":5, "w":1.5}, {"label":"K66", "x":13, "y":5}, {"label":"K76", "x":14, "y":5}, {"label":"K96", "x":15, "y":5}] 423 {"label": "K14", "matrix": [1, 1], "x": 1, "y": 1},
424 {"label": "K24", "matrix": [1, 2], "x": 2, "y": 1},
425 {"label": "K34", "matrix": [1, 3], "x": 3, "y": 1},
426 {"label": "K44", "matrix": [1, 4], "x": 4, "y": 1},
427 {"label": "K54", "matrix": [1, 5], "x": 5, "y": 1},
428 {"label": "K16", "matrix": [1, 6], "x": 6, "y": 1},
429 {"label": "KB6", "matrix": [1, 7], "x": 7, "y": 1},
430 {"label": "KB7", "matrix": [1, 8], "x": 8, "y": 1},
431 {"label": "K17", "matrix": [1, 9], "x": 9, "y": 1},
432 {"label": "KA4", "matrix": [1, 10], "x": 10, "y": 1},
433 {"label": "KB4", "matrix": [1, 11], "x": 11, "y": 1},
434 {"label": "KC4", "matrix": [1, 12], "x": 12, "y": 1},
435 {"label": "KE4", "matrix": [1, 13], "x": 13, "y": 1},
436 {"label": "KE4", "matrix": [1, 14], "x": 14, "y": 1},
437 {"label": "KD0", "matrix": [6, 14], "x": 15, "y": 1},
438
439 {"label": "K03", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
440 {"label": "K13", "matrix": [2, 1], "x": 1.5, "y": 2},
441 {"label": "K23", "matrix": [2, 2], "x": 2.5, "y": 2},
442 {"label": "K33", "matrix": [2, 3], "x": 3.5, "y": 2},
443 {"label": "K43", "matrix": [2, 4], "x": 4.5, "y": 2},
444 {"label": "K53", "matrix": [2, 5], "x": 5.5, "y": 2},
445 {"label": "K26", "matrix": [2, 6], "x": 6.5, "y": 2},
446 {"label": "KC6", "matrix": [2, 7], "x": 7.5, "y": 2},
447 {"label": "KC7", "matrix": [2, 8], "x": 8.5, "y": 2},
448 {"label": "K27", "matrix": [2, 9], "x": 9.5, "y": 2},
449 {"label": "KA3", "matrix": [2, 10], "x": 10.5, "y": 2},
450 {"label": "KB3", "matrix": [2, 11], "x": 11.5, "y": 2},
451 {"label": "KC3", "matrix": [2, 12], "x": 12.5, "y": 2},
452 {"label": "KD3", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
453 {"label": "K67", "matrix": [2, 14], "x": 15, "y": 2},
454
455 {"label": "K02", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
456 {"label": "K12", "matrix": [3, 1], "x": 1.75, "y": 3},
457 {"label": "K22", "matrix": [3, 2], "x": 2.75, "y": 3},
458 {"label": "K32", "matrix": [3, 3], "x": 3.75, "y": 3},
459 {"label": "K42", "matrix": [3, 4], "x": 4.75, "y": 3},
460 {"label": "K52", "matrix": [3, 5], "x": 5.75, "y": 3},
461 {"label": "K36", "matrix": [3, 6], "x": 6.75, "y": 3},
462 {"label": "KD6", "matrix": [3, 7], "x": 7.75, "y": 3},
463 {"label": "KD7", "matrix": [3, 8], "x": 8.75, "y": 3},
464 {"label": "K37", "matrix": [3, 9], "x": 9.75, "y": 3},
465 {"label": "KA2", "matrix": [3, 10], "x": 10.75, "y": 3},
466 {"label": "KB2", "matrix": [3, 11], "x": 11.75, "y": 3},
467 {"label": "KD2", "matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
468 {"label": "KE0", "matrix": [3, 14], "x": 15, "y": 3},
469
470 {"label": "K01", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
471 {"label": "K11", "matrix": [4, 2], "x": 2.25, "y": 4},
472 {"label": "K21", "matrix": [4, 3], "x": 3.25, "y": 4},
473 {"label": "K31", "matrix": [4, 4], "x": 4.25, "y": 4},
474 {"label": "K41", "matrix": [4, 5], "x": 5.25, "y": 4},
475 {"label": "K51", "matrix": [4, 6], "x": 6.25, "y": 4},
476 {"label": "K46", "matrix": [4, 7], "x": 7.25, "y": 4},
477 {"label": "KE6", "matrix": [4, 8], "x": 8.25, "y": 4},
478 {"label": "KE7", "matrix": [4, 9], "x": 9.25, "y": 4},
479 {"label": "K47", "matrix": [4, 10], "x": 10.25, "y": 4},
480 {"label": "KA1", "matrix": [4, 11], "x": 11.25, "y": 4},
481 {"label": "KB1", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
482 {"label": "K86", "matrix": [4, 13], "x": 14, "y": 4},
483 {"label": "K77", "matrix": [4, 14], "x": 15, "y": 4},
484
485 {"label": "K00", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
486 {"label": "K00", "matrix": [5, 1], "x": 1.5, "y": 5},
487 {"label": "K20", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.5},
488 {"label": "K56", "matrix": [5, 5], "x": 4, "y": 5, "w": 7},
489 {"label": "K57", "matrix": [5, 8], "x": 11, "y": 5, "w": 1.5},
490
491 {"label": "K66", "matrix": [5, 12], "x": 13, "y": 5},
492 {"label": "K76", "matrix": [5, 13], "x": 14, "y": 5},
493 {"label": "K96", "matrix": [5, 14], "x": 15, "y": 5}
494 ]
50 }, 495 },
496 "LAYOUT_wk": {
497 "layout": [
498 {"label": "K05", "matrix": [0, 0], "x": 0, "y": 0},
499 {"label": "K25", "matrix": [0, 1], "x": 1, "y": 0},
500 {"label": "K35", "matrix": [0, 2], "x": 2, "y": 0},
501 {"label": "K45", "matrix": [0, 3], "x": 3, "y": 0},
502 {"label": "K55", "matrix": [0, 4], "x": 4, "y": 0},
503 {"label": "K06", "matrix": [0, 5], "x": 5, "y": 0},
504 {"label": "KA6", "matrix": [0, 6], "x": 6, "y": 0},
505 {"label": "KA7", "matrix": [0, 7], "x": 7, "y": 0},
506 {"label": "K07", "matrix": [0, 8], "x": 8, "y": 0},
507 {"label": "KB5", "matrix": [0, 9], "x": 9, "y": 0},
508 {"label": "KC5", "matrix": [0, 10], "x": 10, "y": 0},
509 {"label": "KD5", "matrix": [0, 11], "x": 11, "y": 0},
510 {"label": "KE5", "matrix": [0, 12], "x": 12, "y": 0},
511 {"label": "KD1", "matrix": [0, 13], "x": 13, "y": 0},
512 {"label": "KE1", "matrix": [0, 14], "x": 14, "y": 0},
513 {"label": "KE2", "matrix": [6, 13], "x": 15, "y": 0},
514
515 {"label": "K04", "matrix": [1, 0], "x": 0, "y": 1},
516 {"label": "K14", "matrix": [1, 1], "x": 1, "y": 1},
517 {"label": "K24", "matrix": [1, 2], "x": 2, "y": 1},
518 {"label": "K34", "matrix": [1, 3], "x": 3, "y": 1},
519 {"label": "K44", "matrix": [1, 4], "x": 4, "y": 1},
520 {"label": "K54", "matrix": [1, 5], "x": 5, "y": 1},
521 {"label": "K16", "matrix": [1, 6], "x": 6, "y": 1},
522 {"label": "KB6", "matrix": [1, 7], "x": 7, "y": 1},
523 {"label": "KB7", "matrix": [1, 8], "x": 8, "y": 1},
524 {"label": "K17", "matrix": [1, 9], "x": 9, "y": 1},
525 {"label": "KA4", "matrix": [1, 10], "x": 10, "y": 1},
526 {"label": "KB4", "matrix": [1, 11], "x": 11, "y": 1},
527 {"label": "KC4", "matrix": [1, 12], "x": 12, "y": 1},
528 {"label": "KE4", "matrix": [1, 13], "x": 13, "y": 1, "w": 2},
529 {"label": "KD0", "matrix": [6, 14], "x": 15, "y": 1},
530
531 {"label": "K03", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
532 {"label": "K13", "matrix": [2, 1], "x": 1.5, "y": 2},
533 {"label": "K23", "matrix": [2, 2], "x": 2.5, "y": 2},
534 {"label": "K33", "matrix": [2, 3], "x": 3.5, "y": 2},
535 {"label": "K43", "matrix": [2, 4], "x": 4.5, "y": 2},
536 {"label": "K53", "matrix": [2, 5], "x": 5.5, "y": 2},
537 {"label": "K26", "matrix": [2, 6], "x": 6.5, "y": 2},
538 {"label": "KC6", "matrix": [2, 7], "x": 7.5, "y": 2},
539 {"label": "KC7", "matrix": [2, 8], "x": 8.5, "y": 2},
540 {"label": "K27", "matrix": [2, 9], "x": 9.5, "y": 2},
541 {"label": "KA3", "matrix": [2, 10], "x": 10.5, "y": 2},
542 {"label": "KB3", "matrix": [2, 11], "x": 11.5, "y": 2},
543 {"label": "KC3", "matrix": [2, 12], "x": 12.5, "y": 2},
544 {"label": "KD3", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
545 {"label": "K67", "matrix": [2, 14], "x": 15, "y": 2},
51 546
547 {"label": "K02", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
548 {"label": "K12", "matrix": [3, 1], "x": 1.75, "y": 3},
549 {"label": "K22", "matrix": [3, 2], "x": 2.75, "y": 3},
550 {"label": "K32", "matrix": [3, 3], "x": 3.75, "y": 3},
551 {"label": "K42", "matrix": [3, 4], "x": 4.75, "y": 3},
552 {"label": "K52", "matrix": [3, 5], "x": 5.75, "y": 3},
553 {"label": "K36", "matrix": [3, 6], "x": 6.75, "y": 3},
554 {"label": "KD6", "matrix": [3, 7], "x": 7.75, "y": 3},
555 {"label": "KD7", "matrix": [3, 8], "x": 8.75, "y": 3},
556 {"label": "K37", "matrix": [3, 9], "x": 9.75, "y": 3},
557 {"label": "KA2", "matrix": [3, 10], "x": 10.75, "y": 3},
558 {"label": "KB2", "matrix": [3, 11], "x": 11.75, "y": 3},
559 {"label": "KD2", "matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
560 {"label": "KE0", "matrix": [3, 14], "x": 15, "y": 3},
561
562 {"label": "K01", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
563 {"label": "K11", "matrix": [4, 2], "x": 2.25, "y": 4},
564 {"label": "K21", "matrix": [4, 3], "x": 3.25, "y": 4},
565 {"label": "K31", "matrix": [4, 4], "x": 4.25, "y": 4},
566 {"label": "K41", "matrix": [4, 5], "x": 5.25, "y": 4},
567 {"label": "K51", "matrix": [4, 6], "x": 6.25, "y": 4},
568 {"label": "K46", "matrix": [4, 7], "x": 7.25, "y": 4},
569 {"label": "KE6", "matrix": [4, 8], "x": 8.25, "y": 4},
570 {"label": "KE7", "matrix": [4, 9], "x": 9.25, "y": 4},
571 {"label": "K47", "matrix": [4, 10], "x": 10.25, "y": 4},
572 {"label": "KA1", "matrix": [4, 11], "x": 11.25, "y": 4},
573 {"label": "KB1", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
574 {"label": "K86", "matrix": [4, 13], "x": 14, "y": 4},
575 {"label": "K77", "matrix": [4, 14], "x": 15, "y": 4},
576
577 {"label": "K00", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
578 {"label": "K00", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
579 {"label": "K20", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
580 {"label": "K56", "matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
581 {"label": "K57", "matrix": [5, 8], "x": 10, "y": 5, "w": 1.5},
582 {"label": "K57", "matrix": [5, 10], "x": 11.5, "y": 5, "w": 1.5},
583 {"label": "K66", "matrix": [5, 12], "x": 13, "y": 5},
584 {"label": "K76", "matrix": [5, 13], "x": 14, "y": 5},
585 {"label": "K96", "matrix": [5, 14], "x": 15, "y": 5}
586 ]
587 },
52 "LAYOUT_wk_split_bs": { 588 "LAYOUT_wk_split_bs": {
53 "layout": [{"label":"K05", "x":0, "y":0}, {"label":"K25", "x":1, "y":0}, {"label":"K35", "x":2, "y":0}, {"label":"K45", "x":3, "y":0}, {"label":"K55", "x":4, "y":0}, {"label":"K06", "x":5, "y":0}, {"label":"KA6", "x":6, "y":0}, {"label":"KA7", "x":7, "y":0}, {"label":"K07", "x":8, "y":0}, {"label":"KB5", "x":9, "y":0}, {"label":"KC5", "x":10, "y":0}, {"label":"KD5", "x":11, "y":0}, {"label":"KE5", "x":12, "y":0}, {"label":"KD1", "x":13, "y":0}, {"label":"KE1", "x":14, "y":0}, {"label":"KE2", "x":15, "y":0}, {"label":"K04", "x":0, "y":1}, {"label":"K14", "x":1, "y":1}, {"label":"K24", "x":2, "y":1}, {"label":"K34", "x":3, "y":1}, {"label":"K44", "x":4, "y":1}, {"label":"K54", "x":5, "y":1}, {"label":"K16", "x":6, "y":1}, {"label":"KB6", "x":7, "y":1}, {"label":"KB7", "x":8, "y":1}, {"label":"K17", "x":9, "y":1}, {"label":"KA4", "x":10, "y":1}, {"label":"KB4", "x":11, "y":1}, {"label":"KC4", "x":12, "y":1}, {"label":"KE4", "x":13, "y":1}, {"label":"KE4", "x":14, "y":1}, {"label":"KD0", "x":15, "y":1}, {"label":"K03", "x":0, "y":2, "w":1.5}, {"label":"K13", "x":1.5, "y":2}, {"label":"K23", "x":2.5, "y":2}, {"label":"K33", "x":3.5, "y":2}, {"label":"K43", "x":4.5, "y":2}, {"label":"K53", "x":5.5, "y":2}, {"label":"K26", "x":6.5, "y":2}, {"label":"KC6", "x":7.5, "y":2}, {"label":"KC7", "x":8.5, "y":2}, {"label":"K27", "x":9.5, "y":2}, {"label":"KA3", "x":10.5, "y":2}, {"label":"KB3", "x":11.5, "y":2}, {"label":"KC3", "x":12.5, "y":2}, {"label":"KD3", "x":13.5, "y":2, "w":1.5}, {"label":"K67", "x":15, "y":2}, {"label":"K02", "x":0, "y":3, "w":1.75}, {"label":"K12", "x":1.75, "y":3}, {"label":"K22", "x":2.75, "y":3}, {"label":"K32", "x":3.75, "y":3}, {"label":"K42", "x":4.75, "y":3}, {"label":"K52", "x":5.75, "y":3}, {"label":"K36", "x":6.75, "y":3}, {"label":"KD6", "x":7.75, "y":3}, {"label":"KD7", "x":8.75, "y":3}, {"label":"K37", "x":9.75, "y":3}, {"label":"KA2", "x":10.75, "y":3}, {"label":"KB2", "x":11.75, "y":3}, {"label":"KD2", "x":12.75, "y":3, "w":2.25}, {"label":"KE0", "x":15, "y":3}, {"label":"K01", "x":0, "y":4, "w":2.25}, {"label":"K11", "x":2.25, "y":4}, {"label":"K21", "x":3.25, "y":4}, {"label":"K31", "x":4.25, "y":4}, {"label":"K41", "x":5.25, "y":4}, {"label":"K51", "x":6.25, "y":4}, {"label":"K46", "x":7.25, "y":4}, {"label":"KE6", "x":8.25, "y":4}, {"label":"KE7", "x":9.25, "y":4}, {"label":"K47", "x":10.25, "y":4}, {"label":"KA1", "x":11.25, "y":4}, {"label":"KB1", "x":12.25, "y":4, "w":1.75}, {"label":"K86", "x":14, "y":4}, {"label":"K77", "x":15, "y":4}, {"label":"K00", "x":0, "y":5, "w":1.25}, {"label":"K00", "x":1.25, "y":5, "w":1.25}, {"label":"K20", "x":2.5, "y":5, "w":1.25}, {"label":"K56", "x":3.75, "y":5, "w":6.25}, {"label":"K57", "x":10, "y":5, "w":1.5}, {"label":"K57", "x":11.5, "y":5, "w":1.5}, {"label":"K66", "x":13, "y":5}, {"label":"K76", "x":14, "y":5}, {"label":"K96", "x":15, "y":5}] 589 "layout": [
590 {"label": "K05", "matrix": [0, 0], "x": 0, "y": 0},
591 {"label": "K25", "matrix": [0, 1], "x": 1, "y": 0},
592 {"label": "K35", "matrix": [0, 2], "x": 2, "y": 0},
593 {"label": "K45", "matrix": [0, 3], "x": 3, "y": 0},
594 {"label": "K55", "matrix": [0, 4], "x": 4, "y": 0},
595 {"label": "K06", "matrix": [0, 5], "x": 5, "y": 0},
596 {"label": "KA6", "matrix": [0, 6], "x": 6, "y": 0},
597 {"label": "KA7", "matrix": [0, 7], "x": 7, "y": 0},
598 {"label": "K07", "matrix": [0, 8], "x": 8, "y": 0},
599 {"label": "KB5", "matrix": [0, 9], "x": 9, "y": 0},
600 {"label": "KC5", "matrix": [0, 10], "x": 10, "y": 0},
601 {"label": "KD5", "matrix": [0, 11], "x": 11, "y": 0},
602 {"label": "KE5", "matrix": [0, 12], "x": 12, "y": 0},
603 {"label": "KD1", "matrix": [0, 13], "x": 13, "y": 0},
604 {"label": "KE1", "matrix": [0, 14], "x": 14, "y": 0},
605 {"label": "KE2", "matrix": [6, 13], "x": 15, "y": 0},
606
607 {"label": "K04", "matrix": [1, 0], "x": 0, "y": 1},
608 {"label": "K14", "matrix": [1, 1], "x": 1, "y": 1},
609 {"label": "K24", "matrix": [1, 2], "x": 2, "y": 1},
610 {"label": "K34", "matrix": [1, 3], "x": 3, "y": 1},
611 {"label": "K44", "matrix": [1, 4], "x": 4, "y": 1},
612 {"label": "K54", "matrix": [1, 5], "x": 5, "y": 1},
613 {"label": "K16", "matrix": [1, 6], "x": 6, "y": 1},
614 {"label": "KB6", "matrix": [1, 7], "x": 7, "y": 1},
615 {"label": "KB7", "matrix": [1, 8], "x": 8, "y": 1},
616 {"label": "K17", "matrix": [1, 9], "x": 9, "y": 1},
617 {"label": "KA4", "matrix": [1, 10], "x": 10, "y": 1},
618 {"label": "KB4", "matrix": [1, 11], "x": 11, "y": 1},
619 {"label": "KC4", "matrix": [1, 12], "x": 12, "y": 1},
620 {"label": "KE4", "matrix": [1, 13], "x": 13, "y": 1},
621 {"label": "KE4", "matrix": [1, 14], "x": 14, "y": 1},
622 {"label": "KD0", "matrix": [6, 14], "x": 15, "y": 1},
623
624 {"label": "K03", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
625 {"label": "K13", "matrix": [2, 1], "x": 1.5, "y": 2},
626 {"label": "K23", "matrix": [2, 2], "x": 2.5, "y": 2},
627 {"label": "K33", "matrix": [2, 3], "x": 3.5, "y": 2},
628 {"label": "K43", "matrix": [2, 4], "x": 4.5, "y": 2},
629 {"label": "K53", "matrix": [2, 5], "x": 5.5, "y": 2},
630 {"label": "K26", "matrix": [2, 6], "x": 6.5, "y": 2},
631 {"label": "KC6", "matrix": [2, 7], "x": 7.5, "y": 2},
632 {"label": "KC7", "matrix": [2, 8], "x": 8.5, "y": 2},
633 {"label": "K27", "matrix": [2, 9], "x": 9.5, "y": 2},
634 {"label": "KA3", "matrix": [2, 10], "x": 10.5, "y": 2},
635 {"label": "KB3", "matrix": [2, 11], "x": 11.5, "y": 2},
636 {"label": "KC3", "matrix": [2, 12], "x": 12.5, "y": 2},
637 {"label": "KD3", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
638 {"label": "K67", "matrix": [2, 14], "x": 15, "y": 2},
639
640 {"label": "K02", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
641 {"label": "K12", "matrix": [3, 1], "x": 1.75, "y": 3},
642 {"label": "K22", "matrix": [3, 2], "x": 2.75, "y": 3},
643 {"label": "K32", "matrix": [3, 3], "x": 3.75, "y": 3},
644 {"label": "K42", "matrix": [3, 4], "x": 4.75, "y": 3},
645 {"label": "K52", "matrix": [3, 5], "x": 5.75, "y": 3},
646 {"label": "K36", "matrix": [3, 6], "x": 6.75, "y": 3},
647 {"label": "KD6", "matrix": [3, 7], "x": 7.75, "y": 3},
648 {"label": "KD7", "matrix": [3, 8], "x": 8.75, "y": 3},
649 {"label": "K37", "matrix": [3, 9], "x": 9.75, "y": 3},
650 {"label": "KA2", "matrix": [3, 10], "x": 10.75, "y": 3},
651 {"label": "KB2", "matrix": [3, 11], "x": 11.75, "y": 3},
652 {"label": "KD2", "matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
653 {"label": "KE0", "matrix": [3, 14], "x": 15, "y": 3},
654
655 {"label": "K01", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
656 {"label": "K11", "matrix": [4, 2], "x": 2.25, "y": 4},
657 {"label": "K21", "matrix": [4, 3], "x": 3.25, "y": 4},
658 {"label": "K31", "matrix": [4, 4], "x": 4.25, "y": 4},
659 {"label": "K41", "matrix": [4, 5], "x": 5.25, "y": 4},
660 {"label": "K51", "matrix": [4, 6], "x": 6.25, "y": 4},
661 {"label": "K46", "matrix": [4, 7], "x": 7.25, "y": 4},
662 {"label": "KE6", "matrix": [4, 8], "x": 8.25, "y": 4},
663 {"label": "KE7", "matrix": [4, 9], "x": 9.25, "y": 4},
664 {"label": "K47", "matrix": [4, 10], "x": 10.25, "y": 4},
665 {"label": "KA1", "matrix": [4, 11], "x": 11.25, "y": 4},
666 {"label": "KB1", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
667 {"label": "K86", "matrix": [4, 13], "x": 14, "y": 4},
668 {"label": "K77", "matrix": [4, 14], "x": 15, "y": 4},
669
670 {"label": "K00", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
671 {"label": "K00", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
672 {"label": "K20", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
673 {"label": "K56", "matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
674 {"label": "K57", "matrix": [5, 8], "x": 10, "y": 5, "w": 1.5},
675 {"label": "K57", "matrix": [5, 10], "x": 11.5, "y": 5, "w": 1.5},
676 {"label": "K66", "matrix": [5, 12], "x": 13, "y": 5},
677 {"label": "K76", "matrix": [5, 13], "x": 14, "y": 5},
678 {"label": "K96", "matrix": [5, 14], "x": 15, "y": 5}
679 ]
54 } 680 }
55 } 681 }
56 } 682 }
diff --git a/keyboards/singa/singa.h b/keyboards/singa/singa.h
deleted file mode 100644
index 03b6848886..0000000000
--- a/keyboards/singa/singa.h
+++ /dev/null
@@ -1,140 +0,0 @@
1/* Copyright 2018 amnesia0287
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16#pragma once
17
18#include "quantum.h"
19
20// This a shortcut to help you visually see your layout.
21// The first section contains all of the arguments
22// The second converts the arguments into a two-dimensional array
23#define LAYOUT( \
24 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, \
25 k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, k31, \
26 k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, \
27 k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60, k61, \
28 k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, k72, k73, k74, k75, k76, \
29 k77, k78, k79, k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k90 \
30){ \
31 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14 }, \
32 { k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30 }, \
33 { k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, k46 }, \
34 { k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60, k61 }, \
35 { k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, k72, k73, k74, k75, k76 }, \
36 { k77, k78, k79, k80, k81, k82, KC_NO, k83, k84, k85, k86, k87, k88, k89, k90 }, \
37 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k15, k31 } \
38}
39
40#define LAYOUT_wkl( \
41 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, \
42 k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, \
43 k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, \
44 k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, \
45 k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, k72, k73, \
46 k74, k75, k76, k77, k78, k79, k80 \
47){ \
48 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14 }, \
49 { k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, KC_NO }, \
50 { k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45 }, \
51 { k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, KC_NO, k58, k59 }, \
52 { k60, KC_NO, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, k72, k73 }, \
53 { k74, KC_NO, k75, KC_NO, KC_NO, k76, KC_NO, KC_NO, k77, KC_NO, KC_NO, KC_NO, k78, k79, k80 }, \
54 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k15, k30 } \
55}
56
57#define LAYOUT_wkl_split_bs( \
58 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, \
59 k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k81, k30, \
60 k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, \
61 k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, \
62 k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, k72, k73, \
63 k74, k75, k76, k77, k78, k79, k80 \
64){ \
65 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14 }, \
66 { k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k81 }, \
67 { k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45 }, \
68 { k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, KC_NO, k58, k59 }, \
69 { k60, KC_NO, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, k72, k73 }, \
70 { k74, KC_NO, k75, KC_NO, KC_NO, k76, KC_NO, KC_NO, k77, KC_NO, KC_NO, KC_NO, k78, k79, k80 }, \
71 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k15, k30 } \
72}
73
74#define LAYOUT_tsangan( \
75 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, \
76 k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, \
77 k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, \
78 k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, \
79 k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, k72, k73, \
80 k74, k81, k75, k76, k77, k78, k79, k80 \
81){ \
82 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14 }, \
83 { k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, KC_NO }, \
84 { k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45 }, \
85 { k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, KC_NO, k58, k59 }, \
86 { k60, KC_NO, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, k72, k73 }, \
87 { k74, k81, k75, KC_NO, KC_NO, k76, KC_NO, KC_NO, k77, KC_NO, KC_NO, KC_NO, k78, k79, k80 }, \
88 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k15, k30 } \
89}
90
91#define LAYOUT_tsangan_split_bs( \
92 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, \
93 k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k82, k30, \
94 k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, \
95 k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, \
96 k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, k72, k73, \
97 k74, k81, k75, k76, k77, k78, k79, k80 \
98){ \
99 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14 }, \
100 { k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k82 }, \
101 { k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45 }, \
102 { k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, KC_NO, k58, k59 }, \
103 { k60, KC_NO, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, k72, k73 }, \
104 { k74, k81, k75, KC_NO, KC_NO, k76, KC_NO, KC_NO, k77, KC_NO, KC_NO, KC_NO, k78, k79, k80 }, \
105 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k15, k30 } \
106}
107
108#define LAYOUT_wk( \
109 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, \
110 k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, \
111 k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, \
112 k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, \
113 k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, k72, k73, \
114 k74, k81, k75, k76, k77, k82, k78, k79, k80 \
115){ \
116 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14 }, \
117 { k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, KC_NO }, \
118 { k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45 }, \
119 { k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, KC_NO, k58, k59 }, \
120 { k60, KC_NO, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, k72, k73 }, \
121 { k74, k81 , k75, KC_NO, KC_NO, k76, KC_NO, KC_NO, k77, KC_NO, k82, KC_NO, k78, k79, k80 }, \
122 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k15, k30 } \
123}
124
125#define LAYOUT_wk_split_bs( \
126 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, \
127 k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k83, k30, \
128 k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, \
129 k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, \
130 k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, k72, k73, \
131 k74, k81, k75, k76, k77, k82, k78, k79, k80 \
132){ \
133 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14 }, \
134 { k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k83 }, \
135 { k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45 }, \
136 { k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, KC_NO, k58, k59 }, \
137 { k60, KC_NO, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, k72, k73 }, \
138 { k74, k81, k75, KC_NO, KC_NO, k76, KC_NO, KC_NO, k77, KC_NO, k82, KC_NO, k78, k79, k80 }, \
139 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k15, k30 } \
140}
diff --git a/keyboards/sirius/unigo66/info.json b/keyboards/sirius/unigo66/info.json
index 9954295859..866fd9abbf 100644
--- a/keyboards/sirius/unigo66/info.json
+++ b/keyboards/sirius/unigo66/info.json
@@ -13,144 +13,169 @@
13 "layouts": { 13 "layouts": {
14 "LAYOUT": { 14 "LAYOUT": {
15 "layout": [ 15 "layout": [
16 {"label":"Esc", "x":0, "y":0, "w":1.5}, 16 {"matrix": [2, 9], "x": 0, "y": 0, "w": 1.5},
17 {"label":"1", "x":1.5, "y":0}, 17 {"matrix": [1, 14], "x": 1.5, "y": 0},
18 {"label":"2", "x":2.5, "y":0}, 18 {"matrix": [1, 15], "x": 2.5, "y": 0},
19 {"label":"3", "x":3.5, "y":0}, 19 {"matrix": [2, 0], "x": 3.5, "y": 0},
20 {"label":"4", "x":4.5, "y":0}, 20 {"matrix": [2, 1], "x": 4.5, "y": 0},
21 {"label":"5", "x":5.5, "y":0}, 21 {"matrix": [2, 2], "x": 5.5, "y": 0},
22 {"label":"-", "x":6.5, "y":0}, 22 {"matrix": [2, 13], "x": 6.5, "y": 0},
23 {"label":"=", "x":9.5, "y":0}, 23
24 {"label":"6", "x":10.5, "y":0}, 24 {"matrix": [2, 14], "x": 9.5, "y": 0},
25 {"label":"7", "x":11.5, "y":0}, 25 {"matrix": [2, 3], "x": 10.5, "y": 0},
26 {"label":"8", "x":12.5, "y":0}, 26 {"matrix": [2, 4], "x": 11.5, "y": 0},
27 {"label":"9", "x":13.5, "y":0}, 27 {"matrix": [2, 5], "x": 12.5, "y": 0},
28 {"label":"0", "x":14.5, "y":0}, 28 {"matrix": [2, 6], "x": 13.5, "y": 0},
29 {"label":"Bspc", "x":15.5, "y":0, "w":1.5}, 29 {"matrix": [2, 7], "x": 14.5, "y": 0},
30 {"label":"Tab", "x":0, "y":1, "w":1.5}, 30 {"matrix": [2, 10], "x": 15.5, "y": 0, "w": 1.5},
31 {"label":"Q", "x":1.5, "y":1}, 31
32 {"label":"W", "x":2.5, "y":1}, 32 {"matrix": [2, 11], "x": 0, "y": 1, "w": 1.5},
33 {"label":"E", "x":3.5, "y":1}, 33 {"matrix": [1, 4], "x": 1.5, "y": 1},
34 {"label":"R", "x":4.5, "y":1}, 34 {"matrix": [1, 10], "x": 2.5, "y": 1},
35 {"label":"T", "x":5.5, "y":1}, 35 {"matrix": [0, 8], "x": 3.5, "y": 1},
36 {"label":"PgUp", "x":6.5, "y":1, "h":1.5}, 36 {"matrix": [1, 5], "x": 4.5, "y": 1},
37 {"label":"[", "x":9.5, "y":1, "h":1.5}, 37 {"matrix": [1, 7], "x": 5.5, "y": 1},
38 {"label":"Y", "x":10.5, "y":1}, 38 {"matrix": [4, 11], "x": 6.5, "y": 1, "h": 1.5},
39 {"label":"U", "x":11.5, "y":1}, 39
40 {"label":"I", "x":12.5, "y":1}, 40 {"matrix": [2, 15], "x": 9.5, "y": 1, "h": 1.5},
41 {"label":"O", "x":13.5, "y":1}, 41 {"matrix": [1, 12], "x": 10.5, "y": 1},
42 {"label":"P", "x":14.5, "y":1}, 42 {"matrix": [1, 8], "x": 11.5, "y": 1},
43 {"label":"\\", "x":15.5, "y":1, "w":1.5}, 43 {"matrix": [0, 12], "x": 12.5, "y": 1},
44 {"label":"Caps", "x":0, "y":2, "w":1.5}, 44 {"matrix": [1, 2], "x": 13.5, "y": 1},
45 {"label":"A", "x":1.5, "y":2}, 45 {"matrix": [1, 3], "x": 14.5, "y": 1},
46 {"label":"S", "x":2.5, "y":2}, 46 {"matrix": [3, 1], "x": 15.5, "y": 1, "w": 1.5},
47 {"label":"D", "x":3.5, "y":2}, 47
48 {"label":"F", "x":4.5, "y":2}, 48 {"matrix": [3, 9], "x": 0, "y": 2, "w": 1.5},
49 {"label":"G", "x":5.5, "y":2}, 49 {"matrix": [0, 4], "x": 1.5, "y": 2},
50 {"label":"H", "x":10.5, "y":2}, 50 {"matrix": [1, 6], "x": 2.5, "y": 2},
51 {"label":"J", "x":11.5, "y":2}, 51 {"matrix": [0, 7], "x": 3.5, "y": 2},
52 {"label":"K", "x":12.5, "y":2}, 52 {"matrix": [0, 9], "x": 4.5, "y": 2},
53 {"label":"L", "x":13.5, "y":2}, 53 {"matrix": [0, 10], "x": 5.5, "y": 2},
54 {"label":";", "x":14.5, "y":2}, 54
55 {"label":"Enter", "x":15.5, "y":2, "w":1.5}, 55 {"matrix": [0, 11], "x": 10.5, "y": 2},
56 {"label":"Shift", "x":0, "y":3, "w":1.5}, 56 {"matrix": [0, 13], "x": 11.5, "y": 2},
57 {"label":"Z", "x":1.5, "y":3}, 57 {"matrix": [0, 14], "x": 12.5, "y": 2},
58 {"label":"X", "x":2.5, "y":3}, 58 {"matrix": [0, 15], "x": 13.5, "y": 2},
59 {"label":"C", "x":3.5, "y":3}, 59 {"matrix": [3, 3], "x": 14.5, "y": 2},
60 {"label":"V", "x":4.5, "y":3}, 60 {"matrix": [3, 4], "x": 15.5, "y": 2, "w": 1.5},
61 {"label":"B", "x":5.5, "y":3}, 61
62 {"label":"PgDn", "x":6.5, "y":2.5, "h":1.5}, 62 {"matrix": [14, 1], "x": 0, "y": 3, "w": 1.5},
63 {"label":"]", "x":9.5, "y":2.5, "h":1.5}, 63 {"matrix": [1, 13], "x": 1.5, "y": 3},
64 {"label":"N", "x":10.5, "y":3}, 64 {"matrix": [1, 11], "x": 2.5, "y": 3},
65 {"label":"M", "x":11.5, "y":3}, 65 {"matrix": [0, 6], "x": 3.5, "y": 3},
66 {"label":",", "x":12.5, "y":3}, 66 {"matrix": [1, 9], "x": 4.5, "y": 3},
67 {"label":".", "x":13.5, "y":3}, 67 {"matrix": [0, 5], "x": 5.5, "y": 3},
68 {"label":"Up", "x":14.5, "y":3}, 68 {"matrix": [4, 14], "x": 6.5, "y": 2.5, "h": 1.5},
69 {"label":"Shift", "x":15.5, "y":3, "w":1.5}, 69
70 {"label":"Ctrl", "x":0.5, "y":4}, 70 {"matrix": [3, 0], "x": 9.5, "y": 2.5, "h": 1.5},
71 {"label":"Super", "x":1.5, "y":4}, 71 {"matrix": [1, 1], "x": 10.5, "y": 3},
72 {"label":"Alt", "x":2.5, "y":4}, 72 {"matrix": [1, 0], "x": 11.5, "y": 3},
73 {"label":"Left", "x":13.5, "y":4}, 73 {"matrix": [3, 6], "x": 12.5, "y": 3},
74 {"label":"Down", "x":14.5, "y":4}, 74 {"matrix": [3, 7], "x": 13.5, "y": 3},
75 {"label":"Right", "x":15.5, "y":4}, 75 {"matrix": [5, 2], "x": 14.5, "y": 3},
76 {"label":"Space", "x":5.5, "y":5}, 76 {"matrix": [14, 5], "x": 15.5, "y": 3, "w": 1.5},
77 {"label":"Ins", "x":6.5, "y":5}, 77
78 {"label":"Home", "x":9.5, "y":5}, 78 {"matrix": [14, 0], "x": 0.5, "y": 4},
79 {"label":"Space", "x":10.5, "y":5}, 79 {"matrix": [14, 3], "x": 1.5, "y": 4},
80 {"label":"Space", "x":5.5, "y":6}, 80 {"matrix": [14, 2], "x": 2.5, "y": 4},
81 {"label":"Del", "x":6.5, "y":6}, 81 {"matrix": [5, 0], "x": 13.5, "y": 4},
82 {"label":"End", "x":9.5, "y":6}, 82 {"matrix": [5, 1], "x": 14.5, "y": 4},
83 {"label":"Space", "x":10.5, "y":6} 83 {"matrix": [4, 15], "x": 15.5, "y": 4},
84
85 {"matrix": [2, 12], "x": 5.5, "y": 5},
86 {"matrix": [4, 9], "x": 6.5, "y": 5},
87
88 {"matrix": [4, 10], "x": 9.5, "y": 5},
89 {"matrix": [2, 8], "x": 10.5, "y": 5},
90
91 {"matrix": [14, 6], "x": 5.5, "y": 6},
92 {"matrix": [4, 12], "x": 6.5, "y": 6},
93
94 {"matrix": [4, 13], "x": 9.5, "y": 6},
95 {"matrix": [14, 4], "x": 10.5, "y": 6}
84 ] 96 ]
85 }, 97 },
86 "LAYOUT_beta_pcb": { 98 "LAYOUT_beta_pcb": {
87 "layout": [ 99 "layout": [
88 {"label":"Esc", "x":0, "y":0, "w":1.5}, 100 {"matrix": [1, 13], "x": 0, "y": 0, "w": 1.5},
89 {"label":"1", "x":1.5, "y":0}, 101 {"matrix": [1, 14], "x": 1.5, "y": 0},
90 {"label":"2", "x":2.5, "y":0}, 102 {"matrix": [3, 0], "x": 2.5, "y": 0},
91 {"label":"3", "x":3.5, "y":0}, 103 {"matrix": [2, 15], "x": 3.5, "y": 0},
92 {"label":"4", "x":4.5, "y":0}, 104 {"matrix": [4, 5], "x": 4.5, "y": 0},
93 {"label":"5", "x":5.5, "y":0}, 105 {"matrix": [3, 11], "x": 5.5, "y": 0},
94 {"label":"-", "x":6.5, "y":0}, 106 {"matrix": [14, 6], "x": 6.5, "y": 0},
95 {"label":"=", "x":9.5, "y":0}, 107
96 {"label":"6", "x":10.5, "y":0}, 108 {"matrix": [14, 2], "x": 9.5, "y": 0},
97 {"label":"7", "x":11.5, "y":0}, 109 {"matrix": [3, 10], "x": 10.5, "y": 0},
98 {"label":"8", "x":12.5, "y":0}, 110 {"matrix": [3, 9], "x": 11.5, "y": 0},
99 {"label":"9", "x":13.5, "y":0}, 111 {"matrix": [1, 4], "x": 12.5, "y": 0},
100 {"label":"0", "x":14.5, "y":0}, 112 {"matrix": [0, 4], "x": 13.5, "y": 0},
101 {"label":"Bspc", "x":15.5, "y":0, "w":1.5}, 113 {"matrix": [0, 9], "x": 14.5, "y": 0},
102 {"label":"Tab", "x":0, "y":1, "w":1.5}, 114 {"matrix": [0, 7], "x": 15.5, "y": 0, "w": 1.5},
103 {"label":"Q", "x":1.5, "y":1}, 115
104 {"label":"W", "x":2.5, "y":1}, 116 {"matrix": [2, 9], "x": 0, "y": 1, "w": 1.5},
105 {"label":"E", "x":3.5, "y":1}, 117 {"matrix": [1, 5], "x": 1.5, "y": 1},
106 {"label":"R", "x":4.5, "y":1}, 118 {"matrix": [3, 12], "x": 2.5, "y": 1},
107 {"label":"T", "x":5.5, "y":1}, 119 {"matrix": [3, 13], "x": 3.5, "y": 1},
108 {"label":"PgUp", "x":6.5, "y":1, "h":1.5}, 120 {"matrix": [3, 14], "x": 4.5, "y": 1},
109 {"label":"[", "x":9.5, "y":1, "h":1.5}, 121 {"matrix": [3, 15], "x": 5.5, "y": 1},
110 {"label":"Y", "x":10.5, "y":1}, 122 {"matrix": [5, 8], "x": 6.5, "y": 1, "h": 1.5},
111 {"label":"U", "x":11.5, "y":1}, 123
112 {"label":"I", "x":12.5, "y":1}, 124 {"matrix": [5, 0], "x": 9.5, "y": 1, "h": 1.5},
113 {"label":"O", "x":13.5, "y":1}, 125 {"matrix": [2, 12], "x": 10.5, "y": 1},
114 {"label":"P", "x":14.5, "y":1}, 126 {"matrix": [1, 1], "x": 11.5, "y": 1},
115 {"label":"\\", "x":15.5, "y":1, "w":1.5}, 127 {"matrix": [0, 5], "x": 12.5, "y": 1},
116 {"label":"Caps", "x":0, "y":2, "w":1.5}, 128 {"matrix": [5, 5], "x": 13.5, "y": 1},
117 {"label":"A", "x":1.5, "y":2}, 129 {"matrix": [1, 0], "x": 14.5, "y": 1},
118 {"label":"S", "x":2.5, "y":2}, 130 {"matrix": [0, 6], "x": 15.5, "y": 1, "w": 1.5},
119 {"label":"D", "x":3.5, "y":2}, 131
120 {"label":"F", "x":4.5, "y":2}, 132 {"matrix": [3, 1], "x": 0, "y": 2, "w": 1.5},
121 {"label":"G", "x":5.5, "y":2}, 133 {"matrix": [5, 15], "x": 1.5, "y": 2},
122 {"label":"H", "x":10.5, "y":2}, 134 {"matrix": [5, 14], "x": 2.5, "y": 2},
123 {"label":"J", "x":11.5, "y":2}, 135 {"matrix": [6, 1], "x": 3.5, "y": 2},
124 {"label":"K", "x":12.5, "y":2}, 136 {"matrix": [2, 10], "x": 4.5, "y": 2},
125 {"label":"L", "x":13.5, "y":2}, 137 {"matrix": [3, 8], "x": 5.5, "y": 2},
126 {"label":";", "x":14.5, "y":2}, 138
127 {"label":"Enter", "x":15.5, "y":2, "w":1.5}, 139 {"matrix": [4, 12], "x": 10.5, "y": 2},
128 {"label":"Shift", "x":0, "y":3, "w":1.5}, 140 {"matrix": [5, 7], "x": 11.5, "y": 2},
129 {"label":"Z", "x":1.5, "y":3}, 141 {"matrix": [5, 3], "x": 12.5, "y": 2},
130 {"label":"X", "x":2.5, "y":3}, 142 {"matrix": [5, 11], "x": 13.5, "y": 2},
131 {"label":"C", "x":3.5, "y":3}, 143 {"matrix": [5, 10], "x": 14.5, "y": 2},
132 {"label":"V", "x":4.5, "y":3}, 144 {"matrix": [0, 8], "x": 15.5, "y": 2, "w": 1.5},
133 {"label":"B", "x":5.5, "y":3}, 145
134 {"label":"PgDn", "x":6.5, "y":2.5, "h":1.5}, 146 {"matrix": [3, 5], "x": 0, "y": 3, "w": 1.5},
135 {"label":"]", "x":9.5, "y":2.5, "h":1.5}, 147 {"matrix": [5, 13], "x": 1.5, "y": 3},
136 {"label":"N", "x":10.5, "y":3}, 148 {"matrix": [1, 7], "x": 2.5, "y": 3},
137 {"label":"M", "x":11.5, "y":3}, 149 {"matrix": [1, 11], "x": 3.5, "y": 3},
138 {"label":",", "x":12.5, "y":3}, 150 {"matrix": [1, 10], "x": 4.5, "y": 3},
139 {"label":".", "x":13.5, "y":3}, 151 {"matrix": [5, 2], "x": 5.5, "y": 3},
140 {"label":"Up", "x":14.5, "y":3}, 152 {"matrix": [5, 6], "x": 6.5, "y": 2.5, "h": 1.5},
141 {"label":"Shift", "x":15.5, "y":3, "w":1.5}, 153
142 {"label":"Ctrl", "x":0.5, "y":4}, 154 {"matrix": [5, 1], "x": 9.5, "y": 2.5, "h": 1.5},
143 {"label":"Super", "x":1.5, "y":4}, 155 {"matrix": [4, 13], "x": 10.5, "y": 3},
144 {"label":"Alt", "x":2.5, "y":4}, 156 {"matrix": [2, 3], "x": 11.5, "y": 3},
145 {"label":"Left", "x":13.5, "y":4}, 157 {"matrix": [1, 12], "x": 12.5, "y": 3},
146 {"label":"Down", "x":14.5, "y":4}, 158 {"matrix": [1, 3], "x": 13.5, "y": 3},
147 {"label":"Right", "x":15.5, "y":4}, 159 {"matrix": [2, 14], "x": 14.5, "y": 3},
148 {"label":"Space", "x":5.5, "y":5, "h":2}, 160 {"matrix": [0, 12], "x": 15.5, "y": 3, "w": 1.5},
149 {"label":"Ins", "x":6.5, "y":5}, 161
150 {"label":"Home", "x":9.5, "y":5}, 162 {"matrix": [5, 12], "x": 0.5, "y": 4},
151 {"label":"Space", "x":10.5, "y":5, "h":2}, 163 {"matrix": [0, 10], "x": 1.5, "y": 4},
152 {"label":"Del", "x":6.5, "y":6}, 164 {"matrix": [0, 15], "x": 2.5, "y": 4},
153 {"label":"End", "x":9.5, "y":6} 165
166 {"matrix": [3, 6], "x": 13.5, "y": 4},
167 {"matrix": [0, 14], "x": 14.5, "y": 4},
168 {"matrix": [3, 7], "x": 15.5, "y": 4},
169
170 {"matrix": [14, 4], "x": 5.5, "y": 5, "h": 2},
171 {"matrix": [4, 9], "x": 6.5, "y": 5},
172
173 {"matrix": [4, 11], "x": 9.5, "y": 5},
174 {"matrix": [14, 0], "x": 10.5, "y": 5, "h": 2},
175
176 {"matrix": [14, 5], "x": 6.5, "y": 6},
177
178 {"matrix": [14, 1], "x": 9.5, "y": 6}
154 ] 179 ]
155 } 180 }
156 } 181 }
diff --git a/keyboards/sirius/unigo66/unigo66.h b/keyboards/sirius/unigo66/unigo66.h
deleted file mode 100644
index 62af132789..0000000000
--- a/keyboards/sirius/unigo66/unigo66.h
+++ /dev/null
@@ -1,106 +0,0 @@
1/*
2Copyright 2017 Balz Guenat <balz.guenat@gmail.com>
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
19
20#include "quantum.h"
21
22#define LAYOUT( \
23 K29,K1E,K1F,K20,K21,K22,K2D, K2E,K23,K24,K25,K26,K27,K2A,\
24 K2B,K14,K1A,K08,K15,K17,K4B, K2F,K1C,K18,K0C,K12,K13,K31,\
25 K39,K04,K16,K07,K09,K0A, K0B,K0D,K0E,K0F,K33,K34,\
26 KE1,K1D,K1B,K06,K19,K05,K4E, K30,K11,K10,K36,K37,K52,KE5,\
27 KE0,KE3,KE2, K50,K51,K4F,\
28 K2C,K49, K4A,K28, \
29 KE6,K4C, K4D,KE4 \
30) { \
31 { KC_NO, KC_NO, KC_NO, KC_NO, K04, K05, K06, K07, /* 00-07 */ \
32 K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, /* 08-0F */ \
33 { K10, K11, K12, K13, K14, K15, K16, K17, /* 10-17 */ \
34 K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, /* 18-1F */ \
35 { K20, K21, K22, K23, K24, K25, K26, K27, /* 20-27 */ \
36 K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, /* 28-2F */ \
37 { K30, K31, KC_NO, K33, K34, KC_NO, K36, K37, /* 30-37 */ \
38 KC_NO, K39, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 38-3F */ \
39 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 40-47 */ \
40 KC_NO, K49, K4A, K4B, K4C, K4D, K4E, K4F }, /* 48-4F */ \
41 { K50, K51, K52, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 50-57 */ \
42 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 58-5F */ \
43 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 60-67 */ \
44 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 68-6F */ \
45 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 70-77 */ \
46 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 78-7F */ \
47 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 80-87 */ \
48 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 88-8F */ \
49 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 90-97 */ \
50 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 98-9F */ \
51 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* A0-A7 */ \
52 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* A8-AF */ \
53 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* B0-B7 */ \
54 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* B8-BF */ \
55 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* C0-C7 */ \
56 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* C8-CF */ \
57 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* D0-D7 */ \
58 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* D8-DF */ \
59 { KE0, KE1, KE2, KE3, KE4, KE5, KE6, KC_NO, /* E0-E7 */ \
60 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* E8-EF */ \
61 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* F0-F7 */ \
62 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* F8-FF */ \
63}
64
65#define LAYOUT_beta_pcb( \
66 K1E, K1F, K30, K2F, K45, K3B, KE6, KE2, K3A, K39, K14, K04, K09, K07, \
67 K29, K15, K3C, K3D, K3E, K3F, K58, K50, K2C, K11, K05, K55, K10, K06, \
68 K31, K5F, K5E, K61, K2A, K38, K4C, K57, K53, K5B, K5A, K08, \
69 K35, K5D, K17, K1B, K1A, K52, K56, K51, K4D, K23, K1C, K13, K2E, K0C, \
70 K5C, K0A, K0F, K36, K0E, K37, \
71 KE4, K49, K4B, KE0, \
72 KE5, KE1\
73) { \
74 { KC_NO, KC_NO, KC_NO, KC_NO, K04, K05, K06, K07, /* 00-07 */ \
75 K08, K09, K0A, KC_NO, K0C, KC_NO, K0E, K0F }, /* 08-0F */ \
76 { K10, K11, KC_NO, K13, K14, K15, KC_NO, K17, /* 10-17 */ \
77 KC_NO, KC_NO, K1A, K1B, K1C, K1E, K1F, KC_NO }, /* 18-1F */ \
78 { KC_NO, KC_NO, KC_NO, K23, KC_NO, KC_NO, KC_NO, KC_NO, /* 20-27 */ \
79 KC_NO, K29, K2A, KC_NO, K2C, KC_NO, K2E, K2F }, /* 28-2F */ \
80 { K30, K31, KC_NO, KC_NO, KC_NO, K35, K36, K37, /* 30-37 */ \
81 K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, /* 38-3F */ \
82 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K45, KC_NO, KC_NO, /* 40-47 */ \
83 KC_NO, K49, KC_NO, K4B, K4C, K4D, KC_NO, KC_NO }, /* 48-4F */ \
84 { K50, K51, K52, K53, KC_NO, K55, K56, K57, /* 50-57 */ \
85 K58, KC_NO, K5A, K5B, K5C, K5D, K5E, K5F }, /* 58-5F */ \
86 { KC_NO, K61, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 60-67 */ \
87 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 68-6F */ \
88 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 70-77 */ \
89 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 78-7F */ \
90 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 80-87 */ \
91 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 88-8F */ \
92 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 90-97 */ \
93 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 98-9F */ \
94 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* A0-A7 */ \
95 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* A8-AF */ \
96 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* B0-B7 */ \
97 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* B8-BF */ \
98 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* C0-C7 */ \
99 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* C8-CF */ \
100 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* D0-D7 */ \
101 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* D8-DF */ \
102 { KE0, KE1, KE2, KC_NO, KE4, KE5, KE6, KC_NO, /* E0-E7 */ \
103 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* E8-EF */ \
104 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* F0-F7 */ \
105 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* F8-FF */ \
106}
diff --git a/keyboards/thevankeyboards/minivan/info.json b/keyboards/thevankeyboards/minivan/info.json
index be95cdaf5a..c20ad5427e 100644
--- a/keyboards/thevankeyboards/minivan/info.json
+++ b/keyboards/thevankeyboards/minivan/info.json
@@ -19,20 +19,213 @@
19 "processor": "atmega32u4", 19 "processor": "atmega32u4",
20 "bootloader": "atmel-dfu", 20 "bootloader": "atmel-dfu",
21 "layouts": { 21 "layouts": {
22 "LAYOUT": { 22 "LAYOUT": {
23 "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"|", "x":11, "y":0, "w":1.75}, {"label":"Caps Lock", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"\"", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"?", "x":10.75, "y":2}, {"x":11.75, "y":2}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Win", "x":1.25, "y":3, "w":1.5}, {"label":"Alt", "x":2.75, "y":3, "w":1.25}, {"x":4, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"label":"Alt", "x":8.25, "y":3, "w":1.25}, {"label":"Win", "x":9.5, "y":3, "w":1.5}, {"label":"Menu", "x":11, "y":3, "w":1.75}] 23 "layout": [
24 }, 24 {"matrix": [0, 0], "x": 0, "y": 0},
25 {"matrix": [0, 1], "x": 1, "y": 0},
26 {"matrix": [0, 2], "x": 2, "y": 0},
27 {"matrix": [0, 3], "x": 3, "y": 0},
28 {"matrix": [0, 4], "x": 4, "y": 0},
29 {"matrix": [0, 5], "x": 5, "y": 0},
30 {"matrix": [0, 6], "x": 6, "y": 0},
31 {"matrix": [0, 7], "x": 7, "y": 0},
32 {"matrix": [0, 8], "x": 8, "y": 0},
33 {"matrix": [0, 9], "x": 9, "y": 0},
34 {"matrix": [0, 10], "x": 10, "y": 0},
35 {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
36 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
25 37
26 "LAYOUT_arrow": { 38 {"matrix": [1, 1], "x": 1.25, "y": 1},
27 "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"|", "x":11, "y":0, "w":1.75}, {"label":"Caps Lock", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"\"", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"?", "x":10.75, "y":2}, {"x":11.75, "y":2}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Win", "x":1.25, "y":3, "w":1.5}, {"label":"Alt", "x":2.75, "y":3, "w":1.25}, {"x":4, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3, "w":1.5}, {"label":"Alt", "x":9.75, "y":3}, {"label":"Win", "x":10.75, "y":3}, {"label":"Menu", "x":11.75, "y":3}] 39 {"matrix": [1, 2], "x": 2.25, "y": 1},
28 }, 40 {"matrix": [1, 3], "x": 3.25, "y": 1},
41 {"matrix": [1, 4], "x": 4.25, "y": 1},
42 {"matrix": [1, 5], "x": 5.25, "y": 1},
43 {"matrix": [1, 6], "x": 6.25, "y": 1},
44 {"matrix": [1, 7], "x": 7.25, "y": 1},
45 {"matrix": [1, 8], "x": 8.25, "y": 1},
46 {"matrix": [1, 9], "x": 9.25, "y": 1},
47 {"matrix": [1, 10], "x": 10.25, "y": 1},
48 {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
29 49
30 "LAYOUT_command": { 50 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
31 "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"|", "x":11, "y":0, "w":1.75}, {"label":"Caps Lock", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"\"", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"?", "x":10.75, "y":2}, {"x":11.75, "y":2}, {"label":"Ctrl", "x":0, "y":3}, {"label":"Win", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3, "w":1.5}, {"label":"Alt", "x":9.75, "y":3, "w":1.5}, {"label":"Win", "x":11.25, "y":3, "w":1.5}] 51 {"matrix": [2, 1], "x": 1.75, "y": 2},
32 }, 52 {"matrix": [2, 2], "x": 2.75, "y": 2},
53 {"matrix": [2, 3], "x": 3.75, "y": 2},
54 {"matrix": [2, 4], "x": 4.75, "y": 2},
55 {"matrix": [2, 5], "x": 5.75, "y": 2},
56 {"matrix": [2, 6], "x": 6.75, "y": 2},
57 {"matrix": [2, 7], "x": 7.75, "y": 2},
58 {"matrix": [2, 8], "x": 8.75, "y": 2},
59 {"matrix": [2, 9], "x": 9.75, "y": 2},
60 {"matrix": [2, 10], "x": 10.75, "y": 2},
61 {"matrix": [2, 11], "x": 11.75, "y": 2},
33 62
34 "LAYOUT_arrow_command": { 63 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
35 "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"|", "x":11, "y":0, "w":1.75}, {"label":"Caps Lock", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"\"", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"?", "x":10.75, "y":2}, {"x":11.75, "y":2}, {"label":"Ctrl", "x":0, "y":3}, {"label":"Win", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3, "w":1.5}, {"label":"Alt", "x":9.75, "y":3}, {"label":"Win", "x":10.75, "y":3}, {"label":"Menu", "x":11.75, "y":3}] 64 {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.5},
36 } 65 {"matrix": [3, 2], "x": 2.75, "y": 3, "w": 1.25},
66 {"matrix": [3, 3], "x": 4, "y": 3, "w": 2.25},
67 {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 2},
68 {"matrix": [3, 8], "x": 8.25, "y": 3, "w": 1.25},
69 {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.5},
70 {"matrix": [3, 11], "x": 11, "y": 3, "w": 1.75}
71 ]
72 },
73 "LAYOUT_arrow": {
74 "layout": [
75 {"matrix": [0, 0], "x": 0, "y": 0},
76 {"matrix": [0, 1], "x": 1, "y": 0},
77 {"matrix": [0, 2], "x": 2, "y": 0},
78 {"matrix": [0, 3], "x": 3, "y": 0},
79 {"matrix": [0, 4], "x": 4, "y": 0},
80 {"matrix": [0, 5], "x": 5, "y": 0},
81 {"matrix": [0, 6], "x": 6, "y": 0},
82 {"matrix": [0, 7], "x": 7, "y": 0},
83 {"matrix": [0, 8], "x": 8, "y": 0},
84 {"matrix": [0, 9], "x": 9, "y": 0},
85 {"matrix": [0, 10], "x": 10, "y": 0},
86 {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
87 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
88
89 {"matrix": [1, 1], "x": 1.25, "y": 1},
90 {"matrix": [1, 2], "x": 2.25, "y": 1},
91 {"matrix": [1, 3], "x": 3.25, "y": 1},
92 {"matrix": [1, 4], "x": 4.25, "y": 1},
93 {"matrix": [1, 5], "x": 5.25, "y": 1},
94 {"matrix": [1, 6], "x": 6.25, "y": 1},
95 {"matrix": [1, 7], "x": 7.25, "y": 1},
96 {"matrix": [1, 8], "x": 8.25, "y": 1},
97 {"matrix": [1, 9], "x": 9.25, "y": 1},
98 {"matrix": [1, 10], "x": 10.25, "y": 1},
99 {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
100
101 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
102 {"matrix": [2, 1], "x": 1.75, "y": 2},
103 {"matrix": [2, 2], "x": 2.75, "y": 2},
104 {"matrix": [2, 3], "x": 3.75, "y": 2},
105 {"matrix": [2, 4], "x": 4.75, "y": 2},
106 {"matrix": [2, 5], "x": 5.75, "y": 2},
107 {"matrix": [2, 6], "x": 6.75, "y": 2},
108 {"matrix": [2, 7], "x": 7.75, "y": 2},
109 {"matrix": [2, 8], "x": 8.75, "y": 2},
110 {"matrix": [2, 9], "x": 9.75, "y": 2},
111 {"matrix": [2, 10], "x": 10.75, "y": 2},
112 {"matrix": [2, 11], "x": 11.75, "y": 2},
113
114 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
115 {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.5},
116 {"matrix": [3, 2], "x": 2.75, "y": 3, "w": 1.25},
117 {"matrix": [3, 3], "x": 4, "y": 3, "w": 2.25},
118 {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 2},
119 {"matrix": [3, 8], "x": 8.25, "y": 3, "w": 1.5},
120 {"matrix": [3, 9], "x": 9.75, "y": 3},
121 {"matrix": [3, 10], "x": 10.75, "y": 3},
122 {"matrix": [3, 11], "x": 11.75, "y": 3}
123 ]
124 },
125 "LAYOUT_command": {
126 "layout": [
127 {"matrix": [0, 0], "x": 0, "y": 0},
128 {"matrix": [0, 1], "x": 1, "y": 0},
129 {"matrix": [0, 2], "x": 2, "y": 0},
130 {"matrix": [0, 3], "x": 3, "y": 0},
131 {"matrix": [0, 4], "x": 4, "y": 0},
132 {"matrix": [0, 5], "x": 5, "y": 0},
133 {"matrix": [0, 6], "x": 6, "y": 0},
134 {"matrix": [0, 7], "x": 7, "y": 0},
135 {"matrix": [0, 8], "x": 8, "y": 0},
136 {"matrix": [0, 9], "x": 9, "y": 0},
137 {"matrix": [0, 10], "x": 10, "y": 0},
138 {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
139 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
140
141 {"matrix": [1, 1], "x": 1.25, "y": 1},
142 {"matrix": [1, 2], "x": 2.25, "y": 1},
143 {"matrix": [1, 3], "x": 3.25, "y": 1},
144 {"matrix": [1, 4], "x": 4.25, "y": 1},
145 {"matrix": [1, 5], "x": 5.25, "y": 1},
146 {"matrix": [1, 6], "x": 6.25, "y": 1},
147 {"matrix": [1, 7], "x": 7.25, "y": 1},
148 {"matrix": [1, 8], "x": 8.25, "y": 1},
149 {"matrix": [1, 9], "x": 9.25, "y": 1},
150 {"matrix": [1, 10], "x": 10.25, "y": 1},
151 {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
152
153 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
154 {"matrix": [2, 1], "x": 1.75, "y": 2},
155 {"matrix": [2, 2], "x": 2.75, "y": 2},
156 {"matrix": [2, 3], "x": 3.75, "y": 2},
157 {"matrix": [2, 4], "x": 4.75, "y": 2},
158 {"matrix": [2, 5], "x": 5.75, "y": 2},
159 {"matrix": [2, 6], "x": 6.75, "y": 2},
160 {"matrix": [2, 7], "x": 7.75, "y": 2},
161 {"matrix": [2, 8], "x": 8.75, "y": 2},
162 {"matrix": [2, 9], "x": 9.75, "y": 2},
163 {"matrix": [2, 10], "x": 10.75, "y": 2},
164 {"matrix": [2, 11], "x": 11.75, "y": 2},
165
166 {"matrix": [3, 0], "x": 0, "y": 3},
167 {"matrix": [3, 1], "x": 1, "y": 3},
168 {"matrix": [3, 2], "x": 2, "y": 3},
169 {"matrix": [3, 4], "x": 3, "y": 3},
170 {"matrix": [3, 3], "x": 4, "y": 3, "w": 2.25},
171 {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 2},
172 {"matrix": [3, 8], "x": 8.25, "y": 3, "w": 1.5},
173 {"matrix": [3, 9], "x": 9.75, "y": 3, "w": 1.5},
174 {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.5}
175 ]
176 },
177 "LAYOUT_arrow_command": {
178 "layout": [
179 {"matrix": [0, 0], "x": 0, "y": 0},
180 {"matrix": [0, 1], "x": 1, "y": 0},
181 {"matrix": [0, 2], "x": 2, "y": 0},
182 {"matrix": [0, 3], "x": 3, "y": 0},
183 {"matrix": [0, 4], "x": 4, "y": 0},
184 {"matrix": [0, 5], "x": 5, "y": 0},
185 {"matrix": [0, 6], "x": 6, "y": 0},
186 {"matrix": [0, 7], "x": 7, "y": 0},
187 {"matrix": [0, 8], "x": 8, "y": 0},
188 {"matrix": [0, 9], "x": 9, "y": 0},
189 {"matrix": [0, 10], "x": 10, "y": 0},
190 {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
191 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
192
193 {"matrix": [1, 1], "x": 1.25, "y": 1},
194 {"matrix": [1, 2], "x": 2.25, "y": 1},
195 {"matrix": [1, 3], "x": 3.25, "y": 1},
196 {"matrix": [1, 4], "x": 4.25, "y": 1},
197 {"matrix": [1, 5], "x": 5.25, "y": 1},
198 {"matrix": [1, 6], "x": 6.25, "y": 1},
199 {"matrix": [1, 7], "x": 7.25, "y": 1},
200 {"matrix": [1, 8], "x": 8.25, "y": 1},
201 {"matrix": [1, 9], "x": 9.25, "y": 1},
202 {"matrix": [1, 10], "x": 10.25, "y": 1},
203 {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
204
205 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
206 {"matrix": [2, 1], "x": 1.75, "y": 2},
207 {"matrix": [2, 2], "x": 2.75, "y": 2},
208 {"matrix": [2, 3], "x": 3.75, "y": 2},
209 {"matrix": [2, 4], "x": 4.75, "y": 2},
210 {"matrix": [2, 5], "x": 5.75, "y": 2},
211 {"matrix": [2, 6], "x": 6.75, "y": 2},
212 {"matrix": [2, 7], "x": 7.75, "y": 2},
213 {"matrix": [2, 8], "x": 8.75, "y": 2},
214 {"matrix": [2, 9], "x": 9.75, "y": 2},
215 {"matrix": [2, 10], "x": 10.75, "y": 2},
216 {"matrix": [2, 11], "x": 11.75, "y": 2},
217
218 {"matrix": [3, 0], "x": 0, "y": 3},
219 {"matrix": [3, 1], "x": 1, "y": 3},
220 {"matrix": [3, 2], "x": 2, "y": 3},
221 {"matrix": [3, 4], "x": 3, "y": 3},
222 {"matrix": [3, 3], "x": 4, "y": 3, "w": 2.25},
223 {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 2},
224 {"matrix": [3, 8], "x": 8.25, "y": 3, "w": 1.5},
225 {"matrix": [3, 9], "x": 9.75, "y": 3},
226 {"matrix": [3, 10], "x": 10.75, "y": 3},
227 {"matrix": [3, 11], "x": 11.75, "y": 3}
228 ]
229 }
37 } 230 }
38} 231}
diff --git a/keyboards/thevankeyboards/minivan/minivan.h b/keyboards/thevankeyboards/minivan/minivan.h
deleted file mode 100644
index dfd971aea3..0000000000
--- a/keyboards/thevankeyboards/minivan/minivan.h
+++ /dev/null
@@ -1,64 +0,0 @@
1#pragma once
2
3#include "quantum.h"
4
5// This a shortcut to help you visually see your layout.
6// There are a number of variations depending on the layout of your bottom row.
7// The arrow variant adds an additional key on the bottom-right, while the
8// command variant adds an additional key on the bottom-left. arrow-command is a
9// combination of both of those, having an additional key on both sides.
10//
11// Please note that the numbering of the macro arguments are based on the
12// numbers of the keys on the PCB.
13
14#define LAYOUT( \
15 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
16 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
17 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
18 K30, K31, K32, K33, K37, K38, K39, K3B \
19) \
20{ \
21 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
22 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
23 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
24 { K30, K31, K32, K33, KC_NO, KC_NO, KC_NO, K37, K38, K39, KC_NO, K3B } \
25}
26
27#define LAYOUT_arrow( \
28 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
29 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
30 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
31 K30, K31, K32, K33, K37, K38, K39, K3A, K3B \
32) \
33{ \
34 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
35 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
36 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
37 { K30, K31, K32, K33, KC_NO, KC_NO, KC_NO, K37, K38, K39, K3A, K3B } \
38}
39
40#define LAYOUT_command( \
41 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
42 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
43 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
44 K30, K31, K32, K34, K33, K37, K38, K39, K3B \
45) \
46{ \
47 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
48 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
49 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
50 { K30, K31, K32, K33, K34, KC_NO, KC_NO, K37, K38, K39, KC_NO, K3B } \
51}
52
53#define LAYOUT_arrow_command( \
54 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
55 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
56 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
57 K30, K31, K32, K34, K33, K37, K38, K39, K3A, K3B \
58) \
59{ \
60 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
61 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
62 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
63 { K30, K31, K32, K33, K34, KC_NO, KC_NO, K37, K38, K39, K3A, K3B } \
64}
diff --git a/keyboards/tominabox1/littlefoot_lx/rev1/info.json b/keyboards/tominabox1/littlefoot_lx/rev1/info.json
index 3e48c0ea9a..be22362de2 100644
--- a/keyboards/tominabox1/littlefoot_lx/rev1/info.json
+++ b/keyboards/tominabox1/littlefoot_lx/rev1/info.json
@@ -17,11 +17,105 @@
17 "bootloader": "atmel-dfu", 17 "bootloader": "atmel-dfu",
18 "layouts": { 18 "layouts": {
19 "LAYOUT": { 19 "LAYOUT": {
20 "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"1,0", "x":0, "y":1}, {"label":"1,1", "x":1, "y":1}, {"label":"1,2", "x":2, "y":1}, {"label":"1,3", "x":3, "y":1}, {"label":"1,4", "x":4, "y":1}, {"label":"1,5", "x":5, "y":1}, {"label":"1,6", "x":6, "y":1}, {"label":"1,7", "x":7, "y":1}, {"label":"1,8", "x":8, "y":1}, {"label":"1,9", "x":9, "y":1}, {"label":"2,0", "x":0, "y":2}, {"label":"2,1", "x":1, "y":2}, {"label":"2,2", "x":2, "y":2}, {"label":"2,3", "x":3, "y":2}, {"label":"2,4", "x":4, "y":2}, {"label":"2,5", "x":5, "y":2}, {"label":"2,6", "x":6, "y":2}, {"label":"2,7", "x":7, "y":2}, {"label":"2,8", "x":8, "y":2}, {"label":"2,9", "x":9, "y":2}, {"label":"3,0", "x":0, "y":3}, {"label":"3,1", "x":1, "y":3}, {"label":"3,2", "x":2, "y":3}, {"label":"3,3", "x":3, "y":3}, {"label":"3,4", "x":4, "y":3}, {"label":"3,5", "x":5, "y":3}, {"label":"3,6", "x":6, "y":3}, {"label":"3,7", "x":7, "y":3}, {"label":"3,8", "x":8, "y":3}, {"label":"3,9", "x":9, "y":3}, {"x":1.5, "y":4, "w":7}] 20 "layout": [
21 {"matrix": [0, 0], "x": 0, "y": 0},
22 {"matrix": [0, 1], "x": 1, "y": 0},
23 {"matrix": [0, 2], "x": 2, "y": 0},
24 {"matrix": [0, 3], "x": 3, "y": 0},
25 {"matrix": [0, 4], "x": 4, "y": 0},
26 {"matrix": [0, 5], "x": 5, "y": 0},
27 {"matrix": [0, 6], "x": 6, "y": 0},
28 {"matrix": [0, 7], "x": 7, "y": 0},
29 {"matrix": [0, 8], "x": 8, "y": 0},
30 {"matrix": [0, 9], "x": 9, "y": 0},
31
32 {"matrix": [1, 0], "x": 0, "y": 1},
33 {"matrix": [1, 1], "x": 1, "y": 1},
34 {"matrix": [1, 2], "x": 2, "y": 1},
35 {"matrix": [1, 3], "x": 3, "y": 1},
36 {"matrix": [1, 4], "x": 4, "y": 1},
37 {"matrix": [1, 5], "x": 5, "y": 1},
38 {"matrix": [1, 6], "x": 6, "y": 1},
39 {"matrix": [1, 7], "x": 7, "y": 1},
40 {"matrix": [1, 8], "x": 8, "y": 1},
41 {"matrix": [1, 9], "x": 9, "y": 1},
42
43 {"matrix": [2, 0], "x": 0, "y": 2},
44 {"matrix": [2, 1], "x": 1, "y": 2},
45 {"matrix": [2, 2], "x": 2, "y": 2},
46 {"matrix": [2, 3], "x": 3, "y": 2},
47 {"matrix": [2, 4], "x": 4, "y": 2},
48 {"matrix": [2, 5], "x": 5, "y": 2},
49 {"matrix": [2, 6], "x": 6, "y": 2},
50 {"matrix": [2, 7], "x": 7, "y": 2},
51 {"matrix": [2, 8], "x": 8, "y": 2},
52 {"matrix": [2, 9], "x": 9, "y": 2},
53
54 {"matrix": [3, 0], "x": 0, "y": 3},
55 {"matrix": [3, 1], "x": 1, "y": 3},
56 {"matrix": [3, 2], "x": 2, "y": 3},
57 {"matrix": [3, 3], "x": 3, "y": 3},
58 {"matrix": [3, 4], "x": 4, "y": 3},
59 {"matrix": [3, 5], "x": 5, "y": 3},
60 {"matrix": [3, 6], "x": 6, "y": 3},
61 {"matrix": [3, 7], "x": 7, "y": 3},
62 {"matrix": [3, 8], "x": 8, "y": 3},
63 {"matrix": [3, 9], "x": 9, "y": 3},
64
65 {"matrix": [4, 5], "x": 1.5, "y": 4, "w": 7}
66 ]
21 }, 67 },
22 "LAYOUT_split": { 68 "LAYOUT_split": {
23 "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"1,0", "x":0, "y":1}, {"label":"1,1", "x":1, "y":1}, {"label":"1,2", "x":2, "y":1}, {"label":"1,3", "x":3, "y":1}, {"label":"1,4", "x":4, "y":1}, {"label":"1,5", "x":5, "y":1}, {"label":"1,6", "x":6, "y":1}, {"label":"1,7", "x":7, "y":1}, {"label":"1,8", "x":8, "y":1}, {"label":"1,9", "x":9, "y":1}, {"label":"2,0", "x":0, "y":2}, {"label":"2,1", "x":1, "y":2}, {"label":"2,2", "x":2, "y":2}, {"label":"2,3", "x":3, "y":2}, {"label":"2,4", "x":4, "y":2}, {"label":"2,5", "x":5, "y":2}, {"label":"2,6", "x":6, "y":2}, {"label":"2,7", "x":7, "y":2}, {"label":"2,8", "x":8, "y":2}, {"label":"2,9", "x":9, "y":2}, {"label":"3,0", "x":0, "y":3}, {"label":"3,1", "x":1, "y":3}, {"label":"3,2", "x":2, "y":3}, {"label":"3,3", "x":3, "y":3}, {"label":"3,4", "x":4, "y":3}, {"label":"3,5", "x":5, "y":3}, {"label":"3,6", "x":6, "y":3}, {"label":"3,7", "x":7, "y":3}, {"label":"3,8", "x":8, "y":3}, {"label":"3,9", "x":9, "y":3}, {"label":"4,2", "x":1.5, "y":4, "w":1.5}, {"label":"4,4", "x":3, "y":4, "w":2}, {"label":"4,6", "x":5, "y":4, "w":2}, {"label":"4,7", "x":7, "y":4, "w":1.5}] 69 "layout": [
24 } 70 {"matrix": [0, 0], "x": 0, "y": 0},
71 {"matrix": [0, 1], "x": 1, "y": 0},
72 {"matrix": [0, 2], "x": 2, "y": 0},
73 {"matrix": [0, 3], "x": 3, "y": 0},
74 {"matrix": [0, 4], "x": 4, "y": 0},
75 {"matrix": [0, 5], "x": 5, "y": 0},
76 {"matrix": [0, 6], "x": 6, "y": 0},
77 {"matrix": [0, 7], "x": 7, "y": 0},
78 {"matrix": [0, 8], "x": 8, "y": 0},
79 {"matrix": [0, 9], "x": 9, "y": 0},
25 80
81 {"matrix": [1, 0], "x": 0, "y": 1},
82 {"matrix": [1, 1], "x": 1, "y": 1},
83 {"matrix": [1, 2], "x": 2, "y": 1},
84 {"matrix": [1, 3], "x": 3, "y": 1},
85 {"matrix": [1, 4], "x": 4, "y": 1},
86 {"matrix": [1, 5], "x": 5, "y": 1},
87 {"matrix": [1, 6], "x": 6, "y": 1},
88 {"matrix": [1, 7], "x": 7, "y": 1},
89 {"matrix": [1, 8], "x": 8, "y": 1},
90 {"matrix": [1, 9], "x": 9, "y": 1},
91
92 {"matrix": [2, 0], "x": 0, "y": 2},
93 {"matrix": [2, 1], "x": 1, "y": 2},
94 {"matrix": [2, 2], "x": 2, "y": 2},
95 {"matrix": [2, 3], "x": 3, "y": 2},
96 {"matrix": [2, 4], "x": 4, "y": 2},
97 {"matrix": [2, 5], "x": 5, "y": 2},
98 {"matrix": [2, 6], "x": 6, "y": 2},
99 {"matrix": [2, 7], "x": 7, "y": 2},
100 {"matrix": [2, 8], "x": 8, "y": 2},
101 {"matrix": [2, 9], "x": 9, "y": 2},
102
103 {"matrix": [3, 0], "x": 0, "y": 3},
104 {"matrix": [3, 1], "x": 1, "y": 3},
105 {"matrix": [3, 2], "x": 2, "y": 3},
106 {"matrix": [3, 3], "x": 3, "y": 3},
107 {"matrix": [3, 4], "x": 4, "y": 3},
108 {"matrix": [3, 5], "x": 5, "y": 3},
109 {"matrix": [3, 6], "x": 6, "y": 3},
110 {"matrix": [3, 7], "x": 7, "y": 3},
111 {"matrix": [3, 8], "x": 8, "y": 3},
112 {"matrix": [3, 9], "x": 9, "y": 3},
113
114 {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.5},
115 {"matrix": [4, 4], "x": 3, "y": 4, "w": 2},
116 {"matrix": [4, 6], "x": 5, "y": 4, "w": 2},
117 {"matrix": [4, 7], "x": 7, "y": 4, "w": 1.5}
118 ]
119 }
26 } 120 }
27} 121}
diff --git a/keyboards/tominabox1/littlefoot_lx/rev1/rev1.h b/keyboards/tominabox1/littlefoot_lx/rev1/rev1.h
deleted file mode 100644
index f42ded450c..0000000000
--- a/keyboards/tominabox1/littlefoot_lx/rev1/rev1.h
+++ /dev/null
@@ -1,50 +0,0 @@
1/*
2Copyright 2022 tominabox1
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
19
20#include "quantum.h"
21
22#define XXX KC_NO
23
24#define LAYOUT( \
25 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
26 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
27 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
28 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, \
29 K45 \
30) { \
31 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
32 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \
33 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
34 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39 }, \
35 { XXX, XXX, XXX, XXX, XXX, K45, XXX, XXX, XXX, XXX } \
36}
37
38#define LAYOUT_split( \
39 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
40 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
41 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
42 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, \
43 K42, K44, K46, K47 \
44) { \
45 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
46 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \
47 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
48 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39 }, \
49 { XXX, XXX, K42, XXX, K44, XXX, K46, K47, XXX, XXX } \
50}
diff --git a/keyboards/tominabox1/littlefoot_lx/rev2/info.json b/keyboards/tominabox1/littlefoot_lx/rev2/info.json
index 05c02d0451..6a48b5076b 100644
--- a/keyboards/tominabox1/littlefoot_lx/rev2/info.json
+++ b/keyboards/tominabox1/littlefoot_lx/rev2/info.json
@@ -17,11 +17,105 @@
17 "bootloader": "atmel-dfu", 17 "bootloader": "atmel-dfu",
18 "layouts": { 18 "layouts": {
19 "LAYOUT": { 19 "LAYOUT": {
20 "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"1,0", "x":0, "y":1}, {"label":"1,1", "x":1, "y":1}, {"label":"1,2", "x":2, "y":1}, {"label":"1,3", "x":3, "y":1}, {"label":"1,4", "x":4, "y":1}, {"label":"1,5", "x":5, "y":1}, {"label":"1,6", "x":6, "y":1}, {"label":"1,7", "x":7, "y":1}, {"label":"1,8", "x":8, "y":1}, {"label":"1,9", "x":9, "y":1}, {"label":"2,0", "x":0, "y":2}, {"label":"2,1", "x":1, "y":2}, {"label":"2,2", "x":2, "y":2}, {"label":"2,3", "x":3, "y":2}, {"label":"2,4", "x":4, "y":2}, {"label":"2,5", "x":5, "y":2}, {"label":"2,6", "x":6, "y":2}, {"label":"2,7", "x":7, "y":2}, {"label":"2,8", "x":8, "y":2}, {"label":"2,9", "x":9, "y":2}, {"label":"3,0", "x":0, "y":3}, {"label":"3,1", "x":1, "y":3}, {"label":"3,2", "x":2, "y":3}, {"label":"3,3", "x":3, "y":3}, {"label":"3,4", "x":4, "y":3}, {"label":"3,5", "x":5, "y":3}, {"label":"3,6", "x":6, "y":3}, {"label":"3,7", "x":7, "y":3}, {"label":"3,8", "x":8, "y":3}, {"label":"3,9", "x":9, "y":3}, {"x":1.5, "y":4, "w":7}] 20 "layout": [
21 {"matrix": [0, 0], "x": 0, "y": 0},
22 {"matrix": [0, 1], "x": 1, "y": 0},
23 {"matrix": [0, 2], "x": 2, "y": 0},
24 {"matrix": [0, 3], "x": 3, "y": 0},
25 {"matrix": [0, 4], "x": 4, "y": 0},
26 {"matrix": [0, 5], "x": 5, "y": 0},
27 {"matrix": [0, 6], "x": 6, "y": 0},
28 {"matrix": [0, 7], "x": 7, "y": 0},
29 {"matrix": [0, 8], "x": 8, "y": 0},
30 {"matrix": [0, 9], "x": 9, "y": 0},
31
32 {"matrix": [1, 0], "x": 0, "y": 1},
33 {"matrix": [1, 1], "x": 1, "y": 1},
34 {"matrix": [1, 2], "x": 2, "y": 1},
35 {"matrix": [1, 3], "x": 3, "y": 1},
36 {"matrix": [1, 4], "x": 4, "y": 1},
37 {"matrix": [1, 5], "x": 5, "y": 1},
38 {"matrix": [1, 6], "x": 6, "y": 1},
39 {"matrix": [1, 7], "x": 7, "y": 1},
40 {"matrix": [1, 8], "x": 8, "y": 1},
41 {"matrix": [1, 9], "x": 9, "y": 1},
42
43 {"matrix": [2, 0], "x": 0, "y": 2},
44 {"matrix": [2, 1], "x": 1, "y": 2},
45 {"matrix": [2, 2], "x": 2, "y": 2},
46 {"matrix": [2, 3], "x": 3, "y": 2},
47 {"matrix": [2, 4], "x": 4, "y": 2},
48 {"matrix": [2, 5], "x": 5, "y": 2},
49 {"matrix": [2, 6], "x": 6, "y": 2},
50 {"matrix": [2, 7], "x": 7, "y": 2},
51 {"matrix": [2, 8], "x": 8, "y": 2},
52 {"matrix": [2, 9], "x": 9, "y": 2},
53
54 {"matrix": [3, 0], "x": 0, "y": 3},
55 {"matrix": [3, 1], "x": 1, "y": 3},
56 {"matrix": [3, 2], "x": 2, "y": 3},
57 {"matrix": [3, 3], "x": 3, "y": 3},
58 {"matrix": [3, 4], "x": 4, "y": 3},
59 {"matrix": [3, 5], "x": 5, "y": 3},
60 {"matrix": [3, 6], "x": 6, "y": 3},
61 {"matrix": [3, 7], "x": 7, "y": 3},
62 {"matrix": [3, 8], "x": 8, "y": 3},
63 {"matrix": [3, 9], "x": 9, "y": 3},
64
65 {"matrix": [4, 5], "x": 1.5, "y": 4, "w": 7}
66 ]
21 }, 67 },
22 "LAYOUT_split": { 68 "LAYOUT_split": {
23 "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"1,0", "x":0, "y":1}, {"label":"1,1", "x":1, "y":1}, {"label":"1,2", "x":2, "y":1}, {"label":"1,3", "x":3, "y":1}, {"label":"1,4", "x":4, "y":1}, {"label":"1,5", "x":5, "y":1}, {"label":"1,6", "x":6, "y":1}, {"label":"1,7", "x":7, "y":1}, {"label":"1,8", "x":8, "y":1}, {"label":"1,9", "x":9, "y":1}, {"label":"2,0", "x":0, "y":2}, {"label":"2,1", "x":1, "y":2}, {"label":"2,2", "x":2, "y":2}, {"label":"2,3", "x":3, "y":2}, {"label":"2,4", "x":4, "y":2}, {"label":"2,5", "x":5, "y":2}, {"label":"2,6", "x":6, "y":2}, {"label":"2,7", "x":7, "y":2}, {"label":"2,8", "x":8, "y":2}, {"label":"2,9", "x":9, "y":2}, {"label":"3,0", "x":0, "y":3}, {"label":"3,1", "x":1, "y":3}, {"label":"3,2", "x":2, "y":3}, {"label":"3,3", "x":3, "y":3}, {"label":"3,4", "x":4, "y":3}, {"label":"3,5", "x":5, "y":3}, {"label":"3,6", "x":6, "y":3}, {"label":"3,7", "x":7, "y":3}, {"label":"3,8", "x":8, "y":3}, {"label":"3,9", "x":9, "y":3}, {"label":"4,2", "x":1.5, "y":4, "w":1.5}, {"label":"4,4", "x":3, "y":4, "w":2}, {"label":"4,6", "x":5, "y":4, "w":2}, {"label":"4,7", "x":7, "y":4, "w":1.5}] 69 "layout": [
24 } 70 {"matrix": [0, 0], "x": 0, "y": 0},
71 {"matrix": [0, 1], "x": 1, "y": 0},
72 {"matrix": [0, 2], "x": 2, "y": 0},
73 {"matrix": [0, 3], "x": 3, "y": 0},
74 {"matrix": [0, 4], "x": 4, "y": 0},
75 {"matrix": [0, 5], "x": 5, "y": 0},
76 {"matrix": [0, 6], "x": 6, "y": 0},
77 {"matrix": [0, 7], "x": 7, "y": 0},
78 {"matrix": [0, 8], "x": 8, "y": 0},
79 {"matrix": [0, 9], "x": 9, "y": 0},
25 80
81 {"matrix": [1, 0], "x": 0, "y": 1},
82 {"matrix": [1, 1], "x": 1, "y": 1},
83 {"matrix": [1, 2], "x": 2, "y": 1},
84 {"matrix": [1, 3], "x": 3, "y": 1},
85 {"matrix": [1, 4], "x": 4, "y": 1},
86 {"matrix": [1, 5], "x": 5, "y": 1},
87 {"matrix": [1, 6], "x": 6, "y": 1},
88 {"matrix": [1, 7], "x": 7, "y": 1},
89 {"matrix": [1, 8], "x": 8, "y": 1},
90 {"matrix": [1, 9], "x": 9, "y": 1},
91
92 {"matrix": [2, 0], "x": 0, "y": 2},
93 {"matrix": [2, 1], "x": 1, "y": 2},
94 {"matrix": [2, 2], "x": 2, "y": 2},
95 {"matrix": [2, 3], "x": 3, "y": 2},
96 {"matrix": [2, 4], "x": 4, "y": 2},
97 {"matrix": [2, 5], "x": 5, "y": 2},
98 {"matrix": [2, 6], "x": 6, "y": 2},
99 {"matrix": [2, 7], "x": 7, "y": 2},
100 {"matrix": [2, 8], "x": 8, "y": 2},
101 {"matrix": [2, 9], "x": 9, "y": 2},
102
103 {"matrix": [3, 0], "x": 0, "y": 3},
104 {"matrix": [3, 1], "x": 1, "y": 3},
105 {"matrix": [3, 2], "x": 2, "y": 3},
106 {"matrix": [3, 3], "x": 3, "y": 3},
107 {"matrix": [3, 4], "x": 4, "y": 3},
108 {"matrix": [3, 5], "x": 5, "y": 3},
109 {"matrix": [3, 6], "x": 6, "y": 3},
110 {"matrix": [3, 7], "x": 7, "y": 3},
111 {"matrix": [3, 8], "x": 8, "y": 3},
112 {"matrix": [3, 9], "x": 9, "y": 3},
113
114 {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.5},
115 {"matrix": [4, 4], "x": 3, "y": 4, "w": 2},
116 {"matrix": [4, 6], "x": 5, "y": 4, "w": 2},
117 {"matrix": [4, 7], "x": 7, "y": 4, "w": 1.5}
118 ]
119 }
26 } 120 }
27} 121}
diff --git a/keyboards/tominabox1/littlefoot_lx/rev2/rev2.h b/keyboards/tominabox1/littlefoot_lx/rev2/rev2.h
deleted file mode 100644
index f42ded450c..0000000000
--- a/keyboards/tominabox1/littlefoot_lx/rev2/rev2.h
+++ /dev/null
@@ -1,50 +0,0 @@
1/*
2Copyright 2022 tominabox1
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
19
20#include "quantum.h"
21
22#define XXX KC_NO
23
24#define LAYOUT( \
25 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
26 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
27 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
28 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, \
29 K45 \
30) { \
31 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
32 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \
33 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
34 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39 }, \
35 { XXX, XXX, XXX, XXX, XXX, K45, XXX, XXX, XXX, XXX } \
36}
37
38#define LAYOUT_split( \
39 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
40 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
41 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
42 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, \
43 K42, K44, K46, K47 \
44) { \
45 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
46 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \
47 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
48 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39 }, \
49 { XXX, XXX, K42, XXX, K44, XXX, K46, K47, XXX, XXX } \
50}
diff --git a/keyboards/tominabox1/qaz/info.json b/keyboards/tominabox1/qaz/info.json
index 5dd7f7138c..99ae387af7 100644
--- a/keyboards/tominabox1/qaz/info.json
+++ b/keyboards/tominabox1/qaz/info.json
@@ -19,11 +19,90 @@
19 "processor": "atmega32u4", 19 "processor": "atmega32u4",
20 "bootloader": "caterina", 20 "bootloader": "caterina",
21 "layouts": { 21 "layouts": {
22 "LAYOUT_split_space": { 22 "LAYOUT_split_space": {
23 "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0, "w":1.25}, {"label":"A", "x":0, "y":1, "w":1.25}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":5.25, "y":1}, {"label":"J", "x":6.25, "y":1}, {"label":"K", "x":7.25, "y":1}, {"label":"L", "x":8.25, "y":1}, {"label":"Ent", "x":9.25, "y":1}, {"label":"Z", "x":0, "y":2, "w":1.75}, {"label":"X", "x":1.75, "y":2}, {"label":"C", "x":2.75, "y":2}, {"label":"V", "x":3.75, "y":2}, {"label":"B", "x":4.75, "y":2}, {"label":"N", "x":5.75, "y":2}, {"label":"M", "x":6.75, "y":2}, {"label":".", "x":7.75, "y":2}, {"label":"Shift","x":8.75, "y":2, "w":1.5},{"label":"Super", "x":0, "y":3}, {"label":"Meta", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"", "x":3, "y":3, "w":2.25}, {"label":"", "x":5.25, "y":3, "w":2}, {"label":"AltGr", "x":7.25, "y":3},{"label":"Meta", "x":8.25, "y":3},{"label":"Super", "x":9.25, "y":3}] 23 "layout": [
24 }, 24 {"matrix": [0, 0], "x": 0, "y": 0},
25 "LAYOUT": { 25 {"matrix": [0, 1], "x": 1, "y": 0},
26 "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0, "w":1.25}, {"label":"A", "x":0, "y":1, "w":1.25}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":5.25, "y":1}, {"label":"J", "x":6.25, "y":1}, {"label":"K", "x":7.25, "y":1}, {"label":"L", "x":8.25, "y":1}, {"label":"Ent", "x":9.25, "y":1}, {"label":"Z", "x":0, "y":2, "w":1.75}, {"label":"X", "x":1.75, "y":2}, {"label":"C", "x":2.75, "y":2}, {"label":"V", "x":3.75, "y":2}, {"label":"B", "x":4.75, "y":2}, {"label":"N", "x":5.75, "y":2}, {"label":"M", "x":6.75, "y":2}, {"label":".", "x":7.75, "y":2}, {"label":"Shift","x":8.75, "y":2, "w":1.5},{"label":"Super", "x":0, "y":3}, {"label":"Meta", "x":1, "y":3}, {"label":"", "x":2, "y":3, "w":6.25}, {"label":"Meta", "x":8.25, "y":3},{"label":"Super", "x":9.25, "y":3}] 26 {"matrix": [0, 2], "x": 2, "y": 0},
27 } 27 {"matrix": [0, 3], "x": 3, "y": 0},
28 {"matrix": [0, 4], "x": 4, "y": 0},
29 {"matrix": [0, 5], "x": 5, "y": 0},
30 {"matrix": [0, 6], "x": 6, "y": 0},
31 {"matrix": [4, 0], "x": 7, "y": 0},
32 {"matrix": [4, 1], "x": 8, "y": 0},
33 {"matrix": [4, 2], "x": 9, "y": 0, "w": 1.25},
34
35 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
36 {"matrix": [1, 1], "x": 1.25, "y": 1},
37 {"matrix": [1, 2], "x": 2.25, "y": 1},
38 {"matrix": [1, 3], "x": 3.25, "y": 1},
39 {"matrix": [1, 4], "x": 4.25, "y": 1},
40 {"matrix": [1, 5], "x": 5.25, "y": 1},
41 {"matrix": [1, 6], "x": 6.25, "y": 1},
42 {"matrix": [5, 0], "x": 7.25, "y": 1},
43 {"matrix": [5, 1], "x": 8.25, "y": 1},
44 {"matrix": [5, 2], "x": 9.25, "y": 1},
45
46 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
47 {"matrix": [2, 1], "x": 1.75, "y": 2},
48 {"matrix": [2, 2], "x": 2.75, "y": 2},
49 {"matrix": [2, 3], "x": 3.75, "y": 2},
50 {"matrix": [2, 4], "x": 4.75, "y": 2},
51 {"matrix": [2, 5], "x": 5.75, "y": 2},
52 {"matrix": [2, 6], "x": 6.75, "y": 2},
53 {"matrix": [4, 3], "x": 7.75, "y": 2},
54 {"matrix": [5, 3], "x": 8.75, "y": 2, "w": 1.5},
55
56 {"matrix": [3, 0], "x": 0, "y": 3},
57 {"matrix": [3, 1], "x": 1, "y": 3},
58 {"matrix": [3, 2], "x": 2, "y": 3},
59 {"matrix": [3, 3], "x": 3, "y": 3, "w": 2.25},
60 {"matrix": [3, 4], "x": 5.25, "y": 3, "w": 2},
61 {"matrix": [3, 5], "x": 7.25, "y": 3},
62 {"matrix": [3, 6], "x": 8.25, "y": 3},
63 {"matrix": [4, 4], "x": 9.25, "y": 3}
64 ]
65 },
66 "LAYOUT": {
67 "layout": [
68 {"matrix": [0, 0], "x": 0, "y": 0},
69 {"matrix": [0, 1], "x": 1, "y": 0},
70 {"matrix": [0, 2], "x": 2, "y": 0},
71 {"matrix": [0, 3], "x": 3, "y": 0},
72 {"matrix": [0, 4], "x": 4, "y": 0},
73 {"matrix": [0, 5], "x": 5, "y": 0},
74 {"matrix": [0, 6], "x": 6, "y": 0},
75 {"matrix": [4, 0], "x": 7, "y": 0},
76 {"matrix": [4, 1], "x": 8, "y": 0},
77 {"matrix": [4, 2], "x": 9, "y": 0, "w": 1.25},
78
79 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
80 {"matrix": [1, 1], "x": 1.25, "y": 1},
81 {"matrix": [1, 2], "x": 2.25, "y": 1},
82 {"matrix": [1, 3], "x": 3.25, "y": 1},
83 {"matrix": [1, 4], "x": 4.25, "y": 1},
84 {"matrix": [1, 5], "x": 5.25, "y": 1},
85 {"matrix": [1, 6], "x": 6.25, "y": 1},
86 {"matrix": [5, 0], "x": 7.25, "y": 1},
87 {"matrix": [5, 1], "x": 8.25, "y": 1},
88 {"matrix": [5, 2], "x": 9.25, "y": 1},
89
90 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
91 {"matrix": [2, 1], "x": 1.75, "y": 2},
92 {"matrix": [2, 2], "x": 2.75, "y": 2},
93 {"matrix": [2, 3], "x": 3.75, "y": 2},
94 {"matrix": [2, 4], "x": 4.75, "y": 2},
95 {"matrix": [2, 5], "x": 5.75, "y": 2},
96 {"matrix": [2, 6], "x": 6.75, "y": 2},
97 {"matrix": [4, 3], "x": 7.75, "y": 2},
98 {"matrix": [5, 3], "x": 8.75, "y": 2, "w": 1.5},
99
100 {"matrix": [3, 0], "x": 0, "y": 3},
101 {"matrix": [3, 1], "x": 1, "y": 3},
102 {"matrix": [3, 4], "x": 2, "y": 3, "w": 6.25},
103 {"matrix": [3, 6], "x": 8.25, "y": 3},
104 {"matrix": [4, 4], "x": 9.25, "y": 3}
105 ]
106 }
28 } 107 }
29} 108}
diff --git a/keyboards/tominabox1/qaz/qaz.h b/keyboards/tominabox1/qaz/qaz.h
deleted file mode 100644
index aba68d3d27..0000000000
--- a/keyboards/tominabox1/qaz/qaz.h
+++ /dev/null
@@ -1,33 +0,0 @@
1#pragma once
2
3#include "quantum.h"
4
5#define XXX KC_NO
6
7#define LAYOUT_split_space( \
8 K00, K01, K02, K03, K04, K05, K06, K40, K41, K42, \
9 K10, K11, K12, K13, K14, K15, K16, K50, K51, K52, \
10 K20, K21, K22, K23, K24, K25, K26, K43, K53, \
11 K30, K31, K32, K33, K34, K35, K36, K44 \
12) { \
13{ K00, K01, K02, K03, K04, K05, K06 }, \
14{ K10, K11, K12, K13, K14, K15, K16 }, \
15{ K20, K21, K22, K23, K24, K25, K26 }, \
16{ K30, K31, K32, K33, K34, K35, K36 }, \
17{ K40, K41, K42, K43, K44, XXX, XXX }, \
18{ K50, K51, K52, K53, XXX, XXX, XXX } \
19}
20
21#define LAYOUT( \
22 K00, K01, K02, K03, K04, K05, K06, K40, K41, K42, \
23 K10, K11, K12, K13, K14, K15, K16, K50, K51, K52, \
24 K20, K21, K22, K23, K24, K25, K26, K43, K53, \
25 K30, K31, K34, K36, K44 \
26) { \
27{ K00, K01, K02, K03, K04, K05, K06 }, \
28{ K10, K11, K12, K13, K14, K15, K16 }, \
29{ K20, K21, K22, K23, K24, K25, K26 }, \
30{ K30, K31, XXX, XXX, K34, XXX, K36 }, \
31{ K40, K41, K42, K43, K44, XXX, XXX }, \
32{ K50, K51, K52, K53, XXX, XXX, XXX } \
33}
diff --git a/keyboards/trashman/ketch/info.json b/keyboards/trashman/ketch/info.json
index 6b4ea75bb0..02dc364a35 100644
--- a/keyboards/trashman/ketch/info.json
+++ b/keyboards/trashman/ketch/info.json
@@ -21,45 +21,260 @@
21 "layouts": { 21 "layouts": {
22 "LAYOUT": { 22 "LAYOUT": {
23 "layout": [ 23 "layout": [
24 {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0, "w":1.75}, 24 {"matrix": [5, 0], "x": 0, "y": 0},
25 {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.5}, 25 {"matrix": [5, 1], "x": 1, "y": 0},
26 {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, 26 {"matrix": [5, 2], "x": 2, "y": 0},
27 {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.5}, {"x":2.75, "y":3, "w":1.25}, {"x":4, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3, "w":1.25}, {"x":9.5, "y":3, "w":1.5}, {"x":11, "y":3, "w":1.75} 27 {"matrix": [5, 3], "x": 3, "y": 0},
28 {"matrix": [0, 0], "x": 4, "y": 0},
29 {"matrix": [0, 1], "x": 5, "y": 0},
30 {"matrix": [0, 2], "x": 6, "y": 0},
31 {"matrix": [0, 3], "x": 7, "y": 0},
32 {"matrix": [0, 4], "x": 8, "y": 0},
33 {"matrix": [0, 5], "x": 9, "y": 0},
34 {"matrix": [0, 6], "x": 10, "y": 0},
35 {"matrix": [0, 7], "x": 11, "y": 0, "w": 1.75},
36
37 {"matrix": [4, 0], "x": 0, "y": 1, "w": 1.25},
38 {"matrix": [4, 1], "x": 1.25, "y": 1},
39 {"matrix": [4, 2], "x": 2.25, "y": 1},
40 {"matrix": [4, 3], "x": 3.25, "y": 1},
41 {"matrix": [1, 0], "x": 4.25, "y": 1},
42 {"matrix": [1, 1], "x": 5.25, "y": 1},
43 {"matrix": [1, 2], "x": 6.25, "y": 1},
44 {"matrix": [1, 3], "x": 7.25, "y": 1},
45 {"matrix": [1, 4], "x": 8.25, "y": 1},
46 {"matrix": [1, 5], "x": 9.25, "y": 1},
47 {"matrix": [1, 6], "x": 10.25, "y": 1},
48 {"matrix": [1, 7], "x": 11.25, "y": 1, "w": 1.5},
49
50 {"matrix": [4, 6], "x": 0, "y": 2, "w": 1.75},
51 {"matrix": [5, 6], "x": 1.75, "y": 2},
52 {"matrix": [5, 5], "x": 2.75, "y": 2},
53 {"matrix": [4, 4], "x": 3.75, "y": 2},
54 {"matrix": [2, 0], "x": 4.75, "y": 2},
55 {"matrix": [2, 1], "x": 5.75, "y": 2},
56 {"matrix": [2, 2], "x": 6.75, "y": 2},
57 {"matrix": [2, 3], "x": 7.75, "y": 2},
58 {"matrix": [2, 4], "x": 8.75, "y": 2},
59 {"matrix": [2, 5], "x": 9.75, "y": 2},
60 {"matrix": [2, 6], "x": 10.75, "y": 2},
61 {"matrix": [2, 7], "x": 11.75, "y": 2},
62
63 {"matrix": [4, 5], "x": 0, "y": 3, "w": 1.25},
64 {"matrix": [5, 4], "x": 1.25, "y": 3, "w": 1.5},
65 {"matrix": [3, 1], "x": 2.75, "y": 3, "w": 1.25},
66 {"matrix": [3, 2], "x": 4, "y": 3, "w": 2.25},
67 {"matrix": [3, 3], "x": 6.25, "y": 3, "w": 2},
68 {"matrix": [3, 4], "x": 8.25, "y": 3, "w": 1.25},
69 {"matrix": [3, 5], "x": 9.5, "y": 3, "w": 1.5},
70 {"matrix": [3, 7], "x": 11, "y": 3, "w": 1.75}
28 ] 71 ]
29 }, 72 },
30
31 "LAYOUT_arrow": { 73 "LAYOUT_arrow": {
32 "layout": [ 74 "layout": [
33 {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0, "w":1.75}, 75 {"matrix": [5, 0], "x": 0, "y": 0},
34 {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.5}, 76 {"matrix": [5, 1], "x": 1, "y": 0},
35 {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, 77 {"matrix": [5, 2], "x": 2, "y": 0},
36 {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.5}, {"x":2.75, "y":3, "w":1.25}, {"x":4, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3, "w":1.5}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3} 78 {"matrix": [5, 3], "x": 3, "y": 0},
79 {"matrix": [0, 0], "x": 4, "y": 0},
80 {"matrix": [0, 1], "x": 5, "y": 0},
81 {"matrix": [0, 2], "x": 6, "y": 0},
82 {"matrix": [0, 3], "x": 7, "y": 0},
83 {"matrix": [0, 4], "x": 8, "y": 0},
84 {"matrix": [0, 5], "x": 9, "y": 0},
85 {"matrix": [0, 6], "x": 10, "y": 0},
86 {"matrix": [0, 7], "x": 11, "y": 0, "w": 1.75},
87
88 {"matrix": [4, 0], "x": 0, "y": 1, "w": 1.25},
89 {"matrix": [4, 1], "x": 1.25, "y": 1},
90 {"matrix": [4, 2], "x": 2.25, "y": 1},
91 {"matrix": [4, 3], "x": 3.25, "y": 1},
92 {"matrix": [1, 0], "x": 4.25, "y": 1},
93 {"matrix": [1, 1], "x": 5.25, "y": 1},
94 {"matrix": [1, 2], "x": 6.25, "y": 1},
95 {"matrix": [1, 3], "x": 7.25, "y": 1},
96 {"matrix": [1, 4], "x": 8.25, "y": 1},
97 {"matrix": [1, 5], "x": 9.25, "y": 1},
98 {"matrix": [1, 6], "x": 10.25, "y": 1},
99 {"matrix": [1, 7], "x": 11.25, "y": 1, "w": 1.5},
100
101 {"matrix": [4, 6], "x": 0, "y": 2, "w": 1.75},
102 {"matrix": [5, 6], "x": 1.75, "y": 2},
103 {"matrix": [5, 5], "x": 2.75, "y": 2},
104 {"matrix": [4, 4], "x": 3.75, "y": 2},
105 {"matrix": [2, 0], "x": 4.75, "y": 2},
106 {"matrix": [2, 1], "x": 5.75, "y": 2},
107 {"matrix": [2, 2], "x": 6.75, "y": 2},
108 {"matrix": [2, 3], "x": 7.75, "y": 2},
109 {"matrix": [2, 4], "x": 8.75, "y": 2},
110 {"matrix": [2, 5], "x": 9.75, "y": 2},
111 {"matrix": [2, 6], "x": 10.75, "y": 2},
112 {"matrix": [2, 7], "x": 11.75, "y": 2},
113
114 {"matrix": [4, 5], "x": 0, "y": 3, "w": 1.25},
115 {"matrix": [5, 4], "x": 1.25, "y": 3, "w": 1.5},
116 {"matrix": [3, 0], "x": 2.75, "y": 3, "w": 1.25},
117 {"matrix": [3, 2], "x": 4, "y": 3, "w": 2.25},
118 {"matrix": [3, 3], "x": 6.25, "y": 3, "w": 2},
119 {"matrix": [3, 4], "x": 8.25, "y": 3, "w": 1.5},
120 {"matrix": [3, 5], "x": 9.75, "y": 3},
121 {"matrix": [3, 6], "x": 10.75, "y": 3},
122 {"matrix": [3, 7], "x": 11.75, "y": 3}
37 ] 123 ]
38 }, 124 },
39
40 "LAYOUT_command": { 125 "LAYOUT_command": {
41 "layout": [ 126 "layout": [
42 {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0, "w":1.75}, 127 {"matrix": [5, 0], "x": 0, "y": 0},
43 {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.5}, 128 {"matrix": [5, 1], "x": 1, "y": 0},
44 {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, 129 {"matrix": [5, 2], "x": 2, "y": 0},
45 {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3, "w":1.25}, {"x":9.5, "y":3, "w":1.5}, {"x":11, "y":3, "w":1.75} 130 {"matrix": [5, 3], "x": 3, "y": 0},
131 {"matrix": [0, 0], "x": 4, "y": 0},
132 {"matrix": [0, 1], "x": 5, "y": 0},
133 {"matrix": [0, 2], "x": 6, "y": 0},
134 {"matrix": [0, 3], "x": 7, "y": 0},
135 {"matrix": [0, 4], "x": 8, "y": 0},
136 {"matrix": [0, 5], "x": 9, "y": 0},
137 {"matrix": [0, 6], "x": 10, "y": 0},
138 {"matrix": [0, 7], "x": 11, "y": 0, "w": 1.75},
139
140 {"matrix": [4, 0], "x": 0, "y": 1, "w": 1.25},
141 {"matrix": [4, 1], "x": 1.25, "y": 1},
142 {"matrix": [4, 2], "x": 2.25, "y": 1},
143 {"matrix": [4, 3], "x": 3.25, "y": 1},
144 {"matrix": [1, 0], "x": 4.25, "y": 1},
145 {"matrix": [1, 1], "x": 5.25, "y": 1},
146 {"matrix": [1, 2], "x": 6.25, "y": 1},
147 {"matrix": [1, 3], "x": 7.25, "y": 1},
148 {"matrix": [1, 4], "x": 8.25, "y": 1},
149 {"matrix": [1, 5], "x": 9.25, "y": 1},
150 {"matrix": [1, 6], "x": 10.25, "y": 1},
151 {"matrix": [1, 7], "x": 11.25, "y": 1, "w": 1.5},
152
153 {"matrix": [4, 6], "x": 0, "y": 2, "w": 1.75},
154 {"matrix": [5, 6], "x": 1.75, "y": 2},
155 {"matrix": [5, 5], "x": 2.75, "y": 2},
156 {"matrix": [4, 4], "x": 3.75, "y": 2},
157 {"matrix": [2, 0], "x": 4.75, "y": 2},
158 {"matrix": [2, 1], "x": 5.75, "y": 2},
159 {"matrix": [2, 2], "x": 6.75, "y": 2},
160 {"matrix": [2, 3], "x": 7.75, "y": 2},
161 {"matrix": [2, 4], "x": 8.75, "y": 2},
162 {"matrix": [2, 5], "x": 9.75, "y": 2},
163 {"matrix": [2, 6], "x": 10.75, "y": 2},
164 {"matrix": [2, 7], "x": 11.75, "y": 2},
165
166 {"matrix": [4, 5], "x": 0, "y": 3},
167 {"matrix": [5, 4], "x": 1, "y": 3},
168 {"matrix": [3, 0], "x": 2, "y": 3},
169 {"matrix": [3, 1], "x": 3, "y": 3},
170 {"matrix": [3, 2], "x": 4, "y": 3, "w": 2.25},
171 {"matrix": [3, 3], "x": 6.25, "y": 3, "w": 2},
172 {"matrix": [3, 4], "x": 8.25, "y": 3, "w": 1.25},
173 {"matrix": [3, 5], "x": 9.5, "y": 3, "w": 1.5},
174 {"matrix": [3, 7], "x": 11, "y": 3, "w": 1.75}
46 ] 175 ]
47 }, 176 },
48
49 "LAYOUT_all": { 177 "LAYOUT_all": {
50 "layout": [ 178 "layout": [
51 {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0, "w":1.75}, 179 {"matrix": [5, 0], "x": 0, "y": 0},
52 {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.5}, 180 {"matrix": [5, 1], "x": 1, "y": 0},
53 {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, 181 {"matrix": [5, 2], "x": 2, "y": 0},
54 {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3, "w":1.5}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3} 182 {"matrix": [5, 3], "x": 3, "y": 0},
183 {"matrix": [0, 0], "x": 4, "y": 0},
184 {"matrix": [0, 1], "x": 5, "y": 0},
185 {"matrix": [0, 2], "x": 6, "y": 0},
186 {"matrix": [0, 3], "x": 7, "y": 0},
187 {"matrix": [0, 4], "x": 8, "y": 0},
188 {"matrix": [0, 5], "x": 9, "y": 0},
189 {"matrix": [0, 6], "x": 10, "y": 0},
190 {"matrix": [0, 7], "x": 11, "y": 0, "w": 1.75},
191
192 {"matrix": [4, 0], "x": 0, "y": 1, "w": 1.25},
193 {"matrix": [4, 1], "x": 1.25, "y": 1},
194 {"matrix": [4, 2], "x": 2.25, "y": 1},
195 {"matrix": [4, 3], "x": 3.25, "y": 1},
196 {"matrix": [1, 0], "x": 4.25, "y": 1},
197 {"matrix": [1, 1], "x": 5.25, "y": 1},
198 {"matrix": [1, 2], "x": 6.25, "y": 1},
199 {"matrix": [1, 3], "x": 7.25, "y": 1},
200 {"matrix": [1, 4], "x": 8.25, "y": 1},
201 {"matrix": [1, 5], "x": 9.25, "y": 1},
202 {"matrix": [1, 6], "x": 10.25, "y": 1},
203 {"matrix": [1, 7], "x": 11.25, "y": 1, "w": 1.5},
204
205 {"matrix": [4, 6], "x": 0, "y": 2, "w": 1.75},
206 {"matrix": [5, 6], "x": 1.75, "y": 2},
207 {"matrix": [5, 5], "x": 2.75, "y": 2},
208 {"matrix": [4, 4], "x": 3.75, "y": 2},
209 {"matrix": [2, 0], "x": 4.75, "y": 2},
210 {"matrix": [2, 1], "x": 5.75, "y": 2},
211 {"matrix": [2, 2], "x": 6.75, "y": 2},
212 {"matrix": [2, 3], "x": 7.75, "y": 2},
213 {"matrix": [2, 4], "x": 8.75, "y": 2},
214 {"matrix": [2, 5], "x": 9.75, "y": 2},
215 {"matrix": [2, 6], "x": 10.75, "y": 2},
216 {"matrix": [2, 7], "x": 11.75, "y": 2},
217
218 {"matrix": [4, 5], "x": 0, "y": 3},
219 {"matrix": [5, 4], "x": 1, "y": 3},
220 {"matrix": [3, 0], "x": 2, "y": 3},
221 {"matrix": [3, 1], "x": 3, "y": 3},
222 {"matrix": [3, 2], "x": 4, "y": 3, "w": 2.25},
223 {"matrix": [3, 3], "x": 6.25, "y": 3, "w": 2},
224 {"matrix": [3, 4], "x": 8.25, "y": 3, "w": 1.5},
225 {"matrix": [3, 5], "x": 9.75, "y": 3},
226 {"matrix": [3, 6], "x": 10.75, "y": 3},
227 {"matrix": [3, 7], "x": 11.75, "y": 3}
55 ] 228 ]
56 }, 229 },
57 "LAYOUT_jetvan": { 230 "LAYOUT_jetvan": {
58 "layout": [ 231 "layout": [
59 {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0, "w":1.75}, 232 {"matrix": [5, 0], "x": 0, "y": 0},
60 {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.5}, 233 {"matrix": [5, 1], "x": 1, "y": 0},
61 {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, 234 {"matrix": [5, 2], "x": 2, "y": 0},
62 {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3, "w":1.25}, {"x":3.5, "w":6.25, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3} 235 {"matrix": [5, 3], "x": 3, "y": 0},
236 {"matrix": [0, 0], "x": 4, "y": 0},
237 {"matrix": [0, 1], "x": 5, "y": 0},
238 {"matrix": [0, 2], "x": 6, "y": 0},
239 {"matrix": [0, 3], "x": 7, "y": 0},
240 {"matrix": [0, 4], "x": 8, "y": 0},
241 {"matrix": [0, 5], "x": 9, "y": 0},
242 {"matrix": [0, 6], "x": 10, "y": 0},
243 {"matrix": [0, 7], "x": 11, "y": 0, "w": 1.75},
244
245 {"matrix": [4, 0], "x": 0, "y": 1, "w": 1.25},
246 {"matrix": [4, 1], "x": 1.25, "y": 1},
247 {"matrix": [4, 2], "x": 2.25, "y": 1},
248 {"matrix": [4, 3], "x": 3.25, "y": 1},
249 {"matrix": [1, 0], "x": 4.25, "y": 1},
250 {"matrix": [1, 1], "x": 5.25, "y": 1},
251 {"matrix": [1, 2], "x": 6.25, "y": 1},
252 {"matrix": [1, 3], "x": 7.25, "y": 1},
253 {"matrix": [1, 4], "x": 8.25, "y": 1},
254 {"matrix": [1, 5], "x": 9.25, "y": 1},
255 {"matrix": [1, 6], "x": 10.25, "y": 1},
256 {"matrix": [1, 7], "x": 11.25, "y": 1, "w": 1.5},
257
258 {"matrix": [4, 6], "x": 0, "y": 2, "w": 1.75},
259 {"matrix": [5, 6], "x": 1.75, "y": 2},
260 {"matrix": [5, 5], "x": 2.75, "y": 2},
261 {"matrix": [4, 4], "x": 3.75, "y": 2},
262 {"matrix": [2, 0], "x": 4.75, "y": 2},
263 {"matrix": [2, 1], "x": 5.75, "y": 2},
264 {"matrix": [2, 2], "x": 6.75, "y": 2},
265 {"matrix": [2, 3], "x": 7.75, "y": 2},
266 {"matrix": [2, 4], "x": 8.75, "y": 2},
267 {"matrix": [2, 5], "x": 9.75, "y": 2},
268 {"matrix": [2, 6], "x": 10.75, "y": 2},
269 {"matrix": [2, 7], "x": 11.75, "y": 2},
270
271 {"matrix": [4, 5], "x": 0, "y": 3, "w": 1.25},
272 {"matrix": [5, 4], "x": 1.25, "y": 3},
273 {"matrix": [3, 0], "x": 2.25, "y": 3, "w": 1.25},
274 {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 6.25},
275 {"matrix": [3, 5], "x": 9.75, "y": 3},
276 {"matrix": [3, 6], "x": 10.75, "y": 3},
277 {"matrix": [3, 7], "x": 11.75, "y": 3}
63 ] 278 ]
64 } 279 }
65 } 280 }
diff --git a/keyboards/trashman/ketch/ketch.h b/keyboards/trashman/ketch/ketch.h
deleted file mode 100644
index 25be7cf8f9..0000000000
--- a/keyboards/trashman/ketch/ketch.h
+++ /dev/null
@@ -1,96 +0,0 @@
1/*
2Copyright 2021 Evan Sailer, Jetpacktuxedo, & QMK Firmware
3
4Permission is hereby granted, free of charge, to any person obtaining a copy
5of this software and associated documentation files (the "Software"), to
6deal in the Software without restriction, including without limitation the
7rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
8sell copies of the Software, and to permit persons to whom the Software is
9furnished to do so, subject to the following conditions:
10
11The above copyright notice and this permission notice shall be included in all
12copies or substantial portions of the Software.
13
14THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
20SOFTWARE.
21*/
22
23#pragma once
24#include "quantum.h"
25
26#define LAYOUT(\
27 K39, K40, K41, K42, K0, K1, K2, K3, K4, K5, K6, K7,\
28 K32, K33, K34, K35, K8, K9, K10, K11, K12, K13, K14, K15,\
29 K38, K45, K44, K36, K16, K17, K18, K19, K20, K21, K22, K23,\
30 K37, K43, K24, K26, K27, K28, K29, K31\
31) {\
32 { K0, K1, K2, K3, K4, K5, K6, K7 },\
33 { K8, K9, K10, K11, K12, K13, K14, K15 },\
34 { K16, K17, K18, K19, K20, K21, K22, K23 },\
35 { KC_NO, K24, K26, K27, K28, K29, KC_NO, K31 },\
36 { K32, K33, K34, K35, K36, K37, K38, KC_NO },\
37 { K39, K40, K41, K42, K43, K44, K45, KC_NO }\
38}
39
40#define LAYOUT_arrow(\
41 K39, K40, K41, K42, K0, K1, K2, K3, K4, K5, K6, K7,\
42 K32, K33, K34, K35, K8, K9, K10, K11, K12, K13, K14, K15,\
43 K38, K45, K44, K36, K16, K17, K18, K19, K20, K21, K22, K23,\
44 K37, K43, K24, K26, K27, K28, K29, K30, K31\
45) {\
46 { K0, K1, K2, K3, K4, K5, K6, K7 }, \
47 { K8, K9, K10, K11, K12, K13, K14, K15 }, \
48 { K16, K17, K18, K19, K20, K21, K22, K23 }, \
49 { K24, KC_NO, K26, K27, K28, K29, K30, K31 }, \
50 { K32, K33, K34, K35, K36, K37, K38, KC_NO }, \
51 { K39, K40, K41, K42, K43, K44, K45, KC_NO } \
52}
53
54#define LAYOUT_command(\
55 K39, K40, K41, K42, K0, K1, K2, K3, K4, K5, K6, K7,\
56 K32, K33, K34, K35, K8, K9, K10, K11, K12, K13, K14, K15,\
57 K38, K45, K44, K36, K16, K17, K18, K19, K20, K21, K22, K23,\
58 K37, K43, K24, K25, K26, K27, K28, K29, K31\
59) {\
60 { K0, K1, K2, K3, K4, K5, K6, K7 }, \
61 { K8, K9, K10, K11, K12, K13, K14, K15 }, \
62 { K16, K17, K18, K19, K20, K21, K22, K23 }, \
63 { K24, K25, K26, K27, K28, K29, KC_NO, K31 }, \
64 { K32, K33, K34, K35, K36, K37, K38, KC_NO }, \
65 { K39, K40, K41, K42, K43, K44, K45, KC_NO } \
66}
67
68// This layout is typically called "southpaw_arrow" or "southpaw + arrow", but
69// using "all" here to match typical qmk conventions
70#define LAYOUT_all(\
71 K39, K40, K41, K42, K0, K1, K2, K3, K4, K5, K6, K7,\
72 K32, K33, K34, K35, K8, K9, K10, K11, K12, K13, K14, K15,\
73 K38, K45, K44, K36, K16, K17, K18, K19, K20, K21, K22, K23,\
74 K37, K43, K24, K25, K26, K27, K28, K29, K30, K31\
75) {\
76 { K0, K1, K2, K3, K4, K5, K6, K7 }, \
77 { K8, K9, K10, K11, K12, K13, K14, K15 }, \
78 { K16, K17, K18, K19, K20, K21, K22, K23 }, \
79 { K24, K25, K26, K27, K28, K29, K30, K31 }, \
80 { K32, K33, K34, K35, K36, K37, K38, KC_NO }, \
81 { K39, K40, K41, K42, K43, K44, K45, KC_NO } \
82}
83
84#define LAYOUT_jetvan(\
85 K39, K40, K41, K42, K0, K1, K2, K3, K4, K5, K6, K7,\
86 K32, K33, K34, K35, K8, K9, K10, K11, K12, K13, K14, K15,\
87 K38, K45, K44, K36, K16, K17, K18, K19, K20, K21, K22, K23,\
88 K37, K43, K24, K27, K29, K30, K31\
89) {\
90 { K0, K1, K2, K3, K4, K5, K6, K7 }, \
91 { K8, K9, K10, K11, K12, K13, K14, K15 }, \
92 { K16, K17, K18, K19, K20, K21, K22, K23 }, \
93 { K24, KC_NO, KC_NO, K27, KC_NO, K29, K30, K31 }, \
94 { K32, K33, K34, K35, K36, K37, K38, KC_NO }, \
95 { K39, K40, K41, K42, K43, K44, K45, KC_NO } \
96}
diff --git a/keyboards/viktus/z150_bh/info.json b/keyboards/viktus/z150_bh/info.json
index f622120e9a..d55094022a 100644
--- a/keyboards/viktus/z150_bh/info.json
+++ b/keyboards/viktus/z150_bh/info.json
@@ -23,182 +23,205 @@
23 "layouts": { 23 "layouts": {
24 "LAYOUT": { 24 "LAYOUT": {
25 "layout": [ 25 "layout": [
26 {"label":"F1", "x":0, "y":0}, 26 {"matrix": [0, 0], "x": 0, "y": 0},
27 {"label":"F2", "x":1, "y":0}, 27 {"matrix": [0, 1], "x": 1, "y": 0},
28 {"label":"Esc", "x":2.5, "y":0}, 28
29 {"label":"!", "x":3.5, "y":0}, 29 {"matrix": [0, 2], "x": 2.5, "y": 0},
30 {"label":"@", "x":4.5, "y":0}, 30 {"matrix": [0, 3], "x": 3.5, "y": 0},
31 {"label":"#", "x":5.5, "y":0}, 31 {"matrix": [0, 4], "x": 4.5, "y": 0},
32 {"label":"$", "x":6.5, "y":0}, 32 {"matrix": [0, 5], "x": 5.5, "y": 0},
33 {"label":"%", "x":7.5, "y":0}, 33 {"matrix": [0, 6], "x": 6.5, "y": 0},
34 {"label":"^", "x":8.5, "y":0}, 34 {"matrix": [0, 7], "x": 7.5, "y": 0},
35 {"label":"&", "x":9.5, "y":0}, 35 {"matrix": [0, 8], "x": 8.5, "y": 0},
36 {"label":"*", "x":10.5, "y":0}, 36 {"matrix": [0, 9], "x": 9.5, "y": 0},
37 {"label":"(", "x":11.5, "y":0}, 37 {"matrix": [0, 10], "x": 10.5, "y": 0},
38 {"label":")", "x":12.5, "y":0}, 38 {"matrix": [0, 11], "x": 11.5, "y": 0},
39 {"label":"_", "x":13.5, "y":0}, 39 {"matrix": [0, 12], "x": 12.5, "y": 0},
40 {"label":"+", "x":14.5, "y":0}, 40 {"matrix": [0, 13], "x": 13.5, "y": 0},
41 {"label":"Backspace", "x":15.5, "y":0, "w":1.75}, 41 {"matrix": [0, 14], "x": 14.5, "y": 0},
42 {"label":"Num Lock", "x":17.25, "y":0}, 42 {"matrix": [0, 15], "x": 15.5, "y": 0, "w": 1.75},
43 {"label":"Scroll Lock", "x":18.25, "y":0, "w":1.5}, 43 {"matrix": [0, 16], "x": 17.25, "y": 0},
44 {"label":"Sys Req", "x":19.75, "y":0, "w":1.5}, 44 {"matrix": [0, 17], "x": 18.25, "y": 0, "w": 1.5},
45 {"label":"F3", "x":0, "y":1}, 45 {"matrix": [0, 19], "x": 19.75, "y": 0, "w": 1.5},
46 {"label":"F4", "x":1, "y":1}, 46
47 {"label":"Tab", "x":2.5, "y":1, "w":1.5}, 47 {"matrix": [1, 0], "x": 0, "y": 1},
48 {"label":"Q", "x":4, "y":1}, 48 {"matrix": [1, 1], "x": 1, "y": 1},
49 {"label":"W", "x":5, "y":1}, 49
50 {"label":"E", "x":6, "y":1}, 50 {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5},
51 {"label":"R", "x":7, "y":1}, 51 {"matrix": [1, 3], "x": 4, "y": 1},
52 {"label":"T", "x":8, "y":1}, 52 {"matrix": [1, 4], "x": 5, "y": 1},
53 {"label":"Y", "x":9, "y":1}, 53 {"matrix": [1, 5], "x": 6, "y": 1},
54 {"label":"U", "x":10, "y":1}, 54 {"matrix": [1, 6], "x": 7, "y": 1},
55 {"label":"I", "x":11, "y":1}, 55 {"matrix": [1, 7], "x": 8, "y": 1},
56 {"label":"O", "x":12, "y":1}, 56 {"matrix": [1, 8], "x": 9, "y": 1},
57 {"label":"P", "x":13, "y":1}, 57 {"matrix": [1, 9], "x": 10, "y": 1},
58 {"label":"{", "x":14, "y":1}, 58 {"matrix": [1, 10], "x": 11, "y": 1},
59 {"label":"}", "x":15, "y":1, "w":1.25}, 59 {"matrix": [1, 11], "x": 12, "y": 1},
60 {"label":"Enter", "x":15.25, "y":2, "w":2}, 60 {"matrix": [1, 12], "x": 13, "y": 1},
61 {"label":"7", "x":17.25, "y":1}, 61 {"matrix": [1, 13], "x": 14, "y": 1},
62 {"label":"8", "x":18.25, "y":1}, 62 {"matrix": [1, 14], "x": 15, "y": 1, "w": 1.25},
63 {"label":"9", "x":19.25, "y":1}, 63 {"matrix": [1, 15], "x": 15.25, "y": 2, "w": 2},
64 {"label":"PrtSc", "x":20.25, "y":1}, 64 {"matrix": [1, 16], "x": 17.25, "y": 1},
65 {"label":"F5", "x":0, "y":2}, 65 {"matrix": [1, 17], "x": 18.25, "y": 1},
66 {"label":"F6", "x":1, "y":2}, 66 {"matrix": [1, 18], "x": 19.25, "y": 1},
67 {"label":"Ctrl", "x":2.5, "y":2, "w":1.75}, 67 {"matrix": [1, 19], "x": 20.25, "y": 1},
68 {"label":"A", "x":4.25, "y":2}, 68
69 {"label":"S", "x":5.25, "y":2}, 69 {"matrix": [2, 0], "x": 0, "y": 2},
70 {"label":"D", "x":6.25, "y":2}, 70 {"matrix": [2, 1], "x": 1, "y": 2},
71 {"label":"F", "x":7.25, "y":2}, 71
72 {"label":"G", "x":8.25, "y":2}, 72 {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75},
73 {"label":"H", "x":9.25, "y":2}, 73 {"matrix": [2, 3], "x": 4.25, "y": 2},
74 {"label":"J", "x":10.25, "y":2}, 74 {"matrix": [2, 4], "x": 5.25, "y": 2},
75 {"label":"K", "x":11.25, "y":2}, 75 {"matrix": [2, 5], "x": 6.25, "y": 2},
76 {"label":"L", "x":12.25, "y":2}, 76 {"matrix": [2, 6], "x": 7.25, "y": 2},
77 {"label":":", "x":13.25, "y":2}, 77 {"matrix": [2, 7], "x": 8.25, "y": 2},
78 {"label":"\"", "x":14.25, "y":2}, 78 {"matrix": [2, 8], "x": 9.25, "y": 2},
79 {"label":"4", "x":17.25, "y":2}, 79 {"matrix": [2, 9], "x": 10.25, "y": 2},
80 {"label":"5", "x":18.25, "y":2}, 80 {"matrix": [2, 10], "x": 11.25, "y": 2},
81 {"label":"6", "x":19.25, "y":2}, 81 {"matrix": [2, 11], "x": 12.25, "y": 2},
82 {"label":"-", "x":20.25, "y":2}, 82 {"matrix": [2, 12], "x": 13.25, "y": 2},
83 {"label":"F7", "x":0, "y":3}, 83 {"matrix": [2, 13], "x": 14.25, "y": 2},
84 {"label":"F8", "x":1, "y":3}, 84 {"matrix": [2, 15], "x": 17.25, "y": 2},
85 {"label":"Shift", "x":2.5, "y":3, "w":2.25}, 85 {"matrix": [2, 16], "x": 18.25, "y": 2},
86 {"label":"Z", "x":4.75, "y":3}, 86 {"matrix": [2, 17], "x": 19.25, "y": 2},
87 {"label":"X", "x":5.75, "y":3}, 87 {"matrix": [2, 18], "x": 20.25, "y": 2},
88 {"label":"C", "x":6.75, "y":3}, 88
89 {"label":"V", "x":7.75, "y":3}, 89 {"matrix": [3, 0], "x": 0, "y": 3},
90 {"label":"B", "x":8.75, "y":3}, 90 {"matrix": [3, 1], "x": 1, "y": 3},
91 {"label":"N", "x":9.75, "y":3}, 91
92 {"label":"M", "x":10.75, "y":3}, 92 {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 2.25},
93 {"label":"<", "x":11.75, "y":3}, 93 {"matrix": [3, 3], "x": 4.75, "y": 3},
94 {"label":">", "x":12.75, "y":3}, 94 {"matrix": [3, 4], "x": 5.75, "y": 3},
95 {"label":"?", "x":13.75, "y":3}, 95 {"matrix": [3, 5], "x": 6.75, "y": 3},
96 {"label":"Shift", "x":14.75, "y":3, "w":1.5}, 96 {"matrix": [3, 6], "x": 7.75, "y": 3},
97 {"label":"|", "x":16.25, "y":3}, 97 {"matrix": [3, 7], "x": 8.75, "y": 3},
98 {"label":"1", "x":17.25, "y":3}, 98 {"matrix": [3, 8], "x": 9.75, "y": 3},
99 {"label":"2", "x":18.25, "y":3}, 99 {"matrix": [3, 9], "x": 10.75, "y": 3},
100 {"label":"3", "x":19.25, "y":3}, 100 {"matrix": [3, 10], "x": 11.75, "y": 3},
101 {"label":"+", "x":20.25, "y":3, "h":2}, 101 {"matrix": [3, 11], "x": 12.75, "y": 3},
102 {"label":"F9", "x":0, "y":4}, 102 {"matrix": [3, 12], "x": 13.75, "y": 3},
103 {"label":"F10", "x":1, "y":4}, 103 {"matrix": [3, 13], "x": 14.75, "y": 3, "w": 1.5},
104 {"label":"Alt", "x":2.5, "y":4, "w":1.75}, 104 {"matrix": [3, 14], "x": 16.25, "y": 3},
105 {"label":"~", "x":4.25, "y":4}, 105 {"matrix": [3, 15], "x": 17.25, "y": 3},
106 {"label":"Space", "x":5.25, "y":4, "w":9}, 106 {"matrix": [3, 16], "x": 18.25, "y": 3},
107 {"label":"Caps Lock", "x":14.25, "y":4, "w":2}, 107 {"matrix": [3, 17], "x": 19.25, "y": 3},
108 {"label":"0", "x":16.25, "y":4, "w":2}, 108 {"matrix": [3, 18], "x": 20.25, "y": 3, "h": 2},
109 {"label":".", "x":18.25, "y":4, "w":2} 109
110 {"matrix": [4, 0], "x": 0, "y": 4},
111 {"matrix": [4, 1], "x": 1, "y": 4},
112
113 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.75},
114 {"matrix": [4, 3], "x": 4.25, "y": 4},
115 {"matrix": [4, 7], "x": 5.25, "y": 4, "w": 9},
116 {"matrix": [4, 14], "x": 14.25, "y": 4, "w": 2},
117 {"matrix": [4, 15], "x": 16.25, "y": 4, "w": 2},
118 {"matrix": [4, 17], "x": 18.25, "y": 4, "w": 2}
110 ] 119 ]
111 }, 120 },
112 "LAYOUT_z150_tkl": { 121 "LAYOUT_z150_tkl": {
113 "layout": [ 122 "layout": [
114 {"label":"F1", "x":0, "y":0}, 123 {"matrix": [0, 0], "x": 0, "y": 0},
115 {"label":"F2", "x":1, "y":0}, 124 {"matrix": [0, 1], "x": 1, "y": 0},
116 {"label":"Esc", "x":2.5, "y":0}, 125
117 {"label":"1", "x":3.5, "y":0}, 126 {"matrix": [0, 2], "x": 2.5, "y": 0},
118 {"label":"2", "x":4.5, "y":0}, 127 {"matrix": [0, 3], "x": 3.5, "y": 0},
119 {"label":"3", "x":5.5, "y":0}, 128 {"matrix": [0, 4], "x": 4.5, "y": 0},
120 {"label":"4", "x":6.5, "y":0}, 129 {"matrix": [0, 5], "x": 5.5, "y": 0},
121 {"label":"5", "x":7.5, "y":0}, 130 {"matrix": [0, 6], "x": 6.5, "y": 0},
122 {"label":"6", "x":8.5, "y":0}, 131 {"matrix": [0, 7], "x": 7.5, "y": 0},
123 {"label":"7", "x":9.5, "y":0}, 132 {"matrix": [0, 8], "x": 8.5, "y": 0},
124 {"label":"8", "x":10.5, "y":0}, 133 {"matrix": [0, 9], "x": 9.5, "y": 0},
125 {"label":"9", "x":11.5, "y":0}, 134 {"matrix": [0, 10], "x": 10.5, "y": 0},
126 {"label":"0", "x":12.5, "y":0}, 135 {"matrix": [0, 11], "x": 11.5, "y": 0},
127 {"label":"-", "x":13.5, "y":0}, 136 {"matrix": [0, 12], "x": 12.5, "y": 0},
128 {"label":"=", "x":14.5, "y":0}, 137 {"matrix": [0, 13], "x": 13.5, "y": 0},
129 {"label":"Backspace", "x":15.5, "y":0, "w":2}, 138 {"matrix": [0, 14], "x": 14.5, "y": 0},
130 {"label":"Insert", "x":18.25, "y":0}, 139 {"matrix": [0, 15], "x": 15.5, "y": 0, "w": 2},
131 {"label":"Home", "x":19.25, "y":0}, 140
132 {"label":"PgUp", "x":20.25, "y":0}, 141 {"matrix": [0, 17], "x": 18.25, "y": 0},
133 {"label":"F3", "x":0, "y":1}, 142 {"matrix": [0, 18], "x": 19.25, "y": 0},
134 {"label":"F4", "x":1, "y":1}, 143 {"matrix": [0, 19], "x": 20.25, "y": 0},
135 {"label":"Tab", "x":2.5, "y":1, "w":1.5}, 144
136 {"label":"Q", "x":4, "y":1}, 145 {"matrix": [1, 0], "x": 0, "y": 1},
137 {"label":"W", "x":5, "y":1}, 146 {"matrix": [1, 1], "x": 1, "y": 1},
138 {"label":"E", "x":6, "y":1}, 147
139 {"label":"R", "x":7, "y":1}, 148 {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5},
140 {"label":"T", "x":8, "y":1}, 149 {"matrix": [1, 3], "x": 4, "y": 1},
141 {"label":"Y", "x":9, "y":1}, 150 {"matrix": [1, 4], "x": 5, "y": 1},
142 {"label":"U", "x":10, "y":1}, 151 {"matrix": [1, 5], "x": 6, "y": 1},
143 {"label":"I", "x":11, "y":1}, 152 {"matrix": [1, 6], "x": 7, "y": 1},
144 {"label":"O", "x":12, "y":1}, 153 {"matrix": [1, 7], "x": 8, "y": 1},
145 {"label":"P", "x":13, "y":1}, 154 {"matrix": [1, 8], "x": 9, "y": 1},
146 {"label":"[", "x":14, "y":1}, 155 {"matrix": [1, 9], "x": 10, "y": 1},
147 {"label":"]", "x":15, "y":1}, 156 {"matrix": [1, 10], "x": 11, "y": 1},
148 {"label":"\\", "x":16, "y":1, "w":1.5}, 157 {"matrix": [1, 11], "x": 12, "y": 1},
149 {"label":"Delete", "x":18.25, "y":1}, 158 {"matrix": [1, 12], "x": 13, "y": 1},
150 {"label":"End", "x":19.25, "y":1}, 159 {"matrix": [1, 13], "x": 14, "y": 1},
151 {"label":"PgDn", "x":20.25, "y":1}, 160 {"matrix": [1, 14], "x": 15, "y": 1},
152 {"label":"F5", "x":0, "y":2}, 161 {"matrix": [1, 15], "x": 16, "y": 1, "w": 1.5},
153 {"label":"F6", "x":1, "y":2}, 162
154 {"label":"Caps Lock", "x":2.5, "y":2, "w":1.75}, 163 {"matrix": [1, 17], "x": 18.25, "y": 1},
155 {"label":"A", "x":4.25, "y":2}, 164 {"matrix": [1, 18], "x": 19.25, "y": 1},
156 {"label":"S", "x":5.25, "y":2}, 165 {"matrix": [1, 19], "x": 20.25, "y": 1},
157 {"label":"D", "x":6.25, "y":2}, 166
158 {"label":"F", "x":7.25, "y":2}, 167 {"matrix": [2, 0], "x": 0, "y": 2},
159 {"label":"G", "x":8.25, "y":2}, 168 {"matrix": [2, 1], "x": 1, "y": 2},
160 {"label":"H", "x":9.25, "y":2}, 169
161 {"label":"J", "x":10.25, "y":2}, 170 {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75},
162 {"label":"K", "x":11.25, "y":2}, 171 {"matrix": [2, 3], "x": 4.25, "y": 2},
163 {"label":"L", "x":12.25, "y":2}, 172 {"matrix": [2, 4], "x": 5.25, "y": 2},
164 {"label":";", "x":13.25, "y":2}, 173 {"matrix": [2, 5], "x": 6.25, "y": 2},
165 {"label":"'", "x":14.25, "y":2}, 174 {"matrix": [2, 6], "x": 7.25, "y": 2},
166 {"label":"Enter", "x":15.25, "y":2, "w":2.25}, 175 {"matrix": [2, 7], "x": 8.25, "y": 2},
167 {"x":18.25, "y":2}, 176 {"matrix": [2, 8], "x": 9.25, "y": 2},
168 {"x":19.25, "y":2}, 177 {"matrix": [2, 9], "x": 10.25, "y": 2},
169 {"x":20.25, "y":2}, 178 {"matrix": [2, 10], "x": 11.25, "y": 2},
170 {"label":"F7", "x":0, "y":3}, 179 {"matrix": [2, 11], "x": 12.25, "y": 2},
171 {"label":"F8", "x":1, "y":3}, 180 {"matrix": [2, 12], "x": 13.25, "y": 2},
172 {"label":"Shift", "x":2.5, "y":3, "w":1.25}, 181 {"matrix": [2, 13], "x": 14.25, "y": 2},
173 {"label":"ISO \\", "x":3.75, "y":3}, 182 {"matrix": [2, 14], "x": 15.25, "y": 2, "w": 2.25},
174 {"label":"Z", "x":4.75, "y":3}, 183
175 {"label":"X", "x":5.75, "y":3}, 184 {"matrix": [2, 16], "x": 18.25, "y": 2},
176 {"label":"C", "x":6.75, "y":3}, 185 {"matrix": [2, 17], "x": 19.25, "y": 2},
177 {"label":"V", "x":7.75, "y":3}, 186 {"matrix": [2, 18], "x": 20.25, "y": 2},
178 {"label":"B", "x":8.75, "y":3}, 187
179 {"label":"N", "x":9.75, "y":3}, 188 {"matrix": [3, 0], "x": 0, "y": 3},
180 {"label":"M", "x":10.75, "y":3}, 189 {"matrix": [3, 1], "x": 1, "y": 3},
181 {"label":",", "x":11.75, "y":3}, 190
182 {"label":".", "x":12.75, "y":3}, 191 {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
183 {"label":"/", "x":13.75, "y":3}, 192 {"matrix": [4, 5], "x": 3.75, "y": 3},
184 {"label":"Shift", "x":14.75, "y":3, "w":1.75}, 193 {"matrix": [3, 3], "x": 4.75, "y": 3},
185 {"label":"Fn", "x":16.5, "y":3}, 194 {"matrix": [3, 4], "x": 5.75, "y": 3},
186 {"x":18.25, "y":3}, 195 {"matrix": [3, 5], "x": 6.75, "y": 3},
187 {"label":"Up", "x":19.25, "y":3}, 196 {"matrix": [3, 6], "x": 7.75, "y": 3},
188 {"x":20.25, "y":3}, 197 {"matrix": [3, 7], "x": 8.75, "y": 3},
189 {"label":"F9", "x":0, "y":4}, 198 {"matrix": [3, 8], "x": 9.75, "y": 3},
190 {"label":"F10", "x":1, "y":4}, 199 {"matrix": [3, 9], "x": 10.75, "y": 3},
191 {"label":"Ctrl", "x":2.5, "y":4, "w":1.25}, 200 {"matrix": [3, 10], "x": 11.75, "y": 3},
192 {"label":"Win", "x":3.75, "y":4, "w":1.25}, 201 {"matrix": [3, 11], "x": 12.75, "y": 3},
193 {"label":"Alt", "x":5, "y":4, "w":1.25}, 202 {"matrix": [3, 12], "x": 13.75, "y": 3},
194 {"label":"Space", "x":6.25, "y":4, "w":6.25}, 203 {"matrix": [3, 13], "x": 14.75, "y": 3, "w": 1.75},
195 {"label":"Alt", "x":12.5, "y":4, "w":1.25}, 204 {"matrix": [3, 14], "x": 16.5, "y": 3},
196 {"label":"Win", "x":13.75, "y":4, "w":1.25}, 205
197 {"label":"Menu", "x":15, "y":4, "w":1.25}, 206 {"matrix": [3, 16], "x": 18.25, "y": 3},
198 {"label":"Ctrl", "x":16.25, "y":4, "w":1.25}, 207 {"matrix": [3, 17], "x": 19.25, "y": 3},
199 {"label":"Left", "x":18.25, "y":4}, 208 {"matrix": [3, 18], "x": 20.25, "y": 3},
200 {"label":"Down", "x":19.25, "y":4}, 209
201 {"label":"Right", "x":20.25, "y":4} 210 {"matrix": [4, 0], "x": 0, "y": 4},
211 {"matrix": [4, 1], "x": 1, "y": 4},
212
213 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
214 {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
215 {"matrix": [4, 4], "x": 5, "y": 4, "w": 1.25},
216 {"matrix": [4, 7], "x": 6.25, "y": 4, "w": 6.25},
217 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
218 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
219 {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25},
220 {"matrix": [4, 15], "x": 16.25, "y": 4, "w": 1.25},
221
222 {"matrix": [4, 16], "x": 18.25, "y": 4},
223 {"matrix": [4, 17], "x": 19.25, "y": 4},
224 {"matrix": [4, 18], "x": 20.25, "y": 4}
202 ] 225 ]
203 } 226 }
204 } 227 }
diff --git a/keyboards/viktus/z150_bh/z150_bh.h b/keyboards/viktus/z150_bh/z150_bh.h
deleted file mode 100644
index f97ac1c035..0000000000
--- a/keyboards/viktus/z150_bh/z150_bh.h
+++ /dev/null
@@ -1,31 +0,0 @@
1#pragma once
2
3#include "quantum.h"
4
5#define LAYOUT( \
6 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0J, \
7 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, \
8 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, K2G, K2H, K2I, \
9 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, \
10 K40, K41, K42, K43, K47, K4E, K4F, K4H \
11) { \
12 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, KC_NO, K0J }, \
13 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J }, \
14 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO, K2F, K2G, K2H, K2I, KC_NO }, \
15 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, KC_NO }, \
16 { K40, K41, K42, K43, KC_NO, KC_NO, KC_NO, K47, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K4E, K4F, KC_NO, K4H, KC_NO, KC_NO } \
17}
18
19#define LAYOUT_z150_tkl( \
20 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0H, K0I, K0J, \
21 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1H, K1I, K1J, \
22 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2G, K2H, K2I, \
23 K30, K31, K32, K45, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3G, K3H, K3I, \
24 K40, K41, K42, K43, K44, K47, K4C, K4D, K4E, K4F, K4G, K4H, K4I \
25) { \
26 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, KC_NO, K0H, K0I, K0J }, \
27 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, KC_NO, K1H, K1I, K1J }, \
28 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, KC_NO, K2G, K2H, K2I, KC_NO }, \
29 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, KC_NO, K3G, K3H, K3I, KC_NO }, \
30 { K40, K41, K42, K43, K44, K45, KC_NO, K47, KC_NO, KC_NO, KC_NO, KC_NO, K4C, K4D, K4E, K4F, K4G, K4H, K4I, KC_NO } \
31}
diff --git a/keyboards/winkeyless/bmini/bmini.h b/keyboards/winkeyless/bmini/bmini.h
deleted file mode 100644
index 82b9ec01c9..0000000000
--- a/keyboards/winkeyless/bmini/bmini.h
+++ /dev/null
@@ -1,56 +0,0 @@
1/*
2Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17#pragma once
18
19#include "quantum.h"
20
21#define LAYOUT( \
22 K05, K25, K35, K45, K55, K06, KA6, KA7, K07, KB5, KC5, KD5, KE5, KD1, KE1, KE2, \
23 K04, K14, K24, K34, K44, K54, K16, KB6, KB7, K17, KA4, KB4, KC4, KE4, KD0, \
24 K03, K13, K23, K33, K43, K53, K26, KC6, KC7, K27, KA3, KB3, KC3, KD3, K67, \
25 K02, K12, K22, K32, K42, K52, K36, KD6, KD7, K37, KA2, KB2, KD2, KE0, \
26 K01, K11, K21, K31, K41, K51, K46, KE6, KE7, K47, KA1, KB1, K86, K77, \
27 K00, K10, K20, K56, K57, KB0, KC0, K66, K76, K96 \
28){ \
29 { K00, K10, K20, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KB0, KC0, KD0, KE0 }, \
30 { K01, K11, K21, K31, K41, K51, KC_NO, KC_NO, KC_NO, KC_NO, KA1, KB1, KC_NO, KD1, KE1 }, \
31 { K02, K12, K22, K32, K42, K52, KC_NO, KC_NO, KC_NO, KC_NO, KA2, KB2, KC_NO, KD2, KE2 }, \
32 { K03, K13, K23, K33, K43, K53, KC_NO, KC_NO, KC_NO, KC_NO, KA3, KB3, KC3, KD3, KC_NO }, \
33 { K04, K14, K24, K34, K44, K54, KC_NO, KC_NO, KC_NO, KC_NO, KA4, KB4, KC4, KC_NO, KE4 }, \
34 { K05, KC_NO, K25, K35, K45, K55, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KB5, KC5, KD5, KE5 }, \
35 { K06, K16, K26, K36, K46, K56, K66, K76, K86, K96, KA6, KB6, KC6, KD6, KE6 }, \
36 { K07, K17, K27, K37, K47, K57, K67, K77, KC_NO, KC_NO, KA7, KB7, KC7, KD7, KE7 } \
37}
38
39#define LAYOUT_splitbs( \
40 K05, K25, K35, K45, K55, K06, KA6, KA7, K07, KB5, KC5, KD5, KE5, KD1, KE1, KE2, \
41 K04, K14, K24, K34, K44, K54, K16, KB6, KB7, K17, KA4, KB4, KC4, KE4, KD4, KD0, \
42 K03, K13, K23, K33, K43, K53, K26, KC6, KC7, K27, KA3, KB3, KC3, KD3, K67, \
43 K02, K12, K22, K32, K42, K52, K36, KD6, KD7, K37, KA2, KB2, KD2, KE0, \
44 K01, K11, K21, K31, K41, K51, K46, KE6, KE7, K47, KA1, KB1, K86, K77, \
45 K00, K10, K20, K56, K57, KB0, KC0, K66, K76, K96 \
46){ \
47 { K00, K10, K20, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KB0, KC0, KD0, KE0 }, \
48 { K01, K11, K21, K31, K41, K51, KC_NO, KC_NO, KC_NO, KC_NO, KA1, KB1, KC_NO, KD1, KE1 }, \
49 { K02, K12, K22, K32, K42, K52, KC_NO, KC_NO, KC_NO, KC_NO, KA2, KB2, KC_NO, KD2, KE2 }, \
50 { K03, K13, K23, K33, K43, K53, KC_NO, KC_NO, KC_NO, KC_NO, KA3, KB3, KC3, KD3, KC_NO }, \
51 { K04, K14, K24, K34, K44, K54, KC_NO, KC_NO, KC_NO, KC_NO, KA4, KB4, KC4, KD4, KE4 }, \
52 { K05, KC_NO, K25, K35, K45, K55, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KB5, KC5, KD5, KE5 }, \
53 { K06, K16, K26, K36, K46, K56, K66, K76, K86, K96, KA6, KB6, KC6, KD6, KE6 }, \
54 { K07, K17, K27, K37, K47, K57, K67, K77, KC_NO, KC_NO, KA7, KB7, KC7, KD7, KE7 } \
55}
56
diff --git a/keyboards/winkeyless/bmini/info.json b/keyboards/winkeyless/bmini/info.json
index 7796867d08..2a18caeed4 100644
--- a/keyboards/winkeyless/bmini/info.json
+++ b/keyboards/winkeyless/bmini/info.json
@@ -28,10 +28,191 @@
28 "bootloader": "bootloadhid", 28 "bootloader": "bootloadhid",
29 "layouts": { 29 "layouts": {
30 "LAYOUT": { 30 "LAYOUT": {
31 "layout": [{"label":"K05", "x":0, "y":0}, {"label":"K25", "x":1, "y":0}, {"label":"K35", "x":2, "y":0}, {"label":"K45", "x":3, "y":0}, {"label":"K55", "x":4, "y":0}, {"label":"K06", "x":5, "y":0}, {"label":"KA6", "x":6, "y":0}, {"label":"KA7", "x":7, "y":0}, {"label":"K07", "x":8, "y":0}, {"label":"KB5", "x":9, "y":0}, {"label":"KC5", "x":10, "y":0}, {"label":"KD5", "x":11, "y":0}, {"label":"KE5", "x":12, "y":0}, {"label":"KD1", "x":13, "y":0}, {"label":"KE1", "x":14, "y":0}, {"label":"KE2", "x":15, "y":0}, {"label":"K04", "x":0, "y":1}, {"label":"K14", "x":1, "y":1}, {"label":"K24", "x":2, "y":1}, {"label":"K34", "x":3, "y":1}, {"label":"K44", "x":4, "y":1}, {"label":"K54", "x":5, "y":1}, {"label":"K16", "x":6, "y":1}, {"label":"KB6", "x":7, "y":1}, {"label":"KB7", "x":8, "y":1}, {"label":"K17", "x":9, "y":1}, {"label":"KA4", "x":10, "y":1}, {"label":"KB4", "x":11, "y":1}, {"label":"KC4", "x":12, "y":1}, {"label":"KE4", "x":13, "y":1, "w":2}, {"label":"KD0", "x":15, "y":1}, {"label":"K03", "x":0, "y":2, "w":1.5}, {"label":"K13", "x":1.5, "y":2}, {"label":"K23", "x":2.5, "y":2}, {"label":"K33", "x":3.5, "y":2}, {"label":"K43", "x":4.5, "y":2}, {"label":"K53", "x":5.5, "y":2}, {"label":"K26", "x":6.5, "y":2}, {"label":"KC6", "x":7.5, "y":2}, {"label":"KC7", "x":8.5, "y":2}, {"label":"K27", "x":9.5, "y":2}, {"label":"KA3", "x":10.5, "y":2}, {"label":"KB3", "x":11.5, "y":2}, {"label":"KC3", "x":12.5, "y":2}, {"label":"KD3", "x":13.5, "y":2, "w":1.5}, {"label":"K67", "x":15, "y":2}, {"label":"K02", "x":0, "y":3, "w":1.75}, {"label":"K12", "x":1.75, "y":3}, {"label":"K22", "x":2.75, "y":3}, {"label":"K32", "x":3.75, "y":3}, {"label":"K42", "x":4.75, "y":3}, {"label":"K52", "x":5.75, "y":3}, {"label":"K36", "x":6.75, "y":3}, {"label":"KD6", "x":7.75, "y":3}, {"label":"KD7", "x":8.75, "y":3}, {"label":"K37", "x":9.75, "y":3}, {"label":"KA2", "x":10.75, "y":3}, {"label":"KB2", "x":11.75, "y":3}, {"label":"KD2", "x":12.75, "y":3, "w":2.25}, {"label":"KE0", "x":15, "y":3}, {"label":"K01", "x":0, "y":4, "w":2.25}, {"label":"K11", "x":2.25, "y":4}, {"label":"K21", "x":3.25, "y":4}, {"label":"K31", "x":4.25, "y":4}, {"label":"K41", "x":5.25, "y":4}, {"label":"K51", "x":6.25, "y":4}, {"label":"K46", "x":7.25, "y":4}, {"label":"KE6", "x":8.25, "y":4}, {"label":"KE7", "x":9.25, "y":4}, {"label":"K47", "x":10.25, "y":4}, {"label":"KA1", "x":11.25, "y":4}, {"label":"KB1", "x":12.25, "y":4, "w":1.75}, {"label":"K86", "x":14, "y":4}, {"label":"K77", "x":15, "y":4}, {"label":"K00", "x":0, "y":5, "w":1.25}, {"label":"K10", "x":1.25, "y":5, "w":1.25}, {"label":"K20", "x":2.5, "y":5, "w":1.25}, {"label":"K56", "x":3.75, "y":5, "w":6.25}, {"label":"K57", "x":10, "y":5}, {"label":"KB0", "x":11, "y":5}, {"label":"KC0", "x":12, "y":5}, {"label":"K66", "x":13, "y":5}, {"label":"K76", "x":14, "y":5}, {"label":"K96", "x":15, "y":5}] 31 "layout": [
32 {"matrix": [5, 0], "x": 0, "y": 0},
33 {"matrix": [5, 2], "x": 1, "y": 0},
34 {"matrix": [5, 3], "x": 2, "y": 0},
35 {"matrix": [5, 4], "x": 3, "y": 0},
36 {"matrix": [5, 5], "x": 4, "y": 0},
37 {"matrix": [6, 0], "x": 5, "y": 0},
38 {"matrix": [6, 10], "x": 6, "y": 0},
39 {"matrix": [7, 10], "x": 7, "y": 0},
40 {"matrix": [7, 0], "x": 8, "y": 0},
41 {"matrix": [5, 11], "x": 9, "y": 0},
42 {"matrix": [5, 12], "x": 10, "y": 0},
43 {"matrix": [5, 13], "x": 11, "y": 0},
44 {"matrix": [5, 14], "x": 12, "y": 0},
45 {"matrix": [1, 13], "x": 13, "y": 0},
46 {"matrix": [1, 14], "x": 14, "y": 0},
47 {"matrix": [2, 14], "x": 15, "y": 0},
48
49 {"matrix": [4, 0], "x": 0, "y": 1},
50 {"matrix": [4, 1], "x": 1, "y": 1},
51 {"matrix": [4, 2], "x": 2, "y": 1},
52 {"matrix": [4, 3], "x": 3, "y": 1},
53 {"matrix": [4, 4], "x": 4, "y": 1},
54 {"matrix": [4, 5], "x": 5, "y": 1},
55 {"matrix": [6, 1], "x": 6, "y": 1},
56 {"matrix": [6, 11], "x": 7, "y": 1},
57 {"matrix": [7, 11], "x": 8, "y": 1},
58 {"matrix": [7, 1], "x": 9, "y": 1},
59 {"matrix": [4, 10], "x": 10, "y": 1},
60 {"matrix": [4, 11], "x": 11, "y": 1},
61 {"matrix": [4, 12], "x": 12, "y": 1},
62 {"matrix": [4, 14], "x": 13, "y": 1, "w": 2},
63 {"matrix": [0, 13], "x": 15, "y": 1},
64
65 {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
66 {"matrix": [3, 1], "x": 1.5, "y": 2},
67 {"matrix": [3, 2], "x": 2.5, "y": 2},
68 {"matrix": [3, 3], "x": 3.5, "y": 2},
69 {"matrix": [3, 4], "x": 4.5, "y": 2},
70 {"matrix": [3, 5], "x": 5.5, "y": 2},
71 {"matrix": [6, 2], "x": 6.5, "y": 2},
72 {"matrix": [6, 12], "x": 7.5, "y": 2},
73 {"matrix": [7, 12], "x": 8.5, "y": 2},
74 {"matrix": [7, 2], "x": 9.5, "y": 2},
75 {"matrix": [3, 10], "x": 10.5, "y": 2},
76 {"matrix": [3, 11], "x": 11.5, "y": 2},
77 {"matrix": [3, 12], "x": 12.5, "y": 2},
78 {"matrix": [3, 13], "x": 13.5, "y": 2, "w": 1.5},
79 {"matrix": [7, 6], "x": 15, "y": 2},
80
81 {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
82 {"matrix": [2, 1], "x": 1.75, "y": 3},
83 {"matrix": [2, 2], "x": 2.75, "y": 3},
84 {"matrix": [2, 3], "x": 3.75, "y": 3},
85 {"matrix": [2, 4], "x": 4.75, "y": 3},
86 {"matrix": [2, 5], "x": 5.75, "y": 3},
87 {"matrix": [6, 3], "x": 6.75, "y": 3},
88 {"matrix": [6, 13], "x": 7.75, "y": 3},
89 {"matrix": [7, 13], "x": 8.75, "y": 3},
90 {"matrix": [7, 3], "x": 9.75, "y": 3},
91 {"matrix": [2, 10], "x": 10.75, "y": 3},
92 {"matrix": [2, 11], "x": 11.75, "y": 3},
93 {"matrix": [2, 13], "x": 12.75, "y": 3, "w": 2.25},
94 {"matrix": [0, 14], "x": 15, "y": 3},
95
96 {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
97 {"matrix": [1, 1], "x": 2.25, "y": 4},
98 {"matrix": [1, 2], "x": 3.25, "y": 4},
99 {"matrix": [1, 3], "x": 4.25, "y": 4},
100 {"matrix": [1, 4], "x": 5.25, "y": 4},
101 {"matrix": [1, 5], "x": 6.25, "y": 4},
102 {"matrix": [6, 4], "x": 7.25, "y": 4},
103 {"matrix": [6, 14], "x": 8.25, "y": 4},
104 {"matrix": [7, 14], "x": 9.25, "y": 4},
105 {"matrix": [7, 4], "x": 10.25, "y": 4},
106 {"matrix": [1, 10], "x": 11.25, "y": 4},
107 {"matrix": [1, 11], "x": 12.25, "y": 4, "w": 1.75},
108 {"matrix": [6, 8], "x": 14, "y": 4},
109 {"matrix": [7, 7], "x": 15, "y": 4},
110
111 {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
112 {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
113 {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
114 {"matrix": [6, 5], "x": 3.75, "y": 5, "w": 6.25},
115 {"matrix": [7, 5], "x": 10, "y": 5},
116 {"matrix": [0, 11], "x": 11, "y": 5},
117 {"matrix": [0, 12], "x": 12, "y": 5},
118 {"matrix": [6, 6], "x": 13, "y": 5},
119 {"matrix": [6, 7], "x": 14, "y": 5},
120 {"matrix": [6, 9], "x": 15, "y": 5}
121 ]
32 }, 122 },
33 "LAYOUT_splitbs": { 123 "LAYOUT_splitbs": {
34 "layout": [{"label":"K05", "x":0, "y":0}, {"label":"K25", "x":1, "y":0}, {"label":"K35", "x":2, "y":0}, {"label":"K45", "x":3, "y":0}, {"label":"K55", "x":4, "y":0}, {"label":"K06", "x":5, "y":0}, {"label":"KA6", "x":6, "y":0}, {"label":"KA7", "x":7, "y":0}, {"label":"K07", "x":8, "y":0}, {"label":"KB5", "x":9, "y":0}, {"label":"KC5", "x":10, "y":0}, {"label":"KD5", "x":11, "y":0}, {"label":"KE5", "x":12, "y":0}, {"label":"KD1", "x":13, "y":0}, {"label":"KE1", "x":14, "y":0}, {"label":"KE2", "x":15, "y":0}, {"label":"K04", "x":0, "y":1}, {"label":"K14", "x":1, "y":1}, {"label":"K24", "x":2, "y":1}, {"label":"K34", "x":3, "y":1}, {"label":"K44", "x":4, "y":1}, {"label":"K54", "x":5, "y":1}, {"label":"K16", "x":6, "y":1}, {"label":"KB6", "x":7, "y":1}, {"label":"KB7", "x":8, "y":1}, {"label":"K17", "x":9, "y":1}, {"label":"KA4", "x":10, "y":1}, {"label":"KB4", "x":11, "y":1}, {"label":"KC4", "x":12, "y":1}, {"label":"KE4", "x":13, "y":1}, {"label":"KD4", "x":14, "y":1}, {"label":"KD0", "x":15, "y":1}, {"label":"K03", "x":0, "y":2, "w":1.5}, {"label":"K13", "x":1.5, "y":2}, {"label":"K23", "x":2.5, "y":2}, {"label":"K33", "x":3.5, "y":2}, {"label":"K43", "x":4.5, "y":2}, {"label":"K53", "x":5.5, "y":2}, {"label":"K26", "x":6.5, "y":2}, {"label":"KC6", "x":7.5, "y":2}, {"label":"KC7", "x":8.5, "y":2}, {"label":"K27", "x":9.5, "y":2}, {"label":"KA3", "x":10.5, "y":2}, {"label":"KB3", "x":11.5, "y":2}, {"label":"KC3", "x":12.5, "y":2}, {"label":"KD3", "x":13.5, "y":2, "w":1.5}, {"label":"K67", "x":15, "y":2}, {"label":"K02", "x":0, "y":3, "w":1.75}, {"label":"K12", "x":1.75, "y":3}, {"label":"K22", "x":2.75, "y":3}, {"label":"K32", "x":3.75, "y":3}, {"label":"K42", "x":4.75, "y":3}, {"label":"K52", "x":5.75, "y":3}, {"label":"K36", "x":6.75, "y":3}, {"label":"KD6", "x":7.75, "y":3}, {"label":"KD7", "x":8.75, "y":3}, {"label":"K37", "x":9.75, "y":3}, {"label":"KA2", "x":10.75, "y":3}, {"label":"KB2", "x":11.75, "y":3}, {"label":"KD2", "x":12.75, "y":3, "w":2.25}, {"label":"KE0", "x":15, "y":3}, {"label":"K01", "x":0, "y":4, "w":2.25}, {"label":"K11", "x":2.25, "y":4}, {"label":"K21", "x":3.25, "y":4}, {"label":"K31", "x":4.25, "y":4}, {"label":"K41", "x":5.25, "y":4}, {"label":"K51", "x":6.25, "y":4}, {"label":"K46", "x":7.25, "y":4}, {"label":"KE6", "x":8.25, "y":4}, {"label":"KE7", "x":9.25, "y":4}, {"label":"K47", "x":10.25, "y":4}, {"label":"KA1", "x":11.25, "y":4}, {"label":"KB1", "x":12.25, "y":4, "w":1.75}, {"label":"K86", "x":14, "y":4}, {"label":"K77", "x":15, "y":4}, {"label":"K00", "x":0, "y":5, "w":1.25}, {"label":"K10", "x":1.25, "y":5, "w":1.25}, {"label":"K20", "x":2.5, "y":5, "w":1.25}, {"label":"K56", "x":3.75, "y":5, "w":6.25}, {"label":"K57", "x":10, "y":5}, {"label":"KB0", "x":11, "y":5}, {"label":"KC0", "x":12, "y":5}, {"label":"K66", "x":13, "y":5}, {"label":"K76", "x":14, "y":5}, {"label":"K96", "x":15, "y":5}] 124 "layout": [
125 {"matrix": [5, 0], "x": 0, "y": 0},
126 {"matrix": [5, 2], "x": 1, "y": 0},
127 {"matrix": [5, 3], "x": 2, "y": 0},
128 {"matrix": [5, 4], "x": 3, "y": 0},
129 {"matrix": [5, 5], "x": 4, "y": 0},
130 {"matrix": [6, 0], "x": 5, "y": 0},
131 {"matrix": [6, 10], "x": 6, "y": 0},
132 {"matrix": [7, 10], "x": 7, "y": 0},
133 {"matrix": [7, 0], "x": 8, "y": 0},
134 {"matrix": [5, 11], "x": 9, "y": 0},
135 {"matrix": [5, 12], "x": 10, "y": 0},
136 {"matrix": [5, 13], "x": 11, "y": 0},
137 {"matrix": [5, 14], "x": 12, "y": 0},
138 {"matrix": [1, 13], "x": 13, "y": 0},
139 {"matrix": [1, 14], "x": 14, "y": 0},
140 {"matrix": [2, 14], "x": 15, "y": 0},
141
142 {"matrix": [4, 0], "x": 0, "y": 1},
143 {"matrix": [4, 1], "x": 1, "y": 1},
144 {"matrix": [4, 2], "x": 2, "y": 1},
145 {"matrix": [4, 3], "x": 3, "y": 1},
146 {"matrix": [4, 4], "x": 4, "y": 1},
147 {"matrix": [4, 5], "x": 5, "y": 1},
148 {"matrix": [6, 1], "x": 6, "y": 1},
149 {"matrix": [6, 11], "x": 7, "y": 1},
150 {"matrix": [7, 11], "x": 8, "y": 1},
151 {"matrix": [7, 1], "x": 9, "y": 1},
152 {"matrix": [4, 10], "x": 10, "y": 1},
153 {"matrix": [4, 11], "x": 11, "y": 1},
154 {"matrix": [4, 12], "x": 12, "y": 1},
155 {"matrix": [4, 14], "x": 13, "y": 1},
156 {"matrix": [4, 13], "x": 14, "y": 1},
157 {"matrix": [0, 13], "x": 15, "y": 1},
158
159 {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
160 {"matrix": [3, 1], "x": 1.5, "y": 2},
161 {"matrix": [3, 2], "x": 2.5, "y": 2},
162 {"matrix": [3, 3], "x": 3.5, "y": 2},
163 {"matrix": [3, 4], "x": 4.5, "y": 2},
164 {"matrix": [3, 5], "x": 5.5, "y": 2},
165 {"matrix": [6, 2], "x": 6.5, "y": 2},
166 {"matrix": [6, 12], "x": 7.5, "y": 2},
167 {"matrix": [7, 12], "x": 8.5, "y": 2},
168 {"matrix": [7, 2], "x": 9.5, "y": 2},
169 {"matrix": [3, 10], "x": 10.5, "y": 2},
170 {"matrix": [3, 11], "x": 11.5, "y": 2},
171 {"matrix": [3, 12], "x": 12.5, "y": 2},
172 {"matrix": [3, 13], "x": 13.5, "y": 2, "w": 1.5},
173 {"matrix": [7, 6], "x": 15, "y": 2},
174
175 {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
176 {"matrix": [2, 1], "x": 1.75, "y": 3},
177 {"matrix": [2, 2], "x": 2.75, "y": 3},
178 {"matrix": [2, 3], "x": 3.75, "y": 3},
179 {"matrix": [2, 4], "x": 4.75, "y": 3},
180 {"matrix": [2, 5], "x": 5.75, "y": 3},
181 {"matrix": [6, 3], "x": 6.75, "y": 3},
182 {"matrix": [6, 13], "x": 7.75, "y": 3},
183 {"matrix": [7, 13], "x": 8.75, "y": 3},
184 {"matrix": [7, 3], "x": 9.75, "y": 3},
185 {"matrix": [2, 10], "x": 10.75, "y": 3},
186 {"matrix": [2, 11], "x": 11.75, "y": 3},
187 {"matrix": [2, 13], "x": 12.75, "y": 3, "w": 2.25},
188 {"matrix": [0, 14], "x": 15, "y": 3},
189
190 {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
191 {"matrix": [1, 1], "x": 2.25, "y": 4},
192 {"matrix": [1, 2], "x": 3.25, "y": 4},
193 {"matrix": [1, 3], "x": 4.25, "y": 4},
194 {"matrix": [1, 4], "x": 5.25, "y": 4},
195 {"matrix": [1, 5], "x": 6.25, "y": 4},
196 {"matrix": [6, 4], "x": 7.25, "y": 4},
197 {"matrix": [6, 14], "x": 8.25, "y": 4},
198 {"matrix": [7, 14], "x": 9.25, "y": 4},
199 {"matrix": [7, 4], "x": 10.25, "y": 4},
200 {"matrix": [1, 10], "x": 11.25, "y": 4},
201 {"matrix": [1, 11], "x": 12.25, "y": 4, "w": 1.75},
202 {"matrix": [6, 8], "x": 14, "y": 4},
203 {"matrix": [7, 7], "x": 15, "y": 4},
204
205 {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
206 {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
207 {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
208 {"matrix": [6, 5], "x": 3.75, "y": 5, "w": 6.25},
209 {"matrix": [7, 5], "x": 10, "y": 5},
210 {"matrix": [0, 11], "x": 11, "y": 5},
211 {"matrix": [0, 12], "x": 12, "y": 5},
212 {"matrix": [6, 6], "x": 13, "y": 5},
213 {"matrix": [6, 7], "x": 14, "y": 5},
214 {"matrix": [6, 9], "x": 15, "y": 5}
215 ]
35 } 216 }
36 } 217 }
37} 218}
diff --git a/keyboards/winkeyless/bminiex/bminiex.h b/keyboards/winkeyless/bminiex/bminiex.h
deleted file mode 100644
index b9532f2f0e..0000000000
--- a/keyboards/winkeyless/bminiex/bminiex.h
+++ /dev/null
@@ -1,74 +0,0 @@
1/*
2Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
19
20#include "quantum.h"
21
22#define LAYOUT( \
23 K05, K25, K35, K45, K55, K06, KA6, KA7, K07, KB5, KC5, KD5, KE5, KD1, KE1, KE2, K65, K75, K85, K95, \
24 K04, K14, K24, K34, K44, K54, K16, KB6, KB7, K17, KA4, KB4, KC4, KE4, KD0, K64, K74, K84, K94, \
25 K03, K13, K23, K33, K43, K53, K26, KC6, KC7, K27, KA3, KB3, KC3, KD3, K67, K63, K73, K83, \
26 K02, K12, K22, K32, K42, K52, K36, KD6, KD7, K37, KA2, KB2, KC2, KD2, KE0, K62, K72, K82, K92, \
27 K01, K30, K11, K21, K31, K41, K51, K46, KE6, KE7, K47, KA1, KB1, K86, K77, K61, K71, K81, \
28 K00, K10, K20, K56, K57, KB0, KC0, K66, K76, K96, K60, K80, K90 \
29){ \
30 { K00, K10, K20, K30, KC_NO, KC_NO, K60, KC_NO, K80, K90, KC_NO, KB0, KC0, KD0, KE0 }, \
31 { K01, K11, K21, K31, K41, K51, K61, K71, K81, KC_NO, KA1, KB1, KC_NO, KD1, KE1 }, \
32 { K02, K12, K22, K32, K42, K52, K62, K72, K82, K92, KA2, KB2, KC2, KD2, KE2 }, \
33 { K03, K13, K23, K33, K43, K53, K63, K73, K83, KC_NO, KA3, KB3, KC3, KD3, KC_NO }, \
34 { K04, K14, K24, K34, K44, K54, K64, K74, K84, K94, KA4, KB4, KC4, KC_NO, KE4 }, \
35 { K05, KC_NO, K25, K35, K45, K55, K65, K75, K85, K95, KC_NO, KB5, KC5, KD5, KE5 }, \
36 { K06, K16, K26, K36, K46, K56, K66, K76, K86, K96, KA6, KB6, KC6, KD6, KE6 }, \
37 { K07, K17, K27, K37, K47, K57, K67, K77, KC_NO, KC_NO, KA7, KB7, KC7, KD7, KE7 } \
38}
39
40#define LAYOUT_ansi( \
41 K05, K25, K35, K45, K55, K06, KA6, KA7, K07, KB5, KC5, KD5, KE5, KD1, KE1, KE2, K65, K75, K85, K95, \
42 K04, K14, K24, K34, K44, K54, K16, KB6, KB7, K17, KA4, KB4, KC4, KE4, KD0, K64, K74, K84, K94, \
43 K03, K13, K23, K33, K43, K53, K26, KC6, KC7, K27, KA3, KB3, KC3, KD3, K67, K63, K73, K83, \
44 K02, K12, K22, K32, K42, K52, K36, KD6, KD7, K37, KA2, KB2, KD2, KE0, K62, K72, K82, K92, \
45 K01, K11, K21, K31, K41, K51, K46, KE6, KE7, K47, KA1, KB1, K86, K77, K61, K71, K81, \
46 K00, K10, K20, K56, K57, KB0, KC0, K66, K76, K96, K60, K80, K90 \
47){ \
48 { K00, K10, K20, KC_NO, KC_NO, KC_NO, K60, KC_NO, K80, K90, KC_NO, KB0, KC0, KD0, KE0 }, \
49 { K01, K11, K21, K31, K41, K51, K61, K71, K81, KC_NO, KA1, KB1, KC_NO, KD1, KE1 }, \
50 { K02, K12, K22, K32, K42, K52, K62, K72, K82, K92, KA2, KB2, KC_NO, KD2, KE2 }, \
51 { K03, K13, K23, K33, K43, K53, K63, K73, K83, KC_NO, KA3, KB3, KC3, KD3, KC_NO }, \
52 { K04, K14, K24, K34, K44, K54, K64, K74, K84, K94, KA4, KB4, KC4, KC_NO, KE4 }, \
53 { K05, KC_NO, K25, K35, K45, K55, K65, K75, K85, K95, KC_NO, KB5, KC5, KD5, KE5 }, \
54 { K06, K16, K26, K36, K46, K56, K66, K76, K86, K96, KA6, KB6, KC6, KD6, KE6 }, \
55 { K07, K17, K27, K37, K47, K57, K67, K77, KC_NO, KC_NO, KA7, KB7, KC7, KD7, KE7 } \
56}
57
58#define LAYOUT_iso( \
59 K05, K25, K35, K45, K55, K06, KA6, KA7, K07, KB5, KC5, KD5, KE5, KD1, KE1, KE2, K65, K75, K85, K95, \
60 K04, K14, K24, K34, K44, K54, K16, KB6, KB7, K17, KA4, KB4, KC4, KE4, KD0, K64, K74, K84, K94, \
61 K03, K13, K23, K33, K43, K53, K26, KC6, KC7, K27, KA3, KB3, KC3, K67, K63, K73, K83, \
62 K02, K12, K22, K32, K42, K52, K36, KD6, KD7, K37, KA2, KB2, KC2, KD2, KE0, K62, K72, K82, K92, \
63 K01, K30, K11, K21, K31, K41, K51, K46, KE6, KE7, K47, KA1, KB1, K86, K77, K61, K71, K81, \
64 K00, K10, K20, K56, K57, KB0, KC0, K66, K76, K96, K60, K80, K90 \
65){ \
66 { K00, K10, K20, K30, KC_NO, KC_NO, K60, KC_NO, K80, K90, KC_NO, KB0, KC0, KD0, KE0 }, \
67 { K01, K11, K21, K31, K41, K51, K61, K71, K81, KC_NO, KA1, KB1, KC_NO, KD1, KE1 }, \
68 { K02, K12, K22, K32, K42, K52, K62, K72, K82, K92, KA2, KB2, KC2, KD2, KE2 }, \
69 { K03, K13, K23, K33, K43, K53, K63, K73, K83, KC_NO, KA3, KB3, KC3, KC_NO, KC_NO }, \
70 { K04, K14, K24, K34, K44, K54, K64, K74, K84, K94, KA4, KB4, KC4, KC_NO, KE4 }, \
71 { K05, KC_NO, K25, K35, K45, K55, K65, K75, K85, K95, KC_NO, KB5, KC5, KD5, KE5 }, \
72 { K06, K16, K26, K36, K46, K56, K66, K76, K86, K96, KA6, KB6, KC6, KD6, KE6 }, \
73 { K07, K17, K27, K37, K47, K57, K67, K77, KC_NO, KC_NO, KA7, KB7, KC7, KD7, KE7 } \
74}
diff --git a/keyboards/winkeyless/bminiex/info.json b/keyboards/winkeyless/bminiex/info.json
index 8b8da98045..03a8e408b5 100644
--- a/keyboards/winkeyless/bminiex/info.json
+++ b/keyboards/winkeyless/bminiex/info.json
@@ -30,332 +30,365 @@
30 "layouts": { 30 "layouts": {
31 "LAYOUT": { 31 "LAYOUT": {
32 "layout": [ 32 "layout": [
33 {"label":"ESC", "x":0, "y":0}, 33 {"matrix": [5, 0], "x": 0, "y": 0},
34 {"label":"F1", "x":1, "y":0}, 34 {"matrix": [5, 2], "x": 1, "y": 0},
35 {"label":"F2", "x":2, "y":0}, 35 {"matrix": [5, 3], "x": 2, "y": 0},
36 {"label":"F3", "x":3, "y":0}, 36 {"matrix": [5, 4], "x": 3, "y": 0},
37 {"label":"F4", "x":4, "y":0}, 37 {"matrix": [5, 5], "x": 4, "y": 0},
38 {"label":"F5", "x":5, "y":0}, 38 {"matrix": [6, 0], "x": 5, "y": 0},
39 {"label":"F6", "x":6, "y":0}, 39 {"matrix": [6, 10], "x": 6, "y": 0},
40 {"label":"F7", "x":7, "y":0}, 40 {"matrix": [7, 10], "x": 7, "y": 0},
41 {"label":"F8", "x":8, "y":0}, 41 {"matrix": [7, 0], "x": 8, "y": 0},
42 {"label":"F9", "x":9, "y":0}, 42 {"matrix": [5, 11], "x": 9, "y": 0},
43 {"label":"F10", "x":10, "y":0}, 43 {"matrix": [5, 12], "x": 10, "y": 0},
44 {"label":"F11", "x":11, "y":0}, 44 {"matrix": [5, 13], "x": 11, "y": 0},
45 {"label":"F12", "x":12, "y":0}, 45 {"matrix": [5, 14], "x": 12, "y": 0},
46 {"label":"PSCR", "x":13, "y":0}, 46 {"matrix": [1, 13], "x": 13, "y": 0},
47 {"label":"HOME", "x":14, "y":0}, 47 {"matrix": [1, 14], "x": 14, "y": 0},
48 {"label":"END", "x":15, "y":0}, 48 {"matrix": [2, 14], "x": 15, "y": 0},
49 {"label":"NO", "x":16.25, "y":0}, 49
50 {"label":"NO", "x":17.25, "y":0}, 50 {"matrix": [5, 6], "x": 16.25, "y": 0},
51 {"label":"NO", "x":18.25, "y":0}, 51 {"matrix": [5, 7], "x": 17.25, "y": 0},
52 {"label":"NO", "x":19.25, "y":0}, 52 {"matrix": [5, 8], "x": 18.25, "y": 0},
53 {"label":"GRV", "x":0, "y":1.25}, 53 {"matrix": [5, 9], "x": 19.25, "y": 0},
54 {"label":"1", "x":1, "y":1.25}, 54
55 {"label":"2", "x":2, "y":1.25}, 55 {"matrix": [4, 0], "x": 0, "y": 1.25},
56 {"label":"3", "x":3, "y":1.25}, 56 {"matrix": [4, 1], "x": 1, "y": 1.25},
57 {"label":"4", "x":4, "y":1.25}, 57 {"matrix": [4, 2], "x": 2, "y": 1.25},
58 {"label":"5", "x":5, "y":1.25}, 58 {"matrix": [4, 3], "x": 3, "y": 1.25},
59 {"label":"6", "x":6, "y":1.25}, 59 {"matrix": [4, 4], "x": 4, "y": 1.25},
60 {"label":"7", "x":7, "y":1.25}, 60 {"matrix": [4, 5], "x": 5, "y": 1.25},
61 {"label":"8", "x":8, "y":1.25}, 61 {"matrix": [6, 1], "x": 6, "y": 1.25},
62 {"label":"9", "x":9, "y":1.25}, 62 {"matrix": [6, 11], "x": 7, "y": 1.25},
63 {"label":"0", "x":10, "y":1.25}, 63 {"matrix": [7, 11], "x": 8, "y": 1.25},
64 {"label":"MINS", "x":11, "y":1.25}, 64 {"matrix": [7, 1], "x": 9, "y": 1.25},
65 {"label":"EQL", "x":12, "y":1.25}, 65 {"matrix": [4, 10], "x": 10, "y": 1.25},
66 {"label":"BSPC", "x":13, "y":1.25, "w":2}, 66 {"matrix": [4, 11], "x": 11, "y": 1.25},
67 {"label":"DEL", "x":15, "y":1.25}, 67 {"matrix": [4, 12], "x": 12, "y": 1.25},
68 {"label":"NLCK", "x":16.25, "y":1.25}, 68 {"matrix": [4, 14], "x": 13, "y": 1.25, "w": 2},
69 {"label":"PSLS", "x":17.25, "y":1.25}, 69 {"matrix": [0, 13], "x": 15, "y": 1.25},
70 {"label":"PAST", "x":18.25, "y":1.25}, 70
71 {"label":"PMNS", "x":19.25, "y":1.25}, 71 {"matrix": [4, 6], "x": 16.25, "y": 1.25},
72 {"label":"TAB", "x":0, "y":2.25, "w":1.5}, 72 {"matrix": [4, 7], "x": 17.25, "y": 1.25},
73 {"label":"Q", "x":1.5, "y":2.25}, 73 {"matrix": [4, 8], "x": 18.25, "y": 1.25},
74 {"label":"W", "x":2.5, "y":2.25}, 74 {"matrix": [4, 9], "x": 19.25, "y": 1.25},
75 {"label":"E", "x":3.5, "y":2.25}, 75
76 {"label":"R", "x":4.5, "y":2.25}, 76 {"matrix": [3, 0], "x": 0, "y": 2.25, "w": 1.5},
77 {"label":"T", "x":5.5, "y":2.25}, 77 {"matrix": [3, 1], "x": 1.5, "y": 2.25},
78 {"label":"Y", "x":6.5, "y":2.25}, 78 {"matrix": [3, 2], "x": 2.5, "y": 2.25},
79 {"label":"U", "x":7.5, "y":2.25}, 79 {"matrix": [3, 3], "x": 3.5, "y": 2.25},
80 {"label":"I", "x":8.5, "y":2.25}, 80 {"matrix": [3, 4], "x": 4.5, "y": 2.25},
81 {"label":"O", "x":9.5, "y":2.25}, 81 {"matrix": [3, 5], "x": 5.5, "y": 2.25},
82 {"label":"P", "x":10.5, "y":2.25}, 82 {"matrix": [6, 2], "x": 6.5, "y": 2.25},
83 {"label":"LBRC", "x":11.5, "y":2.25}, 83 {"matrix": [6, 12], "x": 7.5, "y": 2.25},
84 {"label":"RBRC", "x":12.5, "y":2.25}, 84 {"matrix": [7, 12], "x": 8.5, "y": 2.25},
85 {"label":"NO", "x":13.5, "y":2.25, "w":1.5}, 85 {"matrix": [7, 2], "x": 9.5, "y": 2.25},
86 {"label":"INS", "x":15, "y":2.25}, 86 {"matrix": [3, 10], "x": 10.5, "y": 2.25},
87 {"label":"P7", "x":16.25, "y":2.25}, 87 {"matrix": [3, 11], "x": 11.5, "y": 2.25},
88 {"label":"P8", "x":17.25, "y":2.25}, 88 {"matrix": [3, 12], "x": 12.5, "y": 2.25},
89 {"label":"P9", "x":18.25, "y":2.25}, 89 {"matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
90 {"label":"CAPS", "x":0, "y":3.25, "w":1.75}, 90 {"matrix": [7, 6], "x": 15, "y": 2.25},
91 {"label":"A", "x":1.75, "y":3.25}, 91
92 {"label":"S", "x":2.75, "y":3.25}, 92 {"matrix": [3, 6], "x": 16.25, "y": 2.25},
93 {"label":"D", "x":3.75, "y":3.25}, 93 {"matrix": [3, 7], "x": 17.25, "y": 2.25},
94 {"label":"F", "x":4.75, "y":3.25}, 94 {"matrix": [3, 8], "x": 18.25, "y": 2.25},
95 {"label":"G", "x":5.75, "y":3.25}, 95
96 {"label":"H", "x":6.75, "y":3.25}, 96 {"matrix": [2, 0], "x": 0, "y": 3.25, "w": 1.75},
97 {"label":"J", "x":7.75, "y":3.25}, 97 {"matrix": [2, 1], "x": 1.75, "y": 3.25},
98 {"label":"K", "x":8.75, "y":3.25}, 98 {"matrix": [2, 2], "x": 2.75, "y": 3.25},
99 {"label":"L", "x":9.75, "y":3.25}, 99 {"matrix": [2, 3], "x": 3.75, "y": 3.25},
100 {"label":"SCLN", "x":10.75, "y":3.25}, 100 {"matrix": [2, 4], "x": 4.75, "y": 3.25},
101 {"label":"QUOT", "x":11.75, "y":3.25}, 101 {"matrix": [2, 5], "x": 5.75, "y": 3.25},
102 {"label":"NUHS", "x":12.75, "y":3.25}, 102 {"matrix": [6, 3], "x": 6.75, "y": 3.25},
103 {"label":"ENT", "x":13.75, "y":3.25, "w":1.25}, 103 {"matrix": [6, 13], "x": 7.75, "y": 3.25},
104 {"label":"PGUP", "x":15, "y":3.25}, 104 {"matrix": [7, 13], "x": 8.75, "y": 3.25},
105 {"label":"P4", "x":16.25, "y":3.25}, 105 {"matrix": [7, 3], "x": 9.75, "y": 3.25},
106 {"label":"P5", "x":17.25, "y":3.25}, 106 {"matrix": [2, 10], "x": 10.75, "y": 3.25},
107 {"label":"P6", "x":18.25, "y":3.25}, 107 {"matrix": [2, 11], "x": 11.75, "y": 3.25},
108 {"label":"PPLS", "x":19.25, "y":2.25, "h":2}, 108 {"matrix": [2, 12], "x": 12.75, "y": 3.25},
109 {"label":"LSFT", "x":0, "y":4.25, "w":1.25}, 109 {"matrix": [2, 13], "x": 13.75, "y": 3.25, "w": 1.25},
110 {"label":"NUBS", "x":1.25, "y":4.25}, 110 {"matrix": [0, 14], "x": 15, "y": 3.25},
111 {"label":"Z", "x":2.25, "y":4.25}, 111
112 {"label":"X", "x":3.25, "y":4.25}, 112 {"matrix": [2, 6], "x": 16.25, "y": 3.25},
113 {"label":"C", "x":4.25, "y":4.25}, 113 {"matrix": [2, 7], "x": 17.25, "y": 3.25},
114 {"label":"V", "x":5.25, "y":4.25}, 114 {"matrix": [2, 8], "x": 18.25, "y": 3.25},
115 {"label":"B", "x":6.25, "y":4.25}, 115 {"matrix": [2, 9], "x": 19.25, "y": 2.25, "h": 2},
116 {"label":"N", "x":7.25, "y":4.25}, 116
117 {"label":"M", "x":8.25, "y":4.25}, 117 {"matrix": [1, 0], "x": 0, "y": 4.25, "w": 1.25},
118 {"label":"COMM", "x":9.25, "y":4.25}, 118 {"matrix": [0, 3], "x": 1.25, "y": 4.25},
119 {"label":"DOT", "x":10.25, "y":4.25}, 119 {"matrix": [1, 1], "x": 2.25, "y": 4.25},
120 {"label":"SLSH", "x":11.25, "y":4.25}, 120 {"matrix": [1, 2], "x": 3.25, "y": 4.25},
121 {"label":"RSFT", "x":12.25, "y":4.25, "w":1.75}, 121 {"matrix": [1, 3], "x": 4.25, "y": 4.25},
122 {"label":"UP", "x":14, "y":4.25}, 122 {"matrix": [1, 4], "x": 5.25, "y": 4.25},
123 {"label":"PGDN", "x":15, "y":4.25}, 123 {"matrix": [1, 5], "x": 6.25, "y": 4.25},
124 {"label":"P1", "x":16.25, "y":4.25}, 124 {"matrix": [6, 4], "x": 7.25, "y": 4.25},
125 {"label":"P2", "x":17.25, "y":4.25}, 125 {"matrix": [6, 14], "x": 8.25, "y": 4.25},
126 {"label":"P3", "x":18.25, "y":4.25}, 126 {"matrix": [7, 14], "x": 9.25, "y": 4.25},
127 {"label":"LCTL", "x":0, "y":5.25, "w":1.25}, 127 {"matrix": [7, 4], "x": 10.25, "y": 4.25},
128 {"label":"LGUI", "x":1.25, "y":5.25, "w":1.25}, 128 {"matrix": [1, 10], "x": 11.25, "y": 4.25},
129 {"label":"LALT", "x":2.5, "y":5.25, "w":1.25}, 129 {"matrix": [1, 11], "x": 12.25, "y": 4.25, "w": 1.75},
130 {"label":"SPC", "x":3.75, "y":5.25, "w":6.25}, 130 {"matrix": [6, 8], "x": 14, "y": 4.25},
131 {"label":"RALT", "x":10, "y":5.25}, 131 {"matrix": [7, 7], "x": 15, "y": 4.25},
132 {"label":"APP", "x":11, "y":5.25}, 132
133 {"label":"RCTL", "x":12, "y":5.25}, 133 {"matrix": [1, 6], "x": 16.25, "y": 4.25},
134 {"label":"LEFT", "x":13, "y":5.25}, 134 {"matrix": [1, 7], "x": 17.25, "y": 4.25},
135 {"label":"DOWN", "x":14, "y":5.25}, 135 {"matrix": [1, 8], "x": 18.25, "y": 4.25},
136 {"label":"RGHT", "x":15, "y":5.25}, 136
137 {"label":"P0", "x":16.25, "y":5.25, "w":2}, 137 {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 1.25},
138 {"label":"PDOT", "x":18.25, "y":5.25}, 138 {"matrix": [0, 1], "x": 1.25, "y": 5.25, "w": 1.25},
139 {"label":"PENT", "x":19.25, "y":4.25, "h":2} 139 {"matrix": [0, 2], "x": 2.5, "y": 5.25, "w": 1.25},
140 {"matrix": [6, 5], "x": 3.75, "y": 5.25, "w": 6.25},
141 {"matrix": [7, 5], "x": 10, "y": 5.25},
142 {"matrix": [0, 11], "x": 11, "y": 5.25},
143 {"matrix": [0, 12], "x": 12, "y": 5.25},
144 {"matrix": [6, 6], "x": 13, "y": 5.25},
145 {"matrix": [6, 7], "x": 14, "y": 5.25},
146 {"matrix": [6, 9], "x": 15, "y": 5.25},
147
148 {"matrix": [0, 6], "x": 16.25, "y": 5.25, "w": 2},
149 {"matrix": [0, 8], "x": 18.25, "y": 5.25},
150 {"matrix": [0, 9], "x": 19.25, "y": 4.25, "h": 2}
140 ] 151 ]
141 }, 152 },
142 "LAYOUT_ansi": { 153 "LAYOUT_ansi": {
143 "layout": [ 154 "layout": [
144 {"label":"ESC", "x":0, "y":0}, 155 {"matrix": [5, 0], "x": 0, "y": 0},
145 {"label":"F1", "x":1, "y":0}, 156 {"matrix": [5, 2], "x": 1, "y": 0},
146 {"label":"F2", "x":2, "y":0}, 157 {"matrix": [5, 3], "x": 2, "y": 0},
147 {"label":"F3", "x":3, "y":0}, 158 {"matrix": [5, 4], "x": 3, "y": 0},
148 {"label":"F4", "x":4, "y":0}, 159 {"matrix": [5, 5], "x": 4, "y": 0},
149 {"label":"F5", "x":5, "y":0}, 160 {"matrix": [6, 0], "x": 5, "y": 0},
150 {"label":"F6", "x":6, "y":0}, 161 {"matrix": [6, 10], "x": 6, "y": 0},
151 {"label":"F7", "x":7, "y":0}, 162 {"matrix": [7, 10], "x": 7, "y": 0},
152 {"label":"F8", "x":8, "y":0}, 163 {"matrix": [7, 0], "x": 8, "y": 0},
153 {"label":"F9", "x":9, "y":0}, 164 {"matrix": [5, 11], "x": 9, "y": 0},
154 {"label":"F10", "x":10, "y":0}, 165 {"matrix": [5, 12], "x": 10, "y": 0},
155 {"label":"F11", "x":11, "y":0}, 166 {"matrix": [5, 13], "x": 11, "y": 0},
156 {"label":"F12", "x":12, "y":0}, 167 {"matrix": [5, 14], "x": 12, "y": 0},
157 {"label":"PSCR", "x":13, "y":0}, 168 {"matrix": [1, 13], "x": 13, "y": 0},
158 {"label":"HOME", "x":14, "y":0}, 169 {"matrix": [1, 14], "x": 14, "y": 0},
159 {"label":"END", "x":15, "y":0}, 170 {"matrix": [2, 14], "x": 15, "y": 0},
160 {"label":"NO", "x":16.25, "y":0}, 171
161 {"label":"NO", "x":17.25, "y":0}, 172 {"matrix": [5, 6], "x": 16.25, "y": 0},
162 {"label":"NO", "x":18.25, "y":0}, 173 {"matrix": [5, 7], "x": 17.25, "y": 0},
163 {"label":"NO", "x":19.25, "y":0}, 174 {"matrix": [5, 8], "x": 18.25, "y": 0},
164 {"label":"GRV", "x":0, "y":1.25}, 175 {"matrix": [5, 9], "x": 19.25, "y": 0},
165 {"label":"1", "x":1, "y":1.25}, 176
166 {"label":"2", "x":2, "y":1.25}, 177 {"matrix": [4, 0], "x": 0, "y": 1.25},
167 {"label":"3", "x":3, "y":1.25}, 178 {"matrix": [4, 1], "x": 1, "y": 1.25},
168 {"label":"4", "x":4, "y":1.25}, 179 {"matrix": [4, 2], "x": 2, "y": 1.25},
169 {"label":"5", "x":5, "y":1.25}, 180 {"matrix": [4, 3], "x": 3, "y": 1.25},
170 {"label":"6", "x":6, "y":1.25}, 181 {"matrix": [4, 4], "x": 4, "y": 1.25},
171 {"label":"7", "x":7, "y":1.25}, 182 {"matrix": [4, 5], "x": 5, "y": 1.25},
172 {"label":"8", "x":8, "y":1.25}, 183 {"matrix": [6, 1], "x": 6, "y": 1.25},
173 {"label":"9", "x":9, "y":1.25}, 184 {"matrix": [6, 11], "x": 7, "y": 1.25},
174 {"label":"0", "x":10, "y":1.25}, 185 {"matrix": [7, 11], "x": 8, "y": 1.25},
175 {"label":"MINS", "x":11, "y":1.25}, 186 {"matrix": [7, 1], "x": 9, "y": 1.25},
176 {"label":"EQL", "x":12, "y":1.25}, 187 {"matrix": [4, 10], "x": 10, "y": 1.25},
177 {"label":"BSPC", "x":13, "y":1.25, "w":2}, 188 {"matrix": [4, 11], "x": 11, "y": 1.25},
178 {"label":"DEL", "x":15, "y":1.25}, 189 {"matrix": [4, 12], "x": 12, "y": 1.25},
179 {"label":"NLCK", "x":16.25, "y":1.25}, 190 {"matrix": [4, 14], "x": 13, "y": 1.25, "w": 2},
180 {"label":"PSLS", "x":17.25, "y":1.25}, 191 {"matrix": [0, 13], "x": 15, "y": 1.25},
181 {"label":"PAST", "x":18.25, "y":1.25}, 192
182 {"label":"PMNS", "x":19.25, "y":1.25}, 193 {"matrix": [4, 6], "x": 16.25, "y": 1.25},
183 {"label":"TAB", "x":0, "y":2.25, "w":1.5}, 194 {"matrix": [4, 7], "x": 17.25, "y": 1.25},
184 {"label":"Q", "x":1.5, "y":2.25}, 195 {"matrix": [4, 8], "x": 18.25, "y": 1.25},
185 {"label":"W", "x":2.5, "y":2.25}, 196 {"matrix": [4, 9], "x": 19.25, "y": 1.25},
186 {"label":"E", "x":3.5, "y":2.25}, 197
187 {"label":"R", "x":4.5, "y":2.25}, 198 {"matrix": [3, 0], "x": 0, "y": 2.25, "w": 1.5},
188 {"label":"T", "x":5.5, "y":2.25}, 199 {"matrix": [3, 1], "x": 1.5, "y": 2.25},
189 {"label":"Y", "x":6.5, "y":2.25}, 200 {"matrix": [3, 2], "x": 2.5, "y": 2.25},
190 {"label":"U", "x":7.5, "y":2.25}, 201 {"matrix": [3, 3], "x": 3.5, "y": 2.25},
191 {"label":"I", "x":8.5, "y":2.25}, 202 {"matrix": [3, 4], "x": 4.5, "y": 2.25},
192 {"label":"O", "x":9.5, "y":2.25}, 203 {"matrix": [3, 5], "x": 5.5, "y": 2.25},
193 {"label":"P", "x":10.5, "y":2.25}, 204 {"matrix": [6, 2], "x": 6.5, "y": 2.25},
194 {"label":"LBRC", "x":11.5, "y":2.25}, 205 {"matrix": [6, 12], "x": 7.5, "y": 2.25},
195 {"label":"RBRC", "x":12.5, "y":2.25}, 206 {"matrix": [7, 12], "x": 8.5, "y": 2.25},
196 {"label":"BSLS", "x":13.5, "y":2.25, "w":1.5}, 207 {"matrix": [7, 2], "x": 9.5, "y": 2.25},
197 {"label":"INS", "x":15, "y":2.25}, 208 {"matrix": [3, 10], "x": 10.5, "y": 2.25},
198 {"label":"P7", "x":16.25, "y":2.25}, 209 {"matrix": [3, 11], "x": 11.5, "y": 2.25},
199 {"label":"P8", "x":17.25, "y":2.25}, 210 {"matrix": [3, 12], "x": 12.5, "y": 2.25},
200 {"label":"P9", "x":18.25, "y":2.25}, 211 {"matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
201 {"label":"CAPS", "x":0, "y":3.25, "w":1.75}, 212 {"matrix": [7, 6], "x": 15, "y": 2.25},
202 {"label":"A", "x":1.75, "y":3.25}, 213
203 {"label":"S", "x":2.75, "y":3.25}, 214 {"matrix": [3, 6], "x": 16.25, "y": 2.25},
204 {"label":"D", "x":3.75, "y":3.25}, 215 {"matrix": [3, 7], "x": 17.25, "y": 2.25},
205 {"label":"F", "x":4.75, "y":3.25}, 216 {"matrix": [3, 8], "x": 18.25, "y": 2.25},
206 {"label":"G", "x":5.75, "y":3.25}, 217
207 {"label":"H", "x":6.75, "y":3.25}, 218 {"matrix": [2, 0], "x": 0, "y": 3.25, "w": 1.75},
208 {"label":"J", "x":7.75, "y":3.25}, 219 {"matrix": [2, 1], "x": 1.75, "y": 3.25},
209 {"label":"K", "x":8.75, "y":3.25}, 220 {"matrix": [2, 2], "x": 2.75, "y": 3.25},
210 {"label":"L", "x":9.75, "y":3.25}, 221 {"matrix": [2, 3], "x": 3.75, "y": 3.25},
211 {"label":"SCLN", "x":10.75, "y":3.25}, 222 {"matrix": [2, 4], "x": 4.75, "y": 3.25},
212 {"label":"QUOT", "x":11.75, "y":3.25}, 223 {"matrix": [2, 5], "x": 5.75, "y": 3.25},
213 {"label":"ENT", "x":12.75, "y":3.25, "w":2.25}, 224 {"matrix": [6, 3], "x": 6.75, "y": 3.25},
214 {"label":"PGUP", "x":15, "y":3.25}, 225 {"matrix": [6, 13], "x": 7.75, "y": 3.25},
215 {"label":"P4", "x":16.25, "y":3.25}, 226 {"matrix": [7, 13], "x": 8.75, "y": 3.25},
216 {"label":"P5", "x":17.25, "y":3.25}, 227 {"matrix": [7, 3], "x": 9.75, "y": 3.25},
217 {"label":"P6", "x":18.25, "y":3.25}, 228 {"matrix": [2, 10], "x": 10.75, "y": 3.25},
218 {"label":"PPLS", "x":19.25, "y":2.25, "h":2}, 229 {"matrix": [2, 11], "x": 11.75, "y": 3.25},
219 {"label":"LSFT", "x":0, "y":4.25, "w":2.25}, 230 {"matrix": [2, 13], "x": 12.75, "y": 3.25, "w": 2.25},
220 {"label":"Z", "x":2.25, "y":4.25}, 231 {"matrix": [0, 14], "x": 15, "y": 3.25},
221 {"label":"X", "x":3.25, "y":4.25}, 232
222 {"label":"C", "x":4.25, "y":4.25}, 233 {"matrix": [2, 6], "x": 16.25, "y": 3.25},
223 {"label":"V", "x":5.25, "y":4.25}, 234 {"matrix": [2, 7], "x": 17.25, "y": 3.25},
224 {"label":"B", "x":6.25, "y":4.25}, 235 {"matrix": [2, 8], "x": 18.25, "y": 3.25},
225 {"label":"N", "x":7.25, "y":4.25}, 236 {"matrix": [2, 9], "x": 19.25, "y": 2.25, "h": 2},
226 {"label":"M", "x":8.25, "y":4.25}, 237
227 {"label":"COMM", "x":9.25, "y":4.25}, 238 {"matrix": [1, 0], "x": 0, "y": 4.25, "w": 2.25},
228 {"label":"DOT", "x":10.25, "y":4.25}, 239 {"matrix": [1, 1], "x": 2.25, "y": 4.25},
229 {"label":"SLSH", "x":11.25, "y":4.25}, 240 {"matrix": [1, 2], "x": 3.25, "y": 4.25},
230 {"label":"RSFT", "x":12.25, "y":4.25, "w":1.75}, 241 {"matrix": [1, 3], "x": 4.25, "y": 4.25},
231 {"label":"UP", "x":14, "y":4.25}, 242 {"matrix": [1, 4], "x": 5.25, "y": 4.25},
232 {"label":"PGDN", "x":15, "y":4.25}, 243 {"matrix": [1, 5], "x": 6.25, "y": 4.25},
233 {"label":"P1", "x":16.25, "y":4.25}, 244 {"matrix": [6, 4], "x": 7.25, "y": 4.25},
234 {"label":"P2", "x":17.25, "y":4.25}, 245 {"matrix": [6, 14], "x": 8.25, "y": 4.25},
235 {"label":"P3", "x":18.25, "y":4.25}, 246 {"matrix": [7, 14], "x": 9.25, "y": 4.25},
236 {"label":"LCTL", "x":0, "y":5.25, "w":1.25}, 247 {"matrix": [7, 4], "x": 10.25, "y": 4.25},
237 {"label":"LGUI", "x":1.25, "y":5.25, "w":1.25}, 248 {"matrix": [1, 10], "x": 11.25, "y": 4.25},
238 {"label":"LALT", "x":2.5, "y":5.25, "w":1.25}, 249 {"matrix": [1, 11], "x": 12.25, "y": 4.25, "w": 1.75},
239 {"label":"SPC", "x":3.75, "y":5.25, "w":6.25}, 250 {"matrix": [6, 8], "x": 14, "y": 4.25},
240 {"label":"RALT", "x":10, "y":5.25}, 251 {"matrix": [7, 7], "x": 15, "y": 4.25},
241 {"label":"APP", "x":11, "y":5.25}, 252
242 {"label":"RCTL", "x":12, "y":5.25}, 253 {"matrix": [1, 6], "x": 16.25, "y": 4.25},
243 {"label":"LEFT", "x":13, "y":5.25}, 254 {"matrix": [1, 7], "x": 17.25, "y": 4.25},
244 {"label":"DOWN", "x":14, "y":5.25}, 255 {"matrix": [1, 8], "x": 18.25, "y": 4.25},
245 {"label":"RGHT", "x":15, "y":5.25}, 256
246 {"label":"P0", "x":16.25, "y":5.25, "w":2}, 257 {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 1.25},
247 {"label":"PDOT", "x":18.25, "y":5.25}, 258 {"matrix": [0, 1], "x": 1.25, "y": 5.25, "w": 1.25},
248 {"label":"PENT", "x":19.25, "y":4.25, "h":2} 259 {"matrix": [0, 2], "x": 2.5, "y": 5.25, "w": 1.25},
260 {"matrix": [6, 5], "x": 3.75, "y": 5.25, "w": 6.25},
261 {"matrix": [7, 5], "x": 10, "y": 5.25},
262 {"matrix": [0, 11], "x": 11, "y": 5.25},
263 {"matrix": [0, 12], "x": 12, "y": 5.25},
264 {"matrix": [6, 6], "x": 13, "y": 5.25},
265 {"matrix": [6, 7], "x": 14, "y": 5.25},
266 {"matrix": [6, 9], "x": 15, "y": 5.25},
267
268 {"matrix": [0, 6], "x": 16.25, "y": 5.25, "w": 2},
269 {"matrix": [0, 8], "x": 18.25, "y": 5.25},
270 {"matrix": [0, 9], "x": 19.25, "y": 4.25, "h": 2}
249 ] 271 ]
250 }, 272 },
251 "LAYOUT_iso": { 273 "LAYOUT_iso": {
252 "layout": [ 274 "layout": [
253 {"label":"ESC", "x":0, "y":0}, 275 {"matrix": [5, 0], "x": 0, "y": 0},
254 {"label":"F1", "x":1, "y":0}, 276 {"matrix": [5, 2], "x": 1, "y": 0},
255 {"label":"F2", "x":2, "y":0}, 277 {"matrix": [5, 3], "x": 2, "y": 0},
256 {"label":"F3", "x":3, "y":0}, 278 {"matrix": [5, 4], "x": 3, "y": 0},
257 {"label":"F4", "x":4, "y":0}, 279 {"matrix": [5, 5], "x": 4, "y": 0},
258 {"label":"F5", "x":5, "y":0}, 280 {"matrix": [6, 0], "x": 5, "y": 0},
259 {"label":"F6", "x":6, "y":0}, 281 {"matrix": [6, 10], "x": 6, "y": 0},
260 {"label":"F7", "x":7, "y":0}, 282 {"matrix": [7, 10], "x": 7, "y": 0},
261 {"label":"F8", "x":8, "y":0}, 283 {"matrix": [7, 0], "x": 8, "y": 0},
262 {"label":"F9", "x":9, "y":0}, 284 {"matrix": [5, 11], "x": 9, "y": 0},
263 {"label":"F10", "x":10, "y":0}, 285 {"matrix": [5, 12], "x": 10, "y": 0},
264 {"label":"F11", "x":11, "y":0}, 286 {"matrix": [5, 13], "x": 11, "y": 0},
265 {"label":"F12", "x":12, "y":0}, 287 {"matrix": [5, 14], "x": 12, "y": 0},
266 {"label":"PSCR", "x":13, "y":0}, 288 {"matrix": [1, 13], "x": 13, "y": 0},
267 {"label":"HOME", "x":14, "y":0}, 289 {"matrix": [1, 14], "x": 14, "y": 0},
268 {"label":"END", "x":15, "y":0}, 290 {"matrix": [2, 14], "x": 15, "y": 0},
269 {"label":"NO", "x":16.25, "y":0}, 291
270 {"label":"NO", "x":17.25, "y":0}, 292 {"matrix": [5, 6], "x": 16.25, "y": 0},
271 {"label":"NO", "x":18.25, "y":0}, 293 {"matrix": [5, 7], "x": 17.25, "y": 0},
272 {"label":"NO", "x":19.25, "y":0}, 294 {"matrix": [5, 8], "x": 18.25, "y": 0},
273 {"label":"GRV", "x":0, "y":1.25}, 295 {"matrix": [5, 9], "x": 19.25, "y": 0},
274 {"label":"1", "x":1, "y":1.25}, 296
275 {"label":"2", "x":2, "y":1.25}, 297 {"matrix": [4, 0], "x": 0, "y": 1.25},
276 {"label":"3", "x":3, "y":1.25}, 298 {"matrix": [4, 1], "x": 1, "y": 1.25},
277 {"label":"4", "x":4, "y":1.25}, 299 {"matrix": [4, 2], "x": 2, "y": 1.25},
278 {"label":"5", "x":5, "y":1.25}, 300 {"matrix": [4, 3], "x": 3, "y": 1.25},
279 {"label":"6", "x":6, "y":1.25}, 301 {"matrix": [4, 4], "x": 4, "y": 1.25},
280 {"label":"7", "x":7, "y":1.25}, 302 {"matrix": [4, 5], "x": 5, "y": 1.25},
281 {"label":"8", "x":8, "y":1.25}, 303 {"matrix": [6, 1], "x": 6, "y": 1.25},
282 {"label":"9", "x":9, "y":1.25}, 304 {"matrix": [6, 11], "x": 7, "y": 1.25},
283 {"label":"0", "x":10, "y":1.25}, 305 {"matrix": [7, 11], "x": 8, "y": 1.25},
284 {"label":"MINS", "x":11, "y":1.25}, 306 {"matrix": [7, 1], "x": 9, "y": 1.25},
285 {"label":"EQL", "x":12, "y":1.25}, 307 {"matrix": [4, 10], "x": 10, "y": 1.25},
286 {"label":"BSPC", "x":13, "y":1.25, "w":2}, 308 {"matrix": [4, 11], "x": 11, "y": 1.25},
287 {"label":"DEL", "x":15, "y":1.25}, 309 {"matrix": [4, 12], "x": 12, "y": 1.25},
288 {"label":"NLCK", "x":16.25, "y":1.25}, 310 {"matrix": [4, 14], "x": 13, "y": 1.25, "w": 2},
289 {"label":"PSLS", "x":17.25, "y":1.25}, 311 {"matrix": [0, 13], "x": 15, "y": 1.25},
290 {"label":"PAST", "x":18.25, "y":1.25}, 312
291 {"label":"PMNS", "x":19.25, "y":1.25}, 313 {"matrix": [4, 6], "x": 16.25, "y": 1.25},
292 {"label":"TAB", "x":0, "y":2.25, "w":1.5}, 314 {"matrix": [4, 7], "x": 17.25, "y": 1.25},
293 {"label":"Q", "x":1.5, "y":2.25}, 315 {"matrix": [4, 8], "x": 18.25, "y": 1.25},
294 {"label":"W", "x":2.5, "y":2.25}, 316 {"matrix": [4, 9], "x": 19.25, "y": 1.25},
295 {"label":"E", "x":3.5, "y":2.25}, 317
296 {"label":"R", "x":4.5, "y":2.25}, 318 {"matrix": [3, 0], "x": 0, "y": 2.25, "w": 1.5},
297 {"label":"T", "x":5.5, "y":2.25}, 319 {"matrix": [3, 1], "x": 1.5, "y": 2.25},
298 {"label":"Y", "x":6.5, "y":2.25}, 320 {"matrix": [3, 2], "x": 2.5, "y": 2.25},
299 {"label":"U", "x":7.5, "y":2.25}, 321 {"matrix": [3, 3], "x": 3.5, "y": 2.25},
300 {"label":"I", "x":8.5, "y":2.25}, 322 {"matrix": [3, 4], "x": 4.5, "y": 2.25},
301 {"label":"O", "x":9.5, "y":2.25}, 323 {"matrix": [3, 5], "x": 5.5, "y": 2.25},
302 {"label":"P", "x":10.5, "y":2.25}, 324 {"matrix": [6, 2], "x": 6.5, "y": 2.25},
303 {"label":"LBRC", "x":11.5, "y":2.25}, 325 {"matrix": [6, 12], "x": 7.5, "y": 2.25},
304 {"label":"RBRC", "x":12.5, "y":2.25}, 326 {"matrix": [7, 12], "x": 8.5, "y": 2.25},
305 {"label":"INS", "x":15, "y":2.25}, 327 {"matrix": [7, 2], "x": 9.5, "y": 2.25},
306 {"label":"P7", "x":16.25, "y":2.25}, 328 {"matrix": [3, 10], "x": 10.5, "y": 2.25},
307 {"label":"P8", "x":17.25, "y":2.25}, 329 {"matrix": [3, 11], "x": 11.5, "y": 2.25},
308 {"label":"P9", "x":18.25, "y":2.25}, 330 {"matrix": [3, 12], "x": 12.5, "y": 2.25},
309 {"label":"CAPS", "x":0, "y":3.25, "w":1.75}, 331 {"matrix": [7, 6], "x": 15, "y": 2.25},
310 {"label":"A", "x":1.75, "y":3.25}, 332
311 {"label":"S", "x":2.75, "y":3.25}, 333 {"matrix": [3, 6], "x": 16.25, "y": 2.25},
312 {"label":"D", "x":3.75, "y":3.25}, 334 {"matrix": [3, 7], "x": 17.25, "y": 2.25},
313 {"label":"F", "x":4.75, "y":3.25}, 335 {"matrix": [3, 8], "x": 18.25, "y": 2.25},
314 {"label":"G", "x":5.75, "y":3.25}, 336
315 {"label":"H", "x":6.75, "y":3.25}, 337 {"matrix": [2, 0], "x": 0, "y": 3.25, "w": 1.75},
316 {"label":"J", "x":7.75, "y":3.25}, 338 {"matrix": [2, 1], "x": 1.75, "y": 3.25},
317 {"label":"K", "x":8.75, "y":3.25}, 339 {"matrix": [2, 2], "x": 2.75, "y": 3.25},
318 {"label":"L", "x":9.75, "y":3.25}, 340 {"matrix": [2, 3], "x": 3.75, "y": 3.25},
319 {"label":"SCLN", "x":10.75, "y":3.25}, 341 {"matrix": [2, 4], "x": 4.75, "y": 3.25},
320 {"label":"QUOT", "x":11.75, "y":3.25}, 342 {"matrix": [2, 5], "x": 5.75, "y": 3.25},
321 {"label":"NUHS", "x":12.75, "y":3.25}, 343 {"matrix": [6, 3], "x": 6.75, "y": 3.25},
322 {"label":"ENT", "x":13.75, "y":2.25, "w":1.25, "h":2}, 344 {"matrix": [6, 13], "x": 7.75, "y": 3.25},
323 {"label":"PGUP", "x":15, "y":3.25}, 345 {"matrix": [7, 13], "x": 8.75, "y": 3.25},
324 {"label":"P4", "x":16.25, "y":3.25}, 346 {"matrix": [7, 3], "x": 9.75, "y": 3.25},
325 {"label":"P5", "x":17.25, "y":3.25}, 347 {"matrix": [2, 10], "x": 10.75, "y": 3.25},
326 {"label":"P6", "x":18.25, "y":3.25}, 348 {"matrix": [2, 11], "x": 11.75, "y": 3.25},
327 {"label":"PPLS", "x":19.25, "y":2.25, "h":2}, 349 {"matrix": [2, 12], "x": 12.75, "y": 3.25},
328 {"label":"LSFT", "x":0, "y":4.25, "w":1.25}, 350 {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
329 {"label":"NUBS", "x":1.25, "y":4.25}, 351 {"matrix": [0, 14], "x": 15, "y": 3.25},
330 {"label":"Z", "x":2.25, "y":4.25}, 352
331 {"label":"X", "x":3.25, "y":4.25}, 353 {"matrix": [2, 6], "x": 16.25, "y": 3.25},
332 {"label":"C", "x":4.25, "y":4.25}, 354 {"matrix": [2, 7], "x": 17.25, "y": 3.25},
333 {"label":"V", "x":5.25, "y":4.25}, 355 {"matrix": [2, 8], "x": 18.25, "y": 3.25},
334 {"label":"B", "x":6.25, "y":4.25}, 356 {"matrix": [2, 9], "x": 19.25, "y": 2.25, "h": 2},
335 {"label":"N", "x":7.25, "y":4.25}, 357
336 {"label":"M", "x":8.25, "y":4.25}, 358 {"matrix": [1, 0], "x": 0, "y": 4.25, "w": 1.25},
337 {"label":"COMM", "x":9.25, "y":4.25}, 359 {"matrix": [0, 3], "x": 1.25, "y": 4.25},
338 {"label":"DOT", "x":10.25, "y":4.25}, 360 {"matrix": [1, 1], "x": 2.25, "y": 4.25},
339 {"label":"SLSH", "x":11.25, "y":4.25}, 361 {"matrix": [1, 2], "x": 3.25, "y": 4.25},
340 {"label":"RSFT", "x":12.25, "y":4.25, "w":1.75}, 362 {"matrix": [1, 3], "x": 4.25, "y": 4.25},
341 {"label":"UP", "x":14, "y":4.25}, 363 {"matrix": [1, 4], "x": 5.25, "y": 4.25},
342 {"label":"PGDN", "x":15, "y":4.25}, 364 {"matrix": [1, 5], "x": 6.25, "y": 4.25},
343 {"label":"P1", "x":16.25, "y":4.25}, 365 {"matrix": [6, 4], "x": 7.25, "y": 4.25},
344 {"label":"P2", "x":17.25, "y":4.25}, 366 {"matrix": [6, 14], "x": 8.25, "y": 4.25},
345 {"label":"P3", "x":18.25, "y":4.25}, 367 {"matrix": [7, 14], "x": 9.25, "y": 4.25},
346 {"label":"LCTL", "x":0, "y":5.25, "w":1.25}, 368 {"matrix": [7, 4], "x": 10.25, "y": 4.25},
347 {"label":"LGUI", "x":1.25, "y":5.25, "w":1.25}, 369 {"matrix": [1, 10], "x": 11.25, "y": 4.25},
348 {"label":"LALT", "x":2.5, "y":5.25, "w":1.25}, 370 {"matrix": [1, 11], "x": 12.25, "y": 4.25, "w": 1.75},
349 {"label":"SPC", "x":3.75, "y":5.25, "w":6.25}, 371 {"matrix": [6, 8], "x": 14, "y": 4.25},
350 {"label":"RALT", "x":10, "y":5.25}, 372 {"matrix": [7, 7], "x": 15, "y": 4.25},
351 {"label":"APP", "x":11, "y":5.25}, 373
352 {"label":"RCTL", "x":12, "y":5.25}, 374 {"matrix": [1, 6], "x": 16.25, "y": 4.25},
353 {"label":"LEFT", "x":13, "y":5.25}, 375 {"matrix": [1, 7], "x": 17.25, "y": 4.25},
354 {"label":"DOWN", "x":14, "y":5.25}, 376 {"matrix": [1, 8], "x": 18.25, "y": 4.25},
355 {"label":"RGHT", "x":15, "y":5.25}, 377
356 {"label":"P0", "x":16.25, "y":5.25, "w":2}, 378 {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 1.25},
357 {"label":"PDOT", "x":18.25, "y":5.25}, 379 {"matrix": [0, 1], "x": 1.25, "y": 5.25, "w": 1.25},
358 {"label":"PENT", "x":19.25, "y":4.25, "h":2} 380 {"matrix": [0, 2], "x": 2.5, "y": 5.25, "w": 1.25},
381 {"matrix": [6, 5], "x": 3.75, "y": 5.25, "w": 6.25},
382 {"matrix": [7, 5], "x": 10, "y": 5.25},
383 {"matrix": [0, 11], "x": 11, "y": 5.25},
384 {"matrix": [0, 12], "x": 12, "y": 5.25},
385 {"matrix": [6, 6], "x": 13, "y": 5.25},
386 {"matrix": [6, 7], "x": 14, "y": 5.25},
387 {"matrix": [6, 9], "x": 15, "y": 5.25},
388
389 {"matrix": [0, 6], "x": 16.25, "y": 5.25, "w": 2},
390 {"matrix": [0, 8], "x": 18.25, "y": 5.25},
391 {"matrix": [0, 9], "x": 19.25, "y": 4.25, "h": 2}
359 ] 392 ]
360 } 393 }
361 } 394 }
diff --git a/keyboards/wolf/ts60/info.json b/keyboards/wolf/ts60/info.json
index 010ed85755..b0134ff2b1 100644
--- a/keyboards/wolf/ts60/info.json
+++ b/keyboards/wolf/ts60/info.json
@@ -25,269 +25,148 @@
25 "community_layouts": ["60_ansi"], 25 "community_layouts": ["60_ansi"],
26 "layouts": { 26 "layouts": {
27 "LAYOUT": { 27 "LAYOUT": {
28 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"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}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}] 28 "layout": [
29 {"matrix": [0, 0], "x": 0, "y": 0},
30 {"matrix": [1, 0], "x": 1, "y": 0},
31 {"matrix": [0, 1], "x": 2, "y": 0},
32 {"matrix": [1, 1], "x": 3, "y": 0},
33 {"matrix": [0, 2], "x": 4, "y": 0},
34 {"matrix": [1, 2], "x": 5, "y": 0},
35 {"matrix": [0, 3], "x": 6, "y": 0},
36 {"matrix": [1, 3], "x": 7, "y": 0},
37 {"matrix": [0, 4], "x": 8, "y": 0},
38 {"matrix": [1, 4], "x": 9, "y": 0},
39 {"matrix": [0, 5], "x": 10, "y": 0},
40 {"matrix": [1, 5], "x": 11, "y": 0},
41 {"matrix": [0, 6], "x": 12, "y": 0},
42 {"matrix": [0, 7], "x": 13, "y": 0},
43 {"matrix": [1, 7], "x": 14, "y": 0},
44
45 {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
46 {"matrix": [2, 1], "x": 1.5, "y": 1},
47 {"matrix": [3, 1], "x": 2.5, "y": 1},
48 {"matrix": [2, 2], "x": 3.5, "y": 1},
49 {"matrix": [3, 2], "x": 4.5, "y": 1},
50 {"matrix": [2, 3], "x": 5.5, "y": 1},
51 {"matrix": [3, 3], "x": 6.5, "y": 1},
52 {"matrix": [2, 4], "x": 7.5, "y": 1},
53 {"matrix": [3, 4], "x": 8.5, "y": 1},
54 {"matrix": [2, 5], "x": 9.5, "y": 1},
55 {"matrix": [3, 5], "x": 10.5, "y": 1},
56 {"matrix": [2, 6], "x": 11.5, "y": 1},
57 {"matrix": [2, 7], "x": 12.5, "y": 1},
58 {"matrix": [3, 7], "x": 13.5, "y": 1, "w": 1.5},
59
60 {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
61 {"matrix": [4, 1], "x": 1.75, "y": 2},
62 {"matrix": [5, 1], "x": 2.75, "y": 2},
63 {"matrix": [4, 2], "x": 3.75, "y": 2},
64 {"matrix": [5, 2], "x": 4.75, "y": 2},
65 {"matrix": [4, 3], "x": 5.75, "y": 2},
66 {"matrix": [5, 3], "x": 6.75, "y": 2},
67 {"matrix": [4, 4], "x": 7.75, "y": 2},
68 {"matrix": [5, 4], "x": 8.75, "y": 2},
69 {"matrix": [4, 5], "x": 9.75, "y": 2},
70 {"matrix": [5, 5], "x": 10.75, "y": 2},
71 {"matrix": [4, 6], "x": 11.75, "y": 2},
72 {"matrix": [4, 7], "x": 12.75, "y": 2, "w": 2.25},
73
74 {"matrix": [6, 0], "x": 0, "y": 3},
75 {"matrix": [7, 0], "x": 1, "y": 3},
76 {"matrix": [6, 1], "x": 2, "y": 3},
77 {"matrix": [7, 1], "x": 3, "y": 3},
78 {"matrix": [6, 2], "x": 4, "y": 3},
79 {"matrix": [7, 2], "x": 5, "y": 3},
80 {"matrix": [6, 3], "x": 6, "y": 3},
81 {"matrix": [7, 3], "x": 7, "y": 3},
82 {"matrix": [6, 4], "x": 8, "y": 3},
83 {"matrix": [7, 4], "x": 9, "y": 3},
84 {"matrix": [6, 5], "x": 10, "y": 3},
85 {"matrix": [7, 5], "x": 11, "y": 3},
86 {"matrix": [6, 6], "x": 12, "y": 3},
87 {"matrix": [6, 7], "x": 13, "y": 3},
88 {"matrix": [7, 7], "x": 14, "y": 3},
89
90 {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
91 {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
92 {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
93 {"matrix": [8, 2], "x": 3.75, "y": 4, "w": 2.25},
94 {"matrix": [8, 3], "x": 6, "y": 4, "w": 1.25},
95 {"matrix": [8, 4], "x": 7.25, "y": 4, "w": 2.75},
96 {"matrix": [8, 5], "x": 10, "y": 4},
97 {"matrix": [9, 5], "x": 11, "y": 4},
98 {"matrix": [8, 6], "x": 12, "y": 4},
99 {"matrix": [8, 7], "x": 13, "y": 4},
100 {"matrix": [9, 7], "x": 14, "y": 4}
101 ]
29 }, 102 },
30 "LAYOUT_60_ansi": { 103 "LAYOUT_60_ansi": {
31 "layout": [ 104 "layout": [
32 { 105 {"matrix": [0, 0], "x": 0, "y": 0},
33 "x": 0, 106 {"matrix": [1, 0], "x": 1, "y": 0},
34 "y": 0 107 {"matrix": [0, 1], "x": 2, "y": 0},
35 }, 108 {"matrix": [1, 1], "x": 3, "y": 0},
36 { 109 {"matrix": [0, 2], "x": 4, "y": 0},
37 "x": 1, 110 {"matrix": [1, 2], "x": 5, "y": 0},
38 "y": 0 111 {"matrix": [0, 3], "x": 6, "y": 0},
39 }, 112 {"matrix": [1, 3], "x": 7, "y": 0},
40 { 113 {"matrix": [0, 4], "x": 8, "y": 0},
41 "x": 2, 114 {"matrix": [1, 4], "x": 9, "y": 0},
42 "y": 0 115 {"matrix": [0, 5], "x": 10, "y": 0},
43 }, 116 {"matrix": [1, 5], "x": 11, "y": 0},
44 { 117 {"matrix": [0, 6], "x": 12, "y": 0},
45 "x": 3, 118 {"matrix": [0, 7], "x": 13, "y": 0, "w": 2},
46 "y": 0 119
47 }, 120 {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
48 { 121 {"matrix": [2, 1], "x": 1.5, "y": 1},
49 "x": 4, 122 {"matrix": [3, 1], "x": 2.5, "y": 1},
50 "y": 0 123 {"matrix": [2, 2], "x": 3.5, "y": 1},
51 }, 124 {"matrix": [3, 2], "x": 4.5, "y": 1},
52 { 125 {"matrix": [2, 3], "x": 5.5, "y": 1},
53 "x": 5, 126 {"matrix": [3, 3], "x": 6.5, "y": 1},
54 "y": 0 127 {"matrix": [2, 4], "x": 7.5, "y": 1},
55 }, 128 {"matrix": [3, 4], "x": 8.5, "y": 1},
56 { 129 {"matrix": [2, 5], "x": 9.5, "y": 1},
57 "x": 6, 130 {"matrix": [3, 5], "x": 10.5, "y": 1},
58 "y": 0 131 {"matrix": [2, 6], "x": 11.5, "y": 1},
59 }, 132 {"matrix": [2, 7], "x": 12.5, "y": 1},
60 { 133 {"matrix": [3, 7], "x": 13.5, "y": 1, "w": 1.5},
61 "x": 7, 134
62 "y": 0 135 {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
63 }, 136 {"matrix": [4, 1], "x": 1.75, "y": 2},
64 { 137 {"matrix": [5, 1], "x": 2.75, "y": 2},
65 "x": 8, 138 {"matrix": [4, 2], "x": 3.75, "y": 2},
66 "y": 0 139 {"matrix": [5, 2], "x": 4.75, "y": 2},
67 }, 140 {"matrix": [4, 3], "x": 5.75, "y": 2},
68 { 141 {"matrix": [5, 3], "x": 6.75, "y": 2},
69 "x": 9, 142 {"matrix": [4, 4], "x": 7.75, "y": 2},
70 "y": 0 143 {"matrix": [5, 4], "x": 8.75, "y": 2},
71 }, 144 {"matrix": [4, 5], "x": 9.75, "y": 2},
72 { 145 {"matrix": [5, 5], "x": 10.75, "y": 2},
73 "x": 10, 146 {"matrix": [4, 6], "x": 11.75, "y": 2},
74 "y": 0 147 {"matrix": [5, 7], "x": 12.75, "y": 2, "w": 2.25},
75 }, 148
76 { 149 {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
77 "x": 11, 150 {"matrix": [6, 1], "x": 2.25, "y": 3},
78 "y": 0 151 {"matrix": [7, 1], "x": 3.25, "y": 3},
79 }, 152 {"matrix": [6, 2], "x": 4.25, "y": 3},
80 { 153 {"matrix": [7, 2], "x": 5.25, "y": 3},
81 "x": 12, 154 {"matrix": [6, 3], "x": 6.25, "y": 3},
82 "y": 0 155 {"matrix": [7, 3], "x": 7.25, "y": 3},
83 }, 156 {"matrix": [6, 4], "x": 8.25, "y": 3},
84 { 157 {"matrix": [7, 4], "x": 9.25, "y": 3},
85 "x": 13, 158 {"matrix": [6, 5], "x": 10.25, "y": 3},
86 "y": 0, 159 {"matrix": [7, 5], "x": 11.25, "y": 3},
87 "w": 2 160 {"matrix": [6, 7], "x": 12.25, "y": 3, "w": 2.75},
88 }, 161
89 { 162 {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
90 "x": 0, 163 {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
91 "y": 1, 164 {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
92 "w": 1.5 165 {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
93 }, 166 {"matrix": [8, 5], "x": 10, "y": 4, "w": 1.25},
94 { 167 {"matrix": [9, 5], "x": 11.25, "y": 4, "w": 1.25},
95 "x": 1.5, 168 {"matrix": [8, 7], "x": 12.5, "y": 4, "w": 1.25},
96 "y": 1 169 {"matrix": [9, 7], "x": 13.75, "y": 4, "w": 1.25}
97 },
98 {
99 "x": 2.5,
100 "y": 1
101 },
102 {
103 "x": 3.5,
104 "y": 1
105 },
106 {
107 "x": 4.5,
108 "y": 1
109 },
110 {
111 "x": 5.5,
112 "y": 1
113 },
114 {
115 "x": 6.5,
116 "y": 1
117 },
118 {
119 "x": 7.5,
120 "y": 1
121 },
122 {
123 "x": 8.5,
124 "y": 1
125 },
126 {
127 "x": 9.5,
128 "y": 1
129 },
130 {
131 "x": 10.5,
132 "y": 1
133 },
134 {
135 "x": 11.5,
136 "y": 1
137 },
138 {
139 "x": 12.5,
140 "y": 1
141 },
142 {
143 "x": 13.5,
144 "y": 1,
145 "w": 1.5
146 },
147 {
148 "x": 0,
149 "y": 2,
150 "w": 1.75
151 },
152 {
153 "x": 1.75,
154 "y": 2
155 },
156 {
157 "x": 2.75,
158 "y": 2
159 },
160 {
161 "x": 3.75,
162 "y": 2
163 },
164 {
165 "x": 4.75,
166 "y": 2
167 },
168 {
169 "x": 5.75,
170 "y": 2
171 },
172 {
173 "x": 6.75,
174 "y": 2
175 },
176 {
177 "x": 7.75,
178 "y": 2
179 },
180 {
181 "x": 8.75,
182 "y": 2
183 },
184 {
185 "x": 9.75,
186 "y": 2
187 },
188 {
189 "x": 10.75,
190 "y": 2
191 },
192 {
193 "x": 11.75,
194 "y": 2
195 },
196 {
197 "x": 12.75,
198 "y": 2,
199 "w": 2.25
200 },
201 {
202 "x": 0,
203 "y": 3,
204 "w": 2.25
205 },
206 {
207 "x": 2.25,
208 "y": 3
209 },
210 {
211 "x": 3.25,
212 "y": 3
213 },
214 {
215 "x": 4.25,
216 "y": 3
217 },
218 {
219 "x": 5.25,
220 "y": 3
221 },
222 {
223 "x": 6.25,
224 "y": 3
225 },
226 {
227 "x": 7.25,
228 "y": 3
229 },
230 {
231 "x": 8.25,
232 "y": 3
233 },
234 {
235 "x": 9.25,
236 "y": 3
237 },
238 {
239 "x": 10.25,
240 "y": 3
241 },
242 {
243 "x": 11.25,
244 "y": 3
245 },
246 {
247 "x": 12.25,
248 "y": 3,
249 "w": 2.75
250 },
251 {
252 "x": 0,
253 "y": 4,
254 "w": 1.25
255 },
256 {
257 "x": 1.25,
258 "y": 4,
259 "w": 1.25
260 },
261 {
262 "x": 2.5,
263 "y": 4,
264 "w": 1.25
265 },
266 {
267 "x": 3.75,
268 "y": 4,
269 "w": 6.25
270 },
271 {
272 "x": 10,
273 "y": 4,
274 "w": 1.25
275 },
276 {
277 "x": 11.25,
278 "y": 4,
279 "w": 1.25
280 },
281 {
282 "x": 12.5,
283 "y": 4,
284 "w": 1.25
285 },
286 {
287 "x": 13.75,
288 "y": 4,
289 "w": 1.25
290 }
291 ] 170 ]
292 } 171 }
293 } 172 }
diff --git a/keyboards/wolf/ts60/ts60.h b/keyboards/wolf/ts60/ts60.h
deleted file mode 100644
index a402d95483..0000000000
--- a/keyboards/wolf/ts60/ts60.h
+++ /dev/null
@@ -1,82 +0,0 @@
1/*
2Copyright 2020 <contact@vwolf.be>
3This program is free software: you can redistribute it and/or modify
4it under the terms of the GNU General Public License as published by
5the Free Software Foundation, either version 2 of the License, or
6(at your option) any later version.
7This program is distributed in the hope that it will be useful,
8but WITHOUT ANY WARRANTY; without even the implied warranty of
9MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10GNU General Public License for more details.
11You should have received a copy of the GNU General Public License
12along with this program. If not, see <http://www.gnu.org/licenses/>.
13*/
14
15#pragma once
16
17#include "quantum.h"
18
19/* LAYOUT
20 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
21 * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
22 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
23 * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │
24 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
25 * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │
26 * ├───┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┬───┤
27 * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │3d │3e │
28 * ├───┴┬──┴─┬─┴──┬┴───┴───┼───┴┬──┴───┴───┼───┼───┼───┼───┼───┤
29 * │40 │41 │42 │44 │46 │48 │4a │4b │4c │4d │4e │
30 * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┘
31*/
32#define LAYOUT( \
33 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, K0e, \
34 K10, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d, K1e, \
35 K20, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, \
36 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e, \
37 K40, K41, K42, K44, K46, K48, K4a, K4b, K4c, K4d, K4e \
38) { \
39 { K00, K02, K04, K06, K08, K0a, K0c, K0d }, \
40 { K01, K03, K05, K07, K09, K0b, KC_NO, K0e }, \
41 { K10, K12, K14, K16, K18, K1a, K1c, K1d }, \
42 { KC_NO, K13, K15, K17, K19, K1b, KC_NO, K1e }, \
43 { K20, K22, K24, K26, K28, K2a, K2c, K2d }, \
44 { KC_NO, K23, K25, K27, K29, K2b, KC_NO, K2e }, \
45 { K30, K32, K34, K36, K38, K3a, K3c, K3d }, \
46 { K31, K33, K35, K37, K39, K3b, KC_NO, K3e }, \
47 { K40, K42, K44, K46, K48, K4a, K4c, K4d }, \
48 { K41, KC_NO, KC_NO, KC_NO, KC_NO, K4b, KC_NO, K4e } \
49}
50
51/* LAYOUT_60_ansi
52 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
53 * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e │
54 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
55 * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │
56 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
57 * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │
58 * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
59 * │30 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │
60 * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
61 * │40 │41 │42 │46 │4a │4b │4d │4e │
62 * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
63 */
64 #define LAYOUT_60_ansi( \
65 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0e, \
66 K10, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d, K1e, \
67 K20, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, \
68 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3d, \
69 K40, K41, K42, K46, K4a, K4b, K4d, K4e \
70 ) { \
71 { K00, K02, K04, K06, K08, K0a, K0c, K0e }, \
72 { K01, K03, K05, K07, K09, K0b, KC_NO, KC_NO }, \
73 { K10, K12, K14, K16, K18, K1a, K1c, K1d }, \
74 { KC_NO, K13, K15, K17, K19, K1b, KC_NO, K1e }, \
75 { K20, K22, K24, K26, K28, K2a, K2c, KC_NO }, \
76 { KC_NO, K23, K25, K27, K29, K2b, KC_NO, K2d }, \
77 { K30, K32, K34, K36, K38, K3a, KC_NO, K3d }, \
78 { KC_NO, K33, K35, K37, K39, K3b, KC_NO, KC_NO }, \
79 { K40, K42, KC_NO, K46, KC_NO, K4a, KC_NO, K4d }, \
80 { K41, KC_NO, KC_NO, KC_NO, KC_NO, K4b, KC_NO, K4e } \
81}
82
diff --git a/keyboards/work_louder/work_board/info.json b/keyboards/work_louder/work_board/info.json
index 3e208110a8..b79a1144a1 100644
--- a/keyboards/work_louder/work_board/info.json
+++ b/keyboards/work_louder/work_board/info.json
@@ -28,107 +28,113 @@
28 "layouts": { 28 "layouts": {
29 "LAYOUT_2u_space": { 29 "LAYOUT_2u_space": {
30 "layout": [ 30 "layout": [
31 { "x": 0, "y": 0 }, 31 {"matrix": [0, 0], "x": 0, "y": 0},
32 { "x": 1, "y": 0 }, 32 {"matrix": [0, 1], "x": 1, "y": 0},
33 { "x": 2, "y": 0 }, 33 {"matrix": [0, 2], "x": 2, "y": 0},
34 { "x": 3, "y": 0 }, 34 {"matrix": [0, 3], "x": 3, "y": 0},
35 { "x": 4, "y": 0 }, 35 {"matrix": [0, 4], "x": 4, "y": 0},
36 { "x": 5, "y": 0 }, 36 {"matrix": [0, 5], "x": 5, "y": 0},
37 { "x": 6, "y": 0 }, 37 {"matrix": [0, 6], "x": 6, "y": 0},
38 { "x": 7, "y": 0 }, 38 {"matrix": [0, 7], "x": 7, "y": 0},
39 { "x": 8, "y": 0 }, 39 {"matrix": [0, 8], "x": 8, "y": 0},
40 { "x": 9, "y": 0 }, 40 {"matrix": [0, 9], "x": 9, "y": 0},
41 { "x": 10, "y": 0 }, 41 {"matrix": [0, 10], "x": 10, "y": 0},
42 { "x": 11, "y": 0 }, 42 {"matrix": [0, 11], "x": 11, "y": 0},
43 { "x": 12, "y": 0 }, 43 {"matrix": [0, 12], "x": 12, "y": 0},
44 { "x": 0, "y": 1 }, 44
45 { "x": 1, "y": 1 }, 45 {"matrix": [1, 0], "x": 0, "y": 1},
46 { "x": 2, "y": 1 }, 46 {"matrix": [1, 1], "x": 1, "y": 1},
47 { "x": 3, "y": 1 }, 47 {"matrix": [1, 2], "x": 2, "y": 1},
48 { "x": 4, "y": 1 }, 48 {"matrix": [1, 3], "x": 3, "y": 1},
49 { "x": 5, "y": 1 }, 49 {"matrix": [1, 4], "x": 4, "y": 1},
50 { "x": 6, "y": 1 }, 50 {"matrix": [1, 5], "x": 5, "y": 1},
51 { "x": 7, "y": 1 }, 51 {"matrix": [1, 6], "x": 6, "y": 1},
52 { "x": 8, "y": 1 }, 52 {"matrix": [1, 7], "x": 7, "y": 1},
53 { "x": 9, "y": 1 }, 53 {"matrix": [1, 8], "x": 8, "y": 1},
54 { "x": 10, "y": 1 }, 54 {"matrix": [1, 9], "x": 9, "y": 1},
55 { "x": 11, "y": 1 }, 55 {"matrix": [1, 10], "x": 10, "y": 1},
56 { "x": 0, "y": 2 }, 56 {"matrix": [1, 11], "x": 11, "y": 1},
57 { "x": 1, "y": 2 }, 57
58 { "x": 2, "y": 2 }, 58 {"matrix": [2, 0], "x": 0, "y": 2},
59 { "x": 3, "y": 2 }, 59 {"matrix": [2, 1], "x": 1, "y": 2},
60 { "x": 4, "y": 2 }, 60 {"matrix": [2, 2], "x": 2, "y": 2},
61 { "x": 5, "y": 2 }, 61 {"matrix": [2, 3], "x": 3, "y": 2},
62 { "x": 6, "y": 2 }, 62 {"matrix": [2, 4], "x": 4, "y": 2},
63 { "x": 7, "y": 2 }, 63 {"matrix": [2, 5], "x": 5, "y": 2},
64 { "x": 8, "y": 2 }, 64 {"matrix": [2, 6], "x": 6, "y": 2},
65 { "x": 9, "y": 2 }, 65 {"matrix": [2, 7], "x": 7, "y": 2},
66 { "x": 10, "y": 2 }, 66 {"matrix": [2, 8], "x": 8, "y": 2},
67 { "x": 11, "y": 2 }, 67 {"matrix": [2, 9], "x": 9, "y": 2},
68 { "x": 0, "y": 3 }, 68 {"matrix": [2, 10], "x": 10, "y": 2},
69 { "x": 1, "y": 3 }, 69 {"matrix": [2, 11], "x": 11, "y": 2},
70 { "x": 2, "y": 3 }, 70
71 { "x": 3, "y": 3 }, 71 {"matrix": [3, 0], "x": 0, "y": 3},
72 { "x": 4, "y": 3 }, 72 {"matrix": [3, 1], "x": 1, "y": 3},
73 { "x": 5, "y": 3, "w": 2 }, 73 {"matrix": [3, 2], "x": 2, "y": 3},
74 { "x": 7, "y": 3 }, 74 {"matrix": [3, 3], "x": 3, "y": 3},
75 { "x": 8, "y": 3 }, 75 {"matrix": [3, 4], "x": 4, "y": 3},
76 { "x": 9, "y": 3 }, 76 {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
77 { "x": 10, "y": 3 }, 77 {"matrix": [3, 7], "x": 7, "y": 3},
78 { "x": 11, "y": 3 } 78 {"matrix": [3, 8], "x": 8, "y": 3},
79 {"matrix": [3, 9], "x": 9, "y": 3},
80 {"matrix": [3, 10], "x": 10, "y": 3},
81 {"matrix": [3, 11], "x": 11, "y": 3}
79 ] 82 ]
80 }, 83 },
81 "LAYOUT": { 84 "LAYOUT": {
82 "layout": [ 85 "layout": [
83 { "x": 0, "y": 0 }, 86 {"matrix": [0, 0], "x": 0, "y": 0},
84 { "x": 1, "y": 0 }, 87 {"matrix": [0, 1], "x": 1, "y": 0},
85 { "x": 2, "y": 0 }, 88 {"matrix": [0, 2], "x": 2, "y": 0},
86 { "x": 3, "y": 0 }, 89 {"matrix": [0, 3], "x": 3, "y": 0},
87 { "x": 4, "y": 0 }, 90 {"matrix": [0, 4], "x": 4, "y": 0},
88 { "x": 5, "y": 0 }, 91 {"matrix": [0, 5], "x": 5, "y": 0},
89 { "x": 6, "y": 0 }, 92 {"matrix": [0, 6], "x": 6, "y": 0},
90 { "x": 7, "y": 0 }, 93 {"matrix": [0, 7], "x": 7, "y": 0},
91 { "x": 8, "y": 0 }, 94 {"matrix": [0, 8], "x": 8, "y": 0},
92 { "x": 9, "y": 0 }, 95 {"matrix": [0, 9], "x": 9, "y": 0},
93 { "x": 10, "y": 0 }, 96 {"matrix": [0, 10], "x": 10, "y": 0},
94 { "x": 11, "y": 0 }, 97 {"matrix": [0, 11], "x": 11, "y": 0},
95 { "x": 12, "y": 0 }, 98 {"matrix": [0, 12], "x": 12, "y": 0},
96 { "x": 0, "y": 1 }, 99
97 { "x": 1, "y": 1 }, 100 {"matrix": [1, 0], "x": 0, "y": 1},
98 { "x": 2, "y": 1 }, 101 {"matrix": [1, 1], "x": 1, "y": 1},
99 { "x": 3, "y": 1 }, 102 {"matrix": [1, 2], "x": 2, "y": 1},
100 { "x": 4, "y": 1 }, 103 {"matrix": [1, 3], "x": 3, "y": 1},
101 { "x": 5, "y": 1 }, 104 {"matrix": [1, 4], "x": 4, "y": 1},
102 { "x": 6, "y": 1 }, 105 {"matrix": [1, 5], "x": 5, "y": 1},
103 { "x": 7, "y": 1 }, 106 {"matrix": [1, 6], "x": 6, "y": 1},
104 { "x": 8, "y": 1 }, 107 {"matrix": [1, 7], "x": 7, "y": 1},
105 { "x": 9, "y": 1 }, 108 {"matrix": [1, 8], "x": 8, "y": 1},
106 { "x": 10, "y": 1 }, 109 {"matrix": [1, 9], "x": 9, "y": 1},
107 { "x": 11, "y": 1 }, 110 {"matrix": [1, 10], "x": 10, "y": 1},
108 { "x": 0, "y": 2 }, 111 {"matrix": [1, 11], "x": 11, "y": 1},
109 { "x": 1, "y": 2 }, 112
110 { "x": 2, "y": 2 }, 113 {"matrix": [2, 0], "x": 0, "y": 2},
111 { "x": 3, "y": 2 }, 114 {"matrix": [2, 1], "x": 1, "y": 2},
112 { "x": 4, "y": 2 }, 115 {"matrix": [2, 2], "x": 2, "y": 2},
113 { "x": 5, "y": 2 }, 116 {"matrix": [2, 3], "x": 3, "y": 2},
114 { "x": 6, "y": 2 }, 117 {"matrix": [2, 4], "x": 4, "y": 2},
115 { "x": 7, "y": 2 }, 118 {"matrix": [2, 5], "x": 5, "y": 2},
116 { "x": 8, "y": 2 }, 119 {"matrix": [2, 6], "x": 6, "y": 2},
117 { "x": 9, "y": 2 }, 120 {"matrix": [2, 7], "x": 7, "y": 2},
118 { "x": 10, "y": 2 }, 121 {"matrix": [2, 8], "x": 8, "y": 2},
119 { "x": 11, "y": 2 }, 122 {"matrix": [2, 9], "x": 9, "y": 2},
120 { "x": 0, "y": 3 }, 123 {"matrix": [2, 10], "x": 10, "y": 2},
121 { "x": 1, "y": 3 }, 124 {"matrix": [2, 11], "x": 11, "y": 2},
122 { "x": 2, "y": 3 }, 125
123 { "x": 3, "y": 3 }, 126 {"matrix": [3, 0], "x": 0, "y": 3},
124 { "x": 4, "y": 3 }, 127 {"matrix": [3, 1], "x": 1, "y": 3},
125 { "x": 5, "y": 3 }, 128 {"matrix": [3, 2], "x": 2, "y": 3},
126 { "x": 6, "y": 3 }, 129 {"matrix": [3, 3], "x": 3, "y": 3},
127 { "x": 7, "y": 3 }, 130 {"matrix": [3, 4], "x": 4, "y": 3},
128 { "x": 8, "y": 3 }, 131 {"matrix": [3, 5], "x": 5, "y": 3},
129 { "x": 9, "y": 3 }, 132 {"matrix": [3, 6], "x": 6, "y": 3},
130 { "x": 10, "y": 3 }, 133 {"matrix": [3, 7], "x": 7, "y": 3},
131 { "x": 11, "y": 3 } 134 {"matrix": [3, 8], "x": 8, "y": 3},
135 {"matrix": [3, 9], "x": 9, "y": 3},
136 {"matrix": [3, 10], "x": 10, "y": 3},
137 {"matrix": [3, 11], "x": 11, "y": 3}
132 ] 138 ]
133 } 139 }
134 } 140 }
diff --git a/keyboards/work_louder/work_board/work_board.h b/keyboards/work_louder/work_board/work_board.h
index 284eecc430..04de456eca 100644
--- a/keyboards/work_louder/work_board/work_board.h
+++ b/keyboards/work_louder/work_board/work_board.h
@@ -18,39 +18,3 @@
18 18
19#include "quantum.h" 19#include "quantum.h"
20#include "rgb_functions.h" 20#include "rgb_functions.h"
21
22#define ___ KC_NO
23
24/* This is a shortcut to help you visually see your layout.
25 *
26 * The first section contains all of the arguments representing the physical
27 * layout of the board and position of the keys.
28 *
29 * The second converts the arguments into a two-dimensional array which
30 * represents the switch matrix.
31 */
32#define LAYOUT_2u_space( \
33 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
34 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
35 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
36 k30, k31, k32, k33, k34, k35, k37, k38, k39, k3a, k3b \
37) \
38{ \
39 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c }, \
40 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, ___ }, \
41 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, ___ }, \
42 { k30, k31, k32, k33, k34, k35, ___, k37, k38, k39, k3a, k3b, ___ } \
43}
44
45#define LAYOUT( \
46 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
47 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
48 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
49 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
50) \
51{ \
52 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c }, \
53 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, ___ }, \
54 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, ___ }, \
55 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, ___ } \
56}
diff --git a/keyboards/wsk/sl40/info.json b/keyboards/wsk/sl40/info.json
index 73cb2445d2..09f5f98814 100644
--- a/keyboards/wsk/sl40/info.json
+++ b/keyboards/wsk/sl40/info.json
@@ -20,10 +20,117 @@
20 "bootloader": "caterina", 20 "bootloader": "caterina",
21 "layouts": { 21 "layouts": {
22 "LAYOUT": { 22 "LAYOUT": {
23 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1}, {"x":12.25, "y":1, "w":1.75}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2, "w":1.25}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.25}, {"x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":6.25}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}] 23 "layout": [
24 {"matrix": [0, 0], "x": 0, "y": 0},
25 {"matrix": [0, 1], "x": 1, "y": 0},
26 {"matrix": [0, 2], "x": 2, "y": 0},
27 {"matrix": [0, 3], "x": 3, "y": 0},
28 {"matrix": [0, 4], "x": 4, "y": 0},
29 {"matrix": [0, 5], "x": 5, "y": 0},
30 {"matrix": [0, 6], "x": 6, "y": 0},
31 {"matrix": [0, 7], "x": 7, "y": 0},
32 {"matrix": [0, 8], "x": 8, "y": 0},
33 {"matrix": [0, 9], "x": 9, "y": 0},
34 {"matrix": [0, 10], "x": 10, "y": 0},
35 {"matrix": [0, 11], "x": 11, "y": 0},
36 {"matrix": [0, 12], "x": 12, "y": 0},
37 {"matrix": [0, 13], "x": 13, "y": 0},
38
39 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
40 {"matrix": [1, 1], "x": 1.25, "y": 1},
41 {"matrix": [1, 2], "x": 2.25, "y": 1},
42 {"matrix": [1, 3], "x": 3.25, "y": 1},
43 {"matrix": [1, 4], "x": 4.25, "y": 1},
44 {"matrix": [1, 5], "x": 5.25, "y": 1},
45 {"matrix": [1, 6], "x": 6.25, "y": 1},
46 {"matrix": [1, 7], "x": 7.25, "y": 1},
47 {"matrix": [1, 8], "x": 8.25, "y": 1},
48 {"matrix": [1, 9], "x": 9.25, "y": 1},
49 {"matrix": [1, 10], "x": 10.25, "y": 1},
50 {"matrix": [1, 11], "x": 11.25, "y": 1},
51 {"matrix": [1, 13], "x": 12.25, "y": 1, "w": 1.75},
52
53 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
54 {"matrix": [2, 2], "x": 1.75, "y": 2},
55 {"matrix": [2, 3], "x": 2.75, "y": 2},
56 {"matrix": [2, 4], "x": 3.75, "y": 2},
57 {"matrix": [2, 5], "x": 4.75, "y": 2},
58 {"matrix": [2, 6], "x": 5.75, "y": 2},
59 {"matrix": [2, 7], "x": 6.75, "y": 2},
60 {"matrix": [2, 8], "x": 7.75, "y": 2},
61 {"matrix": [2, 9], "x": 8.75, "y": 2},
62 {"matrix": [2, 10], "x": 9.75, "y": 2},
63 {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 1.25},
64 {"matrix": [2, 12], "x": 12, "y": 2},
65 {"matrix": [2, 13], "x": 13, "y": 2},
66
67 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
68 {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
69 {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
70 {"matrix": [3, 6], "x": 3.75, "y": 3, "w": 6.25},
71 {"matrix": [3, 10], "x": 10, "y": 3},
72 {"matrix": [3, 11], "x": 11, "y": 3},
73 {"matrix": [3, 12], "x": 12, "y": 3},
74 {"matrix": [3, 13], "x": 13, "y": 3}
75 ]
24 }, 76 },
25 "LAYOUT_all": { 77 "LAYOUT_all": {
26 "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0},{"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"{", "x":11, "y":0}, {"label":"}", "x":12, "y":0}, {"label":"BS", "x":13, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"\"", "x":11.25, "y":1}, {"label":"Enter", "x":12.25, "y":1, "w":1.75}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"?", "x":10.75, "y":2}, {"x":11.75, "y":2}, {"label":"Shift", "x":12.75, "y":2, "w":1.25}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Win", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3}, {"x":4.75, "y":3, "w":2.25}, {"x":7, "y":3, "w":2}, {"x":9, "y":3}, {"label":"Alt", "x":10, "y":3}, {"label":"Win", "x":11, "y":3}, {"label":"Menu", "x":12, "y":3}, {"label":"Ctrl", "x":13, "y":3}] 78 "layout": [
79 {"matrix": [0, 0], "x": 0, "y": 0},
80 {"matrix": [0, 1], "x": 1, "y": 0},
81 {"matrix": [0, 2], "x": 2, "y": 0},
82 {"matrix": [0, 3], "x": 3, "y": 0},
83 {"matrix": [0, 4], "x": 4, "y": 0},
84 {"matrix": [0, 5], "x": 5, "y": 0},
85 {"matrix": [0, 6], "x": 6, "y": 0},
86 {"matrix": [0, 7], "x": 7, "y": 0},
87 {"matrix": [0, 8], "x": 8, "y": 0},
88 {"matrix": [0, 9], "x": 9, "y": 0},
89 {"matrix": [0, 10], "x": 10, "y": 0},
90 {"matrix": [0, 11], "x": 11, "y": 0},
91 {"matrix": [0, 12], "x": 12, "y": 0},
92 {"matrix": [0, 13], "x": 13, "y": 0},
93
94 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
95 {"matrix": [1, 1], "x": 1.25, "y": 1},
96 {"matrix": [1, 2], "x": 2.25, "y": 1},
97 {"matrix": [1, 3], "x": 3.25, "y": 1},
98 {"matrix": [1, 4], "x": 4.25, "y": 1},
99 {"matrix": [1, 5], "x": 5.25, "y": 1},
100 {"matrix": [1, 6], "x": 6.25, "y": 1},
101 {"matrix": [1, 7], "x": 7.25, "y": 1},
102 {"matrix": [1, 8], "x": 8.25, "y": 1},
103 {"matrix": [1, 9], "x": 9.25, "y": 1},
104 {"matrix": [1, 10], "x": 10.25, "y": 1},
105 {"matrix": [1, 11], "x": 11.25, "y": 1},
106 {"matrix": [1, 13], "x": 12.25, "y": 1, "w": 1.75},
107
108 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
109 {"matrix": [2, 2], "x": 1.75, "y": 2},
110 {"matrix": [2, 3], "x": 2.75, "y": 2},
111 {"matrix": [2, 4], "x": 3.75, "y": 2},
112 {"matrix": [2, 5], "x": 4.75, "y": 2},
113 {"matrix": [2, 6], "x": 5.75, "y": 2},
114 {"matrix": [2, 7], "x": 6.75, "y": 2},
115 {"matrix": [2, 8], "x": 7.75, "y": 2},
116 {"matrix": [2, 9], "x": 8.75, "y": 2},
117 {"matrix": [2, 10], "x": 9.75, "y": 2},
118 {"matrix": [2, 11], "x": 10.75, "y": 2},
119 {"matrix": [2, 12], "x": 11.75, "y": 2},
120 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 1.25},
121
122 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
123 {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
124 {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
125 {"matrix": [3, 4], "x": 3.75, "y": 3},
126 {"matrix": [3, 6], "x": 4.75, "y": 3, "w": 2.25},
127 {"matrix": [3, 8], "x": 7, "y": 3, "w": 2},
128 {"matrix": [3, 9], "x": 9, "y": 3},
129 {"matrix": [3, 10], "x": 10, "y": 3},
130 {"matrix": [3, 11], "x": 11, "y": 3},
131 {"matrix": [3, 12], "x": 12, "y": 3},
132 {"matrix": [3, 13], "x": 13, "y": 3}
133 ]
27 } 134 }
28 } 135 }
29} 136}
diff --git a/keyboards/wsk/sl40/sl40.h b/keyboards/wsk/sl40/sl40.h
deleted file mode 100644
index e0c28629a1..0000000000
--- a/keyboards/wsk/sl40/sl40.h
+++ /dev/null
@@ -1,45 +0,0 @@
1/* Copyright 2020 Worldspawn <mcmancuso@gmail.com>
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#include "quantum.h"
20
21#define LAYOUT( \
22 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, \
23 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1d, \
24 K20, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, \
25 K30, K31, K32, K36, K3a, K3b, K3c, K3d \
26) { \
27 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d }, \
28 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, KC_NO, K1d }, \
29 { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d }, \
30 { K30, K31, K32, KC_NO, KC_NO, KC_NO, K36, KC_NO, KC_NO, KC_NO, K3a, K3b, K3c, K3d } \
31}
32
33#define LAYOUT_all( \
34 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, \
35 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1d, \
36 K20, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, \
37 K30, K31, K32, K34, K36, K38, K39, K3a, K3b, K3c, K3d \
38) \
39{ \
40 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d }, \
41 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, KC_NO, K1d }, \
42 { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d }, \
43 { K30, K31, K32, KC_NO, K34, KC_NO, K36, KC_NO, K38, K39, K3a, K3b, K3c, K3d } \
44}
45
diff --git a/keyboards/xw60/info.json b/keyboards/xw60/info.json
index 93a68a6520..50315c5ffd 100644
--- a/keyboards/xw60/info.json
+++ b/keyboards/xw60/info.json
@@ -17,10 +17,150 @@
17 "bootloader": "atmel-dfu", 17 "bootloader": "atmel-dfu",
18 "layouts": { 18 "layouts": {
19 "LAYOUT": { 19 "LAYOUT": {
20 "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1, "y":0}, {"label":"K02", "x":2, "y":0}, {"label":"K03", "x":3, "y":0}, {"label":"K04", "x":4, "y":0}, {"label":"K05", "x":5, "y":0}, {"label":"K06", "x":6, "y":0}, {"label":"K07", "x":7, "y":0}, {"label":"K08", "x":8, "y":0}, {"label":"K09", "x":9, "y":0}, {"label":"K0A", "x":10, "y":0}, {"label":"K0B", "x":11, "y":0}, {"label":"K0C", "x":12, "y":0}, {"label":"K0D", "x":13, "y":0}, {"label":"K49", "x":14, "y":0}, {"label":"K10", "x":0, "y":1, "w":1.5}, {"label":"K11", "x":1.5, "y":1}, {"label":"K12", "x":2.5, "y":1}, {"label":"K13", "x":3.5, "y":1}, {"label":"K14", "x":4.5, "y":1}, {"label":"K15", "x":5.5, "y":1}, {"label":"K16", "x":6.5, "y":1}, {"label":"K17", "x":7.5, "y":1}, {"label":"K18", "x":8.5, "y":1}, {"label":"K19", "x":9.5, "y":1}, {"label":"K1A", "x":10.5, "y":1}, {"label":"K1B", "x":11.5, "y":1}, {"label":"K1C", "x":12.5, "y":1}, {"label":"K1D", "x":13.5, "y":1, "w":1.5}, {"label":"K20", "x":0, "y":2, "w":1.75}, {"label":"K21", "x":1.75, "y":2}, {"label":"K22", "x":2.75, "y":2}, {"label":"K23", "x":3.75, "y":2}, {"label":"K24", "x":4.75, "y":2}, {"label":"K25", "x":5.75, "y":2}, {"label":"K26", "x":6.75, "y":2}, {"label":"K27", "x":7.75, "y":2}, {"label":"K28", "x":8.75, "y":2}, {"label":"K29", "x":9.75, "y":2}, {"label":"K2A", "x":10.75, "y":2}, {"label":"K2B", "x":11.75, "y":2}, {"label":"K2C", "x":12.75, "y":2}, {"label":"K2D", "x":13.75, "y":2, "w":1.25}, {"label":"K30", "x":0, "y":3, "w":1.25}, {"label":"K31", "x":1.25, "y":3}, {"label":"K32", "x":2.25, "y":3}, {"label":"K33", "x":3.25, "y":3}, {"label":"K34", "x":4.25, "y":3}, {"label":"K35", "x":5.25, "y":3}, {"label":"K36", "x":6.25, "y":3}, {"label":"K37", "x":7.25, "y":3}, {"label":"K38", "x":8.25, "y":3}, {"label":"K39", "x":9.25, "y":3}, {"label":"K3A", "x":10.25, "y":3}, {"label":"K3B", "x":11.25, "y":3}, {"label":"K3D", "x":12.25, "y":3, "w":1.75}, {"label":"K3C", "x":14, "y":3}, {"label":"K40", "x":0, "y":4, "w":1.25}, {"label":"K41", "x":1.25, "y":4, "w":1.25}, {"label":"K42", "x":2.5, "y":4, "w":1.25}, {"label":"K44", "x":3.75, "y":4, "w":2}, {"label":"K45", "x":5.75, "y":4, "w":2.25}, {"label":"K46", "x":8, "y":4, "w":2}, {"label":"K4A", "x":10, "y":4, "w":1.25}, {"label":"K4B", "x":11.25, "y":4, "w":1.25}, {"label":"K4C", "x":12.5, "y":4, "w":1.25}, {"label":"K4D", "x":13.75, "y":4, "w":1.25}] 20 "layout": [
21 {"matrix": [0, 0], "x": 0, "y": 0},
22 {"matrix": [0, 1], "x": 1, "y": 0},
23 {"matrix": [0, 2], "x": 2, "y": 0},
24 {"matrix": [0, 3], "x": 3, "y": 0},
25 {"matrix": [0, 4], "x": 4, "y": 0},
26 {"matrix": [0, 5], "x": 5, "y": 0},
27 {"matrix": [0, 6], "x": 6, "y": 0},
28 {"matrix": [0, 7], "x": 7, "y": 0},
29 {"matrix": [0, 8], "x": 8, "y": 0},
30 {"matrix": [0, 9], "x": 9, "y": 0},
31 {"matrix": [0, 10], "x": 10, "y": 0},
32 {"matrix": [0, 11], "x": 11, "y": 0},
33 {"matrix": [0, 12], "x": 12, "y": 0},
34 {"matrix": [0, 13], "x": 13, "y": 0},
35 {"matrix": [4, 9], "x": 14, "y": 0},
36
37 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
38 {"matrix": [1, 1], "x": 1.5, "y": 1},
39 {"matrix": [1, 2], "x": 2.5, "y": 1},
40 {"matrix": [1, 3], "x": 3.5, "y": 1},
41 {"matrix": [1, 4], "x": 4.5, "y": 1},
42 {"matrix": [1, 5], "x": 5.5, "y": 1},
43 {"matrix": [1, 6], "x": 6.5, "y": 1},
44 {"matrix": [1, 7], "x": 7.5, "y": 1},
45 {"matrix": [1, 8], "x": 8.5, "y": 1},
46 {"matrix": [1, 9], "x": 9.5, "y": 1},
47 {"matrix": [1, 10], "x": 10.5, "y": 1},
48 {"matrix": [1, 11], "x": 11.5, "y": 1},
49 {"matrix": [1, 12], "x": 12.5, "y": 1},
50 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
51
52 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
53 {"matrix": [2, 1], "x": 1.75, "y": 2},
54 {"matrix": [2, 2], "x": 2.75, "y": 2},
55 {"matrix": [2, 3], "x": 3.75, "y": 2},
56 {"matrix": [2, 4], "x": 4.75, "y": 2},
57 {"matrix": [2, 5], "x": 5.75, "y": 2},
58 {"matrix": [2, 6], "x": 6.75, "y": 2},
59 {"matrix": [2, 7], "x": 7.75, "y": 2},
60 {"matrix": [2, 8], "x": 8.75, "y": 2},
61 {"matrix": [2, 9], "x": 9.75, "y": 2},
62 {"matrix": [2, 10], "x": 10.75, "y": 2},
63 {"matrix": [2, 11], "x": 11.75, "y": 2},
64 {"matrix": [2, 12], "x": 12.75, "y": 2},
65 {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
66
67 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
68 {"matrix": [3, 1], "x": 1.25, "y": 3},
69 {"matrix": [3, 2], "x": 2.25, "y": 3},
70 {"matrix": [3, 3], "x": 3.25, "y": 3},
71 {"matrix": [3, 4], "x": 4.25, "y": 3},
72 {"matrix": [3, 5], "x": 5.25, "y": 3},
73 {"matrix": [3, 6], "x": 6.25, "y": 3},
74 {"matrix": [3, 7], "x": 7.25, "y": 3},
75 {"matrix": [3, 8], "x": 8.25, "y": 3},
76 {"matrix": [3, 9], "x": 9.25, "y": 3},
77 {"matrix": [3, 10], "x": 10.25, "y": 3},
78 {"matrix": [3, 11], "x": 11.25, "y": 3},
79 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
80 {"matrix": [3, 12], "x": 14, "y": 3},
81
82 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
83 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
84 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
85 {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2},
86 {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.25},
87 {"matrix": [4, 6], "x": 8, "y": 4, "w": 2},
88 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
89 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
90 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
91 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
92 ]
21 }, 93 },
22 "LAYOUT_pingjunior": { 94 "LAYOUT_pingjunior": {
23 "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1, "y":0}, {"label":"K02", "x":2, "y":0}, {"label":"K03", "x":3, "y":0}, {"label":"K04", "x":4, "y":0}, {"label":"K05", "x":5, "y":0}, {"label":"K06", "x":6, "y":0}, {"label":"K07", "x":7, "y":0}, {"label":"K08", "x":8, "y":0}, {"label":"K09", "x":9, "y":0}, {"label":"K0A", "x":10, "y":0}, {"label":"K0B", "x":11, "y":0}, {"label":"K0C", "x":12, "y":0}, {"label":"K0D", "x":13, "y":0}, {"label":"K49", "x":14, "y":0}, {"label":"K10", "x":0, "y":1, "w":1.5}, {"label":"K11", "x":1.5, "y":1}, {"label":"K12", "x":2.5, "y":1}, {"label":"K13", "x":3.5, "y":1}, {"label":"K14", "x":4.5, "y":1}, {"label":"K15", "x":5.5, "y":1}, {"label":"K16", "x":6.5, "y":1}, {"label":"K17", "x":7.5, "y":1}, {"label":"K18", "x":8.5, "y":1}, {"label":"K19", "x":9.5, "y":1}, {"label":"K1A", "x":10.5, "y":1}, {"label":"K1B", "x":11.5, "y":1}, {"label":"K1C", "x":12.5, "y":1}, {"label":"K1D", "x":13.5, "y":1, "w":1.5}, {"label":"K20", "x":0, "y":2, "w":1.75}, {"label":"K21", "x":1.75, "y":2}, {"label":"K22", "x":2.75, "y":2}, {"label":"K23", "x":3.75, "y":2}, {"label":"K24", "x":4.75, "y":2}, {"label":"K25", "x":5.75, "y":2}, {"label":"K26", "x":6.75, "y":2}, {"label":"K27", "x":7.75, "y":2}, {"label":"K28", "x":8.75, "y":2}, {"label":"K29", "x":9.75, "y":2}, {"label":"K2A", "x":10.75, "y":2}, {"label":"K2B", "x":11.75, "y":2}, {"label":"K2C", "x":12.75, "y":2}, {"label":"K2D", "x":13.75, "y":2, "w":1.25}, {"label":"K31", "x":0, "y":3, "w":2.25}, {"label":"K32", "x":2.25, "y":3}, {"label":"K33", "x":3.25, "y":3}, {"label":"K34", "x":4.25, "y":3}, {"label":"K35", "x":5.25, "y":3}, {"label":"K36", "x":6.25, "y":3}, {"label":"K37", "x":7.25, "y":3}, {"label":"K38", "x":8.25, "y":3}, {"label":"K39", "x":9.25, "y":3}, {"label":"K3A", "x":10.25, "y":3}, {"label":"K3B", "x":11.25, "y":3}, {"label":"K3D", "x":12.25, "y":3, "w":1.75}, {"label":"K3C", "x":14, "y":3}, {"label":"K40", "x":0, "y":4, "w":1.5}, {"label":"K41", "x":1.5, "y":4}, {"label":"K42", "x":2.5, "y":4, "w":1.5}, {"label":"K45", "x":4, "y":4, "w":7}, {"label":"K4B", "x":11, "y":4, "w":1.5}, {"label":"K4C", "x":12.5, "y":4}, {"label":"K4D", "x":13.5, "y":4, "w":1.5}] 95 "layout": [
96 {"matrix": [0, 0], "x": 0, "y": 0},
97 {"matrix": [0, 1], "x": 1, "y": 0},
98 {"matrix": [0, 2], "x": 2, "y": 0},
99 {"matrix": [0, 3], "x": 3, "y": 0},
100 {"matrix": [0, 4], "x": 4, "y": 0},
101 {"matrix": [0, 5], "x": 5, "y": 0},
102 {"matrix": [0, 6], "x": 6, "y": 0},
103 {"matrix": [0, 7], "x": 7, "y": 0},
104 {"matrix": [0, 8], "x": 8, "y": 0},
105 {"matrix": [0, 9], "x": 9, "y": 0},
106 {"matrix": [0, 10], "x": 10, "y": 0},
107 {"matrix": [0, 11], "x": 11, "y": 0},
108 {"matrix": [0, 12], "x": 12, "y": 0},
109 {"matrix": [0, 13], "x": 13, "y": 0},
110 {"matrix": [4, 9], "x": 14, "y": 0},
111
112 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
113 {"matrix": [1, 1], "x": 1.5, "y": 1},
114 {"matrix": [1, 2], "x": 2.5, "y": 1},
115 {"matrix": [1, 3], "x": 3.5, "y": 1},
116 {"matrix": [1, 4], "x": 4.5, "y": 1},
117 {"matrix": [1, 5], "x": 5.5, "y": 1},
118 {"matrix": [1, 6], "x": 6.5, "y": 1},
119 {"matrix": [1, 7], "x": 7.5, "y": 1},
120 {"matrix": [1, 8], "x": 8.5, "y": 1},
121 {"matrix": [1, 9], "x": 9.5, "y": 1},
122 {"matrix": [1, 10], "x": 10.5, "y": 1},
123 {"matrix": [1, 11], "x": 11.5, "y": 1},
124 {"matrix": [1, 12], "x": 12.5, "y": 1},
125 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
126
127 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
128 {"matrix": [2, 1], "x": 1.75, "y": 2},
129 {"matrix": [2, 2], "x": 2.75, "y": 2},
130 {"matrix": [2, 3], "x": 3.75, "y": 2},
131 {"matrix": [2, 4], "x": 4.75, "y": 2},
132 {"matrix": [2, 5], "x": 5.75, "y": 2},
133 {"matrix": [2, 6], "x": 6.75, "y": 2},
134 {"matrix": [2, 7], "x": 7.75, "y": 2},
135 {"matrix": [2, 8], "x": 8.75, "y": 2},
136 {"matrix": [2, 9], "x": 9.75, "y": 2},
137 {"matrix": [2, 10], "x": 10.75, "y": 2},
138 {"matrix": [2, 11], "x": 11.75, "y": 2},
139 {"matrix": [2, 12], "x": 12.75, "y": 2},
140 {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
141
142 {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
143 {"matrix": [3, 2], "x": 2.25, "y": 3},
144 {"matrix": [3, 3], "x": 3.25, "y": 3},
145 {"matrix": [3, 4], "x": 4.25, "y": 3},
146 {"matrix": [3, 5], "x": 5.25, "y": 3},
147 {"matrix": [3, 6], "x": 6.25, "y": 3},
148 {"matrix": [3, 7], "x": 7.25, "y": 3},
149 {"matrix": [3, 8], "x": 8.25, "y": 3},
150 {"matrix": [3, 9], "x": 9.25, "y": 3},
151 {"matrix": [3, 10], "x": 10.25, "y": 3},
152 {"matrix": [3, 11], "x": 11.25, "y": 3},
153 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
154 {"matrix": [3, 12], "x": 14, "y": 3},
155
156 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
157 {"matrix": [4, 1], "x": 1.5, "y": 4},
158 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
159 {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
160 {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
161 {"matrix": [4, 12], "x": 12.5, "y": 4},
162 {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
163 ]
24 } 164 }
25 } 165 }
26 } 166 }
diff --git a/keyboards/xw60/xw60.h b/keyboards/xw60/xw60.h
deleted file mode 100644
index 52be45258a..0000000000
--- a/keyboards/xw60/xw60.h
+++ /dev/null
@@ -1,60 +0,0 @@
1#pragma once
2
3#include "quantum.h"
4
5#define XXX KC_NO
6
7/*
8 * ,-----------------------------------------------------------------------------------------.
9 * | K00 | K01 | K02 | K03 | K04 | K05 | K06 | K07 | K08 | K09 | K0A | K0B | K0C | K0D | K49 |
10 * |-----------------------------------------------------------------------------------------+
11 * | K10 | K11 | K12 | K13 | K14 | K15 | K16 | K17 | K18 | K19 | K1A | K1B | K1C | K1D |
12 * |-----------------------------------------------------------------------------------------+
13 * | K20 | K21 | K22 | K23 | K24 | K25 | K26 | K17 | K28 | K29 | K2A | K2B | K2C | K2D |
14 * |-----------------------------------------------------------------------------------------+
15 * | K30 | K31 | K32 | K33 | K34 | K35 | K36 | K37 | K38 | K39 | K3A | K3B | K3D | K3C |
16 * |-----------------------------------------------------------------------------------------+
17 * | K40 | K41 | K42 | | K44 | K45 | K46 | | K4A | K4B | K4C | K4D |
18 * `-----------------------------------------------------------------------------------------'
19 */
20#define LAYOUT( \
21 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K49, \
22 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
23 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
24 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \
25 K40, K41, K42, K44, K45, K46, K4A, K4B, K4C, K4D \
26) { \
27 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
28 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
29 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
30 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
31 { K40, K41, K42, XXX, K44, K45, K46, XXX, XXX, K49, K4A, K4B, K4C, K4D } \
32}
33
34/*
35 * ,-----------------------------------------------------------------------------------------.
36 * | K00 | K01 | K02 | K03 | K04 | K05 | K06 | K07 | K08 | K09 | K0A | K0B | K0C | K0D | K49 |
37 * |-----------------------------------------------------------------------------------------+
38 * | K10 | K11 | K12 | K13 | K14 | K15 | K16 | K17 | K18 | K19 | K1A | K1B | K1C | K1D |
39 * |-----------------------------------------------------------------------------------------+
40 * | K20 | K21 | K22 | K23 | K24 | K25 | K26 | K17 | K28 | K29 | K2A | K2B | K2C | K2D |
41 * |-----------------------------------------------------------------------------------------+
42 * | K31 | K32 | K33 | K34 | K35 | K36 | K37 | K38 | K39 | K3A | K3B | K3D | K3C |
43 * |-----------------------------------------------------------------------------------------+
44 * | K40 | K41 | K42 | K45 | K4B | K4C | K4D |
45 * `-----------------------------------------------------------------------------------------'
46 */
47#define LAYOUT_pingjunior( \
48 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K49, \
49 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
50 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
51 K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \
52 K40, K41, K42, K45, K4B, K4C, K4D \
53) { \
54 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
55 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
56 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
57 { XXX, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
58 { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, XXX, K4B, K4C, K4D } \
59}
60
diff --git a/keyboards/ymdk/yd60mq/info.json b/keyboards/ymdk/yd60mq/info.json
index cb10a82245..1501113646 100644
--- a/keyboards/ymdk/yd60mq/info.json
+++ b/keyboards/ymdk/yd60mq/info.json
@@ -22,843 +22,854 @@
22 "processor": "atmega32u4", 22 "processor": "atmega32u4",
23 "bootloader": "atmel-dfu", 23 "bootloader": "atmel-dfu",
24 "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_hhkb", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan"], 24 "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_hhkb", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan"],
25 "layout_aliases": {
26 "LAYOUT": "LAYOUT_all"
27 },
25 "layouts": { 28 "layouts": {
26 "LAYOUT_all": { 29 "LAYOUT_all": {
27 "layout": [ 30 "layout": [
28 {"label":"Esc", "x":0, "y":0}, 31 {"matrix": [0, 0], "x": 0, "y": 0},
29 {"label":"1", "x":1, "y":0}, 32 {"matrix": [0, 1], "x": 1, "y": 0},
30 {"label":"2", "x":2, "y":0}, 33 {"matrix": [0, 2], "x": 2, "y": 0},
31 {"label":"3", "x":3, "y":0}, 34 {"matrix": [0, 3], "x": 3, "y": 0},
32 {"label":"4", "x":4, "y":0}, 35 {"matrix": [0, 4], "x": 4, "y": 0},
33 {"label":"5", "x":5, "y":0}, 36 {"matrix": [0, 5], "x": 5, "y": 0},
34 {"label":"6", "x":6, "y":0}, 37 {"matrix": [0, 6], "x": 6, "y": 0},
35 {"label":"7", "x":7, "y":0}, 38 {"matrix": [0, 7], "x": 7, "y": 0},
36 {"label":"8", "x":8, "y":0}, 39 {"matrix": [0, 8], "x": 8, "y": 0},
37 {"label":"9", "x":9, "y":0}, 40 {"matrix": [0, 9], "x": 9, "y": 0},
38 {"label":"0", "x":10, "y":0}, 41 {"matrix": [0, 10], "x": 10, "y": 0},
39 {"label":"-", "x":11, "y":0}, 42 {"matrix": [0, 11], "x": 11, "y": 0},
40 {"label":"=", "x":12, "y":0}, 43 {"matrix": [0, 12], "x": 12, "y": 0},
41 {"label":"\\", "x":13, "y":0}, 44 {"matrix": [0, 13], "x": 13, "y": 0},
42 {"label":"`", "x":14, "y":0}, 45 {"matrix": [0, 14], "x": 14, "y": 0},
43 {"label":"Tab", "x":0, "y":1, "w":1.5}, 46
44 {"label":"Q", "x":1.5, "y":1}, 47 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
45 {"label":"W", "x":2.5, "y":1}, 48 {"matrix": [1, 1], "x": 1.5, "y": 1},
46 {"label":"E", "x":3.5, "y":1}, 49 {"matrix": [1, 2], "x": 2.5, "y": 1},
47 {"label":"R", "x":4.5, "y":1}, 50 {"matrix": [1, 3], "x": 3.5, "y": 1},
48 {"label":"T", "x":5.5, "y":1}, 51 {"matrix": [1, 4], "x": 4.5, "y": 1},
49 {"label":"Y", "x":6.5, "y":1}, 52 {"matrix": [1, 5], "x": 5.5, "y": 1},
50 {"label":"U", "x":7.5, "y":1}, 53 {"matrix": [1, 6], "x": 6.5, "y": 1},
51 {"label":"I", "x":8.5, "y":1}, 54 {"matrix": [1, 7], "x": 7.5, "y": 1},
52 {"label":"O", "x":9.5, "y":1}, 55 {"matrix": [1, 8], "x": 8.5, "y": 1},
53 {"label":"P", "x":10.5, "y":1}, 56 {"matrix": [1, 9], "x": 9.5, "y": 1},
54 {"label":"[", "x":11.5, "y":1}, 57 {"matrix": [1, 10], "x": 10.5, "y": 1},
55 {"label":"]", "x":12.5, "y":1}, 58 {"matrix": [1, 11], "x": 11.5, "y": 1},
56 {"label":"\\", "x":13.5, "y":1, "w":1.5}, 59 {"matrix": [1, 12], "x": 12.5, "y": 1},
57 {"label":"Caps", "x":0, "y":2, "w":1.75}, 60 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
58 {"label":"A", "x":1.75, "y":2}, 61
59 {"label":"S", "x":2.75, "y":2}, 62 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
60 {"label":"D", "x":3.75, "y":2}, 63 {"matrix": [2, 1], "x": 1.75, "y": 2},
61 {"label":"F", "x":4.75, "y":2}, 64 {"matrix": [2, 2], "x": 2.75, "y": 2},
62 {"label":"G", "x":5.75, "y":2}, 65 {"matrix": [2, 3], "x": 3.75, "y": 2},
63 {"label":"H", "x":6.75, "y":2}, 66 {"matrix": [2, 4], "x": 4.75, "y": 2},
64 {"label":"J", "x":7.75, "y":2}, 67 {"matrix": [2, 5], "x": 5.75, "y": 2},
65 {"label":"K", "x":8.75, "y":2}, 68 {"matrix": [2, 6], "x": 6.75, "y": 2},
66 {"label":"L", "x":9.75, "y":2}, 69 {"matrix": [2, 7], "x": 7.75, "y": 2},
67 {"label":";", "x":10.75, "y":2}, 70 {"matrix": [2, 8], "x": 8.75, "y": 2},
68 {"label":"\"", "x":11.75, "y":2}, 71 {"matrix": [2, 9], "x": 9.75, "y": 2},
69 {"label":"ISO Hash", "x":12.75, "y":2}, 72 {"matrix": [2, 10], "x": 10.75, "y": 2},
70 {"label":"Enter", "x":13.75, "y":2, "w":1.25}, 73 {"matrix": [2, 11], "x": 11.75, "y": 2},
71 {"label":"Shift", "x":0, "y":3}, 74 {"matrix": [2, 12], "x": 12.75, "y": 2},
72 {"label":"ISO \\", "x":1, "y":3}, 75 {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
73 {"label":"Z", "x":2, "y":3}, 76
74 {"label":"X", "x":3, "y":3}, 77 {"matrix": [3, 0], "x": 0, "y": 3},
75 {"label":"C", "x":4, "y":3}, 78 {"matrix": [3, 1], "x": 1, "y": 3},
76 {"label":"V", "x":5, "y":3}, 79 {"matrix": [3, 2], "x": 2, "y": 3},
77 {"label":"B", "x":6, "y":3}, 80 {"matrix": [3, 3], "x": 3, "y": 3},
78 {"label":"N", "x":7, "y":3}, 81 {"matrix": [3, 4], "x": 4, "y": 3},
79 {"label":"M", "x":8, "y":3}, 82 {"matrix": [3, 5], "x": 5, "y": 3},
80 {"label":",", "x":9, "y":3}, 83 {"matrix": [3, 6], "x": 6, "y": 3},
81 {"label":".", "x":10, "y":3}, 84 {"matrix": [3, 7], "x": 7, "y": 3},
82 {"label":"/", "x":11, "y":3}, 85 {"matrix": [3, 8], "x": 8, "y": 3},
83 {"label":"Shift", "x":12, "y":3}, 86 {"matrix": [3, 9], "x": 9, "y": 3},
84 {"label":"Up", "x":13, "y":3}, 87 {"matrix": [3, 10], "x": 10, "y": 3},
85 {"label":"Del", "x":14, "y":3}, 88 {"matrix": [3, 11], "x": 11, "y": 3},
86 {"label":"Ctrl", "x":0, "y":4, "w":1.25}, 89 {"matrix": [3, 12], "x": 12, "y": 3},
87 {"label":"GUI", "x":1.25, "y":4, "w":1.25}, 90 {"matrix": [3, 13], "x": 13, "y": 3},
88 {"label":"Alt", "x":2.5, "y":4, "w":1.25}, 91 {"matrix": [3, 14], "x": 14, "y": 3},
89 {"label":"MO(1)", "x":3.75, "y":4, "w":2.25}, 92
90 {"label":"Space", "x":6, "y":4, "w":1.25}, 93 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
91 {"label":"MO(1)", "x":7.25, "y":4, "w":2.75}, 94 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
92 {"label":"Alt", "x":10, "y":4}, 95 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
93 {"label":"Ctrl", "x":11, "y":4}, 96 {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
94 {"label":"Left", "x":12, "y":4}, 97 {"matrix": [4, 7], "x": 6, "y": 4, "w": 1.25},
95 {"label":"Down", "x":13, "y":4}, 98 {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
96 {"label":"Right", "x":14, "y":4} 99 {"matrix": [4, 9], "x": 10, "y": 4},
100 {"matrix": [4, 10], "x": 11, "y": 4},
101 {"matrix": [4, 11], "x": 12, "y": 4},
102 {"matrix": [4, 12], "x": 13, "y": 4},
103 {"matrix": [4, 13], "x": 14, "y": 4}
97 ] 104 ]
98 }, 105 },
99 "LAYOUT_60_ansi": { 106 "LAYOUT_60_ansi": {
100 "layout": [ 107 "layout": [
101 {"x":0, "y":0}, 108 {"matrix": [0, 0], "x": 0, "y": 0},
102 {"x":1, "y":0}, 109 {"matrix": [0, 1], "x": 1, "y": 0},
103 {"x":2, "y":0}, 110 {"matrix": [0, 2], "x": 2, "y": 0},
104 {"x":3, "y":0}, 111 {"matrix": [0, 3], "x": 3, "y": 0},
105 {"x":4, "y":0}, 112 {"matrix": [0, 4], "x": 4, "y": 0},
106 {"x":5, "y":0}, 113 {"matrix": [0, 5], "x": 5, "y": 0},
107 {"x":6, "y":0}, 114 {"matrix": [0, 6], "x": 6, "y": 0},
108 {"x":7, "y":0}, 115 {"matrix": [0, 7], "x": 7, "y": 0},
109 {"x":8, "y":0}, 116 {"matrix": [0, 8], "x": 8, "y": 0},
110 {"x":9, "y":0}, 117 {"matrix": [0, 9], "x": 9, "y": 0},
111 {"x":10, "y":0}, 118 {"matrix": [0, 10], "x": 10, "y": 0},
112 {"x":11, "y":0}, 119 {"matrix": [0, 11], "x": 11, "y": 0},
113 {"x":12, "y":0}, 120 {"matrix": [0, 12], "x": 12, "y": 0},
114 {"x":13, "y":0, "w":2}, 121 {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
115 {"x":0, "y":1, "w":1.5}, 122
116 {"x":1.5, "y":1}, 123 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
117 {"x":2.5, "y":1}, 124 {"matrix": [1, 1], "x": 1.5, "y": 1},
118 {"x":3.5, "y":1}, 125 {"matrix": [1, 2], "x": 2.5, "y": 1},
119 {"x":4.5, "y":1}, 126 {"matrix": [1, 3], "x": 3.5, "y": 1},
120 {"x":5.5, "y":1}, 127 {"matrix": [1, 4], "x": 4.5, "y": 1},
121 {"x":6.5, "y":1}, 128 {"matrix": [1, 5], "x": 5.5, "y": 1},
122 {"x":7.5, "y":1}, 129 {"matrix": [1, 6], "x": 6.5, "y": 1},
123 {"x":8.5, "y":1}, 130 {"matrix": [1, 7], "x": 7.5, "y": 1},
124 {"x":9.5, "y":1}, 131 {"matrix": [1, 8], "x": 8.5, "y": 1},
125 {"x":10.5, "y":1}, 132 {"matrix": [1, 9], "x": 9.5, "y": 1},
126 {"x":11.5, "y":1}, 133 {"matrix": [1, 10], "x": 10.5, "y": 1},
127 {"x":12.5, "y":1}, 134 {"matrix": [1, 11], "x": 11.5, "y": 1},
128 {"x":13.5, "y":1, "w":1.5}, 135 {"matrix": [1, 12], "x": 12.5, "y": 1},
129 {"x":0, "y":2, "w":1.75}, 136 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
130 {"x":1.75, "y":2}, 137
131 {"x":2.75, "y":2}, 138 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
132 {"x":3.75, "y":2}, 139 {"matrix": [2, 1], "x": 1.75, "y": 2},
133 {"x":4.75, "y":2}, 140 {"matrix": [2, 2], "x": 2.75, "y": 2},
134 {"x":5.75, "y":2}, 141 {"matrix": [2, 3], "x": 3.75, "y": 2},
135 {"x":6.75, "y":2}, 142 {"matrix": [2, 4], "x": 4.75, "y": 2},
136 {"x":7.75, "y":2}, 143 {"matrix": [2, 5], "x": 5.75, "y": 2},
137 {"x":8.75, "y":2}, 144 {"matrix": [2, 6], "x": 6.75, "y": 2},
138 {"x":9.75, "y":2}, 145 {"matrix": [2, 7], "x": 7.75, "y": 2},
139 {"x":10.75, "y":2}, 146 {"matrix": [2, 8], "x": 8.75, "y": 2},
140 {"x":11.75, "y":2}, 147 {"matrix": [2, 9], "x": 9.75, "y": 2},
141 {"x":12.75, "y":2, "w":2.25}, 148 {"matrix": [2, 10], "x": 10.75, "y": 2},
142 {"x":0, "y":3, "w":2.25}, 149 {"matrix": [2, 11], "x": 11.75, "y": 2},
143 {"x":2.25, "y":3}, 150 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
144 {"x":3.25, "y":3}, 151
145 {"x":4.25, "y":3}, 152 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
146 {"x":5.25, "y":3}, 153 {"matrix": [3, 2], "x": 2.25, "y": 3},
147 {"x":6.25, "y":3}, 154 {"matrix": [3, 3], "x": 3.25, "y": 3},
148 {"x":7.25, "y":3}, 155 {"matrix": [3, 4], "x": 4.25, "y": 3},
149 {"x":8.25, "y":3}, 156 {"matrix": [3, 5], "x": 5.25, "y": 3},
150 {"x":9.25, "y":3}, 157 {"matrix": [3, 6], "x": 6.25, "y": 3},
151 {"x":10.25, "y":3}, 158 {"matrix": [3, 7], "x": 7.25, "y": 3},
152 {"x":11.25, "y":3}, 159 {"matrix": [3, 8], "x": 8.25, "y": 3},
153 {"x":12.25, "y":3, "w":2.75}, 160 {"matrix": [3, 9], "x": 9.25, "y": 3},
154 {"x":0, "y":4, "w":1.25}, 161 {"matrix": [3, 10], "x": 10.25, "y": 3},
155 {"x":1.25, "y":4, "w":1.25}, 162 {"matrix": [3, 11], "x": 11.25, "y": 3},
156 {"x":2.5, "y":4, "w":1.25}, 163 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
157 {"x":3.75, "y":4, "w":6.25}, 164
158 {"x":10, "y":4, "w":1.25}, 165 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
159 {"x":11.25, "y":4, "w":1.25}, 166 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
160 {"x":12.5, "y":4, "w":1.25}, 167 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
161 {"x":13.75, "y":4, "w":1.25} 168 {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
169 {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
170 {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
171 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
172 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
162 ] 173 ]
163 }, 174 },
164 "LAYOUT_60_ansi_split_bs": { 175 "LAYOUT_60_ansi_split_bs": {
165 "layout": [ 176 "layout": [
166 {"x":0, "y":0}, 177 {"matrix": [0, 0], "x": 0, "y": 0},
167 {"x":1, "y":0}, 178 {"matrix": [0, 1], "x": 1, "y": 0},
168 {"x":2, "y":0}, 179 {"matrix": [0, 2], "x": 2, "y": 0},
169 {"x":3, "y":0}, 180 {"matrix": [0, 3], "x": 3, "y": 0},
170 {"x":4, "y":0}, 181 {"matrix": [0, 4], "x": 4, "y": 0},
171 {"x":5, "y":0}, 182 {"matrix": [0, 5], "x": 5, "y": 0},
172 {"x":6, "y":0}, 183 {"matrix": [0, 6], "x": 6, "y": 0},
173 {"x":7, "y":0}, 184 {"matrix": [0, 7], "x": 7, "y": 0},
174 {"x":8, "y":0}, 185 {"matrix": [0, 8], "x": 8, "y": 0},
175 {"x":9, "y":0}, 186 {"matrix": [0, 9], "x": 9, "y": 0},
176 {"x":10, "y":0}, 187 {"matrix": [0, 10], "x": 10, "y": 0},
177 {"x":11, "y":0}, 188 {"matrix": [0, 11], "x": 11, "y": 0},
178 {"x":12, "y":0}, 189 {"matrix": [0, 12], "x": 12, "y": 0},
179 {"x":13, "y":0}, 190 {"matrix": [0, 13], "x": 13, "y": 0},
180 {"x":14, "y":0}, 191 {"matrix": [0, 14], "x": 14, "y": 0},
181 192
182 {"x":0, "y":1, "w":1.5}, 193 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
183 {"x":1.5, "y":1}, 194 {"matrix": [1, 1], "x": 1.5, "y": 1},
184 {"x":2.5, "y":1}, 195 {"matrix": [1, 2], "x": 2.5, "y": 1},
185 {"x":3.5, "y":1}, 196 {"matrix": [1, 3], "x": 3.5, "y": 1},
186 {"x":4.5, "y":1}, 197 {"matrix": [1, 4], "x": 4.5, "y": 1},
187 {"x":5.5, "y":1}, 198 {"matrix": [1, 5], "x": 5.5, "y": 1},
188 {"x":6.5, "y":1}, 199 {"matrix": [1, 6], "x": 6.5, "y": 1},
189 {"x":7.5, "y":1}, 200 {"matrix": [1, 7], "x": 7.5, "y": 1},
190 {"x":8.5, "y":1}, 201 {"matrix": [1, 8], "x": 8.5, "y": 1},
191 {"x":9.5, "y":1}, 202 {"matrix": [1, 9], "x": 9.5, "y": 1},
192 {"x":10.5, "y":1}, 203 {"matrix": [1, 10], "x": 10.5, "y": 1},
193 {"x":11.5, "y":1}, 204 {"matrix": [1, 11], "x": 11.5, "y": 1},
194 {"x":12.5, "y":1}, 205 {"matrix": [1, 12], "x": 12.5, "y": 1},
195 {"x":13.5, "y":1, "w":1.5}, 206 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
196 207
197 {"x":0, "y":2, "w":1.75}, 208 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
198 {"x":1.75, "y":2}, 209 {"matrix": [2, 1], "x": 1.75, "y": 2},
199 {"x":2.75, "y":2}, 210 {"matrix": [2, 2], "x": 2.75, "y": 2},
200 {"x":3.75, "y":2}, 211 {"matrix": [2, 3], "x": 3.75, "y": 2},
201 {"x":4.75, "y":2}, 212 {"matrix": [2, 4], "x": 4.75, "y": 2},
202 {"x":5.75, "y":2}, 213 {"matrix": [2, 5], "x": 5.75, "y": 2},
203 {"x":6.75, "y":2}, 214 {"matrix": [2, 6], "x": 6.75, "y": 2},
204 {"x":7.75, "y":2}, 215 {"matrix": [2, 7], "x": 7.75, "y": 2},
205 {"x":8.75, "y":2}, 216 {"matrix": [2, 8], "x": 8.75, "y": 2},
206 {"x":9.75, "y":2}, 217 {"matrix": [2, 9], "x": 9.75, "y": 2},
207 {"x":10.75, "y":2}, 218 {"matrix": [2, 10], "x": 10.75, "y": 2},
208 {"x":11.75, "y":2}, 219 {"matrix": [2, 11], "x": 11.75, "y": 2},
209 {"x":12.75, "y":2, "w":2.25}, 220 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
210 221
211 {"x":0, "y":3, "w":2.25}, 222 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
212 {"x":2.25, "y":3}, 223 {"matrix": [3, 2], "x": 2.25, "y": 3},
213 {"x":3.25, "y":3}, 224 {"matrix": [3, 3], "x": 3.25, "y": 3},
214 {"x":4.25, "y":3}, 225 {"matrix": [3, 4], "x": 4.25, "y": 3},
215 {"x":5.25, "y":3}, 226 {"matrix": [3, 5], "x": 5.25, "y": 3},
216 {"x":6.25, "y":3}, 227 {"matrix": [3, 6], "x": 6.25, "y": 3},
217 {"x":7.25, "y":3}, 228 {"matrix": [3, 7], "x": 7.25, "y": 3},
218 {"x":8.25, "y":3}, 229 {"matrix": [3, 8], "x": 8.25, "y": 3},
219 {"x":9.25, "y":3}, 230 {"matrix": [3, 9], "x": 9.25, "y": 3},
220 {"x":10.25, "y":3}, 231 {"matrix": [3, 10], "x": 10.25, "y": 3},
221 {"x":11.25, "y":3}, 232 {"matrix": [3, 11], "x": 11.25, "y": 3},
222 {"x":12.25, "y":3, "w":2.75}, 233 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
223 234
224 {"x":0, "y":4, "w":1.25}, 235 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
225 {"x":1.25, "y":4, "w":1.25}, 236 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
226 {"x":2.5, "y":4, "w":1.25}, 237 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
227 {"x":3.75, "y":4, "w":6.25}, 238 {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
228 {"x":10, "y":4, "w":1.25}, 239 {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
229 {"x":11.25, "y":4, "w":1.25}, 240 {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
230 {"x":12.5, "y":4, "w":1.25}, 241 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
231 {"x":13.75, "y":4, "w":1.25} 242 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
232 ] 243 ]
233 }, 244 },
234 "LAYOUT_60_ansi_split_bs_rshift": { 245 "LAYOUT_60_ansi_split_bs_rshift": {
235 "layout": [ 246 "layout": [
236 {"x":0, "y":0}, 247 {"matrix": [0, 0], "x": 0, "y": 0},
237 {"x":1, "y":0}, 248 {"matrix": [0, 1], "x": 1, "y": 0},
238 {"x":2, "y":0}, 249 {"matrix": [0, 2], "x": 2, "y": 0},
239 {"x":3, "y":0}, 250 {"matrix": [0, 3], "x": 3, "y": 0},
240 {"x":4, "y":0}, 251 {"matrix": [0, 4], "x": 4, "y": 0},
241 {"x":5, "y":0}, 252 {"matrix": [0, 5], "x": 5, "y": 0},
242 {"x":6, "y":0}, 253 {"matrix": [0, 6], "x": 6, "y": 0},
243 {"x":7, "y":0}, 254 {"matrix": [0, 7], "x": 7, "y": 0},
244 {"x":8, "y":0}, 255 {"matrix": [0, 8], "x": 8, "y": 0},
245 {"x":9, "y":0}, 256 {"matrix": [0, 9], "x": 9, "y": 0},
246 {"x":10, "y":0}, 257 {"matrix": [0, 10], "x": 10, "y": 0},
247 {"x":11, "y":0}, 258 {"matrix": [0, 11], "x": 11, "y": 0},
248 {"x":12, "y":0}, 259 {"matrix": [0, 12], "x": 12, "y": 0},
249 {"x":13, "y":0}, 260 {"matrix": [0, 13], "x": 13, "y": 0},
250 {"x":14, "y":0}, 261 {"matrix": [0, 14], "x": 14, "y": 0},
251 262
252 {"x":0, "y":1, "w":1.5}, 263 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
253 {"x":1.5, "y":1}, 264 {"matrix": [1, 1], "x": 1.5, "y": 1},
254 {"x":2.5, "y":1}, 265 {"matrix": [1, 2], "x": 2.5, "y": 1},
255 {"x":3.5, "y":1}, 266 {"matrix": [1, 3], "x": 3.5, "y": 1},
256 {"x":4.5, "y":1}, 267 {"matrix": [1, 4], "x": 4.5, "y": 1},
257 {"x":5.5, "y":1}, 268 {"matrix": [1, 5], "x": 5.5, "y": 1},
258 {"x":6.5, "y":1}, 269 {"matrix": [1, 6], "x": 6.5, "y": 1},
259 {"x":7.5, "y":1}, 270 {"matrix": [1, 7], "x": 7.5, "y": 1},
260 {"x":8.5, "y":1}, 271 {"matrix": [1, 8], "x": 8.5, "y": 1},
261 {"x":9.5, "y":1}, 272 {"matrix": [1, 9], "x": 9.5, "y": 1},
262 {"x":10.5, "y":1}, 273 {"matrix": [1, 10], "x": 10.5, "y": 1},
263 {"x":11.5, "y":1}, 274 {"matrix": [1, 11], "x": 11.5, "y": 1},
264 {"x":12.5, "y":1}, 275 {"matrix": [1, 12], "x": 12.5, "y": 1},
265 {"x":13.5, "y":1, "w":1.5}, 276 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
266 277
267 {"x":0, "y":2, "w":1.75}, 278 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
268 {"x":1.75, "y":2}, 279 {"matrix": [2, 1], "x": 1.75, "y": 2},
269 {"x":2.75, "y":2}, 280 {"matrix": [2, 2], "x": 2.75, "y": 2},
270 {"x":3.75, "y":2}, 281 {"matrix": [2, 3], "x": 3.75, "y": 2},
271 {"x":4.75, "y":2}, 282 {"matrix": [2, 4], "x": 4.75, "y": 2},
272 {"x":5.75, "y":2}, 283 {"matrix": [2, 5], "x": 5.75, "y": 2},
273 {"x":6.75, "y":2}, 284 {"matrix": [2, 6], "x": 6.75, "y": 2},
274 {"x":7.75, "y":2}, 285 {"matrix": [2, 7], "x": 7.75, "y": 2},
275 {"x":8.75, "y":2}, 286 {"matrix": [2, 8], "x": 8.75, "y": 2},
276 {"x":9.75, "y":2}, 287 {"matrix": [2, 9], "x": 9.75, "y": 2},
277 {"x":10.75, "y":2}, 288 {"matrix": [2, 10], "x": 10.75, "y": 2},
278 {"x":11.75, "y":2}, 289 {"matrix": [2, 11], "x": 11.75, "y": 2},
279 {"x":12.75, "y":2, "w":2.25}, 290 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
280 291
281 {"x":0, "y":3, "w":2.25}, 292 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
282 {"x":2.25, "y":3}, 293 {"matrix": [3, 2], "x": 2.25, "y": 3},
283 {"x":3.25, "y":3}, 294 {"matrix": [3, 3], "x": 3.25, "y": 3},
284 {"x":4.25, "y":3}, 295 {"matrix": [3, 4], "x": 4.25, "y": 3},
285 {"x":5.25, "y":3}, 296 {"matrix": [3, 5], "x": 5.25, "y": 3},
286 {"x":6.25, "y":3}, 297 {"matrix": [3, 6], "x": 6.25, "y": 3},
287 {"x":7.25, "y":3}, 298 {"matrix": [3, 7], "x": 7.25, "y": 3},
288 {"x":8.25, "y":3}, 299 {"matrix": [3, 8], "x": 8.25, "y": 3},
289 {"x":9.25, "y":3}, 300 {"matrix": [3, 9], "x": 9.25, "y": 3},
290 {"x":10.25, "y":3}, 301 {"matrix": [3, 10], "x": 10.25, "y": 3},
291 {"x":11.25, "y":3}, 302 {"matrix": [3, 11], "x": 11.25, "y": 3},
292 {"x":12.25, "y":3, "w":1.75}, 303 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
293 {"x":14, "y":3}, 304 {"matrix": [3, 14], "x": 14, "y": 3},
294 305
295 {"x":0, "y":4, "w":1.25}, 306 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
296 {"x":1.25, "y":4, "w":1.25}, 307 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
297 {"x":2.5, "y":4, "w":1.25}, 308 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
298 {"x":3.75, "y":4, "w":6.25}, 309 {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
299 {"x":10, "y":4, "w":1.25}, 310 {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
300 {"x":11.25, "y":4, "w":1.25}, 311 {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
301 {"x":12.5, "y":4, "w":1.25}, 312 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
302 {"x":13.75, "y":4, "w":1.25} 313 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
303 ] 314 ]
304 }, 315 },
305 "LAYOUT_60_ansi_split_rshift": { 316 "LAYOUT_60_ansi_split_rshift": {
306 "layout": [ 317 "layout": [
307 {"x":0, "y":0}, 318 {"matrix": [0, 0], "x": 0, "y": 0},
308 {"x":1, "y":0}, 319 {"matrix": [0, 1], "x": 1, "y": 0},
309 {"x":2, "y":0}, 320 {"matrix": [0, 2], "x": 2, "y": 0},
310 {"x":3, "y":0}, 321 {"matrix": [0, 3], "x": 3, "y": 0},
311 {"x":4, "y":0}, 322 {"matrix": [0, 4], "x": 4, "y": 0},
312 {"x":5, "y":0}, 323 {"matrix": [0, 5], "x": 5, "y": 0},
313 {"x":6, "y":0}, 324 {"matrix": [0, 6], "x": 6, "y": 0},
314 {"x":7, "y":0}, 325 {"matrix": [0, 7], "x": 7, "y": 0},
315 {"x":8, "y":0}, 326 {"matrix": [0, 8], "x": 8, "y": 0},
316 {"x":9, "y":0}, 327 {"matrix": [0, 9], "x": 9, "y": 0},
317 {"x":10, "y":0}, 328 {"matrix": [0, 10], "x": 10, "y": 0},
318 {"x":11, "y":0}, 329 {"matrix": [0, 11], "x": 11, "y": 0},
319 {"x":12, "y":0}, 330 {"matrix": [0, 12], "x": 12, "y": 0},
320 {"x":13, "y":0, "w":2}, 331 {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
321 332
322 {"x":0, "y":1, "w":1.5}, 333 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
323 {"x":1.5, "y":1}, 334 {"matrix": [1, 1], "x": 1.5, "y": 1},
324 {"x":2.5, "y":1}, 335 {"matrix": [1, 2], "x": 2.5, "y": 1},
325 {"x":3.5, "y":1}, 336 {"matrix": [1, 3], "x": 3.5, "y": 1},
326 {"x":4.5, "y":1}, 337 {"matrix": [1, 4], "x": 4.5, "y": 1},
327 {"x":5.5, "y":1}, 338 {"matrix": [1, 5], "x": 5.5, "y": 1},
328 {"x":6.5, "y":1}, 339 {"matrix": [1, 6], "x": 6.5, "y": 1},
329 {"x":7.5, "y":1}, 340 {"matrix": [1, 7], "x": 7.5, "y": 1},
330 {"x":8.5, "y":1}, 341 {"matrix": [1, 8], "x": 8.5, "y": 1},
331 {"x":9.5, "y":1}, 342 {"matrix": [1, 9], "x": 9.5, "y": 1},
332 {"x":10.5, "y":1}, 343 {"matrix": [1, 10], "x": 10.5, "y": 1},
333 {"x":11.5, "y":1}, 344 {"matrix": [1, 11], "x": 11.5, "y": 1},
334 {"x":12.5, "y":1}, 345 {"matrix": [1, 12], "x": 12.5, "y": 1},
335 {"x":13.5, "y":1, "w":1.5}, 346 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
336 347
337 {"x":0, "y":2, "w":1.75}, 348 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
338 {"x":1.75, "y":2}, 349 {"matrix": [2, 1], "x": 1.75, "y": 2},
339 {"x":2.75, "y":2}, 350 {"matrix": [2, 2], "x": 2.75, "y": 2},
340 {"x":3.75, "y":2}, 351 {"matrix": [2, 3], "x": 3.75, "y": 2},
341 {"x":4.75, "y":2}, 352 {"matrix": [2, 4], "x": 4.75, "y": 2},
342 {"x":5.75, "y":2}, 353 {"matrix": [2, 5], "x": 5.75, "y": 2},
343 {"x":6.75, "y":2}, 354 {"matrix": [2, 6], "x": 6.75, "y": 2},
344 {"x":7.75, "y":2}, 355 {"matrix": [2, 7], "x": 7.75, "y": 2},
345 {"x":8.75, "y":2}, 356 {"matrix": [2, 8], "x": 8.75, "y": 2},
346 {"x":9.75, "y":2}, 357 {"matrix": [2, 9], "x": 9.75, "y": 2},
347 {"x":10.75, "y":2}, 358 {"matrix": [2, 10], "x": 10.75, "y": 2},
348 {"x":11.75, "y":2}, 359 {"matrix": [2, 11], "x": 11.75, "y": 2},
349 {"x":12.75, "y":2, "w":2.25}, 360 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
350 361
351 {"x":0, "y":3, "w":2.25}, 362 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
352 {"x":2.25, "y":3}, 363 {"matrix": [3, 2], "x": 2.25, "y": 3},
353 {"x":3.25, "y":3}, 364 {"matrix": [3, 3], "x": 3.25, "y": 3},
354 {"x":4.25, "y":3}, 365 {"matrix": [3, 4], "x": 4.25, "y": 3},
355 {"x":5.25, "y":3}, 366 {"matrix": [3, 5], "x": 5.25, "y": 3},
356 {"x":6.25, "y":3}, 367 {"matrix": [3, 6], "x": 6.25, "y": 3},
357 {"x":7.25, "y":3}, 368 {"matrix": [3, 7], "x": 7.25, "y": 3},
358 {"x":8.25, "y":3}, 369 {"matrix": [3, 8], "x": 8.25, "y": 3},
359 {"x":9.25, "y":3}, 370 {"matrix": [3, 9], "x": 9.25, "y": 3},
360 {"x":10.25, "y":3}, 371 {"matrix": [3, 10], "x": 10.25, "y": 3},
361 {"x":11.25, "y":3}, 372 {"matrix": [3, 11], "x": 11.25, "y": 3},
362 {"x":12.25, "y":3, "w":1.75}, 373 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
363 {"x":14, "y":3}, 374 {"matrix": [3, 14], "x": 14, "y": 3},
364 375
365 {"x":0, "y":4, "w":1.25}, 376 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
366 {"x":1.25, "y":4, "w":1.25}, 377 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
367 {"x":2.5, "y":4, "w":1.25}, 378 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
368 {"x":3.75, "y":4, "w":6.25}, 379 {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
369 {"x":10, "y":4, "w":1.25}, 380 {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
370 {"x":11.25, "y":4, "w":1.25}, 381 {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
371 {"x":12.5, "y":4, "w":1.25}, 382 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
372 {"x":13.75, "y":4, "w":1.25} 383 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
373 ] 384 ]
374 }, 385 },
375 "LAYOUT_60_ansi_tsangan": { 386 "LAYOUT_60_ansi_tsangan": {
376 "layout": [ 387 "layout": [
377 {"x":0, "y":0}, 388 {"matrix": [0, 0], "x": 0, "y": 0},
378 {"x":1, "y":0}, 389 {"matrix": [0, 1], "x": 1, "y": 0},
379 {"x":2, "y":0}, 390 {"matrix": [0, 2], "x": 2, "y": 0},
380 {"x":3, "y":0}, 391 {"matrix": [0, 3], "x": 3, "y": 0},
381 {"x":4, "y":0}, 392 {"matrix": [0, 4], "x": 4, "y": 0},
382 {"x":5, "y":0}, 393 {"matrix": [0, 5], "x": 5, "y": 0},
383 {"x":6, "y":0}, 394 {"matrix": [0, 6], "x": 6, "y": 0},
384 {"x":7, "y":0}, 395 {"matrix": [0, 7], "x": 7, "y": 0},
385 {"x":8, "y":0}, 396 {"matrix": [0, 8], "x": 8, "y": 0},
386 {"x":9, "y":0}, 397 {"matrix": [0, 9], "x": 9, "y": 0},
387 {"x":10, "y":0}, 398 {"matrix": [0, 10], "x": 10, "y": 0},
388 {"x":11, "y":0}, 399 {"matrix": [0, 11], "x": 11, "y": 0},
389 {"x":12, "y":0}, 400 {"matrix": [0, 12], "x": 12, "y": 0},
390 {"x":13, "y":0, "w":2}, 401 {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
391 402
392 {"x":0, "y":1, "w":1.5}, 403 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
393 {"x":1.5, "y":1}, 404 {"matrix": [1, 1], "x": 1.5, "y": 1},
394 {"x":2.5, "y":1}, 405 {"matrix": [1, 2], "x": 2.5, "y": 1},
395 {"x":3.5, "y":1}, 406 {"matrix": [1, 3], "x": 3.5, "y": 1},
396 {"x":4.5, "y":1}, 407 {"matrix": [1, 4], "x": 4.5, "y": 1},
397 {"x":5.5, "y":1}, 408 {"matrix": [1, 5], "x": 5.5, "y": 1},
398 {"x":6.5, "y":1}, 409 {"matrix": [1, 6], "x": 6.5, "y": 1},
399 {"x":7.5, "y":1}, 410 {"matrix": [1, 7], "x": 7.5, "y": 1},
400 {"x":8.5, "y":1}, 411 {"matrix": [1, 8], "x": 8.5, "y": 1},
401 {"x":9.5, "y":1}, 412 {"matrix": [1, 9], "x": 9.5, "y": 1},
402 {"x":10.5, "y":1}, 413 {"matrix": [1, 10], "x": 10.5, "y": 1},
403 {"x":11.5, "y":1}, 414 {"matrix": [1, 11], "x": 11.5, "y": 1},
404 {"x":12.5, "y":1}, 415 {"matrix": [1, 12], "x": 12.5, "y": 1},
405 {"x":13.5, "y":1, "w":1.5}, 416 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
406 417
407 {"x":0, "y":2, "w":1.75}, 418 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
408 {"x":1.75, "y":2}, 419 {"matrix": [2, 1], "x": 1.75, "y": 2},
409 {"x":2.75, "y":2}, 420 {"matrix": [2, 2], "x": 2.75, "y": 2},
410 {"x":3.75, "y":2}, 421 {"matrix": [2, 3], "x": 3.75, "y": 2},
411 {"x":4.75, "y":2}, 422 {"matrix": [2, 4], "x": 4.75, "y": 2},
412 {"x":5.75, "y":2}, 423 {"matrix": [2, 5], "x": 5.75, "y": 2},
413 {"x":6.75, "y":2}, 424 {"matrix": [2, 6], "x": 6.75, "y": 2},
414 {"x":7.75, "y":2}, 425 {"matrix": [2, 7], "x": 7.75, "y": 2},
415 {"x":8.75, "y":2}, 426 {"matrix": [2, 8], "x": 8.75, "y": 2},
416 {"x":9.75, "y":2}, 427 {"matrix": [2, 9], "x": 9.75, "y": 2},
417 {"x":10.75, "y":2}, 428 {"matrix": [2, 10], "x": 10.75, "y": 2},
418 {"x":11.75, "y":2}, 429 {"matrix": [2, 11], "x": 11.75, "y": 2},
419 {"x":12.75, "y":2, "w":2.25}, 430 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
420 431
421 {"x":0, "y":3, "w":2.25}, 432 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
422 {"x":2.25, "y":3}, 433 {"matrix": [3, 2], "x": 2.25, "y": 3},
423 {"x":3.25, "y":3}, 434 {"matrix": [3, 3], "x": 3.25, "y": 3},
424 {"x":4.25, "y":3}, 435 {"matrix": [3, 4], "x": 4.25, "y": 3},
425 {"x":5.25, "y":3}, 436 {"matrix": [3, 5], "x": 5.25, "y": 3},
426 {"x":6.25, "y":3}, 437 {"matrix": [3, 6], "x": 6.25, "y": 3},
427 {"x":7.25, "y":3}, 438 {"matrix": [3, 7], "x": 7.25, "y": 3},
428 {"x":8.25, "y":3}, 439 {"matrix": [3, 8], "x": 8.25, "y": 3},
429 {"x":9.25, "y":3}, 440 {"matrix": [3, 9], "x": 9.25, "y": 3},
430 {"x":10.25, "y":3}, 441 {"matrix": [3, 10], "x": 10.25, "y": 3},
431 {"x":11.25, "y":3}, 442 {"matrix": [3, 11], "x": 11.25, "y": 3},
432 {"x":12.25, "y":3, "w":2.75}, 443 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
433 444
434 {"x":0, "y":4, "w":1.5}, 445 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
435 {"x":1.5, "y":4}, 446 {"matrix": [4, 1], "x": 1.5, "y": 4},
436 {"x":2.5, "y":4, "w":1.5}, 447 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
437 {"x":4, "y":4, "w":7}, 448 {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
438 {"x":11, "y":4, "w":1.5}, 449 {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
439 {"x":12.5, "y":4}, 450 {"matrix": [4, 12], "x": 12.5, "y": 4},
440 {"x":13.5, "y":4, "w":1.5} 451 {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
441 ] 452 ]
442 }, 453 },
443 "LAYOUT_60_hhkb": { 454 "LAYOUT_60_hhkb": {
444 "layout": [ 455 "layout": [
445 {"x":0, "y":0}, 456 {"matrix": [0, 0], "x": 0, "y": 0},
446 {"x":1, "y":0}, 457 {"matrix": [0, 1], "x": 1, "y": 0},
447 {"x":2, "y":0}, 458 {"matrix": [0, 2], "x": 2, "y": 0},
448 {"x":3, "y":0}, 459 {"matrix": [0, 3], "x": 3, "y": 0},
449 {"x":4, "y":0}, 460 {"matrix": [0, 4], "x": 4, "y": 0},
450 {"x":5, "y":0}, 461 {"matrix": [0, 5], "x": 5, "y": 0},
451 {"x":6, "y":0}, 462 {"matrix": [0, 6], "x": 6, "y": 0},
452 {"x":7, "y":0}, 463 {"matrix": [0, 7], "x": 7, "y": 0},
453 {"x":8, "y":0}, 464 {"matrix": [0, 8], "x": 8, "y": 0},
454 {"x":9, "y":0}, 465 {"matrix": [0, 9], "x": 9, "y": 0},
455 {"x":10, "y":0}, 466 {"matrix": [0, 10], "x": 10, "y": 0},
456 {"x":11, "y":0}, 467 {"matrix": [0, 11], "x": 11, "y": 0},
457 {"x":12, "y":0}, 468 {"matrix": [0, 12], "x": 12, "y": 0},
458 {"x":13, "y":0}, 469 {"matrix": [0, 13], "x": 13, "y": 0},
459 {"x":14, "y":0}, 470 {"matrix": [0, 14], "x": 14, "y": 0},
460 471
461 {"x":0, "y":1, "w":1.5}, 472 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
462 {"x":1.5, "y":1}, 473 {"matrix": [1, 1], "x": 1.5, "y": 1},
463 {"x":2.5, "y":1}, 474 {"matrix": [1, 2], "x": 2.5, "y": 1},
464 {"x":3.5, "y":1}, 475 {"matrix": [1, 3], "x": 3.5, "y": 1},
465 {"x":4.5, "y":1}, 476 {"matrix": [1, 4], "x": 4.5, "y": 1},
466 {"x":5.5, "y":1}, 477 {"matrix": [1, 5], "x": 5.5, "y": 1},
467 {"x":6.5, "y":1}, 478 {"matrix": [1, 6], "x": 6.5, "y": 1},
468 {"x":7.5, "y":1}, 479 {"matrix": [1, 7], "x": 7.5, "y": 1},
469 {"x":8.5, "y":1}, 480 {"matrix": [1, 8], "x": 8.5, "y": 1},
470 {"x":9.5, "y":1}, 481 {"matrix": [1, 9], "x": 9.5, "y": 1},
471 {"x":10.5, "y":1}, 482 {"matrix": [1, 10], "x": 10.5, "y": 1},
472 {"x":11.5, "y":1}, 483 {"matrix": [1, 11], "x": 11.5, "y": 1},
473 {"x":12.5, "y":1}, 484 {"matrix": [1, 12], "x": 12.5, "y": 1},
474 {"x":13.5, "y":1, "w":1.5}, 485 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
475 486
476 {"x":0, "y":2, "w":1.75}, 487 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
477 {"x":1.75, "y":2}, 488 {"matrix": [2, 1], "x": 1.75, "y": 2},
478 {"x":2.75, "y":2}, 489 {"matrix": [2, 2], "x": 2.75, "y": 2},
479 {"x":3.75, "y":2}, 490 {"matrix": [2, 3], "x": 3.75, "y": 2},
480 {"x":4.75, "y":2}, 491 {"matrix": [2, 4], "x": 4.75, "y": 2},
481 {"x":5.75, "y":2}, 492 {"matrix": [2, 5], "x": 5.75, "y": 2},
482 {"x":6.75, "y":2}, 493 {"matrix": [2, 6], "x": 6.75, "y": 2},
483 {"x":7.75, "y":2}, 494 {"matrix": [2, 7], "x": 7.75, "y": 2},
484 {"x":8.75, "y":2}, 495 {"matrix": [2, 8], "x": 8.75, "y": 2},
485 {"x":9.75, "y":2}, 496 {"matrix": [2, 9], "x": 9.75, "y": 2},
486 {"x":10.75, "y":2}, 497 {"matrix": [2, 10], "x": 10.75, "y": 2},
487 {"x":11.75, "y":2}, 498 {"matrix": [2, 11], "x": 11.75, "y": 2},
488 {"x":12.75, "y":2, "w":2.25}, 499 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
489 500
490 {"x":0, "y":3, "w":2.25}, 501 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
491 {"x":2.25, "y":3}, 502 {"matrix": [3, 2], "x": 2.25, "y": 3},
492 {"x":3.25, "y":3}, 503 {"matrix": [3, 3], "x": 3.25, "y": 3},
493 {"x":4.25, "y":3}, 504 {"matrix": [3, 4], "x": 4.25, "y": 3},
494 {"x":5.25, "y":3}, 505 {"matrix": [3, 5], "x": 5.25, "y": 3},
495 {"x":6.25, "y":3}, 506 {"matrix": [3, 6], "x": 6.25, "y": 3},
496 {"x":7.25, "y":3}, 507 {"matrix": [3, 7], "x": 7.25, "y": 3},
497 {"x":8.25, "y":3}, 508 {"matrix": [3, 8], "x": 8.25, "y": 3},
498 {"x":9.25, "y":3}, 509 {"matrix": [3, 9], "x": 9.25, "y": 3},
499 {"x":10.25, "y":3}, 510 {"matrix": [3, 10], "x": 10.25, "y": 3},
500 {"x":11.25, "y":3}, 511 {"matrix": [3, 11], "x": 11.25, "y": 3},
501 {"x":12.25, "y":3, "w":1.75}, 512 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
502 {"x":14, "y":3}, 513 {"matrix": [3, 14], "x": 14, "y": 3},
503 514
504 {"x":1.5, "y":4}, 515 {"matrix": [4, 1], "x": 1.5, "y": 4},
505 {"x":2.5, "y":4, "w":1.5}, 516 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
506 {"x":4, "y":4, "w":7}, 517 {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
507 {"x":11, "y":4, "w":1.5}, 518 {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
508 {"x":12.5, "y":4} 519 {"matrix": [4, 12], "x": 12.5, "y": 4}
509 ] 520 ]
510 }, 521 },
511 "LAYOUT_60_iso": { 522 "LAYOUT_60_iso": {
512 "layout": [ 523 "layout": [
513 {"x":0, "y":0}, 524 {"matrix": [0, 0], "x": 0, "y": 0},
514 {"x":1, "y":0}, 525 {"matrix": [0, 1], "x": 1, "y": 0},
515 {"x":2, "y":0}, 526 {"matrix": [0, 2], "x": 2, "y": 0},
516 {"x":3, "y":0}, 527 {"matrix": [0, 3], "x": 3, "y": 0},
517 {"x":4, "y":0}, 528 {"matrix": [0, 4], "x": 4, "y": 0},
518 {"x":5, "y":0}, 529 {"matrix": [0, 5], "x": 5, "y": 0},
519 {"x":6, "y":0}, 530 {"matrix": [0, 6], "x": 6, "y": 0},
520 {"x":7, "y":0}, 531 {"matrix": [0, 7], "x": 7, "y": 0},
521 {"x":8, "y":0}, 532 {"matrix": [0, 8], "x": 8, "y": 0},
522 {"x":9, "y":0}, 533 {"matrix": [0, 9], "x": 9, "y": 0},
523 {"x":10, "y":0}, 534 {"matrix": [0, 10], "x": 10, "y": 0},
524 {"x":11, "y":0}, 535 {"matrix": [0, 11], "x": 11, "y": 0},
525 {"x":12, "y":0}, 536 {"matrix": [0, 12], "x": 12, "y": 0},
526 {"x":13, "y":0, "w":2}, 537 {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
527 538
528 {"x":0, "y":1, "w":1.5}, 539 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
529 {"x":1.5, "y":1}, 540 {"matrix": [1, 1], "x": 1.5, "y": 1},
530 {"x":2.5, "y":1}, 541 {"matrix": [1, 2], "x": 2.5, "y": 1},
531 {"x":3.5, "y":1}, 542 {"matrix": [1, 3], "x": 3.5, "y": 1},
532 {"x":4.5, "y":1}, 543 {"matrix": [1, 4], "x": 4.5, "y": 1},
533 {"x":5.5, "y":1}, 544 {"matrix": [1, 5], "x": 5.5, "y": 1},
534 {"x":6.5, "y":1}, 545 {"matrix": [1, 6], "x": 6.5, "y": 1},
535 {"x":7.5, "y":1}, 546 {"matrix": [1, 7], "x": 7.5, "y": 1},
536 {"x":8.5, "y":1}, 547 {"matrix": [1, 8], "x": 8.5, "y": 1},
537 {"x":9.5, "y":1}, 548 {"matrix": [1, 9], "x": 9.5, "y": 1},
538 {"x":10.5, "y":1}, 549 {"matrix": [1, 10], "x": 10.5, "y": 1},
539 {"x":11.5, "y":1}, 550 {"matrix": [1, 11], "x": 11.5, "y": 1},
540 {"x":12.5, "y":1}, 551 {"matrix": [1, 12], "x": 12.5, "y": 1},
541 552
542 {"x":0, "y":2, "w":1.75}, 553 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
543 {"x":1.75, "y":2}, 554 {"matrix": [2, 1], "x": 1.75, "y": 2},
544 {"x":2.75, "y":2}, 555 {"matrix": [2, 2], "x": 2.75, "y": 2},
545 {"x":3.75, "y":2}, 556 {"matrix": [2, 3], "x": 3.75, "y": 2},
546 {"x":4.75, "y":2}, 557 {"matrix": [2, 4], "x": 4.75, "y": 2},
547 {"x":5.75, "y":2}, 558 {"matrix": [2, 5], "x": 5.75, "y": 2},
548 {"x":6.75, "y":2}, 559 {"matrix": [2, 6], "x": 6.75, "y": 2},
549 {"x":7.75, "y":2}, 560 {"matrix": [2, 7], "x": 7.75, "y": 2},
550 {"x":8.75, "y":2}, 561 {"matrix": [2, 8], "x": 8.75, "y": 2},
551 {"x":9.75, "y":2}, 562 {"matrix": [2, 9], "x": 9.75, "y": 2},
552 {"x":10.75, "y":2}, 563 {"matrix": [2, 10], "x": 10.75, "y": 2},
553 {"x":11.75, "y":2}, 564 {"matrix": [2, 11], "x": 11.75, "y": 2},
554 {"x":12.75, "y":2}, 565 {"matrix": [2, 12], "x": 12.75, "y": 2},
555 {"x":13.75, "y":1, "w":1.25, "h":2}, 566 {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
556 567
557 {"x":0, "y":3, "w":1.25}, 568 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
558 {"x":1.25, "y":3}, 569 {"matrix": [3, 1], "x": 1.25, "y": 3},
559 {"x":2.25, "y":3}, 570 {"matrix": [3, 2], "x": 2.25, "y": 3},
560 {"x":3.25, "y":3}, 571 {"matrix": [3, 3], "x": 3.25, "y": 3},
561 {"x":4.25, "y":3}, 572 {"matrix": [3, 4], "x": 4.25, "y": 3},
562 {"x":5.25, "y":3}, 573 {"matrix": [3, 5], "x": 5.25, "y": 3},
563 {"x":6.25, "y":3}, 574 {"matrix": [3, 6], "x": 6.25, "y": 3},
564 {"x":7.25, "y":3}, 575 {"matrix": [3, 7], "x": 7.25, "y": 3},
565 {"x":8.25, "y":3}, 576 {"matrix": [3, 8], "x": 8.25, "y": 3},
566 {"x":9.25, "y":3}, 577 {"matrix": [3, 9], "x": 9.25, "y": 3},
567 {"x":10.25, "y":3}, 578 {"matrix": [3, 10], "x": 10.25, "y": 3},
568 {"x":11.25, "y":3}, 579 {"matrix": [3, 11], "x": 11.25, "y": 3},
569 {"x":12.25, "y":3, "w":2.75}, 580 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
570 581
571 {"x":0, "y":4, "w":1.25}, 582 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
572 {"x":1.25, "y":4, "w":1.25}, 583 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
573 {"x":2.5, "y":4, "w":1.25}, 584 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
574 {"x":3.75, "y":4, "w":6.25}, 585 {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
575 {"x":10, "y":4, "w":1.25}, 586 {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
576 {"x":11.25, "y":4, "w":1.25}, 587 {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
577 {"x":12.5, "y":4, "w":1.25}, 588 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
578 {"x":13.75, "y":4, "w":1.25} 589 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
579 ] 590 ]
580 }, 591 },
581 "LAYOUT_60_iso_split_bs": { 592 "LAYOUT_60_iso_split_bs": {
582 "layout": [ 593 "layout": [
583 {"x":0, "y":0}, 594 {"matrix": [0, 0], "x": 0, "y": 0},
584 {"x":1, "y":0}, 595 {"matrix": [0, 1], "x": 1, "y": 0},
585 {"x":2, "y":0}, 596 {"matrix": [0, 2], "x": 2, "y": 0},
586 {"x":3, "y":0}, 597 {"matrix": [0, 3], "x": 3, "y": 0},
587 {"x":4, "y":0}, 598 {"matrix": [0, 4], "x": 4, "y": 0},
588 {"x":5, "y":0}, 599 {"matrix": [0, 5], "x": 5, "y": 0},
589 {"x":6, "y":0}, 600 {"matrix": [0, 6], "x": 6, "y": 0},
590 {"x":7, "y":0}, 601 {"matrix": [0, 7], "x": 7, "y": 0},
591 {"x":8, "y":0}, 602 {"matrix": [0, 8], "x": 8, "y": 0},
592 {"x":9, "y":0}, 603 {"matrix": [0, 9], "x": 9, "y": 0},
593 {"x":10, "y":0}, 604 {"matrix": [0, 10], "x": 10, "y": 0},
594 {"x":11, "y":0}, 605 {"matrix": [0, 11], "x": 11, "y": 0},
595 {"x":12, "y":0}, 606 {"matrix": [0, 12], "x": 12, "y": 0},
596 {"x":13, "y":0}, 607 {"matrix": [0, 13], "x": 13, "y": 0},
597 {"x":14, "y":0}, 608 {"matrix": [0, 14], "x": 14, "y": 0},
598 609
599 {"x":0, "y":1, "w":1.5}, 610 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
600 {"x":1.5, "y":1}, 611 {"matrix": [1, 1], "x": 1.5, "y": 1},
601 {"x":2.5, "y":1}, 612 {"matrix": [1, 2], "x": 2.5, "y": 1},
602 {"x":3.5, "y":1}, 613 {"matrix": [1, 3], "x": 3.5, "y": 1},
603 {"x":4.5, "y":1}, 614 {"matrix": [1, 4], "x": 4.5, "y": 1},
604 {"x":5.5, "y":1}, 615 {"matrix": [1, 5], "x": 5.5, "y": 1},
605 {"x":6.5, "y":1}, 616 {"matrix": [1, 6], "x": 6.5, "y": 1},
606 {"x":7.5, "y":1}, 617 {"matrix": [1, 7], "x": 7.5, "y": 1},
607 {"x":8.5, "y":1}, 618 {"matrix": [1, 8], "x": 8.5, "y": 1},
608 {"x":9.5, "y":1}, 619 {"matrix": [1, 9], "x": 9.5, "y": 1},
609 {"x":10.5, "y":1}, 620 {"matrix": [1, 10], "x": 10.5, "y": 1},
610 {"x":11.5, "y":1}, 621 {"matrix": [1, 11], "x": 11.5, "y": 1},
611 {"x":12.5, "y":1}, 622 {"matrix": [1, 12], "x": 12.5, "y": 1},
612 623
613 {"x":0, "y":2, "w":1.75}, 624 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
614 {"x":1.75, "y":2}, 625 {"matrix": [2, 1], "x": 1.75, "y": 2},
615 {"x":2.75, "y":2}, 626 {"matrix": [2, 2], "x": 2.75, "y": 2},
616 {"x":3.75, "y":2}, 627 {"matrix": [2, 3], "x": 3.75, "y": 2},
617 {"x":4.75, "y":2}, 628 {"matrix": [2, 4], "x": 4.75, "y": 2},
618 {"x":5.75, "y":2}, 629 {"matrix": [2, 5], "x": 5.75, "y": 2},
619 {"x":6.75, "y":2}, 630 {"matrix": [2, 6], "x": 6.75, "y": 2},
620 {"x":7.75, "y":2}, 631 {"matrix": [2, 7], "x": 7.75, "y": 2},
621 {"x":8.75, "y":2}, 632 {"matrix": [2, 8], "x": 8.75, "y": 2},
622 {"x":9.75, "y":2}, 633 {"matrix": [2, 9], "x": 9.75, "y": 2},
623 {"x":10.75, "y":2}, 634 {"matrix": [2, 10], "x": 10.75, "y": 2},
624 {"x":11.75, "y":2}, 635 {"matrix": [2, 11], "x": 11.75, "y": 2},
625 {"x":12.75, "y":2}, 636 {"matrix": [2, 12], "x": 12.75, "y": 2},
626 {"x":13.75, "y":1, "w":1.25, "h":2}, 637 {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
627 638
628 {"x":0, "y":3, "w":1.25}, 639 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
629 {"x":1.25, "y":3}, 640 {"matrix": [3, 1], "x": 1.25, "y": 3},
630 {"x":2.25, "y":3}, 641 {"matrix": [3, 2], "x": 2.25, "y": 3},
631 {"x":3.25, "y":3}, 642 {"matrix": [3, 3], "x": 3.25, "y": 3},
632 {"x":4.25, "y":3}, 643 {"matrix": [3, 4], "x": 4.25, "y": 3},
633 {"x":5.25, "y":3}, 644 {"matrix": [3, 5], "x": 5.25, "y": 3},
634 {"x":6.25, "y":3}, 645 {"matrix": [3, 6], "x": 6.25, "y": 3},
635 {"x":7.25, "y":3}, 646 {"matrix": [3, 7], "x": 7.25, "y": 3},
636 {"x":8.25, "y":3}, 647 {"matrix": [3, 8], "x": 8.25, "y": 3},
637 {"x":9.25, "y":3}, 648 {"matrix": [3, 9], "x": 9.25, "y": 3},
638 {"x":10.25, "y":3}, 649 {"matrix": [3, 10], "x": 10.25, "y": 3},
639 {"x":11.25, "y":3}, 650 {"matrix": [3, 11], "x": 11.25, "y": 3},
640 {"x":12.25, "y":3, "w":2.75}, 651 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
641 652
642 {"x":0, "y":4, "w":1.25}, 653 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
643 {"x":1.25, "y":4, "w":1.25}, 654 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
644 {"x":2.5, "y":4, "w":1.25}, 655 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
645 {"x":3.75, "y":4, "w":6.25}, 656 {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
646 {"x":10, "y":4, "w":1.25}, 657 {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
647 {"x":11.25, "y":4, "w":1.25}, 658 {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
648 {"x":12.5, "y":4, "w":1.25}, 659 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
649 {"x":13.75, "y":4, "w":1.25} 660 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
650 ] 661 ]
651 }, 662 },
652 "LAYOUT_60_iso_split_bs_rshift": { 663 "LAYOUT_60_iso_split_bs_rshift": {
653 "layout": [ 664 "layout": [
654 {"x":0, "y":0}, 665 {"matrix": [0, 0], "x": 0, "y": 0},
655 {"x":1, "y":0}, 666 {"matrix": [0, 1], "x": 1, "y": 0},
656 {"x":2, "y":0}, 667 {"matrix": [0, 2], "x": 2, "y": 0},
657 {"x":3, "y":0}, 668 {"matrix": [0, 3], "x": 3, "y": 0},
658 {"x":4, "y":0}, 669 {"matrix": [0, 4], "x": 4, "y": 0},
659 {"x":5, "y":0}, 670 {"matrix": [0, 5], "x": 5, "y": 0},
660 {"x":6, "y":0}, 671 {"matrix": [0, 6], "x": 6, "y": 0},
661 {"x":7, "y":0}, 672 {"matrix": [0, 7], "x": 7, "y": 0},
662 {"x":8, "y":0}, 673 {"matrix": [0, 8], "x": 8, "y": 0},
663 {"x":9, "y":0}, 674 {"matrix": [0, 9], "x": 9, "y": 0},
664 {"x":10, "y":0}, 675 {"matrix": [0, 10], "x": 10, "y": 0},
665 {"x":11, "y":0}, 676 {"matrix": [0, 11], "x": 11, "y": 0},
666 {"x":12, "y":0}, 677 {"matrix": [0, 12], "x": 12, "y": 0},
667 {"x":13, "y":0}, 678 {"matrix": [0, 13], "x": 13, "y": 0},
668 {"x":14, "y":0}, 679 {"matrix": [0, 14], "x": 14, "y": 0},
669 680
670 {"x":0, "y":1, "w":1.5}, 681 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
671 {"x":1.5, "y":1}, 682 {"matrix": [1, 1], "x": 1.5, "y": 1},
672 {"x":2.5, "y":1}, 683 {"matrix": [1, 2], "x": 2.5, "y": 1},
673 {"x":3.5, "y":1}, 684 {"matrix": [1, 3], "x": 3.5, "y": 1},
674 {"x":4.5, "y":1}, 685 {"matrix": [1, 4], "x": 4.5, "y": 1},
675 {"x":5.5, "y":1}, 686 {"matrix": [1, 5], "x": 5.5, "y": 1},
676 {"x":6.5, "y":1}, 687 {"matrix": [1, 6], "x": 6.5, "y": 1},
677 {"x":7.5, "y":1}, 688 {"matrix": [1, 7], "x": 7.5, "y": 1},
678 {"x":8.5, "y":1}, 689 {"matrix": [1, 8], "x": 8.5, "y": 1},
679 {"x":9.5, "y":1}, 690 {"matrix": [1, 9], "x": 9.5, "y": 1},
680 {"x":10.5, "y":1}, 691 {"matrix": [1, 10], "x": 10.5, "y": 1},
681 {"x":11.5, "y":1}, 692 {"matrix": [1, 11], "x": 11.5, "y": 1},
682 {"x":12.5, "y":1}, 693 {"matrix": [1, 12], "x": 12.5, "y": 1},
683 694
684 {"x":0, "y":2, "w":1.75}, 695 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
685 {"x":1.75, "y":2}, 696 {"matrix": [2, 1], "x": 1.75, "y": 2},
686 {"x":2.75, "y":2}, 697 {"matrix": [2, 2], "x": 2.75, "y": 2},
687 {"x":3.75, "y":2}, 698 {"matrix": [2, 3], "x": 3.75, "y": 2},
688 {"x":4.75, "y":2}, 699 {"matrix": [2, 4], "x": 4.75, "y": 2},
689 {"x":5.75, "y":2}, 700 {"matrix": [2, 5], "x": 5.75, "y": 2},
690 {"x":6.75, "y":2}, 701 {"matrix": [2, 6], "x": 6.75, "y": 2},
691 {"x":7.75, "y":2}, 702 {"matrix": [2, 7], "x": 7.75, "y": 2},
692 {"x":8.75, "y":2}, 703 {"matrix": [2, 8], "x": 8.75, "y": 2},
693 {"x":9.75, "y":2}, 704 {"matrix": [2, 9], "x": 9.75, "y": 2},
694 {"x":10.75, "y":2}, 705 {"matrix": [2, 10], "x": 10.75, "y": 2},
695 {"x":11.75, "y":2}, 706 {"matrix": [2, 11], "x": 11.75, "y": 2},
696 {"x":12.75, "y":2}, 707 {"matrix": [2, 12], "x": 12.75, "y": 2},
697 {"x":13.75, "y":1, "w":1.25, "h":2}, 708 {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
698 709
699 {"x":0, "y":3, "w":1.25}, 710 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
700 {"x":1.25, "y":3}, 711 {"matrix": [3, 1], "x": 1.25, "y": 3},
701 {"x":2.25, "y":3}, 712 {"matrix": [3, 2], "x": 2.25, "y": 3},
702 {"x":3.25, "y":3}, 713 {"matrix": [3, 3], "x": 3.25, "y": 3},
703 {"x":4.25, "y":3}, 714 {"matrix": [3, 4], "x": 4.25, "y": 3},
704 {"x":5.25, "y":3}, 715 {"matrix": [3, 5], "x": 5.25, "y": 3},
705 {"x":6.25, "y":3}, 716 {"matrix": [3, 6], "x": 6.25, "y": 3},
706 {"x":7.25, "y":3}, 717 {"matrix": [3, 7], "x": 7.25, "y": 3},
707 {"x":8.25, "y":3}, 718 {"matrix": [3, 8], "x": 8.25, "y": 3},
708 {"x":9.25, "y":3}, 719 {"matrix": [3, 9], "x": 9.25, "y": 3},
709 {"x":10.25, "y":3}, 720 {"matrix": [3, 10], "x": 10.25, "y": 3},
710 {"x":11.25, "y":3}, 721 {"matrix": [3, 11], "x": 11.25, "y": 3},
711 {"x":12.25, "y":3, "w":1.75}, 722 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
712 {"x":14, "y":3}, 723 {"matrix": [3, 14], "x": 14, "y": 3},
713 724
714 {"x":0, "y":4, "w":1.25}, 725 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
715 {"x":1.25, "y":4, "w":1.25}, 726 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
716 {"x":2.5, "y":4, "w":1.25}, 727 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
717 {"x":3.75, "y":4, "w":6.25}, 728 {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
718 {"x":10, "y":4, "w":1.25}, 729 {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
719 {"x":11.25, "y":4, "w":1.25}, 730 {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
720 {"x":12.5, "y":4, "w":1.25}, 731 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
721 {"x":13.75, "y":4, "w":1.25} 732 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
722 ] 733 ]
723 }, 734 },
724 "LAYOUT_60_iso_split_rshift": { 735 "LAYOUT_60_iso_split_rshift": {
725 "layout": [ 736 "layout": [
726 {"x":0, "y":0}, 737 {"matrix": [0, 0], "x": 0, "y": 0},
727 {"x":1, "y":0}, 738 {"matrix": [0, 1], "x": 1, "y": 0},
728 {"x":2, "y":0}, 739 {"matrix": [0, 2], "x": 2, "y": 0},
729 {"x":3, "y":0}, 740 {"matrix": [0, 3], "x": 3, "y": 0},
730 {"x":4, "y":0}, 741 {"matrix": [0, 4], "x": 4, "y": 0},
731 {"x":5, "y":0}, 742 {"matrix": [0, 5], "x": 5, "y": 0},
732 {"x":6, "y":0}, 743 {"matrix": [0, 6], "x": 6, "y": 0},
733 {"x":7, "y":0}, 744 {"matrix": [0, 7], "x": 7, "y": 0},
734 {"x":8, "y":0}, 745 {"matrix": [0, 8], "x": 8, "y": 0},
735 {"x":9, "y":0}, 746 {"matrix": [0, 9], "x": 9, "y": 0},
736 {"x":10, "y":0}, 747 {"matrix": [0, 10], "x": 10, "y": 0},
737 {"x":11, "y":0}, 748 {"matrix": [0, 11], "x": 11, "y": 0},
738 {"x":12, "y":0}, 749 {"matrix": [0, 12], "x": 12, "y": 0},
739 {"x":13, "y":0, "w":2}, 750 {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
740 751
741 {"x":0, "y":1, "w":1.5}, 752 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
742 {"x":1.5, "y":1}, 753 {"matrix": [1, 1], "x": 1.5, "y": 1},
743 {"x":2.5, "y":1}, 754 {"matrix": [1, 2], "x": 2.5, "y": 1},
744 {"x":3.5, "y":1}, 755 {"matrix": [1, 3], "x": 3.5, "y": 1},
745 {"x":4.5, "y":1}, 756 {"matrix": [1, 4], "x": 4.5, "y": 1},
746 {"x":5.5, "y":1}, 757 {"matrix": [1, 5], "x": 5.5, "y": 1},
747 {"x":6.5, "y":1}, 758 {"matrix": [1, 6], "x": 6.5, "y": 1},
748 {"x":7.5, "y":1}, 759 {"matrix": [1, 7], "x": 7.5, "y": 1},
749 {"x":8.5, "y":1}, 760 {"matrix": [1, 8], "x": 8.5, "y": 1},
750 {"x":9.5, "y":1}, 761 {"matrix": [1, 9], "x": 9.5, "y": 1},
751 {"x":10.5, "y":1}, 762 {"matrix": [1, 10], "x": 10.5, "y": 1},
752 {"x":11.5, "y":1}, 763 {"matrix": [1, 11], "x": 11.5, "y": 1},
753 {"x":12.5, "y":1}, 764 {"matrix": [1, 12], "x": 12.5, "y": 1},
754 765
755 {"x":0, "y":2, "w":1.75}, 766 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
756 {"x":1.75, "y":2}, 767 {"matrix": [2, 1], "x": 1.75, "y": 2},
757 {"x":2.75, "y":2}, 768 {"matrix": [2, 2], "x": 2.75, "y": 2},
758 {"x":3.75, "y":2}, 769 {"matrix": [2, 3], "x": 3.75, "y": 2},
759 {"x":4.75, "y":2}, 770 {"matrix": [2, 4], "x": 4.75, "y": 2},
760 {"x":5.75, "y":2}, 771 {"matrix": [2, 5], "x": 5.75, "y": 2},
761 {"x":6.75, "y":2}, 772 {"matrix": [2, 6], "x": 6.75, "y": 2},
762 {"x":7.75, "y":2}, 773 {"matrix": [2, 7], "x": 7.75, "y": 2},
763 {"x":8.75, "y":2}, 774 {"matrix": [2, 8], "x": 8.75, "y": 2},
764 {"x":9.75, "y":2}, 775 {"matrix": [2, 9], "x": 9.75, "y": 2},
765 {"x":10.75, "y":2}, 776 {"matrix": [2, 10], "x": 10.75, "y": 2},
766 {"x":11.75, "y":2}, 777 {"matrix": [2, 11], "x": 11.75, "y": 2},
767 {"x":12.75, "y":2}, 778 {"matrix": [2, 12], "x": 12.75, "y": 2},
768 {"x":13.75, "y":1, "w":1.25, "h":2}, 779 {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
769 780
770 {"x":0, "y":3, "w":1.25}, 781 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
771 {"x":1.25, "y":3}, 782 {"matrix": [3, 1], "x": 1.25, "y": 3},
772 {"x":2.25, "y":3}, 783 {"matrix": [3, 2], "x": 2.25, "y": 3},
773 {"x":3.25, "y":3}, 784 {"matrix": [3, 3], "x": 3.25, "y": 3},
774 {"x":4.25, "y":3}, 785 {"matrix": [3, 4], "x": 4.25, "y": 3},
775 {"x":5.25, "y":3}, 786 {"matrix": [3, 5], "x": 5.25, "y": 3},
776 {"x":6.25, "y":3}, 787 {"matrix": [3, 6], "x": 6.25, "y": 3},
777 {"x":7.25, "y":3}, 788 {"matrix": [3, 7], "x": 7.25, "y": 3},
778 {"x":8.25, "y":3}, 789 {"matrix": [3, 8], "x": 8.25, "y": 3},
779 {"x":9.25, "y":3}, 790 {"matrix": [3, 9], "x": 9.25, "y": 3},
780 {"x":10.25, "y":3}, 791 {"matrix": [3, 10], "x": 10.25, "y": 3},
781 {"x":11.25, "y":3}, 792 {"matrix": [3, 11], "x": 11.25, "y": 3},
782 {"x":12.25, "y":3, "w":1.75}, 793 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
783 {"x":14, "y":3}, 794 {"matrix": [3, 14], "x": 14, "y": 3},
784 795
785 {"x":0, "y":4, "w":1.25}, 796 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
786 {"x":1.25, "y":4, "w":1.25}, 797 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
787 {"x":2.5, "y":4, "w":1.25}, 798 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
788 {"x":3.75, "y":4, "w":6.25}, 799 {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
789 {"x":10, "y":4, "w":1.25}, 800 {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
790 {"x":11.25, "y":4, "w":1.25}, 801 {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
791 {"x":12.5, "y":4, "w":1.25}, 802 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
792 {"x":13.75, "y":4, "w":1.25} 803 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
793 ] 804 ]
794 }, 805 },
795 "LAYOUT_60_iso_tsangan": { 806 "LAYOUT_60_iso_tsangan": {
796 "layout": [ 807 "layout": [
797 {"x":0, "y":0}, 808 {"matrix": [0, 0], "x": 0, "y": 0},
798 {"x":1, "y":0}, 809 {"matrix": [0, 1], "x": 1, "y": 0},
799 {"x":2, "y":0}, 810 {"matrix": [0, 2], "x": 2, "y": 0},
800 {"x":3, "y":0}, 811 {"matrix": [0, 3], "x": 3, "y": 0},
801 {"x":4, "y":0}, 812 {"matrix": [0, 4], "x": 4, "y": 0},
802 {"x":5, "y":0}, 813 {"matrix": [0, 5], "x": 5, "y": 0},
803 {"x":6, "y":0}, 814 {"matrix": [0, 6], "x": 6, "y": 0},
804 {"x":7, "y":0}, 815 {"matrix": [0, 7], "x": 7, "y": 0},
805 {"x":8, "y":0}, 816 {"matrix": [0, 8], "x": 8, "y": 0},
806 {"x":9, "y":0}, 817 {"matrix": [0, 9], "x": 9, "y": 0},
807 {"x":10, "y":0}, 818 {"matrix": [0, 10], "x": 10, "y": 0},
808 {"x":11, "y":0}, 819 {"matrix": [0, 11], "x": 11, "y": 0},
809 {"x":12, "y":0}, 820 {"matrix": [0, 12], "x": 12, "y": 0},
810 {"x":13, "y":0, "w":2}, 821 {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
811 822
812 {"x":0, "y":1, "w":1.5}, 823 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
813 {"x":1.5, "y":1}, 824 {"matrix": [1, 1], "x": 1.5, "y": 1},
814 {"x":2.5, "y":1}, 825 {"matrix": [1, 2], "x": 2.5, "y": 1},
815 {"x":3.5, "y":1}, 826 {"matrix": [1, 3], "x": 3.5, "y": 1},
816 {"x":4.5, "y":1}, 827 {"matrix": [1, 4], "x": 4.5, "y": 1},
817 {"x":5.5, "y":1}, 828 {"matrix": [1, 5], "x": 5.5, "y": 1},
818 {"x":6.5, "y":1}, 829 {"matrix": [1, 6], "x": 6.5, "y": 1},
819 {"x":7.5, "y":1}, 830 {"matrix": [1, 7], "x": 7.5, "y": 1},
820 {"x":8.5, "y":1}, 831 {"matrix": [1, 8], "x": 8.5, "y": 1},
821 {"x":9.5, "y":1}, 832 {"matrix": [1, 9], "x": 9.5, "y": 1},
822 {"x":10.5, "y":1}, 833 {"matrix": [1, 10], "x": 10.5, "y": 1},
823 {"x":11.5, "y":1}, 834 {"matrix": [1, 11], "x": 11.5, "y": 1},
824 {"x":12.5, "y":1}, 835 {"matrix": [1, 12], "x": 12.5, "y": 1},
825 836
826 {"x":0, "y":2, "w":1.75}, 837 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
827 {"x":1.75, "y":2}, 838 {"matrix": [2, 1], "x": 1.75, "y": 2},
828 {"x":2.75, "y":2}, 839 {"matrix": [2, 2], "x": 2.75, "y": 2},
829 {"x":3.75, "y":2}, 840 {"matrix": [2, 3], "x": 3.75, "y": 2},
830 {"x":4.75, "y":2}, 841 {"matrix": [2, 4], "x": 4.75, "y": 2},
831 {"x":5.75, "y":2}, 842 {"matrix": [2, 5], "x": 5.75, "y": 2},
832 {"x":6.75, "y":2}, 843 {"matrix": [2, 6], "x": 6.75, "y": 2},
833 {"x":7.75, "y":2}, 844 {"matrix": [2, 7], "x": 7.75, "y": 2},
834 {"x":8.75, "y":2}, 845 {"matrix": [2, 8], "x": 8.75, "y": 2},
835 {"x":9.75, "y":2}, 846 {"matrix": [2, 9], "x": 9.75, "y": 2},
836 {"x":10.75, "y":2}, 847 {"matrix": [2, 10], "x": 10.75, "y": 2},
837 {"x":11.75, "y":2}, 848 {"matrix": [2, 11], "x": 11.75, "y": 2},
838 {"x":12.75, "y":2}, 849 {"matrix": [2, 12], "x": 12.75, "y": 2},
839 {"x":13.75, "y":1, "w":1.25, "h":2}, 850 {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
840 851
841 {"x":0, "y":3, "w":1.25}, 852 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
842 {"x":1.25, "y":3}, 853 {"matrix": [3, 1], "x": 1.25, "y": 3},
843 {"x":2.25, "y":3}, 854 {"matrix": [3, 2], "x": 2.25, "y": 3},
844 {"x":3.25, "y":3}, 855 {"matrix": [3, 3], "x": 3.25, "y": 3},
845 {"x":4.25, "y":3}, 856 {"matrix": [3, 4], "x": 4.25, "y": 3},
846 {"x":5.25, "y":3}, 857 {"matrix": [3, 5], "x": 5.25, "y": 3},
847 {"x":6.25, "y":3}, 858 {"matrix": [3, 6], "x": 6.25, "y": 3},
848 {"x":7.25, "y":3}, 859 {"matrix": [3, 7], "x": 7.25, "y": 3},
849 {"x":8.25, "y":3}, 860 {"matrix": [3, 8], "x": 8.25, "y": 3},
850 {"x":9.25, "y":3}, 861 {"matrix": [3, 9], "x": 9.25, "y": 3},
851 {"x":10.25, "y":3}, 862 {"matrix": [3, 10], "x": 10.25, "y": 3},
852 {"x":11.25, "y":3}, 863 {"matrix": [3, 11], "x": 11.25, "y": 3},
853 {"x":12.25, "y":3, "w":2.75}, 864 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
854 865
855 {"x":0, "y":4, "w":1.5}, 866 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
856 {"x":1.5, "y":4}, 867 {"matrix": [4, 1], "x": 1.5, "y": 4},
857 {"x":2.5, "y":4, "w":1.5}, 868 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
858 {"x":4, "y":4, "w":7}, 869 {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
859 {"x":11, "y":4, "w":1.5}, 870 {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
860 {"x":12.5, "y":4}, 871 {"matrix": [4, 12], "x": 12.5, "y": 4},
861 {"x":13.5, "y":4, "w":1.5} 872 {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
862 ] 873 ]
863 } 874 }
864 } 875 }
diff --git a/keyboards/ymdk/yd60mq/yd60mq.c b/keyboards/ymdk/yd60mq/yd60mq.c
index bfe6b6c2de..1a14040907 100644
--- a/keyboards/ymdk/yd60mq/yd60mq.c
+++ b/keyboards/ymdk/yd60mq/yd60mq.c
@@ -1,4 +1,4 @@
1#include "yd60mq.h" 1#include "quantum.h"
2 2
3__attribute__((weak)) 3__attribute__((weak))
4void matrix_init_kb(void){ 4void matrix_init_kb(void){
diff --git a/keyboards/ymdk/yd60mq/yd60mq.h b/keyboards/ymdk/yd60mq/yd60mq.h
deleted file mode 100644
index 79ff1a6c05..0000000000
--- a/keyboards/ymdk/yd60mq/yd60mq.h
+++ /dev/null
@@ -1,173 +0,0 @@
1#pragma once
2
3#include "quantum.h"
4
5#define LAYOUT_all( \
6 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
7 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
8 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
9 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
10 K40, K41, K42, K43, K47, K48, K49, K4A, K4B, K4C, K4D \
11) { \
12 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
13 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, KC_NO }, \
14 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO }, \
15 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
16 { K40, K41, K42, K43, KC_NO, KC_NO, KC_NO, K47, K48, K49, K4A, K4B, K4C, K4D, KC_NO } \
17}
18
19#define LAYOUT_60_ansi( \
20 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \
21 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
22 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
23 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
24 K40, K41, K42, K47, K49, K4A, K4C, K4D \
25) { \
26 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E }, \
27 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, KC_NO }, \
28 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO }, \
29 { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, KC_NO }, \
30 { K40, K41, K42, KC_NO, KC_NO, KC_NO, KC_NO, K47, KC_NO, K49, K4A, KC_NO, K4C, K4D, KC_NO } \
31}
32
33#define LAYOUT_60_ansi_split_bs( \
34 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
35 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
36 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
37 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
38 K40, K41, K42, K47, K49, K4A, K4C, K4D \
39) { \
40 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
41 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, KC_NO }, \
42 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO }, \
43 { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, KC_NO }, \
44 { K40, K41, K42, KC_NO, KC_NO, KC_NO, KC_NO, K47, KC_NO, K49, K4A, KC_NO, K4C, K4D, KC_NO } \
45}
46
47#define LAYOUT_60_ansi_split_bs_rshift( \
48 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
49 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
50 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
51 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
52 K40, K41, K42, K47, K49, K4A, K4C, K4D \
53) { \
54 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
55 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, KC_NO }, \
56 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO }, \
57 { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E }, \
58 { K40, K41, K42, KC_NO, KC_NO, KC_NO, KC_NO, K47, KC_NO, K49, K4A, KC_NO, K4C, K4D, KC_NO } \
59}
60
61#define LAYOUT_60_ansi_split_rshift( \
62 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \
63 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
64 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
65 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
66 K40, K41, K42, K47, K49, K4A, K4C, K4D \
67) { \
68 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E }, \
69 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, KC_NO }, \
70 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO }, \
71 { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E }, \
72 { K40, K41, K42, KC_NO, KC_NO, KC_NO, KC_NO, K47, KC_NO, K49, K4A, KC_NO, K4C, K4D, KC_NO } \
73}
74
75#define LAYOUT_60_ansi_tsangan( \
76 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \
77 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
78 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
79 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
80 K40, K41, K42, K47, K4A, K4C, K4D \
81) { \
82 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E }, \
83 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, KC_NO }, \
84 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO }, \
85 { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, KC_NO }, \
86 { K40, K41, K42, KC_NO, KC_NO, KC_NO, KC_NO, K47, KC_NO, KC_NO, K4A, KC_NO, K4C, K4D, KC_NO } \
87}
88
89#define LAYOUT_60_hhkb( \
90 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
91 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
92 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
93 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
94 K41, K42, K47, K4A, K4C \
95) { \
96 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
97 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, KC_NO }, \
98 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO }, \
99 { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E }, \
100 { KC_NO, K41, K42, KC_NO, KC_NO, KC_NO, KC_NO, K47, KC_NO, KC_NO, K4A, KC_NO, K4C, KC_NO, KC_NO } \
101}
102
103#define LAYOUT_60_iso( \
104 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \
105 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
106 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
107 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
108 K40, K41, K42, K47, K49, K4A, K4C, K4D \
109) { \
110 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E }, \
111 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, KC_NO }, \
112 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO }, \
113 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, KC_NO }, \
114 { K40, K41, K42, KC_NO, KC_NO, KC_NO, KC_NO, K47, KC_NO, K49, K4A, KC_NO, K4C, K4D, KC_NO } \
115}
116
117#define LAYOUT_60_iso_split_bs( \
118 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
119 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
120 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
121 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
122 K40, K41, K42, K47, K49, K4A, K4C, K4D \
123) { \
124 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
125 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, KC_NO }, \
126 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO }, \
127 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, KC_NO }, \
128 { K40, K41, K42, KC_NO, KC_NO, KC_NO, KC_NO, K47, KC_NO, K49, K4A, KC_NO, K4C, K4D, KC_NO } \
129}
130
131#define LAYOUT_60_iso_split_bs_rshift( \
132 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
133 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
134 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
135 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
136 K40, K41, K42, K47, K49, K4A, K4C, K4D \
137) { \
138 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
139 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, KC_NO }, \
140 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO }, \
141 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E }, \
142 { K40, K41, K42, KC_NO, KC_NO, KC_NO, KC_NO, K47, KC_NO, K49, K4A, KC_NO, K4C, K4D, KC_NO } \
143}
144
145#define LAYOUT_60_iso_split_rshift( \
146 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \
147 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
148 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
149 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
150 K40, K41, K42, K47, K49, K4A, K4C, K4D \
151) { \
152 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E }, \
153 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, KC_NO }, \
154 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO }, \
155 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E }, \
156 { K40, K41, K42, KC_NO, KC_NO, KC_NO, KC_NO, K47, KC_NO, K49, K4A, KC_NO, K4C, K4D, KC_NO } \
157}
158
159#define LAYOUT_60_iso_tsangan( \
160 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \
161 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
162 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
163 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
164 K40, K41, K42, K47, K4A, K4C, K4D \
165) { \
166 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E }, \
167 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, KC_NO }, \
168 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO }, \
169 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, KC_NO }, \
170 { K40, K41, K42, KC_NO, KC_NO, KC_NO, KC_NO, K47, KC_NO, KC_NO, K4A, KC_NO, K4C, K4D, KC_NO } \
171}
172
173#define LAYOUT LAYOUT_all