summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards')
-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 @@
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"community_layouts": ["60_ansi", "60_ansi_split_bs_rshift"],
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_60_ansi_split_bs_rshift"
+ },
"layouts": {
"LAYOUT_60_ansi": {
"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},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "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},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "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},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "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},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 2.75},
- {"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":13.75, "y":4, "w":1.25}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 13.75, "y": 4, "w": 1.25}
]
},
"LAYOUT_60_ansi_split_bs_rshift": {
"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},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [2, 13], "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},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "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},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "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},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 12], "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":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":13.75, "y":4, "w":1.25}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 13.75, "y": 4, "w": 1.25}
]
}
}
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 @@
-/*
-Copyright 2015 Álvaro "Gondolindrim" Volpato <gondolindrim@acheronproject.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define ___ KC_NO
-
-#include "quantum.h"
-
-// equivalent to LAYOUT_all
-#define LAYOUT_60_ansi_split_bs_rshift( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
- K40, K41, K42, K46, K48, K49, K4A, K4B \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___ }, \
- { K40, K41, K42, ___, ___, ___, K46, ___, K48, K49, K4A, K4B, ___, ___ } \
-}
-
-#define LAYOUT_60_ansi( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, \
- K40, K41, K42, K46, K48, K49, K4A, K4B \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___ }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, ___ }, \
- { K40, K41, K42, ___, ___, ___, K46, ___, K48, K49, K4A, K4B, ___, ___ } \
-}
-
-#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 @@
-/* Copyright 2018 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
- k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k4F, k4E, \
- k51, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k2F, k4D, \
- k52, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
- k53, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k4C, \
- k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \
- { k50, k51, k52, k53, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
-}
-
-#define LAYOUT_split_bs( \
- k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k5C, k0C, k0D, k0E, k0F, k4F, k4E, \
- k51, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k2F, k4D, \
- k52, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
- k53, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k4C, \
- k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \
- { k50, k51, k52, k53, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k5C, XXX, XXX, XXX } \
-}
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 @@
"layouts": {
"LAYOUT": {
"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.5, "y": 0},
- {"x": 17.5, "y": 0},
- {"x": 18.5, "y": 0},
- {"x": 19.5, "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.5, "y": 1},
- {"x": 17.5, "y": 1},
- {"x": 18.5, "y": 1},
- {"x": 19.5, "y": 1, "h": 2},
-
- {"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": 16.5, "y": 2},
- {"x": 17.5, "y": 2},
- {"x": 18.5, "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.25, "y": 3.25},
-
- {"x": 16.5, "y": 3},
- {"x": 17.5, "y": 3},
- {"x": 18.5, "y": 3},
- {"x": 19.5, "y": 3, "h": 2},
-
- {"x": 0, "y": 4, "w": 1.25},
- {"x": 1.25, "y": 4},
- {"x": 2.25, "y": 4, "w": 1.25},
- {"x": 3.5, "y": 4, "w": 7},
- {"x": 10.5, "y": 4, "w": 1.25},
- {"x": 11.75, "y": 4},
- {"x": 12.75, "y": 4, "w": 1.25},
-
- {"x": 14.25, "y": 4.25},
- {"x": 15.25, "y": 4.25},
- {"x": 16.25, "y": 4.25},
-
- {"x": 17.5, "y": 4},
- {"x": 18.5, "y": 4}
+ {"matrix": [5, 0], "x": 0, "y": 0},
+ {"matrix": [0, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+ {"matrix": [0, 5], "x": 6, "y": 0},
+ {"matrix": [0, 6], "x": 7, "y": 0},
+ {"matrix": [0, 7], "x": 8, "y": 0},
+ {"matrix": [0, 8], "x": 9, "y": 0},
+ {"matrix": [0, 9], "x": 10, "y": 0},
+ {"matrix": [0, 10], "x": 11, "y": 0},
+ {"matrix": [0, 11], "x": 12, "y": 0},
+ {"matrix": [0, 12], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [0, 13], "x": 15.25, "y": 0},
+
+ {"matrix": [0, 14], "x": 16.5, "y": 0},
+ {"matrix": [0, 15], "x": 17.5, "y": 0},
+ {"matrix": [4, 15], "x": 18.5, "y": 0},
+ {"matrix": [4, 14], "x": 19.5, "y": 0},
+
+ {"matrix": [5, 1], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 0], "x": 1.5, "y": 1},
+ {"matrix": [1, 1], "x": 2.5, "y": 1},
+ {"matrix": [1, 2], "x": 3.5, "y": 1},
+ {"matrix": [1, 3], "x": 4.5, "y": 1},
+ {"matrix": [1, 4], "x": 5.5, "y": 1},
+ {"matrix": [1, 5], "x": 6.5, "y": 1},
+ {"matrix": [1, 6], "x": 7.5, "y": 1},
+ {"matrix": [1, 7], "x": 8.5, "y": 1},
+ {"matrix": [1, 8], "x": 9.5, "y": 1},
+ {"matrix": [1, 9], "x": 10.5, "y": 1},
+ {"matrix": [1, 10], "x": 11.5, "y": 1},
+ {"matrix": [1, 11], "x": 12.5, "y": 1},
+ {"matrix": [1, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 13], "x": 15.25, "y": 1},
+
+ {"matrix": [1, 14], "x": 16.5, "y": 1},
+ {"matrix": [1, 15], "x": 17.5, "y": 1},
+ {"matrix": [2, 15], "x": 18.5, "y": 1},
+ {"matrix": [4, 13], "x": 19.5, "y": 1, "h": 2},
+
+ {"matrix": [5, 2], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 0], "x": 1.75, "y": 2},
+ {"matrix": [2, 1], "x": 2.75, "y": 2},
+ {"matrix": [2, 2], "x": 3.75, "y": 2},
+ {"matrix": [2, 3], "x": 4.75, "y": 2},
+ {"matrix": [2, 4], "x": 5.75, "y": 2},
+ {"matrix": [2, 5], "x": 6.75, "y": 2},
+ {"matrix": [2, 6], "x": 7.75, "y": 2},
+ {"matrix": [2, 7], "x": 8.75, "y": 2},
+ {"matrix": [2, 8], "x": 9.75, "y": 2},
+ {"matrix": [2, 9], "x": 10.75, "y": 2},
+ {"matrix": [2, 10], "x": 11.75, "y": 2},
+ {"matrix": [2, 11], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [2, 12], "x": 16.5, "y": 2},
+ {"matrix": [2, 13], "x": 17.5, "y": 2},
+ {"matrix": [2, 14], "x": 18.5, "y": 2},
+
+ {"matrix": [5, 3], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 0], "x": 2.25, "y": 3},
+ {"matrix": [3, 1], "x": 3.25, "y": 3},
+ {"matrix": [3, 2], "x": 4.25, "y": 3},
+ {"matrix": [3, 3], "x": 5.25, "y": 3},
+ {"matrix": [3, 4], "x": 6.25, "y": 3},
+ {"matrix": [3, 5], "x": 7.25, "y": 3},
+ {"matrix": [3, 6], "x": 8.25, "y": 3},
+ {"matrix": [3, 7], "x": 9.25, "y": 3},
+ {"matrix": [3, 8], "x": 10.25, "y": 3},
+ {"matrix": [3, 9], "x": 11.25, "y": 3},
+ {"matrix": [3, 10], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 11], "x": 14, "y": 3},
+
+ {"matrix": [3, 12], "x": 15.25, "y": 3.25},
+
+ {"matrix": [3, 13], "x": 16.5, "y": 3},
+ {"matrix": [3, 14], "x": 17.5, "y": 3},
+ {"matrix": [3, 15], "x": 18.5, "y": 3},
+ {"matrix": [4, 12], "x": 19.5, "y": 3, "h": 2},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 7},
+ {"matrix": [4, 4], "x": 10.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 11.75, "y": 4},
+ {"matrix": [4, 6], "x": 12.75, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 7], "x": 14.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 15.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 16.25, "y": 4.25},
+
+ {"matrix": [4, 10], "x": 17.5, "y": 4},
+ {"matrix": [4, 11], "x": 18.5, "y": 4}
]
},
"LAYOUT_split_bs": {
"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.5, "y": 0},
- {"x": 17.5, "y": 0},
- {"x": 18.5, "y": 0},
- {"x": 19.5, "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.5, "y": 1},
- {"x": 17.5, "y": 1},
- {"x": 18.5, "y": 1},
- {"x": 19.5, "y": 1, "h": 2},
-
- {"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": 16.5, "y": 2},
- {"x": 17.5, "y": 2},
- {"x": 18.5, "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.25, "y": 3.25},
-
- {"x": 16.5, "y": 3},
- {"x": 17.5, "y": 3},
- {"x": 18.5, "y": 3},
- {"x": 19.5, "y": 3, "h": 2},
-
- {"x": 0, "y": 4, "w": 1.25},
- {"x": 1.25, "y": 4},
- {"x": 2.25, "y": 4, "w": 1.25},
- {"x": 3.5, "y": 4, "w": 7},
- {"x": 10.5, "y": 4, "w": 1.25},
- {"x": 11.75, "y": 4},
- {"x": 12.75, "y": 4, "w": 1.25},
-
- {"x": 14.25, "y": 4.25},
- {"x": 15.25, "y": 4.25},
- {"x": 16.25, "y": 4.25},
-
- {"x": 17.5, "y": 4},
- {"x": 18.5, "y": 4}
+ {"matrix": [5, 0], "x": 0, "y": 0},
+ {"matrix": [0, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+ {"matrix": [0, 5], "x": 6, "y": 0},
+ {"matrix": [0, 6], "x": 7, "y": 0},
+ {"matrix": [0, 7], "x": 8, "y": 0},
+ {"matrix": [0, 8], "x": 9, "y": 0},
+ {"matrix": [0, 9], "x": 10, "y": 0},
+ {"matrix": [0, 10], "x": 11, "y": 0},
+ {"matrix": [0, 11], "x": 12, "y": 0},
+ {"matrix": [5, 12], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
+
+ {"matrix": [0, 13], "x": 15.25, "y": 0},
+
+ {"matrix": [0, 14], "x": 16.5, "y": 0},
+ {"matrix": [0, 15], "x": 17.5, "y": 0},
+ {"matrix": [4, 15], "x": 18.5, "y": 0},
+ {"matrix": [4, 14], "x": 19.5, "y": 0},
+
+ {"matrix": [5, 1], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 0], "x": 1.5, "y": 1},
+ {"matrix": [1, 1], "x": 2.5, "y": 1},
+ {"matrix": [1, 2], "x": 3.5, "y": 1},
+ {"matrix": [1, 3], "x": 4.5, "y": 1},
+ {"matrix": [1, 4], "x": 5.5, "y": 1},
+ {"matrix": [1, 5], "x": 6.5, "y": 1},
+ {"matrix": [1, 6], "x": 7.5, "y": 1},
+ {"matrix": [1, 7], "x": 8.5, "y": 1},
+ {"matrix": [1, 8], "x": 9.5, "y": 1},
+ {"matrix": [1, 9], "x": 10.5, "y": 1},
+ {"matrix": [1, 10], "x": 11.5, "y": 1},
+ {"matrix": [1, 11], "x": 12.5, "y": 1},
+ {"matrix": [1, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 13], "x": 15.25, "y": 1},
+
+ {"matrix": [1, 14], "x": 16.5, "y": 1},
+ {"matrix": [1, 15], "x": 17.5, "y": 1},
+ {"matrix": [2, 15], "x": 18.5, "y": 1},
+ {"matrix": [4, 13], "x": 19.5, "y": 1, "h": 2},
+
+ {"matrix": [5, 2], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 0], "x": 1.75, "y": 2},
+ {"matrix": [2, 1], "x": 2.75, "y": 2},
+ {"matrix": [2, 2], "x": 3.75, "y": 2},
+ {"matrix": [2, 3], "x": 4.75, "y": 2},
+ {"matrix": [2, 4], "x": 5.75, "y": 2},
+ {"matrix": [2, 5], "x": 6.75, "y": 2},
+ {"matrix": [2, 6], "x": 7.75, "y": 2},
+ {"matrix": [2, 7], "x": 8.75, "y": 2},
+ {"matrix": [2, 8], "x": 9.75, "y": 2},
+ {"matrix": [2, 9], "x": 10.75, "y": 2},
+ {"matrix": [2, 10], "x": 11.75, "y": 2},
+ {"matrix": [2, 11], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [2, 12], "x": 16.5, "y": 2},
+ {"matrix": [2, 13], "x": 17.5, "y": 2},
+ {"matrix": [2, 14], "x": 18.5, "y": 2},
+
+ {"matrix": [5, 3], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 0], "x": 2.25, "y": 3},
+ {"matrix": [3, 1], "x": 3.25, "y": 3},
+ {"matrix": [3, 2], "x": 4.25, "y": 3},
+ {"matrix": [3, 3], "x": 5.25, "y": 3},
+ {"matrix": [3, 4], "x": 6.25, "y": 3},
+ {"matrix": [3, 5], "x": 7.25, "y": 3},
+ {"matrix": [3, 6], "x": 8.25, "y": 3},
+ {"matrix": [3, 7], "x": 9.25, "y": 3},
+ {"matrix": [3, 8], "x": 10.25, "y": 3},
+ {"matrix": [3, 9], "x": 11.25, "y": 3},
+ {"matrix": [3, 10], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 11], "x": 14, "y": 3},
+
+ {"matrix": [3, 12], "x": 15.25, "y": 3.25},
+
+ {"matrix": [3, 13], "x": 16.5, "y": 3},
+ {"matrix": [3, 14], "x": 17.5, "y": 3},
+ {"matrix": [3, 15], "x": 18.5, "y": 3},
+ {"matrix": [4, 12], "x": 19.5, "y": 3, "h": 2},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 7},
+ {"matrix": [4, 4], "x": 10.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 11.75, "y": 4},
+ {"matrix": [4, 6], "x": 12.75, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 7], "x": 14.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 15.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 16.25, "y": 4.25},
+
+ {"matrix": [4, 10], "x": 17.5, "y": 4},
+ {"matrix": [4, 11], "x": 18.5, "y": 4}
]
}
}
+
}
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 @@
-/* Copyright 2021 Salmon Cat Studio
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3D, K3E, K3F, \
- K40, K41, K42, K44, K48, K49, K4A, K4D, K4E, K4F \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO, KC_NO }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, KC_NO, KC_NO, K3D, K3E, K3F }, \
- { K40, K41, K42, KC_NO, K44, KC_NO, KC_NO, KC_NO, K48, K49, K4A, KC_NO, KC_NO, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0G, K0D, K0E, K0F, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
- K30, K3G, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3C, K3D, K3E, K3F, \
- K40, K41, K42, K44, K48, K49, K4A, K4D, K4E, K4F \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO, KC_NO, KC_NO }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, KC_NO, K3C, K3D, K3E, K3F, K3G }, \
- { K40, K41, K42, KC_NO, K44, KC_NO, KC_NO, KC_NO, K48, K49, K4A, KC_NO, KC_NO, K4D, K4E, K4F, KC_NO }, \
-}
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 @@
"layouts": {
"LAYOUT": {
"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":16.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}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1},
+ {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [3, 14], "x": 15.25, "y": 3},
+ {"matrix": [3, 15], "x": 16.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 13], "x": 14.25, "y": 4},
+ {"matrix": [4, 14], "x": 15.25, "y": 4},
+ {"matrix": [4, 15], "x": 16.25, "y": 4}
]
},
"LAYOUT_all": {
"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},
- {"x":13.75, "y":2, "w":1.25},
-
- {"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},
- {"x":13.25, "y":3, "w":1.75},
-
- {"x":15.25, "y":3},
- {"x":16.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}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 16], "x": 13, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1},
+ {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 16], "x": 1.25, "y": 3},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3},
+ {"matrix": [3, 13], "x": 13.25, "y": 3, "w": 1.75},
+
+ {"matrix": [3, 14], "x": 15.25, "y": 3},
+ {"matrix": [3, 15], "x": 16.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 13], "x": 14.25, "y": 4},
+ {"matrix": [4, 14], "x": 15.25, "y": 4},
+ {"matrix": [4, 15], "x": 16.25, "y": 4}
]
}
}
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 @@
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.66, "y": 0},
+ {"matrix": [0, 2], "x": 2.66, "y": 0},
+ {"matrix": [0, 3], "x": 3.66, "y": 0},
+ {"matrix": [0, 4], "x": 4.66, "y": 0},
+ {"matrix": [0, 5], "x": 5.66, "y": 0},
+ {"matrix": [0, 6], "x": 6.66, "y": 0},
+ {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+ {"matrix": [5, 0], "x": 9.32, "y": 0},
+ {"matrix": [5, 1], "x": 10.32, "y": 0},
+ {"matrix": [5, 2], "x": 11.32, "y": 0},
+ {"matrix": [5, 3], "x": 12.32, "y": 0},
+ {"matrix": [5, 4], "x": 13.32, "y": 0},
+ {"matrix": [5, 5], "x": 14.32, "y": 0},
+ {"matrix": [5, 7], "x": 15.32, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3.03, "y": 1},
+ {"matrix": [1, 3], "x": 4.03, "y": 1},
+ {"matrix": [1, 4], "x": 5.03, "y": 1},
+ {"matrix": [1, 5], "x": 6.03, "y": 1},
+ {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+ {"matrix": [6, 0], "x": 9, "y": 1},
+ {"matrix": [6, 1], "x": 10, "y": 1},
+ {"matrix": [6, 2], "x": 11, "y": 1},
+ {"matrix": [6, 3], "x": 12, "y": 1},
+ {"matrix": [6, 4], "x": 13, "y": 1},
+ {"matrix": [6, 5], "x": 14, "y": 1},
+ {"matrix": [6, 6], "x": 15.05, "y": 1},
+ {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.14, "y": 2},
+ {"matrix": [2, 3], "x": 4.14, "y": 2},
+ {"matrix": [2, 4], "x": 5.14, "y": 2},
+ {"matrix": [2, 5], "x": 6.14, "y": 2},
+ {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+ {"matrix": [7, 0], "x": 9.34, "y": 2},
+ {"matrix": [7, 1], "x": 10.34, "y": 2},
+ {"matrix": [7, 2], "x": 11.34, "y": 2},
+ {"matrix": [7, 3], "x": 12.34, "y": 2},
+ {"matrix": [7, 4], "x": 13.34, "y": 2},
+ {"matrix": [7, 5], "x": 14.34, "y": 2},
+ {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.5, "y": 3},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 6.5, "y": 3},
+ {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [8, 0], "x": 8.97, "y": 3},
+ {"matrix": [8, 1], "x": 9.97, "y": 3},
+ {"matrix": [8, 2], "x": 10.97, "y": 3},
+ {"matrix": [8, 3], "x": 11.97, "y": 3},
+ {"matrix": [8, 4], "x": 12.97, "y": 3},
+ {"matrix": [8, 5], "x": 13.97, "y": 3},
+ {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
+ {"matrix": [8, 8], "x": 16.72, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.75, "y": 4},
+ {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.75},
+
+ {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+ {"matrix": [9, 1], "x": 11.22, "y": 4},
+ {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 16.48, "y": 4}
+ ]
},
- "LAYOUT_split_backspace": {
- "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}]
+ "LAYOUT_split_backspace": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.66, "y": 0},
+ {"matrix": [0, 2], "x": 2.66, "y": 0},
+ {"matrix": [0, 3], "x": 3.66, "y": 0},
+ {"matrix": [0, 4], "x": 4.66, "y": 0},
+ {"matrix": [0, 5], "x": 5.66, "y": 0},
+ {"matrix": [0, 6], "x": 6.66, "y": 0},
+ {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+ {"matrix": [5, 0], "x": 9.32, "y": 0},
+ {"matrix": [5, 1], "x": 10.32, "y": 0},
+ {"matrix": [5, 2], "x": 11.32, "y": 0},
+ {"matrix": [5, 3], "x": 12.32, "y": 0},
+ {"matrix": [5, 4], "x": 13.32, "y": 0},
+ {"matrix": [5, 5], "x": 14.32, "y": 0},
+ {"matrix": [5, 6], "x": 15.32, "y": 0},
+ {"matrix": [5, 8], "x": 16.32, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3.03, "y": 1},
+ {"matrix": [1, 3], "x": 4.03, "y": 1},
+ {"matrix": [1, 4], "x": 5.03, "y": 1},
+ {"matrix": [1, 5], "x": 6.03, "y": 1},
+ {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+ {"matrix": [6, 0], "x": 9, "y": 1},
+ {"matrix": [6, 1], "x": 10, "y": 1},
+ {"matrix": [6, 2], "x": 11, "y": 1},
+ {"matrix": [6, 3], "x": 12, "y": 1},
+ {"matrix": [6, 4], "x": 13, "y": 1},
+ {"matrix": [6, 5], "x": 14, "y": 1},
+ {"matrix": [6, 6], "x": 15.05, "y": 1},
+ {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.14, "y": 2},
+ {"matrix": [2, 3], "x": 4.14, "y": 2},
+ {"matrix": [2, 4], "x": 5.14, "y": 2},
+ {"matrix": [2, 5], "x": 6.14, "y": 2},
+ {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+ {"matrix": [7, 0], "x": 9.34, "y": 2},
+ {"matrix": [7, 1], "x": 10.34, "y": 2},
+ {"matrix": [7, 2], "x": 11.34, "y": 2},
+ {"matrix": [7, 3], "x": 12.34, "y": 2},
+ {"matrix": [7, 4], "x": 13.34, "y": 2},
+ {"matrix": [7, 5], "x": 14.34, "y": 2},
+ {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.5, "y": 3},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 6.5, "y": 3},
+ {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [8, 0], "x": 8.97, "y": 3},
+ {"matrix": [8, 1], "x": 9.97, "y": 3},
+ {"matrix": [8, 2], "x": 10.97, "y": 3},
+ {"matrix": [8, 3], "x": 11.97, "y": 3},
+ {"matrix": [8, 4], "x": 12.97, "y": 3},
+ {"matrix": [8, 5], "x": 13.97, "y": 3},
+ {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
+ {"matrix": [8, 8], "x": 16.72, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.75, "y": 4},
+ {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.75},
+
+ {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+ {"matrix": [9, 1], "x": 11.22, "y": 4},
+ {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 16.48, "y": 4}
+ ]
},
- "LAYOUT_split_left_space": {
- "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}]
+ "LAYOUT_split_left_space": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.66, "y": 0},
+ {"matrix": [0, 2], "x": 2.66, "y": 0},
+ {"matrix": [0, 3], "x": 3.66, "y": 0},
+ {"matrix": [0, 4], "x": 4.66, "y": 0},
+ {"matrix": [0, 5], "x": 5.66, "y": 0},
+ {"matrix": [0, 6], "x": 6.66, "y": 0},
+ {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+ {"matrix": [5, 0], "x": 9.32, "y": 0},
+ {"matrix": [5, 1], "x": 10.32, "y": 0},
+ {"matrix": [5, 2], "x": 11.32, "y": 0},
+ {"matrix": [5, 3], "x": 12.32, "y": 0},
+ {"matrix": [5, 4], "x": 13.32, "y": 0},
+ {"matrix": [5, 5], "x": 14.32, "y": 0},
+ {"matrix": [5, 7], "x": 15.32, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3.03, "y": 1},
+ {"matrix": [1, 3], "x": 4.03, "y": 1},
+ {"matrix": [1, 4], "x": 5.03, "y": 1},
+ {"matrix": [1, 5], "x": 6.03, "y": 1},
+ {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+ {"matrix": [6, 0], "x": 9, "y": 1},
+ {"matrix": [6, 1], "x": 10, "y": 1},
+ {"matrix": [6, 2], "x": 11, "y": 1},
+ {"matrix": [6, 3], "x": 12, "y": 1},
+ {"matrix": [6, 4], "x": 13, "y": 1},
+ {"matrix": [6, 5], "x": 14, "y": 1},
+ {"matrix": [6, 6], "x": 15.05, "y": 1},
+ {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.14, "y": 2},
+ {"matrix": [2, 3], "x": 4.14, "y": 2},
+ {"matrix": [2, 4], "x": 5.14, "y": 2},
+ {"matrix": [2, 5], "x": 6.14, "y": 2},
+ {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+ {"matrix": [7, 0], "x": 9.34, "y": 2},
+ {"matrix": [7, 1], "x": 10.34, "y": 2},
+ {"matrix": [7, 2], "x": 11.34, "y": 2},
+ {"matrix": [7, 3], "x": 12.34, "y": 2},
+ {"matrix": [7, 4], "x": 13.34, "y": 2},
+ {"matrix": [7, 5], "x": 14.34, "y": 2},
+ {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.5, "y": 3},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 6.5, "y": 3},
+ {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [8, 0], "x": 8.97, "y": 3},
+ {"matrix": [8, 1], "x": 9.97, "y": 3},
+ {"matrix": [8, 2], "x": 10.97, "y": 3},
+ {"matrix": [8, 3], "x": 11.97, "y": 3},
+ {"matrix": [8, 4], "x": 12.97, "y": 3},
+ {"matrix": [8, 5], "x": 13.97, "y": 3},
+ {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
+ {"matrix": [8, 8], "x": 16.72, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.75, "y": 4},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 1.75},
+ {"matrix": [4, 6], "x": 7.5, "y": 4},
+
+ {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+ {"matrix": [9, 1], "x": 11.22, "y": 4},
+ {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 16.48, "y": 4}
+ ]
},
- "LAYOUT_all": {
- "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}]
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.66, "y": 0},
+ {"matrix": [0, 2], "x": 2.66, "y": 0},
+ {"matrix": [0, 3], "x": 3.66, "y": 0},
+ {"matrix": [0, 4], "x": 4.66, "y": 0},
+ {"matrix": [0, 5], "x": 5.66, "y": 0},
+ {"matrix": [0, 6], "x": 6.66, "y": 0},
+ {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+ {"matrix": [5, 0], "x": 9.32, "y": 0},
+ {"matrix": [5, 1], "x": 10.32, "y": 0},
+ {"matrix": [5, 2], "x": 11.32, "y": 0},
+ {"matrix": [5, 3], "x": 12.32, "y": 0},
+ {"matrix": [5, 4], "x": 13.32, "y": 0},
+ {"matrix": [5, 5], "x": 14.32, "y": 0},
+ {"matrix": [5, 6], "x": 15.32, "y": 0},
+ {"matrix": [5, 7], "x": 16.32, "y": 0},
+ {"matrix": [5, 8], "x": 17.32, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3.03, "y": 1},
+ {"matrix": [1, 3], "x": 4.03, "y": 1},
+ {"matrix": [1, 4], "x": 5.03, "y": 1},
+ {"matrix": [1, 5], "x": 6.03, "y": 1},
+ {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+ {"matrix": [6, 0], "x": 9, "y": 1},
+ {"matrix": [6, 1], "x": 10, "y": 1},
+ {"matrix": [6, 2], "x": 11, "y": 1},
+ {"matrix": [6, 3], "x": 12, "y": 1},
+ {"matrix": [6, 4], "x": 13, "y": 1},
+ {"matrix": [6, 5], "x": 14, "y": 1},
+ {"matrix": [6, 6], "x": 15.05, "y": 1},
+ {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.14, "y": 2},
+ {"matrix": [2, 3], "x": 4.14, "y": 2},
+ {"matrix": [2, 4], "x": 5.14, "y": 2},
+ {"matrix": [2, 5], "x": 6.14, "y": 2},
+ {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+ {"matrix": [7, 0], "x": 9.34, "y": 2},
+ {"matrix": [7, 1], "x": 10.34, "y": 2},
+ {"matrix": [7, 2], "x": 11.34, "y": 2},
+ {"matrix": [7, 3], "x": 12.34, "y": 2},
+ {"matrix": [7, 4], "x": 13.34, "y": 2},
+ {"matrix": [7, 5], "x": 14.34, "y": 2},
+ {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.5, "y": 3},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 6.5, "y": 3},
+ {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [8, 0], "x": 8.97, "y": 3},
+ {"matrix": [8, 1], "x": 9.97, "y": 3},
+ {"matrix": [8, 2], "x": 10.97, "y": 3},
+ {"matrix": [8, 3], "x": 11.97, "y": 3},
+ {"matrix": [8, 4], "x": 12.97, "y": 3},
+ {"matrix": [8, 5], "x": 13.97, "y": 3},
+ {"matrix": [8, 6], "x": 14.97, "y": 3},
+ {"matrix": [8, 7], "x": 15.97, "y": 3},
+ {"matrix": [8, 8], "x": 16.97, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.75, "y": 4},
+ {"matrix": [4, 4], "x": 5.75, "y": 4},
+ {"matrix": [4, 5], "x": 6.75, "y": 4},
+ {"matrix": [4, 6], "x": 7.75, "y": 4},
+
+ {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+ {"matrix": [9, 1], "x": 11.22, "y": 4},
+ {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 16.48, "y": 4}
+ ]
}
}
}
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 @@
-/* Copyright 2020 2Moons
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-//////////////////////////////////////////////////////////////////////////////
-// When only use Slice Rev1.
-//////////////////////////////////////////////////////////////////////////////
-/*
- * ,------------------------------------------------ --------------------------------------------------.
- * | L00 | L01 | L02 | L03 | L04 | L05 | L06 | L07 | | R00 | R01 | R02 | R03 | R04 | R05 | R06R07R08 |
- * |------------------------------------------------ ------------------------------------------------------+
- * | L10 | L11 | L12 | L13 | L14 | L15 | L16 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R37 |
- * |---------------------------------------------- ------------------------------------------------------+
- * | L20 | L21 | L22 | L23 | L24 | L25 | L26 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 |
- * |------------------------------------------------- --------------------------------------------------------+
- * | L30 | L31 | L32 | L33 | L34 | L35 | L36 | | R30 | R31 | R32 | R33 | R34 | R34 | R35 | R36R37R38 |
- * |------------------------------------------------- --------------------------------------------------------'
- * | L40 | L41 | L42 | L43 | L44L45L46 | | R40 | R41 | | R42 | R43 | R44 |
- * |------------------------------------------------- -------------------------------------------------------'
- */
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R07, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, R17, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R38,\
- L40, L41, L42, L43, L45, R40, R41, R42, R43, R44 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06, L07, KC_NO }, \
- { L10, L11, L12, L13, L14, L15, L16, KC_NO, KC_NO }, \
- { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO }, \
- { L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO }, \
- { L40, L41, L42, L43, KC_NO, L45, KC_NO, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, KC_NO, R07, KC_NO }, \
- { R10, R11, R12, R13, R14, R15, R16, R17, KC_NO }, \
- { R20, R21, R22, R23, R24, R25, R26, KC_NO, KC_NO }, \
- { R30, R31, R32, R33, R34, R35, R36, KC_NO, R38 }, \
- { R40, R41, R42, R43, R44, KC_NO, KC_NO, KC_NO, KC_NO } \
- }
-
-#define LAYOUT_all( \
- L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R07, R08, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, R17, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R37, R38,\
- L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06, L07, KC_NO }, \
- { L10, L11, L12, L13, L14, L15, L16, KC_NO, KC_NO }, \
- { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO }, \
- { L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO }, \
- { L40, L41, L42, L43, L44, L45, L46, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, R06, R07, R08 }, \
- { R10, R11, R12, R13, R14, R15, R16, R17, KC_NO }, \
- { R20, R21, R22, R23, R24, R25, R26, KC_NO, KC_NO }, \
- { R30, R31, R32, R33, R34, R35, R36, R37, R38 }, \
- { R40, R41, R42, R43, R44, KC_NO, KC_NO, KC_NO, KC_NO } \
- }
-
-#define LAYOUT_split_backspace( \
- L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R08, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, R17, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R38,\
- L40, L41, L42, L43, L45, R40, R41, R42, R43, R44 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06, L07, KC_NO }, \
- { L10, L11, L12, L13, L14, L15, L16, KC_NO, KC_NO }, \
- { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO }, \
- { L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO }, \
- { L40, L41, L42, L43, KC_NO, L45, KC_NO, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, R06, KC_NO, R08 }, \
- { R10, R11, R12, R13, R14, R15, R16, R17, KC_NO }, \
- { R20, R21, R22, R23, R24, R25, R26, KC_NO, KC_NO }, \
- { R30, R31, R32, R33, R34, R35, R36, KC_NO, R38 }, \
- { R40, R41, R42, R43, R44, KC_NO, KC_NO, KC_NO, KC_NO } \
- }
-
-
-#define LAYOUT_split_left_space( \
- L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R07, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, R17, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R38,\
- L40, L41, L42, L43, L44, L46, R40, R41, R42, R43, R44 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06, L07, KC_NO }, \
- { L10, L11, L12, L13, L14, L15, L16, KC_NO, KC_NO }, \
- { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO }, \
- { L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO }, \
- { L40, L41, L42, L43, L44, KC_NO, L46, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, KC_NO, R07, KC_NO }, \
- { R10, R11, R12, R13, R14, R15, R16, R17, KC_NO }, \
- { R20, R21, R22, R23, R24, R25, R26, KC_NO, KC_NO }, \
- { R30, R31, R32, R33, R34, R35, R36, KC_NO, R38 }, \
- { R40, R41, R42, R43, R44, KC_NO, KC_NO, KC_NO, KC_NO } \
- }
-
-
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 @@
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.66, "y": 0},
+ {"matrix": [0, 2], "x": 2.66, "y": 0},
+ {"matrix": [0, 3], "x": 3.66, "y": 0},
+ {"matrix": [0, 4], "x": 4.66, "y": 0},
+ {"matrix": [0, 5], "x": 5.66, "y": 0},
+ {"matrix": [0, 6], "x": 6.66, "y": 0},
+ {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+ {"matrix": [5, 0], "x": 9.32, "y": 0},
+ {"matrix": [5, 1], "x": 10.32, "y": 0},
+ {"matrix": [5, 2], "x": 11.32, "y": 0},
+ {"matrix": [5, 3], "x": 12.32, "y": 0},
+ {"matrix": [5, 4], "x": 13.32, "y": 0},
+ {"matrix": [5, 5], "x": 14.32, "y": 0},
+ {"matrix": [5, 6], "x": 15.32, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3.03, "y": 1},
+ {"matrix": [1, 3], "x": 4.03, "y": 1},
+ {"matrix": [1, 4], "x": 5.03, "y": 1},
+ {"matrix": [1, 5], "x": 6.03, "y": 1},
+ {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+ {"matrix": [6, 0], "x": 9, "y": 1},
+ {"matrix": [6, 1], "x": 10, "y": 1},
+ {"matrix": [6, 2], "x": 11, "y": 1},
+ {"matrix": [6, 3], "x": 12, "y": 1},
+ {"matrix": [6, 4], "x": 13, "y": 1},
+ {"matrix": [6, 5], "x": 14, "y": 1},
+ {"matrix": [6, 6], "x": 15.05, "y": 1},
+ {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.14, "y": 2},
+ {"matrix": [2, 3], "x": 4.14, "y": 2},
+ {"matrix": [2, 4], "x": 5.14, "y": 2},
+ {"matrix": [2, 5], "x": 6.14, "y": 2},
+ {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+ {"matrix": [7, 0], "x": 9.34, "y": 2},
+ {"matrix": [7, 1], "x": 10.34, "y": 2},
+ {"matrix": [7, 2], "x": 11.34, "y": 2},
+ {"matrix": [7, 3], "x": 12.34, "y": 2},
+ {"matrix": [7, 4], "x": 13.34, "y": 2},
+ {"matrix": [7, 5], "x": 14.34, "y": 2},
+ {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.5, "y": 3},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 6.5, "y": 3},
+ {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [8, 0], "x": 8.97, "y": 3},
+ {"matrix": [8, 1], "x": 9.97, "y": 3},
+ {"matrix": [8, 2], "x": 10.97, "y": 3},
+ {"matrix": [8, 3], "x": 11.97, "y": 3},
+ {"matrix": [8, 4], "x": 12.97, "y": 3},
+ {"matrix": [8, 5], "x": 13.97, "y": 3},
+ {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
+ {"matrix": [8, 7], "x": 16.72, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.75, "y": 4},
+ {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.75},
+
+ {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+ {"matrix": [9, 1], "x": 11.22, "y": 4},
+ {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 16.48, "y": 4}
+ ]
},
"LAYOUT_split_left_space": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.66, "y": 0},
+ {"matrix": [0, 2], "x": 2.66, "y": 0},
+ {"matrix": [0, 3], "x": 3.66, "y": 0},
+ {"matrix": [0, 4], "x": 4.66, "y": 0},
+ {"matrix": [0, 5], "x": 5.66, "y": 0},
+ {"matrix": [0, 6], "x": 6.66, "y": 0},
+ {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+ {"matrix": [5, 0], "x": 9.32, "y": 0},
+ {"matrix": [5, 1], "x": 10.32, "y": 0},
+ {"matrix": [5, 2], "x": 11.32, "y": 0},
+ {"matrix": [5, 3], "x": 12.32, "y": 0},
+ {"matrix": [5, 4], "x": 13.32, "y": 0},
+ {"matrix": [5, 5], "x": 14.32, "y": 0},
+ {"matrix": [5, 6], "x": 15.32, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3.03, "y": 1},
+ {"matrix": [1, 3], "x": 4.03, "y": 1},
+ {"matrix": [1, 4], "x": 5.03, "y": 1},
+ {"matrix": [1, 5], "x": 6.03, "y": 1},
+ {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+ {"matrix": [6, 0], "x": 9, "y": 1},
+ {"matrix": [6, 1], "x": 10, "y": 1},
+ {"matrix": [6, 2], "x": 11, "y": 1},
+ {"matrix": [6, 3], "x": 12, "y": 1},
+ {"matrix": [6, 4], "x": 13, "y": 1},
+ {"matrix": [6, 5], "x": 14, "y": 1},
+ {"matrix": [6, 6], "x": 15.05, "y": 1},
+ {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.14, "y": 2},
+ {"matrix": [2, 3], "x": 4.14, "y": 2},
+ {"matrix": [2, 4], "x": 5.14, "y": 2},
+ {"matrix": [2, 5], "x": 6.14, "y": 2},
+ {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+ {"matrix": [7, 0], "x": 9.34, "y": 2},
+ {"matrix": [7, 1], "x": 10.34, "y": 2},
+ {"matrix": [7, 2], "x": 11.34, "y": 2},
+ {"matrix": [7, 3], "x": 12.34, "y": 2},
+ {"matrix": [7, 4], "x": 13.34, "y": 2},
+ {"matrix": [7, 5], "x": 14.34, "y": 2},
+ {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.5, "y": 3},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 6.5, "y": 3},
+ {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [8, 0], "x": 8.97, "y": 3},
+ {"matrix": [8, 1], "x": 9.97, "y": 3},
+ {"matrix": [8, 2], "x": 10.97, "y": 3},
+ {"matrix": [8, 3], "x": 11.97, "y": 3},
+ {"matrix": [8, 4], "x": 12.97, "y": 3},
+ {"matrix": [8, 5], "x": 13.97, "y": 3},
+ {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
+ {"matrix": [8, 7], "x": 16.72, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.75, "y": 4},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 1.75},
+ {"matrix": [4, 6], "x": 7.5, "y": 4},
+
+ {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+ {"matrix": [9, 1], "x": 11.22, "y": 4},
+ {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 16.48, "y": 4}
+ ]
},
"LAYOUT_all": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.66, "y": 0},
+ {"matrix": [0, 2], "x": 2.66, "y": 0},
+ {"matrix": [0, 3], "x": 3.66, "y": 0},
+ {"matrix": [0, 4], "x": 4.66, "y": 0},
+ {"matrix": [0, 5], "x": 5.66, "y": 0},
+ {"matrix": [0, 6], "x": 6.66, "y": 0},
+ {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+ {"matrix": [5, 0], "x": 9.32, "y": 0},
+ {"matrix": [5, 1], "x": 10.32, "y": 0},
+ {"matrix": [5, 2], "x": 11.32, "y": 0},
+ {"matrix": [5, 3], "x": 12.32, "y": 0},
+ {"matrix": [5, 4], "x": 13.32, "y": 0},
+ {"matrix": [5, 5], "x": 14.32, "y": 0},
+ {"matrix": [5, 6], "x": 15.32, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3.03, "y": 1},
+ {"matrix": [1, 3], "x": 4.03, "y": 1},
+ {"matrix": [1, 4], "x": 5.03, "y": 1},
+ {"matrix": [1, 5], "x": 6.03, "y": 1},
+ {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+ {"matrix": [6, 0], "x": 9, "y": 1},
+ {"matrix": [6, 1], "x": 10, "y": 1},
+ {"matrix": [6, 2], "x": 11, "y": 1},
+ {"matrix": [6, 3], "x": 12, "y": 1},
+ {"matrix": [6, 4], "x": 13, "y": 1},
+ {"matrix": [6, 5], "x": 14, "y": 1},
+ {"matrix": [6, 6], "x": 15.05, "y": 1},
+ {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.14, "y": 2},
+ {"matrix": [2, 3], "x": 4.14, "y": 2},
+ {"matrix": [2, 4], "x": 5.14, "y": 2},
+ {"matrix": [2, 5], "x": 6.14, "y": 2},
+ {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+ {"matrix": [7, 0], "x": 9.34, "y": 2},
+ {"matrix": [7, 1], "x": 10.34, "y": 2},
+ {"matrix": [7, 2], "x": 11.34, "y": 2},
+ {"matrix": [7, 3], "x": 12.34, "y": 2},
+ {"matrix": [7, 4], "x": 13.34, "y": 2},
+ {"matrix": [7, 5], "x": 14.34, "y": 2},
+ {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.5, "y": 3},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 6.5, "y": 3},
+ {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [8, 0], "x": 8.97, "y": 3},
+ {"matrix": [8, 1], "x": 9.97, "y": 3},
+ {"matrix": [8, 2], "x": 10.97, "y": 3},
+ {"matrix": [8, 3], "x": 11.97, "y": 3},
+ {"matrix": [8, 4], "x": 12.97, "y": 3},
+ {"matrix": [8, 5], "x": 13.97, "y": 3},
+ {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
+ {"matrix": [8, 7], "x": 16.72, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.75, "y": 4},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 0.917},
+ {"matrix": [4, 5], "x": 6.667, "y": 4, "w": 0.916},
+ {"matrix": [4, 6], "x": 7.583, "y": 4, "w": 0.917},
+
+ {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+ {"matrix": [9, 1], "x": 11.22, "y": 4},
+ {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 16.48, "y": 4}
+ ]
}
}
}
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 @@
-/* Copyright 2020 2Moons
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-//////////////////////////////////////////////////////////////////////////////
-// When only use Slice Rev1.
-//////////////////////////////////////////////////////////////////////////////
-/*
- * ,------------------------------------------------ --------------------------------------------------.
- * | L00 | L01 | L02 | L03 | L04 | L05 | L06 | L07 | | R00 | R01 | R02 | R03 | R04 | R05 | R06 |
- * |------------------------------------------------ ------------------------------------------------------+
- * | L10 | L11 | L12 | L13 | L14 | L15 | L16 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R37 |
- * |---------------------------------------------- ------------------------------------------------------+
- * | L20 | L21 | L22 | L23 | L24 | L25 | L26 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 |
- * |------------------------------------------------- --------------------------------------------------------+
- * | L30 | L31 | L32 | L33 | L34 | L35 | L36 | | R30 | R31 | R32 | R33 | R34 | R34 | R35 | R36 | R37 |
- * |------------------------------------------------- --------------------------------------------------------'
- * | L40 | L41 | L42 | L43 | L44L45L46 | | R40 | R41 | | R42 | R43 | R44 |
- * |------------------------------------------------- -------------------------------------------------------'
- */
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, R17, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R37,\
- L40, L41, L42, L43, L45, R40, R41, R42, R43, R44 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06, L07, KC_NO }, \
- { L10, L11, L12, L13, L14, L15, L16, KC_NO, KC_NO }, \
- { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO }, \
- { L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO }, \
- { L40, L41, L42, L43, KC_NO, L45, KC_NO, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, R06, KC_NO, KC_NO }, \
- { R10, R11, R12, R13, R14, R15, R16, R17, KC_NO }, \
- { R20, R21, R22, R23, R24, R25, R26, KC_NO, KC_NO }, \
- { R30, R31, R32, R33, R34, R35, R36, R37, KC_NO }, \
- { R40, R41, R42, R43, R44, KC_NO, KC_NO, KC_NO, KC_NO } \
- }
-
-#define LAYOUT_split_left_space( \
- L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, R17, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R37,\
- L40, L41, L42, L43, L44, L46, R40, R41, R42, R43, R44 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06, L07, KC_NO }, \
- { L10, L11, L12, L13, L14, L15, L16, KC_NO, KC_NO }, \
- { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO }, \
- { L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO }, \
- { L40, L41, L42, L43, L44, KC_NO, L46, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, R06, KC_NO, KC_NO }, \
- { R10, R11, R12, R13, R14, R15, R16, R17, KC_NO }, \
- { R20, R21, R22, R23, R24, R25, R26, KC_NO, KC_NO }, \
- { R30, R31, R32, R33, R34, R35, R36, R37, KC_NO }, \
- { R40, R41, R42, R43, R44, KC_NO, KC_NO, KC_NO, KC_NO } \
- }
-
-#define LAYOUT_all( \
- L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, R17, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R37,\
- L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06, L07, KC_NO }, \
- { L10, L11, L12, L13, L14, L15, L16, KC_NO, KC_NO }, \
- { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO }, \
- { L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO }, \
- { L40, L41, L42, L43, L44, L45, L46, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, R06, KC_NO, KC_NO }, \
- { R10, R11, R12, R13, R14, R15, R16, R17, KC_NO }, \
- { R20, R21, R22, R23, R24, R25, R26, KC_NO, KC_NO }, \
- { R30, R31, R32, R33, R34, R35, R36, R37, KC_NO }, \
- { R40, R41, R42, R43, R44, KC_NO, KC_NO, KC_NO, KC_NO } \
- }
-
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 @@
-/* Copyright 2020 OJtheTiny
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
- K30, K31, K32, K34, K36, K37, K38, K39 \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
- { K30, K31, K32, KC_NO, K34, KC_NO, K36, K37, K38, K39, KC_NO, KC_NO } \
-}
-
-#define LAYOUT_arrow( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
- K30, K31, K32, K33, K37, K38, K39, K3A, K3B \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
- { K30, K31, K32, K33, KC_NO, KC_NO, KC_NO, K37, K38, K39, K3A, K3B } \
-}
-
-#define LAYOUT_command( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
- K30, K31, K32, K34, K33, K37, K38, K39, K3B \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
- { K30, K31, K32, K33, K34, KC_NO, KC_NO, K37, K38, K39, KC_NO, K3B } \
-}
-
-#define LAYOUT_arrow_command( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
- K30, K31, K32, K34, K33, K37, K38, K39, K3A, K3B \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
- { K30, K31, K32, K33, K34, KC_NO, KC_NO, K37, K38, K39, K3A, K3B } \
-}
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 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "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} ]
- },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
- "LAYOUT_arrow": {
- "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} ]
- },
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.25, "y": 1},
+ {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
- "LAYOUT_command": {
- "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} ]
- },
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
- "LAYOUT_arrow_command": {
- "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} ]
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3, "w": 1.25},
+ {"matrix": [3, 4], "x": 4, "y": 3, "w": 2.25},
+ {"matrix": [3, 6], "x": 6.25, "y": 3, "w": 2},
+ {"matrix": [3, 7], "x": 8.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 8], "x": 9.5, "y": 3, "w": 1.5},
+ {"matrix": [3, 9], "x": 11, "y": 3, "w": 1.75}
+ ]
+ },
+ "LAYOUT_arrow": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.25, "y": 1},
+ {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3, "w": 1.25},
+ {"matrix": [3, 3], "x": 4, "y": 3, "w": 2.25},
+ {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 2},
+ {"matrix": [3, 8], "x": 8.25, "y": 3, "w": 1.5},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3}
+ ]
+ },
+ "LAYOUT_command": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.25, "y": 1},
+ {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 4], "x": 3, "y": 3},
+ {"matrix": [3, 3], "x": 4, "y": 3, "w": 2.25},
+ {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 2},
+ {"matrix": [3, 8], "x": 8.25, "y": 3, "w": 1.5},
+ {"matrix": [3, 9], "x": 9.75, "y": 3, "w": 1.5},
+ {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.5}
+ ]
+ },
+ "LAYOUT_arrow_command": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.25, "y": 1},
+ {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 4], "x": 3, "y": 3},
+ {"matrix": [3, 3], "x": 4, "y": 3, "w": 2.25},
+ {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 2},
+ {"matrix": [3, 8], "x": 8.25, "y": 3, "w": 1.5},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3}
+ ]
+ }
}
- }
}
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 @@
-/* Copyright 2021 Altain
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-
-/* This section is to help viewers visually clarify the physical layout of Blaster 75 PCB.
-
-ANSI Layout :
- * ,----------------------------------------------------------------
- * | ESC| F1| F2| F3| F4| F5| F6| F7| F8| F9| F10| F11| F12|PSC|INS|
- * ,---------------------------------------------------------------|
- * | ` |1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | + | BKSPC |HOME|
- * |---------------------------------------------------------------|
- * | TAB | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | DEL|
- * |---------------------------------------------------------------|
- * | CTRL | A | S | D | F | G | H | J | K | L | ; | ' | ENTER| END|
- * |---------------------------------------------------------------|
- * | LSHIFT | Z | X | C | V | B | N | M | , | . | / |RSHFT | ↑ | |
- * |---------------------------------------------------------------|
- * |LCTL|LWIN|LALT| 6.25U SPACE |RALT|RCTL| ← | ↓ | → |
- * `----------------------------------------------------------------
- *
- *
-
-
-7U Spacebar Layout :
- * ,----------------------------------------------------------------
- * | ESC| F1| F2| F3| F4| F5| F6| F7| F8| F9| F10| F11| F12|PSC|INS|
- * ,---------------------------------------------------------------|
- * | ` |1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | + | BKSPC |HOME|
- * |---------------------------------------------------------------|
- * | TAB | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | DEL|
- * |---------------------------------------------------------------|
- * | CTRL | A | S | D | F | G | H | J | K | L | ; | ' | ENTER| END|
- * |---------------------------------------------------------------|
- * | LSHIFT | Z | X | C | V | B | N | M | , | . | / |RSHFT | ↑ | |
- * |---------------------------------------------------------------|
- * | LCTL |LWIN| LALT | 7U SPACE | RCTL | ← | ↓ | → |
- * `----------------------------------------------------------------
- *
- * */
-
-#define XXX KC_NO
-
-// BLASTER75 DEFAULT ANSI LAYOUT
-// 6.25U SPACEBAR
-// BOTTOM ROW 1.25 , 1.25 , 1.25 , 6.25 , 1.25 , 1.25 CONFIGURATION
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, \
- K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4B, K4C, K4D, \
- K50, K51, K52, K55, K59, K5B, K5C, K5D, K5E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, K3E }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, XXX, K4B, K4C, K4D, XXX }, \
- { K50, K51, K52, XXX, XXX, K55, XXX, XXX, XXX, K59, XXX, K5B, K5C, K5D, K5E } \
-}
-
-// BLASTER75 7U LAYOUT
-// 7U SPACEBAR
-// BOTTOM ROW 1.5 , 1 , 1.5 , 7 , 1.5 CONFIGURATION
-#define LAYOUT_7u( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, \
- K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4B, K4C, K4D, \
- K50, K51, K52, K55, K5B, K5C, K5D, K5E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, K3E }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, XXX, K4B, K4C, K4D, XXX }, \
- { K50, K51, K52, XXX, XXX, K55, XXX, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E } \
-}
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 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label": "ESC", "y": 0,"x": 0},
- {"label": "F1", "y": 0,"x": 1.25},
- {"label": "F2", "y": 0,"x": 2.25},
- {"label": "F3", "y": 0,"x": 3.25},
- {"label": "F4", "y": 0,"x": 4.25},
- {"label": "F5", "y": 0,"x": 5.5},
- {"label": "F6", "y": 0,"x": 6.5},
- {"label": "F7", "y": 0,"x": 7.5},
- {"label": "F8", "y": 0,"x": 8.5},
- {"label": "F9", "y": 0,"x": 9.75},
- {"label": "F10", "y": 0,"x": 10.75},
- {"label": "F11", "y": 0,"x": 11.75},
- {"label": "F12", "y": 0,"x": 12.75},
- {"label": "PrtSc", "y": 0,"x": 14},
- {"label": "INS", "y": 0,"x": 15},
-
- {"label": "~", "y": 1.25,"x": 0},
- {"label": "!", "y": 1.25,"x": 1},
- {"label": "@", "y": 1.25,"x": 2},
- {"label": "#", "y": 1.25,"x": 3},
- {"label": "$", "y": 1.25,"x": 4},
- {"label": "%", "y": 1.25,"x": 5},
- {"label": "^", "y": 1.25,"x": 6},
- {"label": "&", "y": 1.25,"x": 7},
- {"label": "*", "y": 1.25,"x": 8},
- {"label": "(", "y": 1.25,"x": 9},
- {"label": ")", "y": 1.25,"x": 10},
- {"label": "_", "y": 1.25,"x": 11},
- {"label": "+", "y": 1.25,"x": 12},
- {"label": "Backspace", "y": 1.25,"x": 13, "w": 2},
- {"label": "Home", "y": 1.25,"x": 15},
-
- {"label": "Tab", "y": 2.25,"x": 0, "w": 1.5},
- {"label": "Q", "y": 2.25,"x": 1.5},
- {"label": "W", "y": 2.25,"x": 2.5},
- {"label": "E", "y": 2.25,"x": 3.5},
- {"label": "R", "y": 2.25,"x": 4.5},
- {"label": "T", "y": 2.25,"x": 5.5},
- {"label": "Y", "y": 2.25,"x": 6.5},
- {"label": "U", "y": 2.25,"x": 7.5},
- {"label": "I", "y": 2.25,"x": 8.5},
- {"label": "O", "y": 2.25,"x": 9.5},
- {"label": "P", "y": 2.25,"x": 10.5},
- {"label": "{", "y": 2.25,"x": 11.5},
- {"label": "}", "y": 2.25,"x": 12.5},
- {"label": "|", "y": 2.25,"x": 13.5, "w": 1.5},
- {"label": "Del", "y": 2.25,"x": 15},
-
- {"label": "Caps Lock", "y": 3.25,"x": 0, "w": 1.75},
- {"label": "A", "y": 3.25,"x": 1.75},
- {"label": "S", "y": 3.25,"x": 2.75},
- {"label": "D", "y": 3.25,"x": 3.75},
- {"label": "F", "y": 3.25,"x": 4.75},
- {"label": "G", "y": 3.25,"x": 5.75},
- {"label": "H", "y": 3.25,"x": 6.75},
- {"label": "J", "y": 3.25,"x": 7.75},
- {"label": "K", "y": 3.25,"x": 8.75},
- {"label": "L", "y": 3.25,"x": 9.75},
- {"label": ":", "y": 3.25,"x": 10.75},
- {"label": "\"", "y": 3.25,"x": 11.75},
- {"label": "Enter", "y": 3.25,"x": 12.75, "w": 2.25},
- {"label": "End", "y": 3.25,"x": 15},
-
- {"label": "Shift", "y": 4.25,"x": 0, "w": 2.25},
- {"label": "Z", "y": 4.25,"x": 2.25},
- {"label": "X", "y": 4.25,"x": 3.25},
- {"label": "C", "y": 4.25,"x": 4.25},
- {"label": "V", "y": 4.25,"x": 5.25},
- {"label": "B", "y": 4.25,"x": 6.25},
- {"label": "N", "y": 4.25,"x": 7.25},
- {"label": "M", "y": 4.25,"x": 8.25},
- {"label": "<", "y": 4.25,"x": 9.25},
- {"label": ">", "y": 4.25,"x": 10.25},
- {"label": "?", "y": 4.25,"x": 11.25},
- {"label": "Shift", "y": 4.25,"x": 12.25, "w": 1.75},
- {"label": "\u2191", "y": 4.25,"x": 14},
-
- {"label":"Ctrl", "y":5.25, "x":0, "w":1.25},
- {"label":"Win", "y":5.25, "x":1.25, "w": 1.25},
- {"label":"Alt", "y":5.25, "x":2.5, "w":1.25},
- {"label":"Spacebar", "y":5.25, "x":3.75, "w":6.25},
- {"label":"Win", "y":5.25, "x":10, "w":1.25},
- {"label":"Alt", "y":5.25, "x":11.25, "w":1.25},
- {"label":"\u2190", "y":5.25, "x":13},
- {"label":"\u2193", "y":5.25, "x":14},
- {"label":"\u2192", "y":5.25, "x":15}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+ {"matrix": [0, 9], "x": 9.75, "y": 0},
+ {"matrix": [0, 10], "x": 10.75, "y": 0},
+ {"matrix": [0, 11], "x": 11.75, "y": 0},
+ {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+ {"matrix": [0, 13], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+ {"matrix": [1, 14], "x": 15, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 14], "x": 15, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+ {"matrix": [3, 14], "x": 15, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+
+ {"matrix": [5, 12], "x": 13, "y": 5.25},
+ {"matrix": [5, 13], "x": 14, "y": 5.25},
+ {"matrix": [5, 14], "x": 15, "y": 5.25}
]
},
"LAYOUT_7u": {
"layout": [
- {"label": "ESC", "y": 0,"x": 0},
- {"label": "F1", "y": 0,"x": 1.25},
- {"label": "F2", "y": 0,"x": 2.25},
- {"label": "F3", "y": 0,"x": 3.25},
- {"label": "F4", "y": 0,"x": 4.25},
- {"label": "F5", "y": 0,"x": 5.5},
- {"label": "F6", "y": 0,"x": 6.5},
- {"label": "F7", "y": 0,"x": 7.5},
- {"label": "F8", "y": 0,"x": 8.5},
- {"label": "F9", "y": 0,"x": 9.75},
- {"label": "F10", "y": 0,"x": 10.75},
- {"label": "F11", "y": 0,"x": 11.75},
- {"label": "F12", "y": 0,"x": 12.75},
- {"label": "PrtSc", "y": 0,"x": 14},
- {"label": "INS", "y": 0,"x": 15},
-
- {"label": "~", "y": 1.25,"x": 0},
- {"label": "!", "y": 1.25,"x": 1},
- {"label": "@", "y": 1.25,"x": 2},
- {"label": "#", "y": 1.25,"x": 3},
- {"label": "$", "y": 1.25,"x": 4},
- {"label": "%", "y": 1.25,"x": 5},
- {"label": "^", "y": 1.25,"x": 6},
- {"label": "&", "y": 1.25,"x": 7},
- {"label": "*", "y": 1.25,"x": 8},
- {"label": "(", "y": 1.25,"x": 9},
- {"label": ")", "y": 1.25,"x": 10},
- {"label": "_", "y": 1.25,"x": 11},
- {"label": "+", "y": 1.25,"x": 12},
- {"label": "Backspace", "y": 1.25,"x": 13, "w": 2},
- {"label": "Home", "y": 1.25,"x": 15},
-
- {"label": "Tab", "y": 2.25,"x": 0, "w": 1.5},
- {"label": "Q", "y": 2.25,"x": 1.5},
- {"label": "W", "y": 2.25,"x": 2.5},
- {"label": "E", "y": 2.25,"x": 3.5},
- {"label": "R", "y": 2.25,"x": 4.5},
- {"label": "T", "y": 2.25,"x": 5.5},
- {"label": "Y", "y": 2.25,"x": 6.5},
- {"label": "U", "y": 2.25,"x": 7.5},
- {"label": "I", "y": 2.25,"x": 8.5},
- {"label": "O", "y": 2.25,"x": 9.5},
- {"label": "P", "y": 2.25,"x": 10.5},
- {"label": "{", "y": 2.25,"x": 11.5},
- {"label": "}", "y": 2.25,"x": 12.5},
- {"label": "|", "y": 2.25,"x": 13.5, "w": 1.5},
- {"label": "Del", "y": 2.25,"x": 15},
-
- {"label": "Caps Lock", "y": 3.25,"x": 0, "w": 1.75},
- {"label": "A", "y": 3.25,"x": 1.75},
- {"label": "S", "y": 3.25,"x": 2.75},
- {"label": "D", "y": 3.25,"x": 3.75},
- {"label": "F", "y": 3.25,"x": 4.75},
- {"label": "G", "y": 3.25,"x": 5.75},
- {"label": "H", "y": 3.25,"x": 6.75},
- {"label": "J", "y": 3.25,"x": 7.75},
- {"label": "K", "y": 3.25,"x": 8.75},
- {"label": "L", "y": 3.25,"x": 9.75},
- {"label": ":", "y": 3.25,"x": 10.75},
- {"label": "\"", "y": 3.25,"x": 11.75},
- {"label": "Enter", "y": 3.25,"x": 12.75, "w": 2.25},
- {"label": "End", "y": 3.25,"x": 15},
-
- {"label": "Shift", "y": 4.25,"x": 0, "w": 2.25},
- {"label": "Z", "y": 4.25,"x": 2.25},
- {"label": "X", "y": 4.25,"x": 3.25},
- {"label": "C", "y": 4.25,"x": 4.25},
- {"label": "V", "y": 4.25,"x": 5.25},
- {"label": "B", "y": 4.25,"x": 6.25},
- {"label": "N", "y": 4.25,"x": 7.25},
- {"label": "M", "y": 4.25,"x": 8.25},
- {"label": "<", "y": 4.25,"x": 9.25},
- {"label": ">", "y": 4.25,"x": 10.25},
- {"label": "?", "y": 4.25,"x": 11.25},
- {"label": "Shift", "y": 4.25,"x": 12.25, "w": 1.75},
- {"label": "\u2191", "y": 4.25,"x": 14},
-
- {"label":"Ctrl", "y":5.25, "x": 0, "w":1.5},
- {"label":"Win", "y":5.25, "x":1.5},
- {"label":"Alt", "y":5.25, "x":2.5, "w":1.5},
- {"label":"Spacebar", "y":5.25, "x":4, "w":7},
- {"label":"Alt", "y":5.25, "x":11, "w":1.5},
- {"label":"\u2190", "y":5.25, "x":13},
- {"label":"\u2193", "y":5.25, "x":14},
- {"label":"\u2192", "y":5.25, "x":15}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+ {"matrix": [0, 9], "x": 9.75, "y": 0},
+ {"matrix": [0, 10], "x": 10.75, "y": 0},
+ {"matrix": [0, 11], "x": 11.75, "y": 0},
+ {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+ {"matrix": [0, 13], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+ {"matrix": [1, 14], "x": 15, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 14], "x": 15, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+ {"matrix": [3, 14], "x": 15, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
+ {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+
+ {"matrix": [5, 12], "x": 13, "y": 5.25},
+ {"matrix": [5, 13], "x": 14, "y": 5.25},
+ {"matrix": [5, 14], "x": 15, "y": 5.25}
]
}
}
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 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
- "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}]
+ "layout": [
+ {"matrix": [0, 4], "x": 1, "y": 0},
+ {"matrix": [0, 3], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 1], "x": 4, "y": 0},
+ {"matrix": [0, 0], "x": 5, "y": 0},
+
+ {"matrix": [4, 0], "x": 11, "y": 0},
+ {"matrix": [4, 1], "x": 12, "y": 0},
+ {"matrix": [4, 2], "x": 13, "y": 0},
+ {"matrix": [4, 3], "x": 14, "y": 0},
+ {"matrix": [4, 4], "x": 15, "y": 0},
+
+ {"matrix": [1, 5], "x": 0, "y": 1},
+ {"matrix": [1, 4], "x": 1, "y": 1},
+ {"matrix": [1, 3], "x": 2, "y": 1},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"matrix": [1, 1], "x": 4, "y": 1},
+ {"matrix": [1, 0], "x": 5, "y": 1},
+
+ {"matrix": [5, 0], "x": 11, "y": 1},
+ {"matrix": [5, 1], "x": 12, "y": 1},
+ {"matrix": [5, 2], "x": 13, "y": 1},
+ {"matrix": [5, 3], "x": 14, "y": 1},
+ {"matrix": [5, 4], "x": 15, "y": 1},
+ {"matrix": [5, 5], "x": 16, "y": 1},
+
+ {"matrix": [2, 5], "x": 0, "y": 2},
+ {"matrix": [2, 4], "x": 1, "y": 2},
+ {"matrix": [2, 3], "x": 2, "y": 2},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 1], "x": 4, "y": 2},
+ {"matrix": [2, 0], "x": 5, "y": 2},
+
+ {"matrix": [6, 0], "x": 11, "y": 2},
+ {"matrix": [6, 1], "x": 12, "y": 2},
+ {"matrix": [6, 2], "x": 13, "y": 2},
+ {"matrix": [6, 3], "x": 14, "y": 2},
+ {"matrix": [6, 4], "x": 15, "y": 2},
+ {"matrix": [6, 5], "x": 16, "y": 2},
+
+ {"matrix": [3, 2], "x": 5, "y": 3},
+ {"matrix": [3, 1], "x": 6, "y": 3},
+ {"matrix": [3, 0], "x": 7, "y": 3},
+
+ {"matrix": [7, 0], "x": 9, "y": 3},
+ {"matrix": [7, 1], "x": 10, "y": 3},
+ {"matrix": [7, 2], "x": 11, "y": 3}
+ ]
+ },
+ "LAYOUT_stack": {
+ "layout": [
+ {"matrix": [0, 4], "x": 0, "y": 0},
+ {"matrix": [0, 3], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 1], "x": 3, "y": 0},
+ {"matrix": [0, 0], "x": 4, "y": 0},
+ {"matrix": [1, 5], "x": 5, "y": 0},
+ {"matrix": [1, 4], "x": 6, "y": 0},
+ {"matrix": [1, 3], "x": 7, "y": 0},
+ {"matrix": [1, 2], "x": 8, "y": 0},
+ {"matrix": [1, 1], "x": 9, "y": 0},
+ {"matrix": [1, 0], "x": 10, "y": 0},
+ {"matrix": [2, 5], "x": 11, "y": 0},
+ {"matrix": [2, 4], "x": 12, "y": 0},
+ {"matrix": [2, 3], "x": 13, "y": 0},
+ {"matrix": [2, 2], "x": 14, "y": 0},
+ {"matrix": [2, 1], "x": 15, "y": 0},
+ {"matrix": [2, 0], "x": 16, "y": 0},
+ {"matrix": [3, 2], "x": 17, "y": 0},
+ {"matrix": [3, 1], "x": 18, "y": 0},
+ {"matrix": [3, 0], "x": 19, "y": 0},
+ {"matrix": [4, 0], "x": 20, "y": 0},
+ {"matrix": [4, 1], "x": 21, "y": 0},
+ {"matrix": [4, 2], "x": 22, "y": 0},
+ {"matrix": [4, 3], "x": 23, "y": 0},
+ {"matrix": [4, 4], "x": 24, "y": 0},
+ {"matrix": [5, 0], "x": 25, "y": 0},
+ {"matrix": [5, 1], "x": 26, "y": 0},
+ {"matrix": [5, 2], "x": 27, "y": 0},
+ {"matrix": [5, 3], "x": 28, "y": 0},
+ {"matrix": [5, 4], "x": 29, "y": 0},
+ {"matrix": [5, 5], "x": 30, "y": 0},
+ {"matrix": [6, 0], "x": 31, "y": 0},
+ {"matrix": [6, 1], "x": 32, "y": 0},
+ {"matrix": [6, 2], "x": 33, "y": 0},
+ {"matrix": [6, 3], "x": 34, "y": 0},
+ {"matrix": [6, 4], "x": 35, "y": 0},
+ {"matrix": [6, 5], "x": 36, "y": 0},
+ {"matrix": [7, 0], "x": 37, "y": 0},
+ {"matrix": [7, 1], "x": 38, "y": 0},
+ {"matrix": [7, 2], "x": 39, "y": 0}
+ ]
}
}
} \ 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 @@
// Copyright 2021 Christoph Rehmann (crehmann)
// SPDX-License-Identifier: GPL-2.0-or-later
-#include "rev1.h"
+#include "quantum.h"
#ifdef HAPTIC_ENABLE
#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 @@
-// Copyright 2021 Christoph Rehmann (crehmann)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- L00, L01, L02, L03, L04, R05, R06, R07, R08, R09, \
- L10, L11, L12, L13, L14, L15, R16, R17, R18, R19, R20, R21, \
- L22, L23, L24, L25, L26, L27, R28, R29, R30, R31, R32, R33, \
- L34, L35, L36, R37, R38, R39 \
-) \
-{ \
- { L04, L03, L02, L01, L00, KC_NO }, \
- { L15, L14, L13, L12, L11, L10 }, \
- { L27, L26, L25, L24, L23, L22 }, \
- { L36, L35, L34, KC_NO, KC_NO, KC_NO }, \
- { R05, R06, R07, R08, R09, KC_NO }, \
- { R16, R17, R18, R19, R20, R21 }, \
- { R28, R29, R30, R31, R32, R33 }, \
- { R37, R38, R39, KC_NO, KC_NO, KC_NO }, \
-}
-
-#define LAYOUT_stack( \
- L00, L01, L02, L03, L04, \
- L10, L11, L12, L13, L14, L15, \
- L22, L23, L24, L25, L26, L27, \
- L34, L35, L36, \
- \
- R05, R06, R07, R08, R09, \
- R16, R17, R18, R19, R20, R21, \
- R28, R29, R30, R31, R32, R33, \
- R37, R38, R39 \
-) \
-{ \
- { L04, L03, L02, L01, L00, KC_NO }, \
- { L15, L14, L13, L12, L11, L10 }, \
- { L27, L26, L25, L24, L23, L22 }, \
- { L36, L35, L34, KC_NO, KC_NO, KC_NO }, \
- { R05, R06, R07, R08, R09, KC_NO }, \
- { R16, R17, R18, R19, R20, R21 }, \
- { R28, R29, R30, R31, R32, R33 }, \
- { R37, R38, R39, KC_NO, KC_NO, KC_NO }, \
-}
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[];
void reset_keyboard_kb(void);
void click(uint16_t freq, uint16_t duration);
-
-#define XXX KC_NO
-
-/* Vanilla Keymap */
-// This a shortcut to help you visually see your layout.
-/*
-* ,-------------------------------------------------------------------------------.
-* | 00 | 01 | 02 | 03 | 04 | 05 | 06 | 07 | 08 | 09 | 0A | 0B | 0C | 0D | 0E | 0F |
-* |-------------------------------------------------------------------------------|
-* | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 1A | 1B | 1C | 1D | 1F |
-* |-------------------------------------------------------------------------------|
-* | 20 | 21 |22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 2A | 2B | 2C | 2D | 2E |
-* |-------------------------------------------------------------------------------|
-* | 30 | 31 |32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | 3A | 3B | 3C | 3E |
-* |-------------------------------------------------------------------------------|
-* | 40 | 42 |43 | 44 | 45 | 46 | 47 | 48 | 49 | 4A | 4B | 4C | 4D | 4E |
-* |-------------------------------------------------------------------------------|
-* | 50 | 51 | 52 | 53 | 56 | 58 | 59 | 5A | 5B | 5C | 5D | 5E |
-* `-------------------------------------------------------------------------------'
-*/
-// The first section contains all of the arguements
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1F, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3E, \
- k40, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, \
- k50, k51, k52, k53, k56, k58, k59, k5A, k5B, k5C, k5D, k5E \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX, k1F }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, XXX }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, XXX, k3E, XXX }, \
- { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, XXX }, \
- { k50, k51, k52, k53, XXX, XXX, k56, XXX, k58, k59, k5A, k5B, k5C, k5D, k5E, XXX } \
-}
-
-#define LAYOUT_all( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
- k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, \
- k50, k51, k52, k53, k56, k58, k59, k5A, k5B, k5C, k5D, k5E \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, XXX }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, XXX }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, XXX }, \
- { k50, k51, k52, k53, XXX, XXX, k56, XXX, k58, k59, k5A, k5B, k5C, k5D, k5E, XXX } \
-}
-
-#define LAYOUT_iso( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1F, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3E, \
- k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, \
- k50, k51, k52, k53, k56, k58, k59, k5A, k5B, k5C, k5D, k5E \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX, k1F }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, XXX }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, XXX, k3E, XXX }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, XXX }, \
- { k50, k51, k52, k53, XXX, XXX, k56, XXX, k58, k59, k5A, k5B, k5C, k5D, k5E, XXX } \
-}
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 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
- "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}]
- },
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 15], "x": 15, "y": 0},
- "LAYOUT_all": {
- "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}]
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+ {"matrix": [1, 15], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 11], "x": 11.25, "y": 4},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 3], "x": 3.75, "y": 5, "w": 2.75},
+ {"matrix": [5, 6], "x": 6.5, "y": 5},
+ {"matrix": [5, 8], "x": 7.5, "y": 5, "w": 2.5},
+ {"matrix": [5, 9], "x": 10, "y": 5},
+ {"matrix": [5, 10], "x": 11, "y": 5},
+ {"matrix": [5, 11], "x": 12, "y": 5},
+ {"matrix": [5, 12], "x": 13, "y": 5},
+ {"matrix": [5, 13], "x": 14, "y": 5},
+ {"matrix": [5, 14], "x": 15, "y": 5}
+ ]
},
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 15], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1},
+ {"matrix": [1, 14], "x": 14, "y": 1},
+ {"matrix": [1, 15], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 12], "x": 12.75, "y": 3},
+ {"matrix": [3, 13], "x": 13.75, "y": 3, "w": 1.25},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 11], "x": 11.25, "y": 4},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 3], "x": 3.75, "y": 5, "w": 2.75},
+ {"matrix": [5, 6], "x": 6.5, "y": 5},
+ {"matrix": [5, 8], "x": 7.5, "y": 5, "w": 2.5},
+ {"matrix": [5, 9], "x": 10, "y": 5},
+ {"matrix": [5, 10], "x": 11, "y": 5},
+ {"matrix": [5, 11], "x": 12, "y": 5},
+ {"matrix": [5, 12], "x": 13, "y": 5},
+ {"matrix": [5, 13], "x": 14, "y": 5},
+ {"matrix": [5, 14], "x": 15, "y": 5}
+ ]
+ },
"LAYOUT_iso": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 15], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+ {"matrix": [1, 15], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 12], "x": 12.75, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 11], "x": 11.25, "y": 4},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 3], "x": 3.75, "y": 5, "w": 2.25},
+ {"matrix": [5, 6], "x": 6, "y": 5, "w": 1.25},
+ {"matrix": [5, 8], "x": 7.25, "y": 5, "w": 2.75},
+ {"matrix": [5, 9], "x": 10, "y": 5},
+ {"matrix": [5, 10], "x": 11, "y": 5},
+ {"matrix": [5, 11], "x": 12, "y": 5},
+ {"matrix": [5, 12], "x": 13, "y": 5},
+ {"matrix": [5, 13], "x": 14, "y": 5},
+ {"matrix": [5, 14], "x": 15, "y": 5}
+ ]
}
}
}
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 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-void matrix_init_user(void);
-
-/*
- * IBM Terminal keyboard 6110345(122keys)/1392595(102keys)
- * http://geekhack.org/showthread.php?10737-What-Can-I-Do-With-a-Terminal-Model-M
- * http://www.seasip.info/VintagePC/ibm_1391406.html
- *
- * Keymap array:
- * 8 bytes
- * +---------+
- * 0| |
- * :| | 0x00-0x87
- * ;| |
- * 17| |
- * +---------+
- */
-#define LAYOUT( \
- k08, k10, k18, k20, k28, k30, k38, k40, k48, k50, k57, k5F, \
- k07, k0F, k17, k1F, k27, k2F, k37, k3F, k47, k4F, k56, k5E, \
-\
- k05, k06, k0E, k16, k1E, k26, k25, k2E, k36, k3D, k3E, k46, k45, k4E, k55, k5D, k66, k67, k6E, k6F, k76, k77, k7E, k84, \
- k04, k0C, k0D, k15, k1D, k24, k2D, k2C, k35, k3C, k43, k44, k4D, k54, k5B, k5C, k64, k65, k6D, k6C, k75, k7D, k7C, \
- k03, k0B, k14, k1C, k1B, k23, k2B, k34, k33, k3B, k42, k4B, k4C, k52, k53, k5A, k63, k6B, k73, k74, k7B, \
- k83, k0A, k12, k13, k1A, k22, k21, k2A, k32, k31, k3A, k41, k49, k4A, k51, k59, k61, k62, k6A, k69, k72, k7A, k79, \
- k01, k09, k11, k19, k29, k39, k58, k60, k68, k70, k71, k78 \
-) { \
- { XXX, k01, XXX, k03, k04, k05, k06, k07 }, \
- { k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
- { k10, k11, k12, k13, k14, k15, k16, k17 }, \
- { k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
- { k20, k21, k22, k23, k24, k25, k26, k27 }, \
- { k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
- { k30, k31, k32, k33, k34, k35, k36, k37 }, \
- { k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
- { k40, k41, k42, k43, k44, k45, k46, k47 }, \
- { k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \
- { k50, k51, k52, k53, k54, k55, k56, k57 }, \
- { k58, k59, k5A, k5B, k5C, k5D, k5E, k5F }, \
- { k60, k61, k62, k63, k64, k65, k66, k67 }, \
- { k68, k69, k6A, k6B, k6C, k6D, k6E, k6F }, \
- { k70, k71, k72, k73, k74, k75, k76, k77 }, \
- { k78, k79, k7A, k7B, k7C, k7D, k7E, XXX }, \
- { XXX, XXX, XXX, k83, k84, XXX, XXX, XXX } \
-}
-
-/*
- * IBM Terminal keyboard 1399625, 101-key
- */
-#define LAYOUT_101( \
- k08, k07, k0F, k17, k1F, k27, k2F, k37, k3F, k47, k4F, k56, k5E, k57, k5F, k62, \
-\
- k0E, k16, k1E, k26, k25, k2E, k36, k3D, k3E, k46, k45, k4E, k55, k66, k67, k6E, k6F, k76, k77, k7E, k84, \
- k0D, k15, k1D, k24, k2D, k2C, k35, k3C, k43, k44, k4D, k54, k5B, k5C, k64, k65, k6D, k6C, k75, k7D, \
- k14, k1C, k1B, k23, k2B, k34, k33, k3B, k42, k4B, k4C, k52, k5A, k6B, k73, k74, k7C, \
- k12, k1A, k22, k21, k2A, k32, k31, k3A, k41, k49, k4A, k59, k63, k69, k72, k7A, \
- k11, k19, k29, k39, k58, k61, k60, k6A, k70, k71, k79 \
-) { \
- { XXX, XXX, XXX, XXX, XXX, XXX, XXX, k07 }, \
- { k08, XXX, XXX, XXX, XXX, k0D, k0E, k0F }, \
- { XXX, k11, k12, XXX, k14, k15, k16, k17 }, \
- { XXX, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
- { XXX, k21, k22, k23, k24, k25, k26, k27 }, \
- { XXX, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
- { XXX, k31, k32, k33, k34, k35, k36, k37 }, \
- { XXX, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
- { XXX, k41, k42, k43, k44, k45, k46, k47 }, \
- { XXX, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \
- { XXX, XXX, k52, XXX, k54, k55, k56, k57 }, \
- { k58, k59, k5A, k5B, k5C, XXX, k5E, k5F }, \
- { k60, k61, k62, k63, k64, k65, k66, k67 }, \
- { XXX, k69, k6A, k6B, k6C, k6D, k6E, k6F }, \
- { k70, k71, k72, k73, k74, k75, k76, k77 }, \
- { XXX, k79, k7A, XXX, k7C, k7D, k7E, XXX }, \
- { XXX, XXX, XXX, XXX, k84, XXX, XXX, XXX } \
-}
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 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"F13", "x":3.25, "y":0},
- {"label":"F14", "x":4.25, "y":0},
- {"label":"F15", "x":5.25, "y":0},
- {"label":"F16", "x":6.25, "y":0},
- {"label":"F17", "x":7.25, "y":0},
- {"label":"F18", "x":8.25, "y":0},
- {"label":"F19", "x":9.25, "y":0},
- {"label":"F20", "x":10.25, "y":0},
- {"label":"F21", "x":11.25, "y":0},
- {"label":"F22", "x":12.25, "y":0},
- {"label":"F23", "x":13.25, "y":0},
- {"label":"F24", "x":14.25, "y":0},
- {"label":"F1", "x":3.25, "y":1},
- {"label":"F2", "x":4.25, "y":1},
- {"label":"F3", "x":5.25, "y":1},
- {"label":"F4", "x":6.25, "y":1},
- {"label":"F5", "x":7.25, "y":1},
- {"label":"F6", "x":8.25, "y":1},
- {"label":"F7", "x":9.25, "y":1},
- {"label":"F8", "x":10.25, "y":1},
- {"label":"F9", "x":11.25, "y":1},
- {"label":"F10", "x":12.25, "y":1},
- {"label":"F11", "x":13.25, "y":1},
- {"label":"F12", "x":14.25, "y":1},
- {"label":"Print Screen", "x":0, "y":3},
- {"label":"Esc", "x":1, "y":3},
- {"label":"Esc", "x":2.25, "y":3},
- {"label":"1", "x":3.25, "y":3},
- {"label":"2", "x":4.25, "y":3},
- {"label":"3", "x":5.25, "y":3},
- {"label":"4", "x":6.25, "y":3},
- {"label":"5", "x":7.25, "y":3},
- {"label":"6", "x":8.25, "y":3},
- {"label":"7", "x":9.25, "y":3},
- {"label":"8", "x":10.25, "y":3},
- {"label":"9", "x":11.25, "y":3},
- {"label":"0", "x":12.25, "y":3},
- {"label":"-", "x":13.25, "y":3},
- {"label":"=", "x":14.25, "y":3},
- {"label":"No", "x":15.25, "y":3},
- {"label":"Back Space", "x":16.25, "y":3},
- {"label":"Insert", "x":17.5, "y":3},
- {"label":"Home", "x":18.5, "y":3},
- {"label":"Page Up", "x":19.5, "y":3},
- {"label":"Num Lock", "x":20.75, "y":3},
- {"label":"/", "x":21.75, "y":3},
- {"label":"*", "x":22.75, "y":3},
- {"label":"-", "x":23.75, "y":3},
- {"label":"Scroll Lock", "x":0, "y":4},
- {"label":"Int4", "x":1, "y":4},
- {"label":"Tab", "x":2.25, "y":4, "w":1.5},
- {"label":"Q", "x":3.75, "y":4},
- {"label":"W", "x":4.75, "y":4},
- {"label":"E", "x":5.75, "y":4},
- {"label":"R", "x":6.75, "y":4},
- {"label":"T", "x":7.75, "y":4},
- {"label":"Y", "x":8.75, "y":4},
- {"label":"U", "x":9.75, "y":4},
- {"label":"I", "x":10.75, "y":4},
- {"label":"O", "x":11.75, "y":4},
- {"label":"P", "x":12.75, "y":4},
- {"label":"[", "x":13.75, "y":4},
- {"label":"]", "x":14.75, "y":4},
- {"label":"No", "x":15.75, "y":4, "w":1.5},
- {"label":"Delete", "x":17.5, "y":4},
- {"label":"End", "x":18.5, "y":4},
- {"label":"Page Down", "x":19.5, "y":4},
- {"label":"7", "x":20.75, "y":4},
- {"label":"8", "x":21.75, "y":4},
- {"label":"9", "x":22.75, "y":4},
- {"label":"+", "x":23.75, "y":4},
- {"label":"Pause", "x":0, "y":5},
- {"label":"Int5", "x":1, "y":5},
- {"label":"Caps Lock", "x":2.25, "y":5, "w":1.75},
- {"label":"A", "x":4, "y":5},
- {"label":"S", "x":5, "y":5},
- {"label":"D", "x":6, "y":5},
- {"label":"F", "x":7, "y":5},
- {"label":"G", "x":8, "y":5},
- {"label":"H", "x":9, "y":5},
- {"label":"J", "x":10, "y":5},
- {"label":"K", "x":11, "y":5},
- {"label":"L", "x":12, "y":5},
- {"label":";", "x":13, "y":5},
- {"label":"'", "x":14, "y":5},
- {"label":"\\", "x":15, "y":5},
- {"label":"Enter", "x":16, "y":5, "w":1.25},
- {"label":"Up", "x":18.5, "y":5},
- {"label":"4", "x":20.75, "y":5},
- {"label":"5", "x":21.75, "y":5},
- {"label":"6", "x":22.75, "y":5},
- {"label":",", "x":23.75, "y":5},
- {"label":"App", "x":0, "y":6},
- {"label":"Int6", "x":1, "y":6},
- {"label":"Shift", "x":2.25, "y":6, "w":1.25},
- {"label":"ISO \\", "x":3.5, "y":6},
- {"label":"Z", "x":4.5, "y":6},
- {"label":"X", "x":5.5, "y":6},
- {"label":"C", "x":6.5, "y":6},
- {"label":"V", "x":7.5, "y":6},
- {"label":"B", "x":8.5, "y":6},
- {"label":"N", "x":9.5, "y":6},
- {"label":"M", "x":10.5, "y":6},
- {"label":",", "x":11.5, "y":6},
- {"label":".", "x":12.5, "y":6},
- {"label":"/", "x":13.5, "y":6},
- {"label":"No", "x":14.5, "y":6},
- {"label":"Shift", "x":15.5, "y":6, "w":1.75},
- {"label":"Left", "x":17.5, "y":6},
- {"label":"Int2", "x":18.5, "y":6},
- {"label":"Right", "x":19.5, "y":6},
- {"label":"1", "x":20.75, "y":6},
- {"label":"2", "x":21.75, "y":6},
- {"label":"3", "x":22.75, "y":6},
- {"label":"Enter", "x":23.75, "y":6},
- {"label":"RGUI", "x":0, "y":7},
- {"label":"lgui", "x":1, "y":7},
- {"label":"Ctrl", "x":2.25, "y":7, "w":1.5},
- {"label":"Alt", "x":4.75, "y":7, "w":1.5},
- {"label":"Space", "x":6.25, "y":7, "w":7},
- {"label":"Alt", "x":13.25, "y":7, "w":1.5},
- {"label":"Ctrl", "x":15.75, "y":7, "w":1.5},
- {"label":"Down", "x":18.5, "y":7},
- {"label":"No", "x":20.75, "y":7},
- {"label":"0", "x":21.75, "y":7},
- {"label":".", "x":22.75, "y":7},
- {"label":"No", "x":23.75, "y":7}
+ {"matrix": [1, 0], "x": 3.25, "y": 0},
+ {"matrix": [2, 0], "x": 4.25, "y": 0},
+ {"matrix": [3, 0], "x": 5.25, "y": 0},
+ {"matrix": [4, 0], "x": 6.25, "y": 0},
+ {"matrix": [5, 0], "x": 7.25, "y": 0},
+ {"matrix": [6, 0], "x": 8.25, "y": 0},
+ {"matrix": [7, 0], "x": 9.25, "y": 0},
+ {"matrix": [8, 0], "x": 10.25, "y": 0},
+ {"matrix": [9, 0], "x": 11.25, "y": 0},
+ {"matrix": [10, 0], "x": 12.25, "y": 0},
+ {"matrix": [10, 7], "x": 13.25, "y": 0},
+ {"matrix": [11, 7], "x": 14.25, "y": 0},
+
+ {"matrix": [0, 7], "x": 3.25, "y": 1},
+ {"matrix": [1, 7], "x": 4.25, "y": 1},
+ {"matrix": [2, 7], "x": 5.25, "y": 1},
+ {"matrix": [3, 7], "x": 6.25, "y": 1},
+ {"matrix": [4, 7], "x": 7.25, "y": 1},
+ {"matrix": [5, 7], "x": 8.25, "y": 1},
+ {"matrix": [6, 7], "x": 9.25, "y": 1},
+ {"matrix": [7, 7], "x": 10.25, "y": 1},
+ {"matrix": [8, 7], "x": 11.25, "y": 1},
+ {"matrix": [9, 7], "x": 12.25, "y": 1},
+ {"matrix": [10, 6], "x": 13.25, "y": 1},
+ {"matrix": [11, 6], "x": 14.25, "y": 1},
+
+ {"matrix": [0, 5], "x": 0, "y": 3},
+ {"matrix": [0, 6], "x": 1, "y": 3},
+
+ {"matrix": [1, 6], "x": 2.25, "y": 3},
+ {"matrix": [2, 6], "x": 3.25, "y": 3},
+ {"matrix": [3, 6], "x": 4.25, "y": 3},
+ {"matrix": [4, 6], "x": 5.25, "y": 3},
+ {"matrix": [4, 5], "x": 6.25, "y": 3},
+ {"matrix": [5, 6], "x": 7.25, "y": 3},
+ {"matrix": [6, 6], "x": 8.25, "y": 3},
+ {"matrix": [7, 5], "x": 9.25, "y": 3},
+ {"matrix": [7, 6], "x": 10.25, "y": 3},
+ {"matrix": [8, 6], "x": 11.25, "y": 3},
+ {"matrix": [8, 5], "x": 12.25, "y": 3},
+ {"matrix": [9, 6], "x": 13.25, "y": 3},
+ {"matrix": [10, 5], "x": 14.25, "y": 3},
+ {"matrix": [11, 5], "x": 15.25, "y": 3},
+ {"matrix": [12, 6], "x": 16.25, "y": 3},
+
+ {"matrix": [12, 7], "x": 17.5, "y": 3},
+ {"matrix": [13, 6], "x": 18.5, "y": 3},
+ {"matrix": [13, 7], "x": 19.5, "y": 3},
+
+ {"matrix": [14, 6], "x": 20.75, "y": 3},
+ {"matrix": [14, 7], "x": 21.75, "y": 3},
+ {"matrix": [15, 6], "x": 22.75, "y": 3},
+ {"matrix": [16, 4], "x": 23.75, "y": 3},
+
+ {"matrix": [0, 4], "x": 0, "y": 4},
+ {"matrix": [1, 4], "x": 1, "y": 4},
+
+ {"matrix": [1, 5], "x": 2.25, "y": 4, "w": 1.5},
+ {"matrix": [2, 5], "x": 3.75, "y": 4},
+ {"matrix": [3, 5], "x": 4.75, "y": 4},
+ {"matrix": [4, 4], "x": 5.75, "y": 4},
+ {"matrix": [5, 5], "x": 6.75, "y": 4},
+ {"matrix": [5, 4], "x": 7.75, "y": 4},
+ {"matrix": [6, 5], "x": 8.75, "y": 4},
+ {"matrix": [7, 4], "x": 9.75, "y": 4},
+ {"matrix": [8, 3], "x": 10.75, "y": 4},
+ {"matrix": [8, 4], "x": 11.75, "y": 4},
+ {"matrix": [9, 5], "x": 12.75, "y": 4},
+ {"matrix": [10, 4], "x": 13.75, "y": 4},
+ {"matrix": [11, 3], "x": 14.75, "y": 4},
+ {"matrix": [11, 4], "x": 15.75, "y": 4, "w": 1.5},
+
+ {"matrix": [12, 4], "x": 17.5, "y": 4},
+ {"matrix": [12, 5], "x": 18.5, "y": 4},
+ {"matrix": [13, 5], "x": 19.5, "y": 4},
+
+ {"matrix": [13, 4], "x": 20.75, "y": 4},
+ {"matrix": [14, 5], "x": 21.75, "y": 4},
+ {"matrix": [15, 5], "x": 22.75, "y": 4},
+ {"matrix": [15, 4], "x": 23.75, "y": 4},
+
+ {"matrix": [0, 3], "x": 0, "y": 5},
+ {"matrix": [1, 3], "x": 1, "y": 5},
+
+ {"matrix": [2, 4], "x": 2.25, "y": 5, "w": 1.75},
+ {"matrix": [3, 4], "x": 4, "y": 5},
+ {"matrix": [3, 3], "x": 5, "y": 5},
+ {"matrix": [4, 3], "x": 6, "y": 5},
+ {"matrix": [5, 3], "x": 7, "y": 5},
+ {"matrix": [6, 4], "x": 8, "y": 5},
+ {"matrix": [6, 3], "x": 9, "y": 5},
+ {"matrix": [7, 3], "x": 10, "y": 5},
+ {"matrix": [8, 2], "x": 11, "y": 5},
+ {"matrix": [9, 3], "x": 12, "y": 5},
+ {"matrix": [9, 4], "x": 13, "y": 5},
+ {"matrix": [10, 2], "x": 14, "y": 5},
+ {"matrix": [10, 3], "x": 15, "y": 5},
+ {"matrix": [11, 2], "x": 16, "y": 5, "w": 1.25},
+
+ {"matrix": [12, 3], "x": 18.5, "y": 5},
+
+ {"matrix": [13, 3], "x": 20.75, "y": 5},
+ {"matrix": [14, 3], "x": 21.75, "y": 5},
+ {"matrix": [14, 4], "x": 22.75, "y": 5},
+ {"matrix": [15, 3], "x": 23.75, "y": 5},
+
+ {"matrix": [16, 3], "x": 0, "y": 6},
+ {"matrix": [1, 2], "x": 1, "y": 6},
+
+ {"matrix": [2, 2], "x": 2.25, "y": 6, "w": 1.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 6},
+ {"matrix": [3, 2], "x": 4.5, "y": 6},
+ {"matrix": [4, 2], "x": 5.5, "y": 6},
+ {"matrix": [4, 1], "x": 6.5, "y": 6},
+ {"matrix": [5, 2], "x": 7.5, "y": 6},
+ {"matrix": [6, 2], "x": 8.5, "y": 6},
+ {"matrix": [6, 1], "x": 9.5, "y": 6},
+ {"matrix": [7, 2], "x": 10.5, "y": 6},
+ {"matrix": [8, 1], "x": 11.5, "y": 6},
+ {"matrix": [9, 1], "x": 12.5, "y": 6},
+ {"matrix": [9, 2], "x": 13.5, "y": 6},
+ {"matrix": [10, 1], "x": 14.5, "y": 6},
+ {"matrix": [11, 1], "x": 15.5, "y": 6, "w": 1.75},
+
+ {"matrix": [12, 1], "x": 17.5, "y": 6},
+ {"matrix": [12, 2], "x": 18.5, "y": 6},
+ {"matrix": [13, 2], "x": 19.5, "y": 6},
+
+ {"matrix": [13, 1], "x": 20.75, "y": 6},
+ {"matrix": [14, 2], "x": 21.75, "y": 6},
+ {"matrix": [15, 2], "x": 22.75, "y": 6},
+ {"matrix": [15, 1], "x": 23.75, "y": 6},
+
+ {"matrix": [0, 1], "x": 0, "y": 7},
+ {"matrix": [1, 1], "x": 1, "y": 7},
+ {"matrix": [2, 1], "x": 2.25, "y": 7, "w": 1.5},
+ {"matrix": [3, 1], "x": 4.75, "y": 7, "w": 1.5},
+ {"matrix": [5, 1], "x": 6.25, "y": 7, "w": 7},
+ {"matrix": [7, 1], "x": 13.25, "y": 7, "w": 1.5},
+ {"matrix": [11, 0], "x": 15.75, "y": 7, "w": 1.5},
+
+ {"matrix": [12, 0], "x": 18.5, "y": 7},
+
+ {"matrix": [13, 0], "x": 20.75, "y": 7},
+ {"matrix": [14, 0], "x": 21.75, "y": 7},
+ {"matrix": [14, 1], "x": 22.75, "y": 7},
+ {"matrix": [15, 0], "x": 23.75, "y": 7}
]
},
"LAYOUT_101": {
"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":"Print Screen", "x":15.25, "y":0},
- {"label":"Scroll Lock", "x":16.25, "y":0},
- {"label":"Pause", "x":17.25, "y":0},
- {"label":"`", "x":0, "y":2},
- {"label":"1", "x":1, "y":2},
- {"label":"2", "x":2, "y":2},
- {"label":"3", "x":3, "y":2},
- {"label":"4", "x":4, "y":2},
- {"label":"5", "x":5, "y":2},
- {"label":"6", "x":6, "y":2},
- {"label":"7", "x":7, "y":2},
- {"label":"8", "x":8, "y":2},
- {"label":"9", "x":9, "y":2},
- {"label":"0", "x":10, "y":2},
- {"label":"-", "x":11, "y":2},
- {"label":"=", "x":12, "y":2},
- {"label":"Back Space", "x":13, "y":2, "w":2},
- {"label":"Insert", "x":15.25, "y":2},
- {"label":"Home", "x":16.25, "y":2},
- {"label":"Page Up", "x":17.25, "y":2},
- {"label":"Num Lock", "x":18.5, "y":2},
- {"label":"/", "x":19.5, "y":2},
- {"label":"*", "x":20.5, "y":2},
- {"label":"-", "x":21.5, "y":2},
- {"label":"Tab", "x":0, "y":3, "w":1.5},
- {"label":"Q", "x":1.5, "y":3},
- {"label":"W", "x":2.5, "y":3},
- {"label":"E", "x":3.5, "y":3},
- {"label":"R", "x":4.5, "y":3},
- {"label":"T", "x":5.5, "y":3},
- {"label":"Y", "x":6.5, "y":3},
- {"label":"U", "x":7.5, "y":3},
- {"label":"I", "x":8.5, "y":3},
- {"label":"O", "x":9.5, "y":3},
- {"label":"P", "x":10.5, "y":3},
- {"label":"[", "x":11.5, "y":3},
- {"label":"]", "x":12.5, "y":3},
- {"label":"\\", "x":13.5, "y":3, "w":1.5},
- {"label":"Delete", "x":15.25, "y":3},
- {"label":"End", "x":16.25, "y":3},
- {"label":"Page Down", "x":17.25, "y":3},
- {"label":"7", "x":18.5, "y":3},
- {"label":"8", "x":19.5, "y":3},
- {"label":"9", "x":20.5, "y":3},
- {"label":"Caps Lock", "x":0, "y":4, "w":1.75},
- {"label":"A", "x":1.75, "y":4},
- {"label":"S", "x":2.75, "y":4},
- {"label":"D", "x":3.75, "y":4},
- {"label":"F", "x":4.75, "y":4},
- {"label":"G", "x":5.75, "y":4},
- {"label":"H", "x":6.75, "y":4},
- {"label":"J", "x":7.75, "y":4},
- {"label":"K", "x":8.75, "y":4},
- {"label":"L", "x":9.75, "y":4},
- {"label":";", "x":10.75, "y":4},
- {"label":"'", "x":11.75, "y":4},
- {"label":"Enter", "x":12.75, "y":4, "w":2.25},
- {"label":"4", "x":18.5, "y":4},
- {"label":"5", "x":19.5, "y":4},
- {"label":"6", "x":20.5, "y":4},
- {"label":"+", "x":21.5, "y":3, "h":2},
- {"label":"Shift", "x":0, "y":5, "w":2.25},
- {"label":"Z", "x":2.25, "y":5},
- {"label":"X", "x":3.25, "y":5},
- {"label":"C", "x":4.25, "y":5},
- {"label":"V", "x":5.25, "y":5},
- {"label":"B", "x":6.25, "y":5},
- {"label":"N", "x":7.25, "y":5},
- {"label":"M", "x":8.25, "y":5},
- {"label":",", "x":9.25, "y":5},
- {"label":".", "x":10.25, "y":5},
- {"label":"/", "x":11.25, "y":5},
- {"label":"Shift", "x":12.25, "y":5, "w":2.75},
- {"label":"Up", "x":16.25, "y":5},
- {"label":"1", "x":18.5, "y":5},
- {"label":"2", "x":19.5, "y":5},
- {"label":"3", "x":20.5, "y":5},
- {"label":"Ctrl", "x":0, "y":6, "w":1.5},
- {"label":"Alt", "x":2.5, "y":6, "w":1.5},
- {"label":"Space", "x":4, "y":6, "w":7},
- {"label":"Alt", "x":11, "y":6, "w":1.5},
- {"label":"Ctrl", "x":13.5, "y":6, "w":1.5},
- {"label":"Left", "x":15.25, "y":6},
- {"label":"Down", "x":16.25, "y":6},
- {"label":"Right", "x":17.25, "y":6},
- {"label":"0", "x":18.5, "y":6, "w":2},
- {"label":".", "x":20.5, "y":6},
- {"label":"Enter", "x":21.5, "y":5, "h":2}
+ {"matrix": [1, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 7], "x": 2, "y": 0},
+ {"matrix": [1, 7], "x": 3, "y": 0},
+ {"matrix": [2, 7], "x": 4, "y": 0},
+ {"matrix": [3, 7], "x": 5, "y": 0},
+
+ {"matrix": [4, 7], "x": 6.5, "y": 0},
+ {"matrix": [5, 7], "x": 7.5, "y": 0},
+ {"matrix": [6, 7], "x": 8.5, "y": 0},
+ {"matrix": [7, 7], "x": 9.5, "y": 0},
+
+ {"matrix": [8, 7], "x": 11, "y": 0},
+ {"matrix": [9, 7], "x": 12, "y": 0},
+ {"matrix": [10, 6], "x": 13, "y": 0},
+ {"matrix": [11, 6], "x": 14, "y": 0},
+
+ {"matrix": [10, 7], "x": 15.25, "y": 0},
+ {"matrix": [11, 7], "x": 16.25, "y": 0},
+ {"matrix": [12, 2], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 6], "x": 0, "y": 2},
+ {"matrix": [2, 6], "x": 1, "y": 2},
+ {"matrix": [3, 6], "x": 2, "y": 2},
+ {"matrix": [4, 6], "x": 3, "y": 2},
+ {"matrix": [4, 5], "x": 4, "y": 2},
+ {"matrix": [5, 6], "x": 5, "y": 2},
+ {"matrix": [6, 6], "x": 6, "y": 2},
+ {"matrix": [7, 5], "x": 7, "y": 2},
+ {"matrix": [7, 6], "x": 8, "y": 2},
+ {"matrix": [8, 6], "x": 9, "y": 2},
+ {"matrix": [8, 5], "x": 10, "y": 2},
+ {"matrix": [9, 6], "x": 11, "y": 2},
+ {"matrix": [10, 5], "x": 12, "y": 2},
+ {"matrix": [12, 6], "x": 13, "y": 2, "w": 2},
+
+ {"matrix": [12, 7], "x": 15.25, "y": 2},
+ {"matrix": [13, 6], "x": 16.25, "y": 2},
+ {"matrix": [13, 7], "x": 17.25, "y": 2},
+
+ {"matrix": [14, 6], "x": 18.5, "y": 2},
+ {"matrix": [14, 7], "x": 19.5, "y": 2},
+ {"matrix": [15, 6], "x": 20.5, "y": 2},
+ {"matrix": [16, 4], "x": 21.5, "y": 2},
+
+ {"matrix": [1, 5], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [2, 5], "x": 1.5, "y": 3},
+ {"matrix": [3, 5], "x": 2.5, "y": 3},
+ {"matrix": [4, 4], "x": 3.5, "y": 3},
+ {"matrix": [5, 5], "x": 4.5, "y": 3},
+ {"matrix": [5, 4], "x": 5.5, "y": 3},
+ {"matrix": [6, 5], "x": 6.5, "y": 3},
+ {"matrix": [7, 4], "x": 7.5, "y": 3},
+ {"matrix": [8, 3], "x": 8.5, "y": 3},
+ {"matrix": [8, 4], "x": 9.5, "y": 3},
+ {"matrix": [9, 5], "x": 10.5, "y": 3},
+ {"matrix": [10, 4], "x": 11.5, "y": 3},
+ {"matrix": [11, 3], "x": 12.5, "y": 3},
+ {"matrix": [11, 4], "x": 13.5, "y": 3, "w": 1.5},
+
+ {"matrix": [12, 4], "x": 15.25, "y": 3},
+ {"matrix": [12, 5], "x": 16.25, "y": 3},
+ {"matrix": [13, 5], "x": 17.25, "y": 3},
+
+ {"matrix": [13, 4], "x": 18.5, "y": 3},
+ {"matrix": [14, 5], "x": 19.5, "y": 3},
+ {"matrix": [15, 5], "x": 20.5, "y": 3},
+
+ {"matrix": [2, 4], "x": 0, "y": 4, "w": 1.75},
+ {"matrix": [3, 4], "x": 1.75, "y": 4},
+ {"matrix": [3, 3], "x": 2.75, "y": 4},
+ {"matrix": [4, 3], "x": 3.75, "y": 4},
+ {"matrix": [5, 3], "x": 4.75, "y": 4},
+ {"matrix": [6, 4], "x": 5.75, "y": 4},
+ {"matrix": [6, 3], "x": 6.75, "y": 4},
+ {"matrix": [7, 3], "x": 7.75, "y": 4},
+ {"matrix": [8, 2], "x": 8.75, "y": 4},
+ {"matrix": [9, 3], "x": 9.75, "y": 4},
+ {"matrix": [9, 4], "x": 10.75, "y": 4},
+ {"matrix": [10, 2], "x": 11.75, "y": 4},
+ {"matrix": [11, 2], "x": 12.75, "y": 4, "w": 2.25},
+
+ {"matrix": [13, 3], "x": 18.5, "y": 4},
+ {"matrix": [14, 3], "x": 19.5, "y": 4},
+ {"matrix": [14, 4], "x": 20.5, "y": 4},
+ {"matrix": [15, 4], "x": 21.5, "y": 3, "h": 2},
+
+ {"matrix": [2, 2], "x": 0, "y": 5, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 5},
+ {"matrix": [4, 2], "x": 3.25, "y": 5},
+ {"matrix": [4, 1], "x": 4.25, "y": 5},
+ {"matrix": [5, 2], "x": 5.25, "y": 5},
+ {"matrix": [6, 2], "x": 6.25, "y": 5},
+ {"matrix": [6, 1], "x": 7.25, "y": 5},
+ {"matrix": [7, 2], "x": 8.25, "y": 5},
+ {"matrix": [8, 1], "x": 9.25, "y": 5},
+ {"matrix": [9, 1], "x": 10.25, "y": 5},
+ {"matrix": [9, 2], "x": 11.25, "y": 5},
+ {"matrix": [11, 1], "x": 12.25, "y": 5, "w": 2.75},
+
+ {"matrix": [12, 3], "x": 16.25, "y": 5},
+
+ {"matrix": [13, 1], "x": 18.5, "y": 5},
+ {"matrix": [14, 2], "x": 19.5, "y": 5},
+ {"matrix": [15, 2], "x": 20.5, "y": 5},
+
+ {"matrix": [2, 1], "x": 0, "y": 6, "w": 1.5},
+ {"matrix": [3, 1], "x": 2.5, "y": 6, "w": 1.5},
+ {"matrix": [5, 1], "x": 4, "y": 6, "w": 7},
+ {"matrix": [7, 1], "x": 11, "y": 6, "w": 1.5},
+ {"matrix": [11, 0], "x": 13.5, "y": 6, "w": 1.5},
+
+ {"matrix": [12, 1], "x": 15.25, "y": 6},
+ {"matrix": [12, 0], "x": 16.25, "y": 6},
+ {"matrix": [13, 2], "x": 17.25, "y": 6},
+
+ {"matrix": [14, 0], "x": 18.5, "y": 6, "w": 2},
+ {"matrix": [14, 1], "x": 20.5, "y": 6},
+ {"matrix": [15, 1], "x": 21.5, "y": 5, "h": 2}
]
}
}
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 @@
"layouts": {
"LAYOUT_xt": {
"layout": [
- {"x": 0, "y": 0},
- {"x": 1, "y": 0},
- {"x": 2.25, "y": 0},
- {"x": 3.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.25, "y": 0},
- {"x": 9.25, "y": 0},
- {"x": 10.25, "y": 0},
- {"x": 11.25, "y": 0},
- {"x": 12.25, "y": 0},
- {"x": 13.25, "y": 0},
- {"x": 14.25, "y": 0},
- {"x": 15.25, "y": 0, "w": 1.75},
- {"x": 17, "y": 0, "w": 2},
- {"x": 19, "y": 0, "w": 2},
- {"x": 0, "y": 1},
- {"x": 1, "y": 1},
- {"x": 2.25, "y": 1, "w": 1.5},
- {"x": 3.75, "y": 1},
- {"x": 4.75, "y": 1},
- {"x": 5.75, "y": 1},
- {"x": 6.75, "y": 1},
- {"x": 7.75, "y": 1},
- {"x": 8.75, "y": 1},
- {"x": 9.75, "y": 1},
- {"x": 10.75, "y": 1},
- {"x": 11.75, "y": 1},
- {"x": 12.75, "y": 1},
- {"x": 13.75, "y": 1},
- {"x": 14.75, "y": 1, "w": 1.25},
- {"x": 17, "y": 1},
- {"x": 18, "y": 1},
- {"x": 19, "y": 1},
- {"x": 20, "y": 1},
- {"x": 0, "y": 2},
- {"x": 1, "y": 2},
- {"x": 2.25, "y": 2, "w": 1.75},
- {"x": 4, "y": 2},
- {"x": 5, "y": 2},
- {"x": 6, "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": 13, "y": 2},
- {"x": 14, "y": 2},
- {"x": 15, "y": 2},
- {"x": 16, "y": 1, "h": 2},
- {"x": 17, "y": 2},
- {"x": 18, "y": 2},
- {"x": 19, "y": 2},
- {"x": 0, "y": 3},
- {"x": 1, "y": 3},
- {"x": 2.25, "y": 3, "w": 1.25},
- {"x": 3.5, "y": 3},
- {"x": 4.5, "y": 3},
- {"x": 5.5, "y": 3},
- {"x": 6.5, "y": 3},
- {"x": 7.5, "y": 3},
- {"x": 8.5, "y": 3},
- {"x": 9.5, "y": 3},
- {"x": 10.5, "y": 3},
- {"x": 11.5, "y": 3},
- {"x": 12.5, "y": 3},
- {"x": 13.5, "y": 3},
- {"x": 14.5, "y": 3, "w": 1.5},
- {"x": 16, "y": 3},
- {"x": 17, "y": 3},
- {"x": 18, "y": 3},
- {"x": 19, "y": 3},
- {"x": 20, "y": 2, "h": 3},
- {"x": 0, "y": 4},
- {"x": 1, "y": 4},
- {"x": 2.25, "y": 4, "w": 2},
- {"x": 4.25, "y": 4, "w": 9.75},
- {"x": 14, "y": 4, "w": 2},
- {"x": 16, "y": 4, "w": 2},
- {"x": 18, "y": 4, "w": 2}
+ {"matrix": [7, 3], "x": 0, "y": 0},
+ {"matrix": [7, 4], "x": 1, "y": 0},
+
+ {"matrix": [0, 1], "x": 2.25, "y": 0},
+ {"matrix": [0, 2], "x": 3.25, "y": 0},
+ {"matrix": [0, 3], "x": 4.25, "y": 0},
+ {"matrix": [0, 4], "x": 5.25, "y": 0},
+ {"matrix": [0, 5], "x": 6.25, "y": 0},
+ {"matrix": [0, 6], "x": 7.25, "y": 0},
+ {"matrix": [0, 7], "x": 8.25, "y": 0},
+ {"matrix": [1, 0], "x": 9.25, "y": 0},
+ {"matrix": [1, 1], "x": 10.25, "y": 0},
+ {"matrix": [1, 2], "x": 11.25, "y": 0},
+ {"matrix": [1, 3], "x": 12.25, "y": 0},
+ {"matrix": [1, 4], "x": 13.25, "y": 0},
+ {"matrix": [1, 5], "x": 14.25, "y": 0},
+ {"matrix": [1, 6], "x": 15.25, "y": 0, "w": 1.75},
+ {"matrix": [8, 5], "x": 17, "y": 0, "w": 2},
+ {"matrix": [8, 6], "x": 19, "y": 0, "w": 2},
+
+ {"matrix": [7, 5], "x": 0, "y": 1},
+ {"matrix": [7, 6], "x": 1, "y": 1},
+
+ {"matrix": [1, 7], "x": 2.25, "y": 1, "w": 1.5},
+ {"matrix": [2, 0], "x": 3.75, "y": 1},
+ {"matrix": [2, 1], "x": 4.75, "y": 1},
+ {"matrix": [2, 2], "x": 5.75, "y": 1},
+ {"matrix": [2, 3], "x": 6.75, "y": 1},
+ {"matrix": [2, 4], "x": 7.75, "y": 1},
+ {"matrix": [2, 5], "x": 8.75, "y": 1},
+ {"matrix": [2, 6], "x": 9.75, "y": 1},
+ {"matrix": [2, 7], "x": 10.75, "y": 1},
+ {"matrix": [3, 0], "x": 11.75, "y": 1},
+ {"matrix": [3, 1], "x": 12.75, "y": 1},
+ {"matrix": [3, 2], "x": 13.75, "y": 1},
+ {"matrix": [3, 3], "x": 14.75, "y": 1, "w": 1.25},
+ {"matrix": [8, 7], "x": 17, "y": 1},
+ {"matrix": [9, 0], "x": 18, "y": 1},
+ {"matrix": [9, 1], "x": 19, "y": 1},
+ {"matrix": [9, 2], "x": 20, "y": 1},
+
+ {"matrix": [7, 7], "x": 0, "y": 2},
+ {"matrix": [8, 0], "x": 1, "y": 2},
+
+ {"matrix": [3, 5], "x": 2.25, "y": 2, "w": 1.75},
+ {"matrix": [3, 6], "x": 4, "y": 2},
+ {"matrix": [3, 7], "x": 5, "y": 2},
+ {"matrix": [4, 0], "x": 6, "y": 2},
+ {"matrix": [4, 1], "x": 7, "y": 2},
+ {"matrix": [4, 2], "x": 8, "y": 2},
+ {"matrix": [4, 3], "x": 9, "y": 2},
+ {"matrix": [4, 4], "x": 10, "y": 2},
+ {"matrix": [4, 5], "x": 11, "y": 2},
+ {"matrix": [4, 6], "x": 12, "y": 2},
+ {"matrix": [4, 7], "x": 13, "y": 2},
+ {"matrix": [5, 0], "x": 14, "y": 2},
+ {"matrix": [5, 1], "x": 15, "y": 2},
+ {"matrix": [3, 4], "x": 16, "y": 1, "h": 2},
+ {"matrix": [9, 3], "x": 17, "y": 2},
+ {"matrix": [9, 4], "x": 18, "y": 2},
+ {"matrix": [9, 5], "x": 19, "y": 2},
+
+ {"matrix": [8, 1], "x": 0, "y": 3},
+ {"matrix": [8, 2], "x": 1, "y": 3},
+
+ {"matrix": [5, 2], "x": 2.25, "y": 3, "w": 1.25},
+ {"matrix": [5, 3], "x": 3.5, "y": 3},
+ {"matrix": [5, 4], "x": 4.5, "y": 3},
+ {"matrix": [5, 5], "x": 5.5, "y": 3},
+ {"matrix": [5, 6], "x": 6.5, "y": 3},
+ {"matrix": [5, 7], "x": 7.5, "y": 3},
+ {"matrix": [6, 0], "x": 8.5, "y": 3},
+ {"matrix": [6, 1], "x": 9.5, "y": 3},
+ {"matrix": [6, 2], "x": 10.5, "y": 3},
+ {"matrix": [6, 3], "x": 11.5, "y": 3},
+ {"matrix": [6, 4], "x": 12.5, "y": 3},
+ {"matrix": [6, 5], "x": 13.5, "y": 3},
+ {"matrix": [6, 6], "x": 14.5, "y": 3, "w": 1.5},
+ {"matrix": [6, 7], "x": 16, "y": 3},
+ {"matrix": [9, 7], "x": 17, "y": 3},
+ {"matrix": [10, 0], "x": 18, "y": 3},
+ {"matrix": [10, 1], "x": 19, "y": 3},
+ {"matrix": [9, 6], "x": 20, "y": 2, "h": 3},
+
+ {"matrix": [8, 3], "x": 0, "y": 4},
+ {"matrix": [8, 4], "x": 1, "y": 4},
+
+ {"matrix": [7, 0], "x": 2.25, "y": 4, "w": 2},
+ {"matrix": [7, 1], "x": 4.25, "y": 4, "w": 9.75},
+ {"matrix": [7, 2], "x": 14, "y": 4, "w": 2},
+ {"matrix": [10, 2], "x": 16, "y": 4, "w": 2},
+ {"matrix": [10, 3], "x": 18, "y": 4, "w": 2}
]
},
"LAYOUT": {
"layout": [
- {"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},
- {"x": 2, "y": 1},
- {"x": 3, "y": 1},
- {"x": 4, "y": 1},
- {"x": 5, "y": 1},
- {"x": 6, "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": 13, "y": 1},
- {"x": 15.25, "y": 1},
- {"x": 16.25, "y": 1},
- {"x": 17.25, "y": 1},
- {"x": 19.5, "y": 1},
- {"x": 20.5, "y": 1},
- {"x": 21.5, "y": 1},
- {"x": 0, "y": 2.5},
- {"x": 1, "y": 2.5},
- {"x": 2, "y": 2.5},
- {"x": 3, "y": 2.5},
- {"x": 4, "y": 2.5},
- {"x": 5, "y": 2.5},
- {"x": 6, "y": 2.5},
- {"x": 7, "y": 2.5},
- {"x": 8, "y": 2.5},
- {"x": 9, "y": 2.5},
- {"x": 10, "y": 2.5},
- {"x": 11, "y": 2.5},
- {"x": 12, "y": 2.5},
- {"x": 13, "y": 2.5},
- {"x": 14, "y": 2.5},
- {"x": 15.25, "y": 2.5},
- {"x": 16.25, "y": 2.5},
- {"x": 17.25, "y": 2.5},
- {"x": 18.5, "y": 2.5},
- {"x": 19.5, "y": 2.5},
- {"x": 20.5, "y": 2.5},
- {"x": 21.5, "y": 2.5},
- {"x": 0, "y": 3.5, "w": 1.5},
- {"x": 1.5, "y": 3.5},
- {"x": 2.5, "y": 3.5},
- {"x": 3.5, "y": 3.5},
- {"x": 4.5, "y": 3.5},
- {"x": 5.5, "y": 3.5},
- {"x": 6.5, "y": 3.5},
- {"x": 7.5, "y": 3.5},
- {"x": 8.5, "y": 3.5},
- {"x": 9.5, "y": 3.5},
- {"x": 10.5, "y": 3.5},
- {"x": 11.5, "y": 3.5},
- {"x": 12.5, "y": 3.5},
- {"x": 13.5, "y": 3.5, "w": 1.5},
- {"x": 15.25, "y": 3.5},
- {"x": 16.25, "y": 3.5},
- {"x": 17.25, "y": 3.5},
- {"x": 18.5, "y": 3.5},
- {"x": 19.5, "y": 3.5},
- {"x": 20.5, "y": 3.5},
- {"x": 21.5, "y": 3.5},
- {"x": 0, "y": 4.5, "w": 1.75},
- {"x": 1.75, "y": 4.5},
- {"x": 2.75, "y": 4.5},
- {"x": 3.75, "y": 4.5},
- {"x": 4.75, "y": 4.5},
- {"x": 5.75, "y": 4.5},
- {"x": 6.75, "y": 4.5},
- {"x": 7.75, "y": 4.5},
- {"x": 8.75, "y": 4.5},
- {"x": 9.75, "y": 4.5},
- {"x": 10.75, "y": 4.5},
- {"x": 11.75, "y": 4.5},
- {"x": 12.75, "y": 4.5},
- {"x": 13.75, "y": 4.5, "w": 1.25},
- {"x": 18.5, "y": 4.5},
- {"x": 19.5, "y": 4.5},
- {"x": 20.5, "y": 4.5},
- {"x": 21.5, "y": 4.5},
- {"x": 0, "y": 5.5, "w": 1.25},
- {"x": 1.25, "y": 5.5},
- {"x": 2.25, "y": 5.5},
- {"x": 3.25, "y": 5.5},
- {"x": 4.25, "y": 5.5},
- {"x": 5.25, "y": 5.5},
- {"x": 6.25, "y": 5.5},
- {"x": 7.25, "y": 5.5},
- {"x": 8.25, "y": 5.5},
- {"x": 9.25, "y": 5.5},
- {"x": 10.25, "y": 5.5},
- {"x": 11.25, "y": 5.5},
- {"x": 12.25, "y": 5.5},
- {"x": 13.25, "y": 5.5, "w": 1.75},
- {"x": 16.25, "y": 5.5},
- {"x": 18.5, "y": 5.5},
- {"x": 19.5, "y": 5.5},
- {"x": 20.5, "y": 5.5},
- {"x": 21.5, "y": 5.5},
- {"x": 0, "y": 6.5, "w": 1.25},
- {"x": 1.25, "y": 6.5, "w": 1.25},
- {"x": 2.5, "y": 6.5, "w": 1.25},
- {"x": 3.75, "y": 6.5, "w": 1.25},
- {"x": 5, "y": 6.5, "w": 3.25},
- {"x": 8.25, "y": 6.5, "w": 1.25},
- {"x": 9.5, "y": 6.5, "w": 1.25},
- {"x": 10.75, "y": 6.5},
- {"x": 11.75, "y": 6.5},
- {"x": 12.75, "y": 6.5},
- {"x": 13.75, "y": 6.5, "w": 1.25},
- {"x": 15.25, "y": 6.5},
- {"x": 16.25, "y": 6.5},
- {"x": 17.25, "y": 6.5},
- {"x": 18.5, "y": 6.5, "w": 2},
- {"x": 20.5, "y": 6.5},
- {"x": 21.5, "y": 6.5}
+ {"matrix": [12, 4], "x": 2, "y": 0},
+ {"matrix": [12, 5], "x": 3, "y": 0},
+ {"matrix": [12, 6], "x": 4, "y": 0},
+ {"matrix": [12, 7], "x": 5, "y": 0},
+ {"matrix": [13, 0], "x": 6, "y": 0},
+ {"matrix": [13, 1], "x": 7, "y": 0},
+ {"matrix": [13, 2], "x": 8, "y": 0},
+ {"matrix": [13, 3], "x": 9, "y": 0},
+ {"matrix": [13, 4], "x": 10, "y": 0},
+ {"matrix": [13, 5], "x": 11, "y": 0},
+ {"matrix": [13, 6], "x": 12, "y": 0},
+ {"matrix": [14, 6], "x": 13, "y": 0},
+
+ {"matrix": [0, 1], "x": 0, "y": 1},
+
+ {"matrix": [7, 3], "x": 2, "y": 1},
+ {"matrix": [7, 4], "x": 3, "y": 1},
+ {"matrix": [7, 5], "x": 4, "y": 1},
+ {"matrix": [7, 6], "x": 5, "y": 1},
+ {"matrix": [7, 7], "x": 6, "y": 1},
+ {"matrix": [8, 0], "x": 7, "y": 1},
+ {"matrix": [8, 1], "x": 8, "y": 1},
+ {"matrix": [8, 2], "x": 9, "y": 1},
+ {"matrix": [8, 3], "x": 10, "y": 1},
+ {"matrix": [8, 4], "x": 11, "y": 1},
+ {"matrix": [10, 7], "x": 12, "y": 1},
+ {"matrix": [11, 0], "x": 13, "y": 1},
+
+ {"matrix": [10, 4], "x": 15.25, "y": 1},
+ {"matrix": [8, 6], "x": 16.25, "y": 1},
+ {"matrix": [10, 5], "x": 17.25, "y": 1},
+
+ {"matrix": [11, 5], "x": 19.5, "y": 1},
+ {"matrix": [11, 6], "x": 20.5, "y": 1},
+ {"matrix": [11, 7], "x": 21.5, "y": 1},
+
+ {"matrix": [5, 1], "x": 0, "y": 2.5},
+ {"matrix": [0, 2], "x": 1, "y": 2.5},
+ {"matrix": [0, 3], "x": 2, "y": 2.5},
+ {"matrix": [0, 4], "x": 3, "y": 2.5},
+ {"matrix": [0, 5], "x": 4, "y": 2.5},
+ {"matrix": [0, 6], "x": 5, "y": 2.5},
+ {"matrix": [0, 7], "x": 6, "y": 2.5},
+ {"matrix": [1, 0], "x": 7, "y": 2.5},
+ {"matrix": [1, 1], "x": 8, "y": 2.5},
+ {"matrix": [1, 2], "x": 9, "y": 2.5},
+ {"matrix": [1, 3], "x": 10, "y": 2.5},
+ {"matrix": [1, 4], "x": 11, "y": 2.5},
+ {"matrix": [1, 5], "x": 12, "y": 2.5},
+ {"matrix": [15, 5], "x": 13, "y": 2.5},
+ {"matrix": [1, 6], "x": 14, "y": 2.5},
+
+ {"matrix": [14, 1], "x": 15.25, "y": 2.5},
+ {"matrix": [14, 4], "x": 16.25, "y": 2.5},
+ {"matrix": [14, 7], "x": 17.25, "y": 2.5},
+
+ {"matrix": [8, 5], "x": 18.5, "y": 2.5},
+ {"matrix": [15, 7], "x": 19.5, "y": 2.5},
+ {"matrix": [6, 7], "x": 20.5, "y": 2.5},
+ {"matrix": [9, 2], "x": 21.5, "y": 2.5},
+
+ {"matrix": [1, 7], "x": 0, "y": 3.5, "w": 1.5},
+ {"matrix": [2, 0], "x": 1.5, "y": 3.5},
+ {"matrix": [2, 1], "x": 2.5, "y": 3.5},
+ {"matrix": [2, 2], "x": 3.5, "y": 3.5},
+ {"matrix": [2, 3], "x": 4.5, "y": 3.5},
+ {"matrix": [2, 4], "x": 5.5, "y": 3.5},
+ {"matrix": [2, 5], "x": 6.5, "y": 3.5},
+ {"matrix": [2, 6], "x": 7.5, "y": 3.5},
+ {"matrix": [2, 7], "x": 8.5, "y": 3.5},
+ {"matrix": [3, 0], "x": 9.5, "y": 3.5},
+ {"matrix": [3, 1], "x": 10.5, "y": 3.5},
+ {"matrix": [3, 2], "x": 11.5, "y": 3.5},
+ {"matrix": [3, 3], "x": 12.5, "y": 3.5},
+ {"matrix": [5, 3], "x": 13.5, "y": 3.5, "w": 1.5},
+
+ {"matrix": [14, 2], "x": 15.25, "y": 3.5},
+ {"matrix": [14, 5], "x": 16.25, "y": 3.5},
+ {"matrix": [15, 0], "x": 17.25, "y": 3.5},
+
+ {"matrix": [8, 7], "x": 18.5, "y": 3.5},
+ {"matrix": [9, 0], "x": 19.5, "y": 3.5},
+ {"matrix": [9, 1], "x": 20.5, "y": 3.5},
+ {"matrix": [9, 6], "x": 21.5, "y": 3.5},
+
+ {"matrix": [7, 2], "x": 0, "y": 4.5, "w": 1.75},
+ {"matrix": [3, 6], "x": 1.75, "y": 4.5},
+ {"matrix": [3, 7], "x": 2.75, "y": 4.5},
+ {"matrix": [4, 0], "x": 3.75, "y": 4.5},
+ {"matrix": [4, 1], "x": 4.75, "y": 4.5},
+ {"matrix": [4, 2], "x": 5.75, "y": 4.5},
+ {"matrix": [4, 3], "x": 6.75, "y": 4.5},
+ {"matrix": [4, 4], "x": 7.75, "y": 4.5},
+ {"matrix": [4, 5], "x": 8.75, "y": 4.5},
+ {"matrix": [4, 6], "x": 9.75, "y": 4.5},
+ {"matrix": [4, 7], "x": 10.75, "y": 4.5},
+ {"matrix": [5, 0], "x": 11.75, "y": 4.5},
+ {"matrix": [0, 0], "x": 12.75, "y": 4.5},
+ {"matrix": [3, 4], "x": 13.75, "y": 4.5, "w": 1.25},
+
+ {"matrix": [9, 3], "x": 18.5, "y": 4.5},
+ {"matrix": [9, 4], "x": 19.5, "y": 4.5},
+ {"matrix": [9, 5], "x": 20.5, "y": 4.5},
+ {"matrix": [15, 6], "x": 21.5, "y": 4.5},
+
+ {"matrix": [5, 2], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [10, 6], "x": 1.25, "y": 5.5},
+ {"matrix": [5, 4], "x": 2.25, "y": 5.5},
+ {"matrix": [5, 5], "x": 3.25, "y": 5.5},
+ {"matrix": [5, 6], "x": 4.25, "y": 5.5},
+ {"matrix": [5, 7], "x": 5.25, "y": 5.5},
+ {"matrix": [6, 0], "x": 6.25, "y": 5.5},
+ {"matrix": [6, 1], "x": 7.25, "y": 5.5},
+ {"matrix": [6, 2], "x": 8.25, "y": 5.5},
+ {"matrix": [6, 3], "x": 9.25, "y": 5.5},
+ {"matrix": [6, 4], "x": 10.25, "y": 5.5},
+ {"matrix": [6, 5], "x": 11.25, "y": 5.5},
+ {"matrix": [14, 3], "x": 12.25, "y": 5.5},
+ {"matrix": [6, 6], "x": 13.25, "y": 5.5, "w": 1.75},
+
+ {"matrix": [12, 0], "x": 16.25, "y": 5.5},
+
+ {"matrix": [9, 7], "x": 18.5, "y": 5.5},
+ {"matrix": [10, 0], "x": 19.5, "y": 5.5},
+ {"matrix": [10, 1], "x": 20.5, "y": 5.5},
+ {"matrix": [13, 7], "x": 21.5, "y": 5.5},
+
+ {"matrix": [3, 5], "x": 0, "y": 6.5, "w": 1.25},
+ {"matrix": [11, 2], "x": 1.25, "y": 6.5, "w": 1.25},
+ {"matrix": [7, 0], "x": 2.5, "y": 6.5, "w": 1.25},
+ {"matrix": [15, 3], "x": 3.75, "y": 6.5, "w": 1.25},
+ {"matrix": [7, 1], "x": 5, "y": 6.5, "w": 3.25},
+ {"matrix": [15, 1], "x": 8.25, "y": 6.5, "w": 1.25},
+ {"matrix": [14, 0], "x": 9.5, "y": 6.5, "w": 1.25},
+ {"matrix": [15, 4], "x": 10.75, "y": 6.5},
+ {"matrix": [11, 3], "x": 11.75, "y": 6.5},
+ {"matrix": [11, 4], "x": 12.75, "y": 6.5},
+ {"matrix": [15, 2], "x": 13.75, "y": 6.5, "w": 1.25},
+
+ {"matrix": [12, 1], "x": 15.25, "y": 6.5},
+ {"matrix": [12, 2], "x": 16.25, "y": 6.5},
+ {"matrix": [12, 3], "x": 17.25, "y": 6.5},
+
+ {"matrix": [10, 2], "x": 18.5, "y": 6.5, "w": 2},
+ {"matrix": [10, 3], "x": 20.5, "y": 6.5},
+ {"matrix": [11, 1], "x": 21.5, "y": 6.5}
]
}
}
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 @@
-/*
-Copyright 2011,2012,2013 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* IBM XT keyboard layout
- * ,-------. ,--------------------------------------------------------------------------.
- * | F1| F2| |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| BS |NumLck |ScrLck |
- * |-------| |--------------------------------------------------------------------------|
- * | F3| F4| | Tab | Q| W| E| R| T| Y| U| I| O| P| [| ] | | 7| 8| 9| -|
- * |-------| |------------------------------------------------------|Ent|---------------|
- * | F5| F6| | Ctrl | A| S| D| F| G| H| J| K| L| ;| '| `| | 4| 5| 6| |
- * |-------| |----------------------------------------------------------------------| |
- * | F7| F8| |Shif| \| Z| X| C| V| B| N| M| ,| .| /|Shift| *| 1| 2| 3| +|
- * |-------| |----------------------------------------------------------------------| |
- * | F9|F10| | Alt | Space |CapsLck| 0 | . | |
- * `-------' `--------------------------------------------------------------------------'
- * Scan code set 1
- * ,-------. ,--------------------------------------------------------------------------.
- * | 3B| 3C| | 01| 02| 03| 04| 05| 06| 07| 08| 09| 0A| 0B| 0C| 0D| 0E | 45 | 46 |
- * |-------| |--------------------------------------------------------------------------|
- * | 3D| 3E| | 0F | 10| 11| 12| 13| 14| 15| 16| 17| 18| 19| 1A| 1B | | 47| 48| 49| 4A|
- * |-------| |------------------------------------------------------| 1C|---------------|
- * | 3F| 40| | 1D | 1E| 1F| 20| 21| 22| 23| 24| 25| 26| 27| 28| 29| | 4B| 4C| 4D| |
- * |-------| |----------------------------------------------------------------------| |
- * | 41| 42| | 2A | 2B| 2C| 2D| 2E| 2F| 30| 31| 32| 33| 34| 35| 36 | 37| 4F| 50| 51| 4E|
- * |-------| |----------------------------------------------------------------------| |
- * | 43| 44| | 38 | 39 | 3A | 52 | 53 | |
- * `-------' `--------------------------------------------------------------------------'
- */
-#define LAYOUT_xt( \
- k3B, k3C, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k45, k46, \
- k3D, k3E, k0F, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k47, k48, k49, k4A, \
- k3F, k40, k1D, k1E, k1F, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k1C, k4B, k4C, k4D, \
- k41, k42, k2A, k2B, k2C, k2D, k2E, k2F, k30, k31, k32, k33, k34, k35, k36, k37, k4F, k50, k51, k4E, \
- k43, k44, k38, k39, k3A, k52, k53 \
-) { \
- { XXX, k01, k02, k03, k04, k05, k06, k07 }, \
- { k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
- { k10, k11, k12, k13, k14, k15, k16, k17 }, \
- { k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
- { k20, k21, k22, k23, k24, k25, k26, k27 }, \
- { k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
- { k30, k31, k32, k33, k34, k35, k36, k37 }, \
- { k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
- { k40, k41, k42, k43, k44, k45, k46, k47 }, \
- { k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \
- { k50, k51, k52, k53, XXX, XXX, XXX, XXX }, \
- { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
- { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
- { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
- { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
- { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
-}
-
-/* Extended keyboard layout
- * ,-----------------------------------------------.
- * |F13|F14|F15|F16|F17|F18|F19|F20|F21|F22|F23|F24|
- * ,---. |-----------------------------------------------| ,-----------. ,-----------.
- * |Esc| |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12| |PrS|ScL|Pau| |VDn|VUp|Mut|
- * `---' `-----------------------------------------------' `-----------' `-----------'
- * ,-----------------------------------------------------------. ,-----------. ,---------------.
- * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|JPY|Bsp| |Ins|Hom|PgU| |NmL| /| *| -|
- * |-----------------------------------------------------------| |-----------| |---------------|
- * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \ | |Del|End|PgD| | 7| 8| 9| +|
- * |-----------------------------------------------------------| `-----------' |---------------|
- * |CapsL | A| S| D| F| G| H| J| K| L| ;| '| #|Entr| | 4| 5| 6|KP,|
- * |-----------------------------------------------------------| ,---. |---------------|
- * |Shft| <| Z| X| C| V| B| N| M| ,| .| /| RO|Shift | |Up | | 1| 2| 3|Ent|
- * |-----------------------------------------------------------| ,-----------. |---------------|
- * |Ctl|Gui|Alt|MHEN| Space |HENK|KANA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| | 0| .|KP=|
- * `-----------------------------------------------------------' `-----------' `---------------'
- * ,-----------------------------------------------.
- * | 64| 65| 66| 67| 68| 69| 6A| 6B| 6C| 6D| 6E| 76|
- * ,---. |-----------------------------------------------| ,-----------. ,-----------.
- * | 01| | 3B| 3C| 3D| 3E| 3F| 40| 41| 42| 43| 44| 57| 58| |*37| 46|*45| |e5E|e5F|e63|
- * `---' `-----------------------------------------------' `-----------' `-----------'
- * ,-----------------------------------------------------------. ,-----------. ,---------------.
- * | 29| 02| 03| 04| 05| 06| 07| 08| 09| 0A| 0B| 0C| 0D| 7D| 0E| |e52|e47|e49| | 45|e35| 37| 4A|
- * |-----------------------------------------------------------| |-----------| |---------------|
- * | 0F | 10| 11| 12| 13| 14| 15| 16| 17| 18| 19| 1A| 1B| 2B | |e53|e4F|e51| | 47| 48| 49| 4E|
- * |-----------------------------------------------------------| `-----------' |---------------|
- * | 3A | 1E| 1F| 20| 21| 22| 23| 24| 25| 26| 27| 28| 00| 1C | | 4B| 4C| 4D| 7E|
- * |-----------------------------------------------------------| ,---. |---------------|
- * | 2A | 56| 2C| 2D| 2E| 2F| 30| 31| 32| 33| 34| 35| 73| 36 | |e48| | 4F| 50| 51|e1C|
- * |-----------------------------------------------------------| ,-----------. |---------------|
- * | 1D|e5B| 38| 7B | 39 | 79 | 70 |e38|e5C|e5D|e1D| |e4B|e50|e4D| | 52| 53| 59|
- * `-----------------------------------------------------------' `-----------' `---------------'
- * e: E0-escaped codes
- * *: special handling codes
- */
-#define LAYOUT( \
- k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E, k76, \
- k01, k3B, k3C, k3D, k3E, k3F, k40, k41, k42, k43, k44, k57, k58, k54, k46, k55, k5D, k5E, k5F, \
- k29, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k7D, k0E, k71, k74, k77, k45, k7F, k37, k4A, \
- k0F, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k2B, k72, k75, k78, k47, k48, k49, k4E, \
- k3A, k1E, k1F, k20, k21, k22, k23, k24, k25, k26, k27, k28, k00, k1C, k4B, k4C, k4D, k7E, \
- k2A, k56, k2C, k2D, k2E, k2F, k30, k31, k32, k33, k34, k35, k73, k36, k60, k4F, k50, k51, k6F, \
- k1D, k5A, k38, k7B, k39, k79, k70, k7C, k5B, k5C, k7A, k61, k62, k63, k52, k53, k59 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07 }, \
- { k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
- { k10, k11, k12, k13, k14, k15, k16, k17 }, \
- { k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
- { k20, k21, k22, k23, k24, k25, k26, k27 }, \
- { k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
- { k30, k31, k32, k33, k34, k35, k36, k37 }, \
- { k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
- { k40, k41, k42, k43, k44, k45, k46, k47 }, \
- { k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \
- { k50, k51, k52, k53, k54, k55, k56, k57 }, \
- { k58, k59, k5A, k5B, k5C, k5D, k5E, k5F }, \
- { k60, k61, k62, k63, k64, k65, k66, k67 }, \
- { k68, k69, k6A, k6B, k6C, k6D, k6E, k6F }, \
- { k70, k71, k72, k73, k74, k75, k76, k77 }, \
- { k78, k79, k7A, k7B, k7C, k7D, k7E, k7F } \
-}
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 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_all": {
- "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}]
- },
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [0, 7], "x": 6.5, "y": 0},
+ {"matrix": [0, 8], "x": 7.5, "y": 0},
+ {"matrix": [0, 9], "x": 8.5, "y": 0},
+ {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [0, 15], "x": 15.25, "y": 0},
+
+ {"matrix": [0, 16], "x": 16.5, "y": 0},
+ {"matrix": [0, 17], "x": 17.5, "y": 0},
+ {"matrix": [0, 18], "x": 18.5, "y": 0},
+ {"matrix": [0, 19], "x": 19.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25},
+ {"matrix": [1, 14], "x": 14, "y": 1.25},
+
+ {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+
+ {"matrix": [1, 16], "x": 16.5, "y": 1.25},
+ {"matrix": [1, 17], "x": 17.5, "y": 1.25},
+ {"matrix": [1, 18], "x": 18.5, "y": 1.25},
+ {"matrix": [1, 19], "x": 19.5, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+
+ {"matrix": [2, 16], "x": 16.5, "y": 2.25},
+ {"matrix": [2, 17], "x": 17.5, "y": 2.25},
+ {"matrix": [2, 18], "x": 18.5, "y": 2.25},
+ {"matrix": [2, 19], "x": 19.5, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 14], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [3, 16], "x": 16.5, "y": 3.25},
+ {"matrix": [3, 17], "x": 17.5, "y": 3.25},
+ {"matrix": [3, 18], "x": 18.5, "y": 3.25},
+ {"matrix": [3, 19], "x": 19.5, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 12], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"matrix": [4, 14], "x": 14, "y": 4.25},
+
+ {"matrix": [4, 15], "x": 15.25, "y": 4.5},
+
+ {"matrix": [4, 16], "x": 16.5, "y": 4.25},
+ {"matrix": [4, 17], "x": 17.5, "y": 4.25},
+ {"matrix": [4, 18], "x": 18.5, "y": 4.25},
+ {"matrix": [4, 19], "x": 19.5, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 8], "x": 4, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 11], "x": 10.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 12], "x": 11.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 13], "x": 12.75, "y": 5.25, "w": 1.25},
+
+ {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+ {"matrix": [5, 15], "x": 15.25, "y": 5.5},
+ {"matrix": [5, 16], "x": 16.25, "y": 5.5},
+
+ {"matrix": [5, 17], "x": 17.5, "y": 5.25},
+ {"matrix": [5, 18], "x": 18.5, "y": 5.25},
+ {"matrix": [5, 19], "x": 19.5, "y": 5.25}
+ ]
+ },
"LAYOUT": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [0, 7], "x": 6.5, "y": 0},
+ {"matrix": [0, 8], "x": 7.5, "y": 0},
+ {"matrix": [0, 9], "x": 8.5, "y": 0},
+ {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [0, 15], "x": 15.25, "y": 0},
+
+ {"matrix": [0, 16], "x": 16.5, "y": 0},
+ {"matrix": [0, 17], "x": 17.5, "y": 0},
+ {"matrix": [0, 18], "x": 18.5, "y": 0},
+ {"matrix": [0, 19], "x": 19.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 14], "x": 13, "y": 1.25, "w": 2},
+
+ {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+
+ {"matrix": [1, 16], "x": 16.5, "y": 1.25},
+ {"matrix": [1, 17], "x": 17.5, "y": 1.25},
+ {"matrix": [1, 18], "x": 18.5, "y": 1.25},
+ {"matrix": [1, 19], "x": 19.5, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+
+ {"matrix": [2, 16], "x": 16.5, "y": 2.25},
+ {"matrix": [2, 17], "x": 17.5, "y": 2.25},
+ {"matrix": [2, 18], "x": 18.5, "y": 2.25},
+ {"matrix": [2, 19], "x": 19.5, "y": 2.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 14], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [3, 16], "x": 16.5, "y": 3.25},
+ {"matrix": [3, 17], "x": 17.5, "y": 3.25},
+ {"matrix": [3, 18], "x": 18.5, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 12], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+ {"matrix": [4, 15], "x": 15.25, "y": 4.5},
+
+ {"matrix": [4, 16], "x": 16.5, "y": 4.25},
+ {"matrix": [4, 17], "x": 17.5, "y": 4.25},
+ {"matrix": [4, 18], "x": 18.5, "y": 4.25},
+
+ {"matrix": [4, 19], "x": 19.5, "y": 4.25, "h": 2},
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 8], "x": 4, "y": 5.25, "w": 7},
+ {"matrix": [5, 12], "x": 11, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 13], "x": 12.5, "y": 5.25, "w": 1.5},
+
+ {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+ {"matrix": [5, 15], "x": 15.25, "y": 5.5},
+ {"matrix": [5, 16], "x": 16.25, "y": 5.5},
+
+ {"matrix": [5, 17], "x": 17.5, "y": 5.25},
+ {"matrix": [5, 18], "x": 18.5, "y": 5.25}
+ ]
}
}
}
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 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "jetfire.h"
+#include "quantum.h"
#include "indicator_leds.h"
enum 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 @@
-/* Copyright 2018 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// The following is an example using the Planck MIT layout
-// The first section contains all of the arguments representing the physical
-// layout of the board and position of the keys
-// The second converts the arguments into a two-dimensional array which
-// represents the switch matrix.
-
-#define LAYOUT_all( \
- K5A, K5C, K5D, K5E, K5F, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, K5Q, K5R, K5S, K5T, \
- K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, K4O, K4P, K4Q, K4R, K4S, K4T, \
- K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3O, K3P, K3Q, K3R, K3S, K3T, \
- K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2O, K2Q, K2R, K2S, K2T, \
- K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1M, K1N, K1O, K1P, K1Q, K1R, K1S, K1T, \
- K0A, K0B, K0C, K0I, K0L, K0M, K0N, K0O, K0P, K0Q, K0R, K0S, K0T \
-) { \
- { K5A, KC_NO, K5C, K5D, K5E, K5F, KC_NO, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, K5Q, K5R, K5S, K5T }, \
- { K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, K4O, K4P, K4Q, K4R, K4S, K4T }, \
- { K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, KC_NO, K3O, K3P, K3Q, K3R, K3S, K3T }, \
- { K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, KC_NO, KC_NO, K2O, KC_NO, K2Q, K2R, K2S, K2T }, \
- { K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, KC_NO, K1M, K1N, K1O, K1P, K1Q, K1R, K1S, K1T }, \
- { 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 } \
-}
-
-#define LAYOUT( \
- K5A, K5C, K5D, K5E, K5F, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, K5Q, K5R, K5S, K5T, \
- K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4O, K4P, K4Q, K4R, K4S, K4T, \
- K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3O, K3P, K3Q, K3R, K3S, K3T, \
- K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2O, K2Q, K2R, K2S, \
- K1A, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1M, K1N, K1P, K1Q, K1R, K1S, K1T, \
- K0A, K0B, K0C, K0I, K0M, K0N, K0O, K0P, K0Q, K0R, K0S \
-) { \
- { K5A, KC_NO, K5C, K5D, K5E, K5F, KC_NO, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, K5Q, K5R, K5S, K5T }, \
- { K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, KC_NO, K4O, K4P, K4Q, K4R, K4S, K4T }, \
- { K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, KC_NO, K3O, K3P, K3Q, K3R, K3S, K3T }, \
- { K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, KC_NO, KC_NO, K2O, KC_NO, K2Q, K2R, K2S, KC_NO }, \
- { K1A, KC_NO, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, KC_NO, K1M, K1N, KC_NO, K1P, K1Q, K1R, K1S, K1T }, \
- { 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 } \
-}
-
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 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_all": {
- "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}]
- },
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+
+ {"matrix": [0, 9], "x": 8.75, "y": 0},
+ {"matrix": [0, 10], "x": 9.75, "y": 0},
+ {"matrix": [0, 11], "x": 10.75, "y": 0},
+ {"matrix": [0, 12], "x": 11.75, "y": 0},
+
+ {"matrix": [0, 13], "x": 13.25, "y": 0},
+ {"matrix": [0, 14], "x": 14.25, "y": 0},
+ {"matrix": [0, 15], "x": 15.25, "y": 0},
+ {"matrix": [0, 16], "x": 16.25, "y": 0},
+
+ {"matrix": [0, 19], "x": 17.5, "y": 0},
+ {"matrix": [0, 18], "x": 18.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+
+ {"matrix": [1, 2], "x": 2.25, "y": 1.25},
+ {"matrix": [1, 3], "x": 3.25, "y": 1.25},
+ {"matrix": [1, 4], "x": 4.25, "y": 1.25},
+ {"matrix": [1, 5], "x": 5.25, "y": 1.25},
+ {"matrix": [1, 6], "x": 6.25, "y": 1.25},
+ {"matrix": [1, 7], "x": 7.25, "y": 1.25},
+ {"matrix": [1, 8], "x": 8.25, "y": 1.25},
+ {"matrix": [1, 9], "x": 9.25, "y": 1.25},
+ {"matrix": [1, 10], "x": 10.25, "y": 1.25},
+ {"matrix": [1, 11], "x": 11.25, "y": 1.25},
+ {"matrix": [1, 12], "x": 12.25, "y": 1.25},
+ {"matrix": [1, 13], "x": 13.25, "y": 1.25},
+ {"matrix": [1, 14], "x": 14.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+
+ {"matrix": [1, 17], "x": 17.5, "y": 1.25},
+ {"matrix": [1, 18], "x": 18.5, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25},
+ {"matrix": [2, 1], "x": 1, "y": 2.25},
+
+ {"matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 3], "x": 3.75, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.75, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.75, "y": 2.25},
+ {"matrix": [2, 13], "x": 13.75, "y": 2.25},
+ {"matrix": [2, 14], "x": 14.75, "y": 2.25},
+ {"matrix": [2, 16], "x": 15.75, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 17], "x": 17.5, "y": 2.25},
+ {"matrix": [2, 18], "x": 18.5, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25},
+ {"matrix": [3, 1], "x": 1, "y": 3.25},
+
+ {"matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 3], "x": 4, "y": 3.25},
+ {"matrix": [3, 4], "x": 5, "y": 3.25},
+ {"matrix": [3, 5], "x": 6, "y": 3.25},
+ {"matrix": [3, 6], "x": 7, "y": 3.25},
+ {"matrix": [3, 7], "x": 8, "y": 3.25},
+ {"matrix": [3, 8], "x": 9, "y": 3.25},
+ {"matrix": [3, 9], "x": 10, "y": 3.25},
+ {"matrix": [3, 10], "x": 11, "y": 3.25},
+ {"matrix": [3, 11], "x": 12, "y": 3.25},
+ {"matrix": [3, 12], "x": 13, "y": 3.25},
+ {"matrix": [3, 13], "x": 14, "y": 3.25},
+ {"matrix": [3, 14], "x": 15, "y": 3.25},
+ {"matrix": [3, 16], "x": 16, "y": 3.25, "w": 1.25},
+
+ {"matrix": [3, 17], "x": 17.5, "y": 3.25},
+ {"matrix": [3, 18], "x": 18.5, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25},
+ {"matrix": [4, 1], "x": 1, "y": 4.25},
+
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.5, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.5, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.5, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.5, "y": 4.25},
+ {"matrix": [4, 7], "x": 7.5, "y": 4.25},
+ {"matrix": [4, 8], "x": 8.5, "y": 4.25},
+ {"matrix": [4, 9], "x": 9.5, "y": 4.25},
+ {"matrix": [4, 10], "x": 10.5, "y": 4.25},
+ {"matrix": [4, 11], "x": 11.5, "y": 4.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4.25},
+ {"matrix": [4, 14], "x": 13.5, "y": 4.25},
+ {"matrix": [4, 15], "x": 14.5, "y": 4.25, "w": 1.75},
+ {"matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+ {"matrix": [4, 17], "x": 17.5, "y": 4.5},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25},
+ {"matrix": [5, 1], "x": 1, "y": 5.25},
+
+ {"matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 3], "x": 3.75, "y": 5.25},
+ {"matrix": [5, 4], "x": 4.75, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 10], "x": 6.25, "y": 5.25, "w": 6},
+ {"matrix": [5, 12], "x": 12.25, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 14], "x": 13.75, "y": 5.25},
+ {"matrix": [5, 15], "x": 14.75, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 16], "x": 16.5, "y": 5.5},
+ {"matrix": [5, 17], "x": 17.5, "y": 5.5},
+ {"matrix": [5, 18], "x": 18.5, "y": 5.5}
+ ]
+ },
"LAYOUT": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+
+ {"matrix": [0, 9], "x": 8.75, "y": 0},
+ {"matrix": [0, 10], "x": 9.75, "y": 0},
+ {"matrix": [0, 11], "x": 10.75, "y": 0},
+ {"matrix": [0, 12], "x": 11.75, "y": 0},
+
+ {"matrix": [0, 13], "x": 13.25, "y": 0},
+ {"matrix": [0, 14], "x": 14.25, "y": 0},
+ {"matrix": [0, 15], "x": 15.25, "y": 0},
+ {"matrix": [0, 16], "x": 16.25, "y": 0},
+
+ {"matrix": [0, 19], "x": 17.5, "y": 0},
+ {"matrix": [0, 18], "x": 18.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+
+ {"matrix": [1, 2], "x": 2.25, "y": 1.25},
+ {"matrix": [1, 3], "x": 3.25, "y": 1.25},
+ {"matrix": [1, 4], "x": 4.25, "y": 1.25},
+ {"matrix": [1, 5], "x": 5.25, "y": 1.25},
+ {"matrix": [1, 6], "x": 6.25, "y": 1.25},
+ {"matrix": [1, 7], "x": 7.25, "y": 1.25},
+ {"matrix": [1, 8], "x": 8.25, "y": 1.25},
+ {"matrix": [1, 9], "x": 9.25, "y": 1.25},
+ {"matrix": [1, 10], "x": 10.25, "y": 1.25},
+ {"matrix": [1, 11], "x": 11.25, "y": 1.25},
+ {"matrix": [1, 12], "x": 12.25, "y": 1.25},
+ {"matrix": [1, 13], "x": 13.25, "y": 1.25},
+ {"matrix": [1, 14], "x": 14.25, "y": 1.25},
+ {"matrix": [1, 16], "x": 15.25, "y": 1.25, "w": 2},
+
+ {"matrix": [1, 17], "x": 17.5, "y": 1.25},
+ {"matrix": [1, 18], "x": 18.5, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25},
+ {"matrix": [2, 1], "x": 1, "y": 2.25},
+
+ {"matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 3], "x": 3.75, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.75, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.75, "y": 2.25},
+ {"matrix": [2, 13], "x": 13.75, "y": 2.25},
+ {"matrix": [2, 14], "x": 14.75, "y": 2.25},
+ {"matrix": [2, 16], "x": 15.75, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 17], "x": 17.5, "y": 2.25},
+ {"matrix": [2, 18], "x": 18.5, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25},
+ {"matrix": [3, 1], "x": 1, "y": 3.25},
+
+ {"matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 3], "x": 4, "y": 3.25},
+ {"matrix": [3, 4], "x": 5, "y": 3.25},
+ {"matrix": [3, 5], "x": 6, "y": 3.25},
+ {"matrix": [3, 6], "x": 7, "y": 3.25},
+ {"matrix": [3, 7], "x": 8, "y": 3.25},
+ {"matrix": [3, 8], "x": 9, "y": 3.25},
+ {"matrix": [3, 9], "x": 10, "y": 3.25},
+ {"matrix": [3, 10], "x": 11, "y": 3.25},
+ {"matrix": [3, 11], "x": 12, "y": 3.25},
+ {"matrix": [3, 12], "x": 13, "y": 3.25},
+ {"matrix": [3, 13], "x": 14, "y": 3.25},
+ {"matrix": [3, 16], "x": 15, "y": 3.25, "w": 2.25},
+
+ {"matrix": [3, 17], "x": 17.5, "y": 3.25},
+ {"matrix": [3, 18], "x": 18.5, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25},
+ {"matrix": [4, 1], "x": 1, "y": 4.25},
+
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 2.25},
+ {"matrix": [4, 4], "x": 4.5, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.5, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.5, "y": 4.25},
+ {"matrix": [4, 7], "x": 7.5, "y": 4.25},
+ {"matrix": [4, 8], "x": 8.5, "y": 4.25},
+ {"matrix": [4, 9], "x": 9.5, "y": 4.25},
+ {"matrix": [4, 10], "x": 10.5, "y": 4.25},
+ {"matrix": [4, 11], "x": 11.5, "y": 4.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4.25},
+ {"matrix": [4, 14], "x": 13.5, "y": 4.25},
+ {"matrix": [4, 15], "x": 14.5, "y": 4.25, "w": 2.75},
+ {"matrix": [4, 17], "x": 17.5, "y": 4.5},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25},
+ {"matrix": [5, 1], "x": 1, "y": 5.25},
+
+ {"matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 3], "x": 3.75, "y": 5.25},
+ {"matrix": [5, 4], "x": 4.75, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 10], "x": 6.25, "y": 5.25, "w": 6},
+ {"matrix": [5, 12], "x": 12.25, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 14], "x": 13.75, "y": 5.25},
+ {"matrix": [5, 15], "x": 14.75, "y": 5.25, "w": 1.5},
+
+ {"matrix": [5, 16], "x": 16.5, "y": 5.5},
+ {"matrix": [5, 17], "x": 17.5, "y": 5.5},
+ {"matrix": [5, 18], "x": 18.5, "y": 5.5}
+ ]
}
}
}
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 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "tcv3.h"
+#include "quantum.h"
#include "indicator_leds.h"
enum 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 @@
-/* Copyright 2019 MechMerlin <mechmerlin@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_all( \
- K00, K01, K02, K04, K05, K06, K07, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0J, K0I, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2G, K2H, K2I, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3G, K3H, K3I, \
- K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4E, K4F, K4G, K4H, \
- K50, K51, K52, K53, K54, K5A, K5C, K5E, K5F, K5G, K5H, K5I \
-) { \
- { K00, K01, K02, XXX, K04, K05, K06, K07, XXX, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, XXX, K0I, K0J }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, XXX }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, XXX, K2G, K2H, K2I, XXX }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, XXX, K3G, K3H, K3I, XXX }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, XXX, K4E, K4F, K4G, K4H, XXX, XXX }, \
- { K50, K51, K52, K53, K54, XXX, XXX, XXX, XXX, XXX, K5A, XXX, K5C, XXX, K5E, K5F, K5G, K5H, K5I, XXX }, \
-}
-
-
-#define LAYOUT( \
- K00, K01, K02, K04, K05, K06, K07, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0J, K0I, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1G, K1H, K1I, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2G, K2H, K2I, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3G, K3H, K3I, \
- K40, K41, K42, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4E, K4F, K4H, \
- K50, K51, K52, K53, K54, K5A, K5C, K5E, K5F, K5G, K5H, K5I \
-) { \
- { K00, K01, K02, XXX, K04, K05, K06, K07, XXX, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, XXX, K0I, K0J }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, XXX, K1G, K1H, K1I, XXX }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, XXX, K2G, K2H, K2I, XXX }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX, K3G, K3H, K3I, XXX }, \
- { K40, K41, K42, XXX, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, XXX, K4E, K4F, XXX, K4H, XXX, XXX }, \
- { K50, K51, K52, K53, K54, XXX, XXX, XXX, XXX, XXX, K5A, XXX, K5C, XXX, K5E, K5F, K5G, K5H, K5I, XXX }, \
-}
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 @@
"bootloader": "bootloadhid",
"layouts": {
"LAYOUT_all": {
- "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}]
- },
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 10], "x": 11, "y": 0},
+ {"matrix": [0, 11], "x": 12, "y": 0},
+ {"matrix": [0, 12], "x": 13, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [1, 9], "x": 9, "y": 1.5},
+ {"matrix": [1, 10], "x": 10, "y": 1.5},
+ {"matrix": [1, 11], "x": 11, "y": 1.5},
+ {"matrix": [1, 12], "x": 12, "y": 1.5},
+ {"matrix": [1, 13], "x": 13, "y": 1.5},
+ {"matrix": [1, 14], "x": 14, "y": 1.5},
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+ {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [5, 3], "x": 1.25, "y": 4.5},
+ {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+ {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+ {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+ {"matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4.5},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 9], "x": 10, "y": 5.5},
+ {"matrix": [5, 10], "x": 11, "y": 5.5},
+ {"matrix": [5, 11], "x": 12, "y": 5.5},
+ {"matrix": [5, 12], "x": 13, "y": 5.5},
+ {"matrix": [5, 13], "x": 14, "y": 5.5}
+ ]
+ },
"LAYOUT": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 10], "x": 11, "y": 0},
+ {"matrix": [0, 11], "x": 12, "y": 0},
+ {"matrix": [0, 12], "x": 13, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [1, 9], "x": 9, "y": 1.5},
+ {"matrix": [1, 10], "x": 10, "y": 1.5},
+ {"matrix": [1, 11], "x": 11, "y": 1.5},
+ {"matrix": [1, 12], "x": 12, "y": 1.5},
+ {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+ {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+ {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+ {"matrix": [4, 10], "x": 11.25, "y": 4.5, "w": 1.75},
+ {"matrix": [4, 11], "x": 13, "y": 4.5},
+ {"matrix": [4, 13], "x": 14, "y": 4.5},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 9], "x": 10, "y": 5.5},
+ {"matrix": [5, 10], "x": 11, "y": 5.5},
+ {"matrix": [5, 11], "x": 12, "y": 5.5},
+ {"matrix": [5, 12], "x": 13, "y": 5.5},
+ {"matrix": [5, 13], "x": 14, "y": 5.5}
+ ]
}
}
}
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 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define LAYOUT_all( \
- k00, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, \
- k40, k53, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4D, \
- k50, k51, k52, k55, k59, k5A, k5B, k5C, k5D \
-){ \
- { k00, KC_NO, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, KC_NO }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, KC_NO }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, KC_NO, KC_NO }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, KC_NO, k4D, KC_NO }, \
- { k50, k51, k52, k53, KC_NO, k55, KC_NO, KC_NO, KC_NO, k59, k5A, k5B, k5C, k5D, KC_NO }, \
-}
-
-#define LAYOUT( \
- k00, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, \
- k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4D, \
- k50, k51, k52, k55, k59, k5A, k5B, k5C, k5D \
-){ \
- { k00, KC_NO, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, KC_NO }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, KC_NO }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, KC_NO }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, KC_NO, KC_NO }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, KC_NO, k4D, KC_NO }, \
- { k50, k51, k52, KC_NO, KC_NO, k55, KC_NO, KC_NO, KC_NO, k59, k5A, k5B, k5C, k5D, KC_NO }, \
-}
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 @@
"layouts": {
"LAYOUT": {
"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},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "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},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "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},
- {"x": 13.75, "y": 2, "w": 1.25},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
- {"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},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "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": 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": 13.75, "y": 4, "w": 1.25}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
]
},
"LAYOUT_60_ansi": {
"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},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 14], "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},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "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},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "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},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
- {"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": 13.75, "y": 4, "w": 1.25}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
]
},
"LAYOUT_60_ansi_split_bs_rshift": {
"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},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "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},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "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},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "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},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "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": 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": 13.75, "y": 4, "w": 1.25}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
]
},
"LAYOUT_60_hhkb": {
"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},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "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},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "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},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "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},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "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}
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4}
]
},
"LAYOUT_60_iso": {
"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},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 14], "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},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "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},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 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": 2.75},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
- {"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": 13.75, "y": 4, "w": 1.25}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
]
},
"LAYOUT_60_iso_split_bs_rshift": {
"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},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "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},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "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},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 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},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "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": 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": 13.75, "y": 4, "w": 1.25}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
]
},
"LAYOUT_60_tsangan_hhkb": {
"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},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "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},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "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},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "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},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "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": 12.5, "y": 4},
- {"x": 13.5, "y": 4, "w": 1.5}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
]
}
}
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 @@
-#pragma once
-
-#include "quantum.h"
-
-// readability
-#define XXX KC_NO
-
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
- k40, k41, k42, k46, k4a, k4b, k4c, k4d \
-) \
-{ \
- {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
- {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX}, \
- {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX}, \
- {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX}, \
- {k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX} \
-}
-
-#define LAYOUT_60_ansi( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \
- k40, k41, k42, k46, k4a, k4b, k4c, k4d \
-) \
-{ \
- {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e}, \
- {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX}, \
- {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX}, \
- {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, XXX}, \
- {k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX} \
-}
-
-#define LAYOUT_60_ansi_split_bs_rshift( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
- k40, k41, k42, k46, k4a, k4b, k4c, k4d \
-) \
-{ \
- {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
- {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX}, \
- {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX}, \
- {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX}, \
- {k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX} \
-}
-
-#define LAYOUT_60_hhkb( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
- k41, k42, k46, k4b, k4c \
-) \
-{ \
- {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
- {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX}, \
- {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX}, \
- {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX}, \
- {XXX, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4b, k4c, XXX, XXX} \
-}
-
-#define LAYOUT_60_tsangan_hhkb( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
- k40, k41, k42, k46, k4b, k4c, k4d \
-) \
-{ \
- {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
- {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX}, \
- {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX}, \
- {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX}, \
- {k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4b, k4c, k4d, XXX} \
-}
-
-#define LAYOUT_60_iso( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \
- k40, k41, k42, k46, k4a, k4b, k4c, k4d \
-) \
-{ \
- {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e}, \
- {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX}, \
- {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX}, \
- {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, XXX}, \
- {k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX} \
-}
-
-#define LAYOUT_60_iso_split_bs_rshift( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
- k40, k41, k42, k46, k4a, k4b, k4c, k4d \
-) \
-{ \
- {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
- {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX}, \
- {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX}, \
- {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX}, \
- {k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX} \
-}
-
-void matrix_init_user(void);
-void 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 @@
"community_layouts": ["60_ansi"],
"layouts": {
"LAYOUT": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 14], "x": 13, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 1},
+ {"matrix": [1, 3], "x": 2.5, "y": 1},
+ {"matrix": [1, 4], "x": 3.5, "y": 1},
+ {"matrix": [1, 5], "x": 4.5, "y": 1},
+ {"matrix": [1, 6], "x": 5.5, "y": 1},
+ {"matrix": [1, 7], "x": 6.5, "y": 1},
+ {"matrix": [1, 8], "x": 7.5, "y": 1},
+ {"matrix": [1, 9], "x": 8.5, "y": 1},
+ {"matrix": [1, 10], "x": 9.5, "y": 1},
+ {"matrix": [1, 11], "x": 10.5, "y": 1},
+ {"matrix": [1, 12], "x": 11.5, "y": 1},
+ {"matrix": [1, 13], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2},
+ {"matrix": [2, 12], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3},
+ {"matrix": [3, 12], "x": 12, "y": 3},
+ {"matrix": [3, 13], "x": 13, "y": 3},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.75},
+ {"matrix": [4, 2], "x": 1.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 5.5, "y": 4, "w": 2.75},
+ {"matrix": [4, 9], "x": 8.25, "y": 4, "w": 1.75},
+ {"matrix": [4, 10], "x": 10, "y": 4},
+ {"matrix": [4, 11], "x": 11, "y": 4},
+ {"matrix": [4, 12], "x": 12, "y": 4},
+ {"matrix": [4, 13], "x": 13, "y": 4},
+ {"matrix": [4, 14], "x": 14, "y": 4}
+ ]
},
"LAYOUT_60_ansi": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 1},
+ {"matrix": [1, 3], "x": 2.5, "y": 1},
+ {"matrix": [1, 4], "x": 3.5, "y": 1},
+ {"matrix": [1, 5], "x": 4.5, "y": 1},
+ {"matrix": [1, 6], "x": 5.5, "y": 1},
+ {"matrix": [1, 7], "x": 6.5, "y": 1},
+ {"matrix": [1, 8], "x": 7.5, "y": 1},
+ {"matrix": [1, 9], "x": 8.5, "y": 1},
+ {"matrix": [1, 10], "x": 9.5, "y": 1},
+ {"matrix": [1, 11], "x": 10.5, "y": 1},
+ {"matrix": [1, 12], "x": 11.5, "y": 1},
+ {"matrix": [1, 13], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2},
+ {"matrix": [2, 12], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+ ]
},
"LAYOUT_60_hhkb": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 14], "x": 13, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 1},
+ {"matrix": [1, 3], "x": 2.5, "y": 1},
+ {"matrix": [1, 4], "x": 3.5, "y": 1},
+ {"matrix": [1, 5], "x": 4.5, "y": 1},
+ {"matrix": [1, 6], "x": 5.5, "y": 1},
+ {"matrix": [1, 7], "x": 6.5, "y": 1},
+ {"matrix": [1, 8], "x": 7.5, "y": 1},
+ {"matrix": [1, 9], "x": 8.5, "y": 1},
+ {"matrix": [1, 10], "x": 9.5, "y": 1},
+ {"matrix": [1, 11], "x": 10.5, "y": 1},
+ {"matrix": [1, 12], "x": 11.5, "y": 1},
+ {"matrix": [1, 13], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2},
+ {"matrix": [2, 12], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+
+ {"matrix": [4, 2], "x": 1.5, "y": 4},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 12.5, "y": 4}
+ ]
}
}
}
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 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0D, \
- k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
- k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
- k40, k42, k43, k44, k47, k49, k4A, k4B, k4C, k4D, k4E \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
- { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
- { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
- { k40, XXX, k42, k43, k44, XXX, XXX, k47, XXX, k49, k4A, k4B, k4C, k4D, k4E } \
-}
-
-#define LAYOUT_60_ansi( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
- k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
- k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, \
- k40, k42, k43, k47, k4A, k4B, k4D, k4E \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, XXX }, \
- { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
- { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX }, \
- { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX }, \
- { k40, XXX, k42, k43, XXX, XXX, XXX, k47, XXX, XXX, k4A, k4B, XXX, k4D, k4E } \
-}
-
-/* LAYOUT_60_hhkb
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e │0d │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
- * │30 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │3e │
- * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴──────┬┴───┴┬───┬─┴───┤
- * │▓▓▓▓▓│42 │43 │47 (7u) │4b │4d │▓▓▓▓▓│
- * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
-*/
-#define LAYOUT_60_hhkb( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0D, \
- k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
- k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3E, \
- k42, k43, k47, k4B, k4D \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
- { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
- { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX }, \
- { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, XXX, k3E }, \
- { XXX, XXX, k42, k43, XXX, XXX, XXX, k47, XXX, XXX, XXX, k4B, XXX, k4D, XXX } \
-}
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 @@
"community_layouts": ["60_ansi"],
"layouts": {
"LAYOUT": {
- "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}]
- },
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
- "LAYOUT_60_ansi": {
- "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}]
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
},
+ "LAYOUT_60_ansi": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
- "LAYOUT_hhkb": {
- "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}]
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
},
+ "LAYOUT_hhkb": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4}
+ ]
+ },
"LAYOUT_hhkb_splits": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4}
+ ]
}
}
}
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 @@
-#include "oe.h"
+#include "quantum.h"
void led_init_ports(void) {
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 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, \
- k40, k41, k42, k46, k4A, k4B, k4C, k4D \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX }, \
- { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D, XXX } \
-}
-
-#define LAYOUT_60_ansi( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, \
- k40, k41, k42, k46, k4A, k4B, k4C, k4D \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, XXX }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX }, \
- { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, XXX, XXX }, \
- { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D, XXX } \
-}
-
-#define LAYOUT_hhkb( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, \
- k41, k42, k46, k4B, k4C \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, XXX }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX }, \
- { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX }, \
- { XXX, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4B, k4C, XXX, XXX } \
-}
-
-#define LAYOUT_hhkb_splits( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, \
- k41, k42, k46, k4B, k4C \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX }, \
- { XXX, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4B, k4C, XXX, XXX } \
-}
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 @@
"layouts": {
"LAYOUT_all": {
"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},
- {"x": 13.75, "y": 2, "w": 1.25},
-
- {"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": 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": 13.75, "y": 4, "w": 1.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [4, 9], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 12], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
]
},
"LAYOUT": {
"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.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},
- {"x": 13.75, "y": 2, "w": 1.25},
- {"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": 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": 14, "y": 0},
- {"x": 10, "y": 4, "w": 1.25},
- {"x": 11.25, "y": 4, "w": 1.25},
- {"x": 12.5, "y": 4, "w": 1.25},
- {"x": 13.75, "y": 4, "w": 1.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 14, "y": 0},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
]
},
-
"LAYOUT_60_ansi": {
"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": 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": 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": 13.75, "y": 4, "w": 1.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
]
},
-
"LAYOUT_60_iso": {
"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": 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": 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": 2.75},
-
- {"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": 13.75, "y": 4, "w": 1.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
]
},
-
"LAYOUT_60_ansi_split_bs_rshift": {
"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": 0, "y": 4, "w": 1.5},
- {"x": 1.5, "y": 4},
- {"x": 2.5, "y": 4, "w": 1.5},
- {"x": 4, "y": 4, "w": 6},
- {"x": 10, "y": 4, "w": 1.5},
- {"x": 11.5, "y": 4},
- {"x": 12.5, "y": 4},
- {"x": 13.5, "y": 4, "w": 1.5}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [4, 9], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 12], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 5], "x": 4, "y": 4, "w": 6},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 11.5, "y": 4},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
]
},
"LAYOUT_60_ansi_split_rshift": {
"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": 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": 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": 13.75, "y": 4, "w": 1.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 12], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
]
},
"LAYOUT_60_abnt2": {
"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": 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": 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},
- {"x": 13.25, "y": 3, "w": 1.75},
-
- {"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": 13.75, "y": 4, "w": 1.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3},
+ {"matrix": [3, 13], "x": 13.25, "y": 3, "w": 1.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
]
},
"LAYOUT_60_tsangan_hhkb": {
"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": 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": 12.5, "y": 4},
- {"x": 13.5, "y": 4, "w": 1.5}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [4, 9], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 12], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
]
}
}
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); }
static inline void gh60_fn_led_off(void) { setPinInput(F5); }
static inline void gh60_esc_led_off(void) { setPinInput(F6); }
static inline void gh60_wasd_leds_off(void) { setPinInput(F7); }
-
-/* GH60 keymap definition macro
- * K2C, K31 and K3C are extra keys for ISO
- */
-#define LAYOUT_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K49, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \
- K40, K41, K42, K45, K4A, K4B, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
- { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, K4B, K4C, K4D } \
-}
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
- K40, K41, K42, K45, K49, K4A, K4B, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
- { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, K4B, K4C, K4D } \
-}
-
-/* ANSI variant. No extra keys for ISO */
-#define LAYOUT_60_ansi( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
- K40, K41, K42, K45, K4A, K4B, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D }, \
- { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D } \
-}
-
-/* ISO variant. Remove useless ANSI keys */
-#define LAYOUT_60_iso( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
- K40, K41, K42, K45, K4A, K4B, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D }, \
- { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D } \
-}
-
-
-/* HHKB Variant */
-#define LAYOUT_60_ansi_split_bs_rshift( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K49,\
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \
- K40, K41, K42, K45, K4A, K4B, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
- { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, K4B, K4C, K4D } \
-}
-
-/* ANSI with split Right Shift. No extra keys for ISO */
-#define LAYOUT_60_ansi_split_rshift( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \
- K40, K41, K42, K45, K4A, K4B, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
- { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D } \
-}
-
-/* LAYOUT_60_abnt2
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │ │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐2d │
- * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │ │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤
- * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │ 3d │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬──┴─┬────┤
- * │40 │41 │42 │45 │4a │4b │4c │4d │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
-*/
-#define LAYOUT_60_abnt2( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
- K40, K41, K42, K45, K4A, K4B,K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
- { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D } \
-}
-
-#define LAYOUT_60_tsangan_hhkb( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K49,\
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \
- K40, K41, K42, K45, K4B, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
- { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, KC_NO, K4B, K4C, K4D } \
-}
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 @@
#include "quantum.h"
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- l00, l01, l02, l03, l04, l05, l06, l07, l08, l09, l0a, l0b, \
- l10, l11, l12, l13, l14, l15, l16, l17, l18, l19, l1a, l1b, \
- l20, l21, l22, l23, l24, l25, l26, l27, l28, l29, l2a, l2b, \
- l30, l31, l32, l33, l34, l35, l36, l37, l38, l39, l3a, l3b, \
- l40, l41, l42, l43, l44, l45, l46, l47, l48, l49, l4a, l4b, \
- \
- r20, \
- r00, r01, r02, r03, r04, r05, r06, r07, r08, r09, r0a, r0b, renc, \
- r10, r11, r12, r13, r14, r15, r16, r17, r18, r19, r1a, r1b, r1c, \
- r21, r22, r23, r24, r25, r26, r27, r28, r29, r2a, r2b, r2c \
-) { \
- { l00, l10, l20, l30, l40, l0b, l1b, l2b, l3b, l4b }, \
- { l01, l11, l21, l31, l41, l0a, l1a, l2a, l3a, l4a }, \
- { l02, l12, l22, l32, l42, l09, l19, l29, l39, l49 }, \
- { l03, l13, l23, l33, l43, l08, l18, l28, l38, l48 }, \
- { l04, l14, l24, l34, l44, l07, l17, l27, l37, l47 }, \
- { l05, l15, l25, l35, l45, l06, l16, l26, l36, l46 }, \
- \
- { r00, r01, r02, r03, r04, r05, r06, KC_NO, KC_NO, KC_NO }, \
- { r10, r11, r12, r13, r14, r15, r16, KC_NO, KC_NO, KC_NO }, \
- { r20, r21, r22, r23, r24, r25, r26, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, renc, r0b, r0a, r09, r08, r07, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, r1c, r1b, r1a, r19, r18, r17, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, r2c, r2b, r2a, r29, r28, r27, KC_NO, KC_NO, KC_NO } \
-}
-
-#define LAYOUT_giabarinaix2( \
- l00, l01, l02, l03, l04, l05, l06, l07, l08, l09, l0a, l0b, \
- l10, l11, l12, l13, l14, l15, l16, l17, l18, l19, l1a, l1b, \
- l20, l21, l22, l23, l24, l25, l26, l27, l28, l29, l2a, l2b, \
- l30, l31, l32, l33, l34, l35, l36, l37, l38, l39, l3a, l3b, \
- l40, l41, l42, l43, l44, l45, l46, l47, l48, l49, l4a, l4b, \
- \
- r00, r01, r02, r03, r04, r05, r06, r07, r08, r09, r0a, r0b, \
- r10, r11, r12, r13, r14, r15, r16, r17, r18, r19, r1a, r1b, \
- r20, r21, r22, r23, r24, r25, r26, r27, r28, r29, r2a, r2b, \
- r30, r31, r32, r33, r34, r35, r36, r37, r38, r39, r3a, r3b, \
- r40, r41, r42, r43, r44, r45, r46, r47, r48, r49, r4a, r4b \
-) { \
- { l00, l10, l20, l30, l40, l0b, l1b, l2b, l3b, l4b }, \
- { l01, l11, l21, l31, l41, l0a, l1a, l2a, l3a, l4a }, \
- { l02, l12, l22, l32, l42, l09, l19, l29, l39, l49 }, \
- { l03, l13, l23, l33, l43, l08, l18, l28, l38, l48 }, \
- { l04, l14, l24, l34, l44, l07, l17, l27, l37, l47 }, \
- { l05, l15, l25, l35, l45, l06, l16, l26, l36, l46 }, \
- \
- { r4b, r3b, r2b, r1b, r0b, r40, r30, r20, r10, r00 }, \
- { r4a, r3a, r2a, r1a, r0a, r41, r31, r21, r11, r01 }, \
- { r49, r39, r29, r19, r09, r42, r32, r22, r12, r02 }, \
- { r48, r38, r28, r18, r08, r43, r33, r23, r13, r03 }, \
- { r47, r37, r27, r17, r07, r44, r34, r24, r14, r04 }, \
- { r46, r36, r26, r16, r06, r45, r35, r25, r15, r05 } \
-}
-
-
#define _________________QWERTY_L1_________________ KC_Q, KC_W, KC_E, KC_R, KC_T
#define _________________QWERTY_L2_________________ KC_A, KC_S, KC_D, KC_F, KC_G
#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 @@
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
- "layout": [
- {"label": "l00", "x": 0, "y": 0},
- {"label": "l01", "x": 1, "y": 0},
- {"label": "l02", "x": 2, "y": 0},
- {"label": "l03", "x": 3, "y": 0},
- {"label": "l04", "x": 4, "y": 0},
- {"label": "l05", "x": 5, "y": 0},
- {"label": "l06", "x": 6, "y": 0},
- {"label": "l07", "x": 7, "y": 0},
- {"label": "l08", "x": 8, "y": 0},
- {"label": "l09", "x": 9, "y": 0},
- {"label": "l0a", "x": 10, "y": 0},
- {"label": "l0b", "x": 11, "y": 0},
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [2, 0], "x": 2, "y": 0},
+ {"matrix": [3, 0], "x": 3, "y": 0},
+ {"matrix": [4, 0], "x": 4, "y": 0},
+ {"matrix": [5, 0], "x": 5, "y": 0},
+ {"matrix": [5, 5], "x": 6, "y": 0},
+ {"matrix": [4, 5], "x": 7, "y": 0},
+ {"matrix": [3, 5], "x": 8, "y": 0},
+ {"matrix": [2, 5], "x": 9, "y": 0},
+ {"matrix": [1, 5], "x": 10, "y": 0},
+ {"matrix": [0, 5], "x": 11, "y": 0},
- {"label": "l10", "x": 0.5, "y": 1},
- {"label": "l11", "x": 1.5, "y": 1},
- {"label": "l12", "x": 2.5, "y": 1},
- {"label": "l13", "x": 3.5, "y": 1},
- {"label": "l14", "x": 4.5, "y": 1},
- {"label": "l15", "x": 5.5, "y": 1},
- {"label": "l16", "x": 6.5, "y": 1},
- {"label": "l17", "x": 7.5, "y": 1},
- {"label": "l18", "x": 8.5, "y": 1},
- {"label": "l19", "x": 9.5, "y": 1},
- {"label": "l1a", "x": 10.5, "y": 1},
- {"label": "l1b", "x": 11.5, "y": 1},
+ {"matrix": [0, 1], "x": 0.5, "y": 1},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [2, 1], "x": 2.5, "y": 1},
+ {"matrix": [3, 1], "x": 3.5, "y": 1},
+ {"matrix": [4, 1], "x": 4.5, "y": 1},
+ {"matrix": [5, 1], "x": 5.5, "y": 1},
+ {"matrix": [5, 6], "x": 6.5, "y": 1},
+ {"matrix": [4, 6], "x": 7.5, "y": 1},
+ {"matrix": [3, 6], "x": 8.5, "y": 1},
+ {"matrix": [2, 6], "x": 9.5, "y": 1},
+ {"matrix": [1, 6], "x": 10.5, "y": 1},
+ {"matrix": [0, 6], "x": 11.5, "y": 1},
- {"label": "r20", "x": 14.5, "y": 1},
+ {"matrix": [0, 2], "x": 14.5, "y": 1},
- {"label": "l20", "x": 1, "y": 2},
- {"label": "l21", "x": 2, "y": 2},
- {"label": "l22", "x": 3, "y": 2},
- {"label": "l23", "x": 4, "y": 2},
- {"label": "l24", "x": 5, "y": 2},
- {"label": "l25", "x": 6, "y": 2},
- {"label": "l26", "x": 7, "y": 2},
- {"label": "l27", "x": 8, "y": 2},
- {"label": "l28", "x": 9, "y": 2},
- {"label": "l29", "x": 10, "y": 2},
- {"label": "l2a", "x": 11, "y": 2},
- {"label": "l2b", "x": 12, "y": 2},
+ {"matrix": [1, 2], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [3, 2], "x": 3, "y": 2},
+ {"matrix": [4, 2], "x": 4, "y": 2},
+ {"matrix": [5, 2], "x": 5, "y": 2},
+ {"matrix": [5, 7], "x": 6, "y": 2},
+ {"matrix": [4, 7], "x": 7, "y": 2},
+ {"matrix": [3, 7], "x": 8, "y": 2},
+ {"matrix": [2, 7], "x": 9, "y": 2},
+ {"matrix": [1, 7], "x": 10, "y": 2},
+ {"matrix": [0, 7], "x": 11, "y": 2},
+ {"matrix": [0, 3], "x": 12, "y": 2},
- {"label": "r00", "x": 15, "y": 2},
- {"label": "r01", "x": 16, "y": 2},
- {"label": "r02", "x": 17, "y": 2},
- {"label": "r03", "x": 18, "y": 2},
- {"label": "r04", "x": 19, "y": 2},
- {"label": "r05", "x": 20, "y": 2},
- {"label": "r06", "x": 21, "y": 2},
- {"label": "r07", "x": 22, "y": 2},
- {"label": "r08", "x": 23, "y": 2},
- {"label": "r09", "x": 24, "y": 2},
- {"label": "r0a", "x": 25, "y": 2},
- {"label": "r0b", "x": 26, "y": 2},
+ {"matrix": [1, 3], "x": 15, "y": 2},
+ {"matrix": [2, 3], "x": 16, "y": 2},
+ {"matrix": [3, 3], "x": 17, "y": 2},
+ {"matrix": [4, 3], "x": 18, "y": 2},
+ {"matrix": [5, 3], "x": 19, "y": 2},
+ {"matrix": [5, 8], "x": 20, "y": 2},
+ {"matrix": [4, 8], "x": 21, "y": 2},
+ {"matrix": [3, 8], "x": 22, "y": 2},
+ {"matrix": [2, 8], "x": 23, "y": 2},
+ {"matrix": [1, 8], "x": 24, "y": 2},
+ {"matrix": [0, 8], "x": 25, "y": 2},
+ {"matrix": [0, 4], "x": 26, "y": 2},
- {"label": "renc", "x": 27.5, "y": 2},
+ {"matrix": [1, 4], "x": 27.5, "y": 2},
- {"label": "l30", "x": 1.5, "y": 3},
- {"label": "l31", "x": 2.5, "y": 3},
- {"label": "l32", "x": 3.5, "y": 3},
- {"label": "l33", "x": 4.5, "y": 3},
- {"label": "l34", "x": 5.5, "y": 3},
- {"label": "l35", "x": 6.5, "y": 3},
- {"label": "l36", "x": 7.5, "y": 3},
- {"label": "l37", "x": 8.5, "y": 3},
- {"label": "l38", "x": 9.5, "y": 3},
- {"label": "l39", "x": 10.5, "y": 3},
- {"label": "l3a", "x": 11.5, "y": 3},
- {"label": "l3b", "x": 12.5, "y": 3},
+ {"matrix": [2, 4], "x": 1.5, "y": 3},
+ {"matrix": [3, 4], "x": 2.5, "y": 3},
+ {"matrix": [4, 4], "x": 3.5, "y": 3},
+ {"matrix": [5, 4], "x": 4.5, "y": 3},
+ {"matrix": [5, 9], "x": 5.5, "y": 3},
+ {"matrix": [4, 9], "x": 6.5, "y": 3},
+ {"matrix": [3, 9], "x": 7.5, "y": 3},
+ {"matrix": [2, 9], "x": 8.5, "y": 3},
+ {"matrix": [1, 9], "x": 9.5, "y": 3},
+ {"matrix": [0, 9], "x": 10.5, "y": 3},
+ {"matrix": [8, 0], "x": 11.5, "y": 3},
+ {"matrix": [6, 0], "x": 12.5, "y": 3},
- {"label": "r10", "x": 14.5, "y": 3},
- {"label": "r11", "x": 15.5, "y": 3},
- {"label": "r12", "x": 16.5, "y": 3},
- {"label": "r13", "x": 17.5, "y": 3},
- {"label": "r14", "x": 18.5, "y": 3},
- {"label": "r15", "x": 19.5, "y": 3},
- {"label": "r16", "x": 20.5, "y": 3},
- {"label": "r17", "x": 21.5, "y": 3},
- {"label": "r18", "x": 22.5, "y": 3},
- {"label": "r19", "x": 23.5, "y": 3},
- {"label": "r1a", "x": 24.5, "y": 3},
- {"label": "r1b", "x": 25.5, "y": 3},
- {"label": "r1c", "x": 26.5, "y": 3},
+ {"matrix": [6, 1], "x": 14.5, "y": 3},
+ {"matrix": [6, 2], "x": 15.5, "y": 3},
+ {"matrix": [6, 3], "x": 16.5, "y": 3},
+ {"matrix": [6, 4], "x": 17.5, "y": 3},
+ {"matrix": [6, 5], "x": 18.5, "y": 3},
+ {"matrix": [6, 6], "x": 19.5, "y": 3},
+ {"matrix": [9, 6], "x": 20.5, "y": 3},
+ {"matrix": [9, 5], "x": 21.5, "y": 3},
+ {"matrix": [9, 4], "x": 22.5, "y": 3},
+ {"matrix": [9, 3], "x": 23.5, "y": 3},
+ {"matrix": [9, 2], "x": 24.5, "y": 3},
+ {"matrix": [9, 1], "x": 25.5, "y": 3},
+ {"matrix": [7, 0], "x": 26.5, "y": 3},
- {"label": "l40", "x": 2, "y": 4},
- {"label": "l41", "x": 3, "y": 4},
- {"label": "l42", "x": 4, "y": 4},
- {"label": "l43", "x": 5, "y": 4},
- {"label": "l44", "x": 6, "y": 4},
- {"label": "l45", "x": 7, "y": 4},
- {"label": "l46", "x": 8, "y": 4},
- {"label": "l47", "x": 9, "y": 4},
- {"label": "l48", "x": 10, "y": 4},
- {"label": "l49", "x": 11, "y": 4},
- {"label": "l4a", "x": 12, "y": 4},
- {"label": "l4b", "x": 13, "y": 4},
+ {"matrix": [7, 1], "x": 2, "y": 4},
+ {"matrix": [7, 2], "x": 3, "y": 4},
+ {"matrix": [7, 3], "x": 4, "y": 4},
+ {"matrix": [7, 4], "x": 5, "y": 4},
+ {"matrix": [7, 5], "x": 6, "y": 4},
+ {"matrix": [7, 6], "x": 7, "y": 4},
+ {"matrix": [10, 6], "x": 8, "y": 4},
+ {"matrix": [10, 5], "x": 9, "y": 4},
+ {"matrix": [10, 4], "x": 10, "y": 4},
+ {"matrix": [10, 3], "x": 11, "y": 4},
+ {"matrix": [10, 2], "x": 12, "y": 4},
+ {"matrix": [10, 1], "x": 13, "y": 4},
- {"label": "r21", "x": 15, "y": 4},
- {"label": "r22", "x": 16, "y": 4},
- {"label": "r23", "x": 17, "y": 4},
- {"label": "r24", "x": 18, "y": 4},
- {"label": "r25", "x": 19, "y": 4},
- {"label": "r26", "x": 20, "y": 4},
- {"label": "r27", "x": 21, "y": 4},
- {"label": "r28", "x": 22, "y": 4},
- {"label": "r29", "x": 23, "y": 4},
- {"label": "r2a", "x": 24, "y": 4},
- {"label": "r2b", "x": 25, "y": 4},
- {"label": "r2c", "x": 26, "y": 4}
+ {"matrix": [8, 1], "x": 15, "y": 4},
+ {"matrix": [8, 2], "x": 16, "y": 4},
+ {"matrix": [8, 3], "x": 17, "y": 4},
+ {"matrix": [8, 4], "x": 18, "y": 4},
+ {"matrix": [8, 5], "x": 19, "y": 4},
+ {"matrix": [8, 6], "x": 20, "y": 4},
+ {"matrix": [11, 6], "x": 21, "y": 4},
+ {"matrix": [11, 5], "x": 22, "y": 4},
+ {"matrix": [11, 4], "x": 23, "y": 4},
+ {"matrix": [11, 3], "x": 24, "y": 4},
+ {"matrix": [11, 2], "x": 25, "y": 4},
+ {"matrix": [11, 1], "x": 26, "y": 4}
+ ]
+ },
+ "LAYOUT_giabarinaix2": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [2, 0], "x": 2, "y": 0},
+ {"matrix": [3, 0], "x": 3, "y": 0},
+ {"matrix": [4, 0], "x": 4, "y": 0},
+ {"matrix": [5, 0], "x": 5, "y": 0},
+ {"matrix": [5, 5], "x": 6, "y": 0},
+ {"matrix": [4, 5], "x": 7, "y": 0},
+ {"matrix": [3, 5], "x": 8, "y": 0},
+ {"matrix": [2, 5], "x": 9, "y": 0},
+ {"matrix": [1, 5], "x": 10, "y": 0},
+ {"matrix": [0, 5], "x": 11, "y": 0},
+ {"matrix": [0, 1], "x": 12, "y": 0},
+ {"matrix": [1, 1], "x": 13, "y": 0},
+ {"matrix": [2, 1], "x": 14, "y": 0},
+ {"matrix": [3, 1], "x": 15, "y": 0},
+ {"matrix": [4, 1], "x": 16, "y": 0},
+ {"matrix": [5, 1], "x": 17, "y": 0},
+ {"matrix": [5, 6], "x": 18, "y": 0},
+ {"matrix": [4, 6], "x": 19, "y": 0},
+ {"matrix": [3, 6], "x": 20, "y": 0},
+ {"matrix": [2, 6], "x": 21, "y": 0},
+ {"matrix": [1, 6], "x": 22, "y": 0},
+ {"matrix": [0, 6], "x": 23, "y": 0},
+ {"matrix": [0, 2], "x": 24, "y": 0},
+ {"matrix": [1, 2], "x": 25, "y": 0},
+ {"matrix": [2, 2], "x": 26, "y": 0},
+ {"matrix": [3, 2], "x": 27, "y": 0},
+ {"matrix": [4, 2], "x": 28, "y": 0},
+ {"matrix": [5, 2], "x": 29, "y": 0},
+ {"matrix": [5, 7], "x": 30, "y": 0},
+ {"matrix": [4, 7], "x": 31, "y": 0},
+ {"matrix": [3, 7], "x": 32, "y": 0},
+ {"matrix": [2, 7], "x": 33, "y": 0},
+ {"matrix": [1, 7], "x": 34, "y": 0},
+ {"matrix": [0, 7], "x": 35, "y": 0},
+ {"matrix": [0, 3], "x": 36, "y": 0},
+ {"matrix": [1, 3], "x": 37, "y": 0},
+ {"matrix": [2, 3], "x": 38, "y": 0},
+ {"matrix": [3, 3], "x": 39, "y": 0},
+ {"matrix": [4, 3], "x": 40, "y": 0},
+ {"matrix": [5, 3], "x": 41, "y": 0},
+ {"matrix": [5, 8], "x": 42, "y": 0},
+ {"matrix": [4, 8], "x": 43, "y": 0},
+ {"matrix": [3, 8], "x": 44, "y": 0},
+ {"matrix": [2, 8], "x": 45, "y": 0},
+ {"matrix": [1, 8], "x": 46, "y": 0},
+ {"matrix": [0, 8], "x": 47, "y": 0},
+ {"matrix": [0, 4], "x": 48, "y": 0},
+ {"matrix": [1, 4], "x": 49, "y": 0},
+ {"matrix": [2, 4], "x": 50, "y": 0},
+ {"matrix": [3, 4], "x": 51, "y": 0},
+ {"matrix": [4, 4], "x": 52, "y": 0},
+ {"matrix": [5, 4], "x": 53, "y": 0},
+ {"matrix": [5, 9], "x": 54, "y": 0},
+ {"matrix": [4, 9], "x": 55, "y": 0},
+ {"matrix": [3, 9], "x": 56, "y": 0},
+ {"matrix": [2, 9], "x": 57, "y": 0},
+ {"matrix": [1, 9], "x": 58, "y": 0},
+ {"matrix": [0, 9], "x": 59, "y": 0},
+ {"matrix": [6, 9], "x": 60, "y": 0},
+ {"matrix": [7, 9], "x": 61, "y": 0},
+ {"matrix": [8, 9], "x": 62, "y": 0},
+ {"matrix": [9, 9], "x": 63, "y": 0},
+ {"matrix": [10, 9], "x": 64, "y": 0},
+ {"matrix": [11, 9], "x": 65, "y": 0},
+ {"matrix": [11, 4], "x": 66, "y": 0},
+ {"matrix": [10, 4], "x": 67, "y": 0},
+ {"matrix": [9, 4], "x": 68, "y": 0},
+ {"matrix": [8, 4], "x": 69, "y": 0},
+ {"matrix": [7, 4], "x": 70, "y": 0},
+ {"matrix": [6, 4], "x": 71, "y": 0},
+ {"matrix": [6, 8], "x": 72, "y": 0},
+ {"matrix": [7, 8], "x": 73, "y": 0},
+ {"matrix": [8, 8], "x": 74, "y": 0},
+ {"matrix": [9, 8], "x": 75, "y": 0},
+ {"matrix": [10, 8], "x": 76, "y": 0},
+ {"matrix": [11, 8], "x": 77, "y": 0},
+ {"matrix": [11, 3], "x": 78, "y": 0},
+ {"matrix": [10, 3], "x": 79, "y": 0},
+ {"matrix": [9, 3], "x": 80, "y": 0},
+ {"matrix": [8, 3], "x": 81, "y": 0},
+ {"matrix": [7, 3], "x": 82, "y": 0},
+ {"matrix": [6, 3], "x": 83, "y": 0},
+ {"matrix": [6, 7], "x": 84, "y": 0},
+ {"matrix": [7, 7], "x": 85, "y": 0},
+ {"matrix": [8, 7], "x": 86, "y": 0},
+ {"matrix": [9, 7], "x": 87, "y": 0},
+ {"matrix": [10, 7], "x": 88, "y": 0},
+ {"matrix": [11, 7], "x": 89, "y": 0},
+ {"matrix": [11, 2], "x": 90, "y": 0},
+ {"matrix": [10, 2], "x": 91, "y": 0},
+ {"matrix": [9, 2], "x": 92, "y": 0},
+ {"matrix": [8, 2], "x": 93, "y": 0},
+ {"matrix": [7, 2], "x": 94, "y": 0},
+ {"matrix": [6, 2], "x": 95, "y": 0},
+ {"matrix": [6, 6], "x": 96, "y": 0},
+ {"matrix": [7, 6], "x": 97, "y": 0},
+ {"matrix": [8, 6], "x": 98, "y": 0},
+ {"matrix": [9, 6], "x": 99, "y": 0},
+ {"matrix": [10, 6], "x": 100, "y": 0},
+ {"matrix": [11, 6], "x": 101, "y": 0},
+ {"matrix": [11, 1], "x": 102, "y": 0},
+ {"matrix": [10, 1], "x": 103, "y": 0},
+ {"matrix": [9, 1], "x": 104, "y": 0},
+ {"matrix": [8, 1], "x": 105, "y": 0},
+ {"matrix": [7, 1], "x": 106, "y": 0},
+ {"matrix": [6, 1], "x": 107, "y": 0},
+ {"matrix": [6, 5], "x": 108, "y": 0},
+ {"matrix": [7, 5], "x": 109, "y": 0},
+ {"matrix": [8, 5], "x": 110, "y": 0},
+ {"matrix": [9, 5], "x": 111, "y": 0},
+ {"matrix": [10, 5], "x": 112, "y": 0},
+ {"matrix": [11, 5], "x": 113, "y": 0},
+ {"matrix": [11, 0], "x": 114, "y": 0},
+ {"matrix": [10, 0], "x": 115, "y": 0},
+ {"matrix": [9, 0], "x": 116, "y": 0},
+ {"matrix": [8, 0], "x": 117, "y": 0},
+ {"matrix": [7, 0], "x": 118, "y": 0},
+ {"matrix": [6, 0], "x": 119, "y": 0}
]
}
}
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 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"L00", "x":0.25, "y":0},
- {"label":"L01", "x":1.25, "y":0},
- {"label":"L02", "x":2.25, "y":0},
- {"label":"L03", "x":3.25, "y":0},
- {"label":"L04", "x":4.25, "y":0},
- {"label":"L05", "x":5.25, "y":0},
- {"label":"L06", "x":6.25, "y":0},
- {"label":"R00", "x":9.25, "y":0},
- {"label":"R01", "x":10.25, "y":0},
- {"label":"R02", "x":11.25, "y":0},
- {"label":"R03", "x":12.25, "y":0},
- {"label":"R04", "x":13.25, "y":0},
- {"label":"R05", "x":14.25, "y":0},
- {"label":"R06", "x":15.25, "y":0},
+ {"matrix": [0, 0], "x": 0.25, "y": 0},
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
- {"label":"L11", "x":0.25, "y":1, "w":1.75},
- {"label":"L12", "x":2, "y":1},
- {"label":"L13", "x":3.25, "y":1},
- {"label":"L14", "x":4.25, "y":1},
- {"label":"L15", "x":5.25, "y":1},
- {"label":"L16", "x":6.25, "y":1},
- {"label":"R10", "x":9.25, "y":1},
- {"label":"R11", "x":10.25, "y":1},
- {"label":"R12", "x":11.25, "y":1},
- {"label":"R13", "x":12.25, "y":1},
- {"label":"R14", "x":13.5, "y":1},
- {"label":"R15", "x":14.5, "y":1},
- {"label":"R16", "x":15.5, "y":1},
+ {"matrix": [4, 0], "x": 9.25, "y": 0},
+ {"matrix": [4, 1], "x": 10.25, "y": 0},
+ {"matrix": [4, 2], "x": 11.25, "y": 0},
+ {"matrix": [4, 3], "x": 12.25, "y": 0},
+ {"matrix": [4, 4], "x": 13.25, "y": 0},
+ {"matrix": [4, 5], "x": 14.25, "y": 0},
+ {"matrix": [4, 6], "x": 15.25, "y": 0},
- {"label":"L21", "x":0, "y":2, "w":1.75},
- {"label":"L22", "x":1.75, "y":2},
- {"label":"L23", "x":3.25, "y":2},
- {"label":"L24", "x":4.25, "y":2},
- {"label":"L25", "x":5.25, "y":2},
- {"label":"L26", "x":6.25, "y":2},
- {"label":"L20", "x":7.75, "y":2},
- {"label":"R20", "x":9.25, "y":2},
- {"label":"R21", "x":10.25, "y":2},
- {"label":"R22", "x":11.25, "y":2},
- {"label":"R23", "x":12.25, "y":2},
- {"label":"R24", "x":13.75, "y":2},
- {"label":"R25", "x":14.75, "y":2},
- {"label":"R26", "x":15.75, "y":2},
+ {"matrix": [1, 1], "x": 0.25, "y": 1, "w": 1.75},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
- {"label":"L31", "x":0.25, "y":3, "w":1.25},
- {"label":"L32", "x":1.5, "y":3, "w":1.25},
- {"label":"L34", "x":4.125, "y":3, "w":1.25},
- {"label":"L35", "x":5.375, "y":3, "w":1.25},
- {"label":"L36", "x":6.625, "y":3},
- {"label":"R30", "x":8.875, "y":3},
- {"label":"R31", "x":9.875, "y":3, "w":1.25},
- {"label":"R32", "x":11.125, "y":3, "w":1.25},
- {"label":"R34", "x":13.75, "y":3},
- {"label":"R35", "x":14.75, "y":3},
- {"label":"R36", "x":15.75, "y":3}
+ {"matrix": [5, 0], "x": 9.25, "y": 1},
+ {"matrix": [5, 1], "x": 10.25, "y": 1},
+ {"matrix": [5, 2], "x": 11.25, "y": 1},
+ {"matrix": [5, 3], "x": 12.25, "y": 1},
+ {"matrix": [5, 4], "x": 13.5, "y": 1},
+ {"matrix": [5, 5], "x": 14.5, "y": 1},
+ {"matrix": [5, 6], "x": 15.5, "y": 1},
+
+ {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.25, "y": 2},
+ {"matrix": [2, 4], "x": 4.25, "y": 2},
+ {"matrix": [2, 5], "x": 5.25, "y": 2},
+ {"matrix": [2, 6], "x": 6.25, "y": 2},
+
+ {"matrix": [2, 0], "x": 7.75, "y": 2},
+
+ {"matrix": [6, 0], "x": 9.25, "y": 2},
+ {"matrix": [6, 1], "x": 10.25, "y": 2},
+ {"matrix": [6, 2], "x": 11.25, "y": 2},
+ {"matrix": [6, 3], "x": 12.25, "y": 2},
+ {"matrix": [6, 4], "x": 13.75, "y": 2},
+ {"matrix": [6, 5], "x": 14.75, "y": 2},
+ {"matrix": [6, 6], "x": 15.75, "y": 2},
+
+ {"matrix": [3, 1], "x": 0.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 2], "x": 1.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 4], "x": 4.125, "y": 3, "w": 1.25},
+ {"matrix": [3, 5], "x": 5.375, "y": 3, "w": 1.25},
+ {"matrix": [3, 6], "x": 6.625, "y": 3},
+
+ {"matrix": [7, 0], "x": 8.875, "y": 3},
+ {"matrix": [7, 1], "x": 9.875, "y": 3, "w": 1.25},
+ {"matrix": [7, 2], "x": 11.125, "y": 3, "w": 1.25},
+
+ {"matrix": [7, 4], "x": 13.75, "y": 3},
+ {"matrix": [7, 5], "x": 14.75, "y": 3},
+ {"matrix": [7, 6], "x": 15.75, "y": 3}
+ ]
+ },
+ "LAYOUT_rotary_layer": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [4, 0], "x": 7, "y": 0},
+ {"matrix": [4, 1], "x": 8, "y": 0},
+ {"matrix": [4, 2], "x": 9, "y": 0},
+ {"matrix": [4, 3], "x": 10, "y": 0},
+ {"matrix": [4, 4], "x": 11, "y": 0},
+ {"matrix": [4, 5], "x": 12, "y": 0},
+ {"matrix": [4, 6], "x": 13, "y": 0},
+ {"matrix": [1, 1], "x": 14, "y": 0},
+ {"matrix": [1, 2], "x": 15, "y": 0},
+ {"matrix": [1, 3], "x": 16, "y": 0},
+ {"matrix": [1, 4], "x": 17, "y": 0},
+ {"matrix": [1, 5], "x": 18, "y": 0},
+ {"matrix": [1, 6], "x": 19, "y": 0},
+ {"matrix": [1, 0], "x": 20, "y": 0},
+ {"matrix": [5, 0], "x": 21, "y": 0},
+ {"matrix": [5, 1], "x": 22, "y": 0},
+ {"matrix": [5, 2], "x": 23, "y": 0},
+ {"matrix": [5, 3], "x": 24, "y": 0},
+ {"matrix": [5, 4], "x": 25, "y": 0},
+ {"matrix": [5, 5], "x": 26, "y": 0},
+ {"matrix": [5, 6], "x": 27, "y": 0},
+ {"matrix": [2, 1], "x": 28, "y": 0},
+ {"matrix": [2, 2], "x": 29, "y": 0},
+ {"matrix": [2, 3], "x": 30, "y": 0},
+ {"matrix": [2, 4], "x": 31, "y": 0},
+ {"matrix": [2, 5], "x": 32, "y": 0},
+ {"matrix": [2, 6], "x": 33, "y": 0},
+ {"matrix": [2, 0], "x": 34, "y": 0},
+ {"matrix": [6, 0], "x": 35, "y": 0},
+ {"matrix": [6, 1], "x": 36, "y": 0},
+ {"matrix": [6, 2], "x": 37, "y": 0},
+ {"matrix": [6, 3], "x": 38, "y": 0},
+ {"matrix": [6, 4], "x": 39, "y": 0},
+ {"matrix": [6, 5], "x": 40, "y": 0},
+ {"matrix": [6, 6], "x": 41, "y": 0},
+ {"matrix": [3, 1], "x": 42, "y": 0},
+ {"matrix": [3, 2], "x": 43, "y": 0},
+ {"matrix": [3, 4], "x": 44, "y": 0},
+ {"matrix": [3, 5], "x": 45, "y": 0},
+ {"matrix": [3, 6], "x": 46, "y": 0},
+ {"matrix": [3, 0], "x": 47, "y": 0},
+ {"matrix": [7, 0], "x": 48, "y": 0},
+ {"matrix": [7, 1], "x": 49, "y": 0},
+ {"matrix": [7, 2], "x": 50, "y": 0},
+ {"matrix": [7, 4], "x": 51, "y": 0},
+ {"matrix": [7, 5], "x": 52, "y": 0},
+ {"matrix": [7, 6], "x": 53, "y": 0}
]
}
}
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 @@
-/*
-Copyright 2021 Salicylic_Acid
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
- L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
- L21, L22, L23, L24, L25, L26, L20, R20, R21, R22, R23, R24, R25, R26, \
- L31, L32, L34, L35, L36, R30, R31, R32, R34, R35, R36 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06 }, \
- { KC_NO, L11, L12, L13, L14, L15, L16 }, \
- { L20, L21, L22, L23, L24, L25, L26 }, \
- { KC_NO, L31, L32, KC_NO, L34, L35, L36 }, \
- { R00, R01, R02, R03, R04, R05, R06 }, \
- { R10, R11, R12, R13, R14, R15, R16 }, \
- { R20, R21, R22, R23, R24, R25, R26 }, \
- { R30, R31, R32, KC_NO, R34, R35, R36 } \
- }
-
-#define LAYOUT_rotary_layer( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
- L11, L12, L13, L14, L15, L16, L10, R10, R11, R12, R13, R14, R15, R16, \
- L21, L22, L23, L24, L25, L26, L20, R20, R21, R22, R23, R24, R25, R26, \
- L31, L32, L34, L35, L36, L30, R30, R31, R32, R34, R35, R36 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06 }, \
- { L10, L11, L12, L13, L14, L15, L16 }, \
- { L20, L21, L22, L23, L24, L25, L26 }, \
- { L30, L31, L32, KC_NO, L34, L35, L36 }, \
- { R00, R01, R02, R03, R04, R05, R06 }, \
- { R10, R11, R12, R13, R14, R15, R16 }, \
- { R20, R21, R22, R23, R24, R25, R26 }, \
- { R30, R31, R32, KC_NO, R34, R35, R36 } \
- }
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 @@
"layouts": {
"LAYOUT": {
"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},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "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},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "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},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "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},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
- {"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": 12.5, "y": 4},
- {"x": 13.5, "y": 4, "w": 1.5}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 1.5, "y": 4},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
]
},
"LAYOUT_ansi": {
"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},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 14], "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},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "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},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "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},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
- {"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": 12.5, "y": 4},
- {"x": 13.5, "y": 4, "w": 1.5}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 1.5, "y": 4},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
]
},
"LAYOUT_bae": {
"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},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "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},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "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": 1, "w": 2.25, "h": 2},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 1, "w": 2.25, "h": 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": 2.75},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
- {"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": 12.5, "y": 4},
- {"x": 13.5, "y": 4, "w": 1.5}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 1.5, "y": 4},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
]
}
}
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 @@
- /* Copyright 2021 Kirill Shkuretskiy
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \
- k40, k42, k43, k47, k4b, k4c, k4d \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, ___ }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, ___, k2d, ___ }, \
- { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, ___, ___ }, \
- { k40, ___, k42, k43, ___, ___, ___, k47, ___, ___, ___, k4b, k4c, k4d, ___ } \
-}
-
-#define LAYOUT_ansi( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \
- k40, k42, k43, k47, k4b, k4c, k4d \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, ___, k0e }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, ___ }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, ___, k2d, ___ }, \
- { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, ___, ___ }, \
- { k40, ___, k42, k43, ___, ___, ___, k47, ___, ___, ___, k4b, k4c, k4d, ___ } \
-}
-
-#define LAYOUT_bae( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \
- k40, k42, k43, k47, k4b, k4c, k4d \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, ___, ___ }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, ___, k2d, ___ }, \
- { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, ___, ___ }, \
- { k40, ___, k42, k43, ___, ___, ___, k47, ___, ___, ___, k4b, k4c, k4d, ___ } \
-}
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 @@
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
- "LAYOUT": {
- "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}]
- },
- "LAYOUT_splitbs": {
- "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}]
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1},
+ {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 13], "x": 14.25, "y": 4},
+ {"matrix": [4, 14], "x": 15.25, "y": 4},
+ {"matrix": [4, 15], "x": 16.25, "y": 4}
+ ]
+ },
+ "LAYOUT_splitbs": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [2, 13], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1},
+ {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 13], "x": 14.25, "y": 4},
+ {"matrix": [4, 14], "x": 15.25, "y": 4},
+ {"matrix": [4, 15], "x": 16.25, "y": 4}
+ ]
}
}
}
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 @@
-/* Copyright 2018 Jumail Mundekkat / MxBlue
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3B, k3C, k3E, \
- k40, k41, k42, k45, k49, k4B, k4C, k4D, k4E, k4F \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, XXX, XXX, XXX }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, XXX, k3B, k3C, XXX, k3E, XXX }, \
- { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, XXX, k4B, k4C, k4D, k4E, k4F } \
-}
-
-#define LAYOUT_splitbs( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k2D, k0E, k0F, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3B, k3C, k3E, \
- k40, k41, k42, k45, k49, k4B, k4C, k4D, k4E, k4F \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, XXX, k3B, k3C, XXX, k3E, XXX }, \
- { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, XXX, k4B, k4C, k4D, k4E, k4F } \
-}
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 @@
"layouts": {
"LAYOUT": {
"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, "y": 0},
+ {"matrix": [7, 16], "x": 0, "y": 0},
+ {"matrix": [6, 14], "x": 1, "y": 0},
+ {"matrix": [6, 15], "x": 2, "y": 0},
+ {"matrix": [6, 16], "x": 3, "y": 0},
+ {"matrix": [5, 14], "x": 4, "y": 0},
+ {"matrix": [5, 15], "x": 5, "y": 0},
+ {"matrix": [5, 16], "x": 6, "y": 0},
+ {"matrix": [7, 0], "x": 7, "y": 0},
+ {"matrix": [7, 1], "x": 8, "y": 0},
+ {"matrix": [7, 2], "x": 9, "y": 0},
+ {"matrix": [7, 3], "x": 10, "y": 0},
+ {"matrix": [7, 4], "x": 11, "y": 0},
+ {"matrix": [7, 5], "x": 12, "y": 0},
+ {"matrix": [1, 14], "x": 13, "y": 0},
+ {"matrix": [1, 10], "x": 14, "y": 0},
+ {"matrix": [1, 11], "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": 6, "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": 13, "y": 1, "w": 2},
- {"x": 15, "y": 1, "h": 1.6},
+ {"matrix": [5, 0], "x": 0, "y": 1},
+ {"matrix": [5, 10], "x": 1, "y": 1},
+ {"matrix": [5, 11], "x": 2, "y": 1},
+ {"matrix": [5, 12], "x": 3, "y": 1},
+ {"matrix": [5, 13], "x": 4, "y": 1},
+ {"matrix": [5, 7], "x": 5, "y": 1},
+ {"matrix": [5, 8], "x": 6, "y": 1},
+ {"matrix": [2, 0], "x": 7, "y": 1},
+ {"matrix": [2, 1], "x": 8, "y": 1},
+ {"matrix": [2, 2], "x": 9, "y": 1},
+ {"matrix": [2, 3], "x": 10, "y": 1},
+ {"matrix": [5, 1], "x": 11, "y": 1},
+ {"matrix": [5, 2], "x": 12, "y": 1},
+ {"matrix": [5, 9], "x": 13, "y": 1, "w": 2},
+ {"matrix": [2, 4], "x": 15, "y": 1, "h": 1.6},
- {"x": 0, "y": 2, "w": 1.5},
- {"x": 1.5, "y": 2},
- {"x": 2.5, "y": 2},
- {"x": 3.5, "y": 2},
- {"x": 4.5, "y": 2},
- {"x": 5.5, "y": 2},
- {"x": 6.5, "y": 2},
- {"x": 7.5, "y": 2},
- {"x": 8.5, "y": 2},
- {"x": 9.5, "y": 2},
- {"x": 10.5, "y": 2},
- {"x": 11.5, "y": 2},
- {"x": 12.5, "y": 2},
- {"x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [6, 17], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [6, 3], "x": 1.5, "y": 2},
+ {"matrix": [6, 4], "x": 2.5, "y": 2},
+ {"matrix": [6, 5], "x": 3.5, "y": 2},
+ {"matrix": [7, 8], "x": 4.5, "y": 2},
+ {"matrix": [7, 9], "x": 5.5, "y": 2},
+ {"matrix": [4, 0], "x": 6.5, "y": 2},
+ {"matrix": [4, 1], "x": 7.5, "y": 2},
+ {"matrix": [4, 2], "x": 8.5, "y": 2},
+ {"matrix": [4, 3], "x": 9.5, "y": 2},
+ {"matrix": [3, 0], "x": 10.5, "y": 2},
+ {"matrix": [3, 1], "x": 11.5, "y": 2},
+ {"matrix": [3, 2], "x": 12.5, "y": 2},
+ {"matrix": [3, 3], "x": 13.5, "y": 2, "w": 1.5},
- {"x": 0, "y": 3, "w": 1.75},
- {"x": 1.75, "y": 3},
- {"x": 2.75, "y": 3},
- {"x": 3.75, "y": 3},
- {"x": 4.75, "y": 3},
- {"x": 5.75, "y": 3},
- {"x": 6.75, "y": 3},
- {"x": 7.75, "y": 3},
- {"x": 8.75, "y": 3},
- {"x": 9.75, "y": 3},
- {"x": 10.75, "y": 3},
- {"x": 11.75, "y": 3},
- {"x": 12.75, "y": 3, "w": 2.25},
- {"x": 15, "y": 2.6, "h": 1.2},
+ {"matrix": [0, 9], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [6, 0], "x": 1.75, "y": 3},
+ {"matrix": [6, 1], "x": 2.75, "y": 3},
+ {"matrix": [6, 2], "x": 3.75, "y": 3},
+ {"matrix": [7, 7], "x": 4.75, "y": 3},
+ {"matrix": [1, 0], "x": 5.75, "y": 3},
+ {"matrix": [1, 1], "x": 6.75, "y": 3},
+ {"matrix": [5, 3], "x": 7.75, "y": 3},
+ {"matrix": [5, 4], "x": 8.75, "y": 3},
+ {"matrix": [5, 5], "x": 9.75, "y": 3},
+ {"matrix": [5, 6], "x": 10.75, "y": 3},
+ {"matrix": [1, 2], "x": 11.75, "y": 3},
+ {"matrix": [7, 15], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [2, 6], "x": 15, "y": 2.6, "h": 1.2},
- {"x": 0, "y": 4, "w": 2.25},
- {"x": 2.25, "y": 4},
- {"x": 3.25, "y": 4},
- {"x": 4.25, "y": 4},
- {"x": 5.25, "y": 4},
- {"x": 6.25, "y": 4},
- {"x": 7.25, "y": 4},
- {"x": 8.25, "y": 4},
- {"x": 9.25, "y": 4},
- {"x": 10.25, "y": 4},
- {"x": 11.25, "y": 4},
- {"x": 12.25, "y": 4, "w": 1.75},
- {"x": 14, "y": 4},
- {"x": 15, "y": 3.8, "h": 1.2},
+ {"matrix": [2, 15], "x": 0, "y": 4, "w": 2.25},
+ {"matrix": [7, 10], "x": 2.25, "y": 4},
+ {"matrix": [7, 11], "x": 3.25, "y": 4},
+ {"matrix": [7, 12], "x": 4.25, "y": 4},
+ {"matrix": [7, 14], "x": 5.25, "y": 4},
+ {"matrix": [0, 0], "x": 6.25, "y": 4},
+ {"matrix": [0, 1], "x": 7.25, "y": 4},
+ {"matrix": [0, 2], "x": 8.25, "y": 4},
+ {"matrix": [0, 3], "x": 9.25, "y": 4},
+ {"matrix": [0, 4], "x": 10.25, "y": 4},
+ {"matrix": [0, 5], "x": 11.25, "y": 4},
+ {"matrix": [2, 11], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [6, 6], "x": 14, "y": 4},
+ {"matrix": [1, 15], "x": 15, "y": 3.8, "h": 1.2},
- {"x": 0, "y": 5, "w": 1.25},
- {"x": 1.25, "y": 5, "w": 1.25},
- {"x": 2.5, "y": 5, "w": 1.25},
- {"x": 3.75, "y": 5, "w": 5.5},
- {"x": 9.25, "y": 5, "w": 1.25},
- {"x": 10.5, "y": 5, "w": 1.25},
- {"x": 11.75, "y": 5, "w": 1.25},
- {"x": 13, "y": 5},
- {"x": 14, "y": 5},
- {"x": 15, "y": 5}
+ {"matrix": [1, 16], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [4, 13], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [3, 14], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [6, 13], "x": 3.75, "y": 5, "w": 5.5},
+ {"matrix": [3, 10], "x": 9.25, "y": 5, "w": 1.25},
+ {"matrix": [0, 17], "x": 10.5, "y": 5, "w": 1.25},
+ {"matrix": [1, 12], "x": 11.75, "y": 5, "w": 1.25},
+ {"matrix": [6, 7], "x": 13, "y": 5},
+ {"matrix": [6, 8], "x": 14, "y": 5},
+ {"matrix": [6, 9], "x": 15, "y": 5}
]
}
}
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 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
- k7G, k6E, k6F, k6G, k5E, k5F, k5G, k70, k71, k72, k73, k74, k75, k1E, k1A, k1B, \
- k50, k5A, k5B, k5C, k5D, k57, k58, k20, k21, k22, k23, k51, k52, k59, k24, \
- k6H, k63, k64, k65, k78, k79, k40, k41, k42, k43, k30, k31, k32, k33, \
- k09, k60, k61, k62, k77, k10, k11, k53, k54, k55, k56, k12, k7F, k26, \
- k2F, k7A, k7B, k7C, k7E, k00, k01, k02, k03, k04, k05, k2B, k66, k1F, \
- k1G, k4D, k3E, k6D, k3A, k0H, k1C, k67, k68, k69 \
-) { \
- { k00, k01, k02, k03, k04, k05, XXX, XXX, XXX, k09, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k0H }, \
- { k10, k11, k12, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k1A, k1B, k1C, XXX, k1E, k1F, k1G, XXX }, \
- { k20, k21, k22, k23, k24, XXX, k26, XXX, XXX, XXX, XXX, k2B, XXX, XXX, XXX, k2F, XXX, XXX }, \
- { k30, k31, k32, k33, XXX, XXX, XXX, XXX, XXX, XXX, k3A, XXX, XXX, XXX, k3E, XXX, XXX, XXX }, \
- { k40, k41, k42, k43, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k4D, XXX, XXX, XXX, XXX }, \
- { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F, k5G, XXX }, \
- { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, XXX, XXX, XXX, k6D, k6E, k6F, k6G, k6H }, \
- { k70, k71, k72, k73, k74, k75, XXX, k77, k78, k79, k7A, k7B, k7C, XXX, k7E, k7F, k7G, XXX } \
-}
-
-#define MATRIX_TESTING_LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G, k3H, \
- k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, \
- k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F, k5G, k5H, \
- k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E, k6F, k6G, k6H, \
- k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A, k7B, k7C, k7D, k7E, k7F, k7G, k7H \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G, k3H }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H }, \
- { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F, k5G, k5H }, \
- { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E, k6F, k6G, k6H }, \
- { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A, k7B, k7C, k7D, k7E, k7F, k7G, k7H } \
-}
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 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"L00", "x":0, "y":0},
- {"label":"L01", "x":1, "y":0},
- {"label":"L02", "x":2, "y":0},
- {"label":"L03", "x":3, "y":0},
- {"label":"L04", "x":4, "y":0},
- {"label":"L05", "x":5, "y":0},
- {"label":"L06", "x":6, "y":0},
-
- {"label":"R00", "x":8, "y":0},
- {"label":"R01", "x":9, "y":0},
- {"label":"R02", "x":10, "y":0},
- {"label":"R03", "x":11, "y":0},
- {"label":"R04", "x":12, "y":0},
- {"label":"R05", "x":13, "y":0},
- {"label":"R06", "x":14, "y":0},
- {"label":"R07", "x":15, "y":0},
-
- {"label":"L10", "x":0, "y":1, "w":1.5},
- {"label":"L11", "x":1.5, "y":1},
- {"label":"L12", "x":2.5, "y":1},
- {"label":"L13", "x":3.5, "y":1},
- {"label":"L14", "x":4.5, "y":1},
- {"label":"L15", "x":5.5, "y":1},
-
- {"label":"R10", "x":7.5, "y":1},
- {"label":"R11", "x":8.5, "y":1},
- {"label":"R12", "x":9.5, "y":1},
- {"label":"R13", "x":10.5, "y":1},
- {"label":"R14", "x":11.5, "y":1},
- {"label":"R15", "x":12.5, "y":1},
- {"label":"R16", "x":13.5, "y":1},
- {"label":"R17", "x":14.5, "y":1, "w":1.5},
-
- {"label":"L20", "x":0, "y":2, "w":1.75},
- {"label":"L21", "x":1.75, "y":2},
- {"label":"L22", "x":2.75, "y":2},
- {"label":"L23", "x":3.75, "y":2},
- {"label":"L24", "x":4.75, "y":2},
- {"label":"L25", "x":5.75, "y":2},
-
- {"label":"R21", "x":7.75, "y":2},
- {"label":"R22", "x":8.75, "y":2},
- {"label":"R23", "x":9.75, "y":2},
- {"label":"R24", "x":10.75, "y":2},
- {"label":"R25", "x":11.75, "y":2},
- {"label":"R26", "x":12.75, "y":2},
- {"label":"R27", "x":13.75, "y":2, "w":2.25},
-
- {"label":"L30", "x":0, "y":3, "w":1.25},
- {"label":"L31", "x":1.25, "y":3},
- {"label":"L32", "x":2.25, "y":3},
- {"label":"L33", "x":3.25, "y":3},
- {"label":"L34", "x":4.25, "y":3},
- {"label":"L35", "x":5.25, "y":3},
- {"label":"L36", "x":6.25, "y":3},
-
- {"label":"R31", "x":8.25, "y":3},
- {"label":"R32", "x":9.25, "y":3},
- {"label":"R33", "x":10.25, "y":3},
- {"label":"R34", "x":11.25, "y":3},
- {"label":"R35", "x":12.25, "y":3},
- {"label":"R36", "x":13.25, "y":3, "w":1.75},
- {"label":"R37", "x":15, "y":3},
-
- {"label":"L40", "x":0, "y":4, "w":1.25},
- {"label":"L41", "x":1.25, "y":4, "w":1.25},
- {"label":"L42", "x":2.5, "y":4, "w":1.25},
- {"label":"L43", "x":3.75, "y":4, "w":2.75},
- {"label":"L44", "x":6.5, "y":4, "w":1.25},
-
- {"label":"R43", "x":8.75, "y":4, "w":1.25},
- {"label":"R44", "x":10, "y":4, "w":2},
- {"label":"R42", "x":12, "y":4},
- {"label":"R45", "x":13, "y":4},
- {"label":"R46", "x":14, "y":4},
- {"label":"R47", "x":15, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+
+ {"matrix": [5, 7], "x": 8, "y": 0},
+ {"matrix": [5, 6], "x": 9, "y": 0},
+ {"matrix": [5, 5], "x": 10, "y": 0},
+ {"matrix": [5, 4], "x": 11, "y": 0},
+ {"matrix": [5, 3], "x": 12, "y": 0},
+ {"matrix": [5, 2], "x": 13, "y": 0},
+ {"matrix": [5, 1], "x": 14, "y": 0},
+ {"matrix": [5, 0], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+ {"matrix": [6, 7], "x": 7.5, "y": 1},
+ {"matrix": [6, 6], "x": 8.5, "y": 1},
+ {"matrix": [6, 5], "x": 9.5, "y": 1},
+ {"matrix": [6, 4], "x": 10.5, "y": 1},
+ {"matrix": [6, 3], "x": 11.5, "y": 1},
+ {"matrix": [6, 2], "x": 12.5, "y": 1},
+ {"matrix": [6, 1], "x": 13.5, "y": 1},
+ {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [7, 6], "x": 7.75, "y": 2},
+ {"matrix": [7, 5], "x": 8.75, "y": 2},
+ {"matrix": [7, 4], "x": 9.75, "y": 2},
+ {"matrix": [7, 3], "x": 10.75, "y": 2},
+ {"matrix": [7, 2], "x": 11.75, "y": 2},
+ {"matrix": [7, 1], "x": 12.75, "y": 2},
+ {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+
+ {"matrix": [8, 6], "x": 8.25, "y": 3},
+ {"matrix": [8, 5], "x": 9.25, "y": 3},
+ {"matrix": [8, 4], "x": 10.25, "y": 3},
+ {"matrix": [8, 3], "x": 11.25, "y": 3},
+ {"matrix": [8, 2], "x": 12.25, "y": 3},
+ {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 1.75},
+ {"matrix": [8, 0], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 1.25},
+
+ {"matrix": [9, 4], "x": 8.75, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 10, "y": 4, "w": 2},
+ {"matrix": [9, 5], "x": 12, "y": 4},
+ {"matrix": [9, 2], "x": 13, "y": 4},
+ {"matrix": [9, 1], "x": 14, "y": 4},
+ {"matrix": [9, 0], "x": 15, "y": 4}
]
},
-
"LAYOUT_ansi_default": {
"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":8, "y":0},
- {"label":"8", "x":9, "y":0},
- {"label":"9", "x":10, "y":0},
- {"label":"0", "x":11, "y":0},
- {"label":"-", "x":12, "y":0},
- {"label":"=", "x":13, "y":0},
- {"label":"Backspace", "x":14, "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":7.5, "y":1},
- {"label":"U", "x":8.5, "y":1},
- {"label":"I", "x":9.5, "y":1},
- {"label":"O", "x":10.5, "y":1},
- {"label":"P", "x":11.5, "y":1},
- {"label":"[", "x":12.5, "y":1},
- {"label":"]", "x":13.5, "y":1},
- {"label":"\\", "x":14.5, "y":1, "w":1.5},
-
- {"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":7.75, "y":2},
- {"label":"J", "x":8.75, "y":2},
- {"label":"K", "x":9.75, "y":2},
- {"label":"L", "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":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":8.25, "y":3},
- {"label":"M", "x":9.25, "y":3},
- {"label":",", "x":10.25, "y":3},
- {"label":".", "x":11.25, "y":3},
- {"label":"/", "x":12.25, "y":3},
- {"label":"Shift", "x":13.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":2.75},
- {"x":6.5, "y":4, "w":1.25},
-
- {"x":8.75, "y":4, "w":1.25},
- {"x":10, "y":4, "w":2},
- {"label":"Alt", "x":12, "y":4},
- {"label":"Win", "x":13, "y":4},
- {"label":"Menu", "x":14, "y":4},
- {"label":"Ctrl", "x":15, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+
+ {"matrix": [5, 7], "x": 8, "y": 0},
+ {"matrix": [5, 6], "x": 9, "y": 0},
+ {"matrix": [5, 5], "x": 10, "y": 0},
+ {"matrix": [5, 4], "x": 11, "y": 0},
+ {"matrix": [5, 3], "x": 12, "y": 0},
+ {"matrix": [5, 2], "x": 13, "y": 0},
+ {"matrix": [5, 0], "x": 14, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+ {"matrix": [6, 7], "x": 7.5, "y": 1},
+ {"matrix": [6, 6], "x": 8.5, "y": 1},
+ {"matrix": [6, 5], "x": 9.5, "y": 1},
+ {"matrix": [6, 4], "x": 10.5, "y": 1},
+ {"matrix": [6, 3], "x": 11.5, "y": 1},
+ {"matrix": [6, 2], "x": 12.5, "y": 1},
+ {"matrix": [6, 1], "x": 13.5, "y": 1},
+ {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [7, 6], "x": 7.75, "y": 2},
+ {"matrix": [7, 5], "x": 8.75, "y": 2},
+ {"matrix": [7, 4], "x": 9.75, "y": 2},
+ {"matrix": [7, 3], "x": 10.75, "y": 2},
+ {"matrix": [7, 2], "x": 11.75, "y": 2},
+ {"matrix": [7, 1], "x": 12.75, "y": 2},
+ {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+
+ {"matrix": [8, 6], "x": 8.25, "y": 3},
+ {"matrix": [8, 5], "x": 9.25, "y": 3},
+ {"matrix": [8, 4], "x": 10.25, "y": 3},
+ {"matrix": [8, 3], "x": 11.25, "y": 3},
+ {"matrix": [8, 2], "x": 12.25, "y": 3},
+ {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 1.25},
+
+ {"matrix": [9, 4], "x": 8.75, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 10, "y": 4, "w": 2},
+ {"matrix": [9, 5], "x": 12, "y": 4},
+ {"matrix": [9, 2], "x": 13, "y": 4},
+ {"matrix": [9, 1], "x": 14, "y": 4},
+ {"matrix": [9, 0], "x": 15, "y": 4}
]
},
-
"LAYOUT_ansi_alt": {
"layout": [
- {"label":"L00", "x":0, "y":0},
- {"label":"L01", "x":1, "y":0},
- {"label":"L02", "x":2, "y":0},
- {"label":"L03", "x":3, "y":0},
- {"label":"L04", "x":4, "y":0},
- {"label":"L05", "x":5, "y":0},
- {"label":"L06", "x":6, "y":0},
-
- {"label":"R00", "x":8, "y":0},
- {"label":"R01", "x":9, "y":0},
- {"label":"R02", "x":10, "y":0},
- {"label":"R03", "x":11, "y":0},
- {"label":"R04", "x":12, "y":0},
- {"label":"R05", "x":13, "y":0},
- {"label":"R07", "x":14, "y":0, "w":2},
-
- {"label":"L10", "x":0, "y":1, "w":1.5},
- {"label":"L11", "x":1.5, "y":1},
- {"label":"L12", "x":2.5, "y":1},
- {"label":"L13", "x":3.5, "y":1},
- {"label":"L14", "x":4.5, "y":1},
- {"label":"L15", "x":5.5, "y":1},
-
- {"label":"R10", "x":7.5, "y":1},
- {"label":"R11", "x":8.5, "y":1},
- {"label":"R12", "x":9.5, "y":1},
- {"label":"R13", "x":10.5, "y":1},
- {"label":"R14", "x":11.5, "y":1},
- {"label":"R15", "x":12.5, "y":1},
- {"label":"R16", "x":13.5, "y":1},
- {"label":"R17", "x":14.5, "y":1, "w":1.5},
-
- {"label":"L20", "x":0, "y":2, "w":1.75},
- {"label":"L21", "x":1.75, "y":2},
- {"label":"L22", "x":2.75, "y":2},
- {"label":"L23", "x":3.75, "y":2},
- {"label":"L24", "x":4.75, "y":2},
- {"label":"L25", "x":5.75, "y":2},
-
- {"label":"R21", "x":7.75, "y":2},
- {"label":"R22", "x":8.75, "y":2},
- {"label":"R23", "x":9.75, "y":2},
- {"label":"R24", "x":10.75, "y":2},
- {"label":"R25", "x":11.75, "y":2},
- {"label":"R26", "x":12.75, "y":2},
- {"label":"R27", "x":13.75, "y":2, "w":2.25},
-
- {"label":"L31", "x":0, "y":3, "w":2.25},
- {"label":"L32", "x":2.25, "y":3},
- {"label":"L33", "x":3.25, "y":3},
- {"label":"L34", "x":4.25, "y":3},
- {"label":"L35", "x":5.25, "y":3},
- {"label":"L36", "x":6.25, "y":3},
-
- {"label":"R31", "x":8.25, "y":3},
- {"label":"R32", "x":9.25, "y":3},
- {"label":"R33", "x":10.25, "y":3},
- {"label":"R34", "x":11.25, "y":3},
- {"label":"R35", "x":12.25, "y":3},
- {"label":"R36", "x":13.25, "y":3, "w":2.75},
-
- {"label":"L40", "x":0, "y":4, "w":1.5},
- {"label":"L41", "x":1.5, "y":4},
- {"label":"L42", "x":2.5, "y":4, "w":1.5},
- {"label":"L43", "x":4, "y":4, "w":2.75},
- {"label":"L44", "x":6.75, "y":4},
-
- {"label":"R43", "x":8.75, "y":4},
- {"label":"R44", "x":9.75, "y":4, "w":2.25},
- {"label":"R45", "x":12, "y":4, "w":1.5},
- {"label":"R46", "x":13.5, "y":4},
- {"label":"R47", "x":14.5, "y":4, "w":1.5}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+
+ {"matrix": [5, 7], "x": 8, "y": 0},
+ {"matrix": [5, 6], "x": 9, "y": 0},
+ {"matrix": [5, 5], "x": 10, "y": 0},
+ {"matrix": [5, 4], "x": 11, "y": 0},
+ {"matrix": [5, 3], "x": 12, "y": 0},
+ {"matrix": [5, 2], "x": 13, "y": 0},
+ {"matrix": [5, 0], "x": 14, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+ {"matrix": [6, 7], "x": 7.5, "y": 1},
+ {"matrix": [6, 6], "x": 8.5, "y": 1},
+ {"matrix": [6, 5], "x": 9.5, "y": 1},
+ {"matrix": [6, 4], "x": 10.5, "y": 1},
+ {"matrix": [6, 3], "x": 11.5, "y": 1},
+ {"matrix": [6, 2], "x": 12.5, "y": 1},
+ {"matrix": [6, 1], "x": 13.5, "y": 1},
+ {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [7, 6], "x": 7.75, "y": 2},
+ {"matrix": [7, 5], "x": 8.75, "y": 2},
+ {"matrix": [7, 4], "x": 9.75, "y": 2},
+ {"matrix": [7, 3], "x": 10.75, "y": 2},
+ {"matrix": [7, 2], "x": 11.75, "y": 2},
+ {"matrix": [7, 1], "x": 12.75, "y": 2},
+ {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+
+ {"matrix": [8, 6], "x": 8.25, "y": 3},
+ {"matrix": [8, 5], "x": 9.25, "y": 3},
+ {"matrix": [8, 4], "x": 10.25, "y": 3},
+ {"matrix": [8, 3], "x": 11.25, "y": 3},
+ {"matrix": [8, 2], "x": 12.25, "y": 3},
+ {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 3], "x": 4, "y": 4, "w": 2.75},
+ {"matrix": [4, 4], "x": 6.75, "y": 4},
+
+ {"matrix": [9, 4], "x": 8.75, "y": 4},
+ {"matrix": [9, 3], "x": 9.75, "y": 4, "w": 2.25},
+ {"matrix": [9, 2], "x": 12, "y": 4, "w": 1.5},
+ {"matrix": [9, 1], "x": 13.5, "y": 4},
+ {"matrix": [9, 0], "x": 14.5, "y": 4, "w": 1.5}
]
},
-
"LAYOUT_iso_default": {
"layout": [
- {"label":"L00", "x":0, "y":0},
- {"label":"L01", "x":1, "y":0},
- {"label":"L02", "x":2, "y":0},
- {"label":"L03", "x":3, "y":0},
- {"label":"L04", "x":4, "y":0},
- {"label":"L05", "x":5, "y":0},
- {"label":"L06", "x":6, "y":0},
-
- {"label":"R00", "x":8, "y":0},
- {"label":"R01", "x":9, "y":0},
- {"label":"R02", "x":10, "y":0},
- {"label":"R03", "x":11, "y":0},
- {"label":"R04", "x":12, "y":0},
- {"label":"R05", "x":13, "y":0},
- {"label":"R07", "x":14, "y":0, "w":2},
-
- {"label":"L10", "x":0, "y":1, "w":1.5},
- {"label":"L11", "x":1.5, "y":1},
- {"label":"L12", "x":2.5, "y":1},
- {"label":"L13", "x":3.5, "y":1},
- {"label":"L14", "x":4.5, "y":1},
- {"label":"L15", "x":5.5, "y":1},
-
- {"label":"R10", "x":7.5, "y":1},
- {"label":"R11", "x":8.5, "y":1},
- {"label":"R12", "x":9.5, "y":1},
- {"label":"R13", "x":10.5, "y":1},
- {"label":"R14", "x":11.5, "y":1},
- {"label":"R15", "x":12.5, "y":1},
- {"label":"R16", "x":13.5, "y":1},
-
- {"label":"L20", "x":0, "y":2, "w":1.75},
- {"label":"L21", "x":1.75, "y":2},
- {"label":"L22", "x":2.75, "y":2},
- {"label":"L23", "x":3.75, "y":2},
- {"label":"L24", "x":4.75, "y":2},
- {"label":"L25", "x":5.75, "y":2},
-
- {"label":"R21", "x":7.75, "y":2},
- {"label":"R22", "x":8.75, "y":2},
- {"label":"R23", "x":9.75, "y":2},
- {"label":"R24", "x":10.75, "y":2},
- {"label":"R25", "x":11.75, "y":2},
- {"label":"R26", "x":12.75, "y":2},
- {"label":"R17", "x":13.75, "y":2},
- {"label":"R27", "x":14.75, "y":1, "w":1.25, "h":2},
-
- {"label":"L30", "x":0, "y":3, "w":1.25},
- {"label":"L31", "x":1.25, "y":3},
- {"label":"L32", "x":2.25, "y":3},
- {"label":"L33", "x":3.25, "y":3},
- {"label":"L34", "x":4.25, "y":3},
- {"label":"L35", "x":5.25, "y":3},
- {"label":"L36", "x":6.25, "y":3},
-
- {"label":"R31", "x":8.25, "y":3},
- {"label":"R32", "x":9.25, "y":3},
- {"label":"R33", "x":10.25, "y":3},
- {"label":"R34", "x":11.25, "y":3},
- {"label":"R35", "x":12.25, "y":3},
- {"label":"R36", "x":13.25, "y":3, "w":2.75},
-
- {"label":"L40", "x":0, "y":4, "w":1.25},
- {"label":"L41", "x":1.25, "y":4, "w":1.25},
- {"label":"L42", "x":2.5, "y":4, "w":1.25},
- {"label":"L43", "x":3.75, "y":4, "w":2.75},
- {"label":"L44", "x":6.5, "y":4, "w":1.25},
-
- {"label":"R43", "x":8.75, "y":4, "w":1.25},
- {"label":"R44", "x":10, "y":4, "w":2},
- {"label":"R42", "x":12, "y":4},
- {"label":"R45", "x":13, "y":4},
- {"label":"R46", "x":14, "y":4},
- {"label":"R47", "x":15, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+
+ {"matrix": [5, 7], "x": 8, "y": 0},
+ {"matrix": [5, 6], "x": 9, "y": 0},
+ {"matrix": [5, 5], "x": 10, "y": 0},
+ {"matrix": [5, 4], "x": 11, "y": 0},
+ {"matrix": [5, 3], "x": 12, "y": 0},
+ {"matrix": [5, 2], "x": 13, "y": 0},
+ {"matrix": [5, 0], "x": 14, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+ {"matrix": [6, 7], "x": 7.5, "y": 1},
+ {"matrix": [6, 6], "x": 8.5, "y": 1},
+ {"matrix": [6, 5], "x": 9.5, "y": 1},
+ {"matrix": [6, 4], "x": 10.5, "y": 1},
+ {"matrix": [6, 3], "x": 11.5, "y": 1},
+ {"matrix": [6, 2], "x": 12.5, "y": 1},
+ {"matrix": [6, 1], "x": 13.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [7, 6], "x": 7.75, "y": 2},
+ {"matrix": [7, 5], "x": 8.75, "y": 2},
+ {"matrix": [7, 4], "x": 9.75, "y": 2},
+ {"matrix": [7, 3], "x": 10.75, "y": 2},
+ {"matrix": [7, 2], "x": 11.75, "y": 2},
+ {"matrix": [7, 1], "x": 12.75, "y": 2},
+ {"matrix": [6, 0], "x": 13.75, "y": 2},
+ {"matrix": [7, 0], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+
+ {"matrix": [8, 6], "x": 8.25, "y": 3},
+ {"matrix": [8, 5], "x": 9.25, "y": 3},
+ {"matrix": [8, 4], "x": 10.25, "y": 3},
+ {"matrix": [8, 3], "x": 11.25, "y": 3},
+ {"matrix": [8, 2], "x": 12.25, "y": 3},
+ {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 1.25},
+
+ {"matrix": [9, 4], "x": 8.75, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 10, "y": 4, "w": 2},
+ {"matrix": [9, 5], "x": 12, "y": 4},
+ {"matrix": [9, 2], "x": 13, "y": 4},
+ {"matrix": [9, 1], "x": 14, "y": 4},
+ {"matrix": [9, 0], "x": 15, "y": 4}
]
},
-
"LAYOUT_iso_alt": {
"layout": [
- {"label":"L00", "x":0, "y":0},
- {"label":"L01", "x":1, "y":0},
- {"label":"L02", "x":2, "y":0},
- {"label":"L03", "x":3, "y":0},
- {"label":"L04", "x":4, "y":0},
- {"label":"L05", "x":5, "y":0},
- {"label":"L06", "x":6, "y":0},
-
- {"label":"R00", "x":8, "y":0},
- {"label":"R01", "x":9, "y":0},
- {"label":"R02", "x":10, "y":0},
- {"label":"R03", "x":11, "y":0},
- {"label":"R04", "x":12, "y":0},
- {"label":"R05", "x":13, "y":0},
- {"label":"R07", "x":14, "y":0, "w":2},
-
- {"label":"L10", "x":0, "y":1, "w":1.5},
- {"label":"L11", "x":1.5, "y":1},
- {"label":"L12", "x":2.5, "y":1},
- {"label":"L13", "x":3.5, "y":1},
- {"label":"L14", "x":4.5, "y":1},
- {"label":"L15", "x":5.5, "y":1},
-
- {"label":"R10", "x":7.5, "y":1},
- {"label":"R11", "x":8.5, "y":1},
- {"label":"R12", "x":9.5, "y":1},
- {"label":"R13", "x":10.5, "y":1},
- {"label":"R14", "x":11.5, "y":1},
- {"label":"R15", "x":12.5, "y":1},
- {"label":"R16", "x":13.5, "y":1},
-
- {"label":"L20", "x":0, "y":2, "w":1.75},
- {"label":"L21", "x":1.75, "y":2},
- {"label":"L22", "x":2.75, "y":2},
- {"label":"L23", "x":3.75, "y":2},
- {"label":"L24", "x":4.75, "y":2},
- {"label":"L25", "x":5.75, "y":2},
-
- {"label":"R21", "x":7.75, "y":2},
- {"label":"R22", "x":8.75, "y":2},
- {"label":"R23", "x":9.75, "y":2},
- {"label":"R24", "x":10.75, "y":2},
- {"label":"R25", "x":11.75, "y":2},
- {"label":"R26", "x":12.75, "y":2},
- {"label":"R17", "x":13.75, "y":2},
- {"label":"R27", "x":14.75, "y":1, "w":1.25, "h":2},
-
- {"label":"L30", "x":0, "y":3, "w":1.25},
- {"label":"L31", "x":1.25, "y":3},
- {"label":"L32", "x":2.25, "y":3},
- {"label":"L33", "x":3.25, "y":3},
- {"label":"L34", "x":4.25, "y":3},
- {"label":"L35", "x":5.25, "y":3},
- {"label":"L36", "x":6.25, "y":3},
-
- {"label":"R31", "x":8.25, "y":3},
- {"label":"R32", "x":9.25, "y":3},
- {"label":"R33", "x":10.25, "y":3},
- {"label":"R34", "x":11.25, "y":3},
- {"label":"R35", "x":12.25, "y":3},
- {"label":"R36", "x":13.25, "y":3, "w":2.75},
-
- {"label":"L40", "x":0, "y":4, "w":1.5},
- {"label":"L41", "x":1.5, "y":4},
- {"label":"L42", "x":2.5, "y":4, "w":1.5},
- {"label":"L43", "x":4, "y":4, "w":2.75},
- {"label":"L44", "x":6.75, "y":4},
-
- {"label":"R43", "x":8.75, "y":4},
- {"label":"R44", "x":9.75, "y":4, "w":2.25},
- {"label":"R45", "x":12, "y":4, "w":1.5},
- {"label":"R46", "x":13.5, "y":4},
- {"label":"R47", "x":14.5, "y":4, "w":1.5}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+
+ {"matrix": [5, 7], "x": 8, "y": 0},
+ {"matrix": [5, 6], "x": 9, "y": 0},
+ {"matrix": [5, 5], "x": 10, "y": 0},
+ {"matrix": [5, 4], "x": 11, "y": 0},
+ {"matrix": [5, 3], "x": 12, "y": 0},
+ {"matrix": [5, 2], "x": 13, "y": 0},
+ {"matrix": [5, 0], "x": 14, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+ {"matrix": [6, 7], "x": 7.5, "y": 1},
+ {"matrix": [6, 6], "x": 8.5, "y": 1},
+ {"matrix": [6, 5], "x": 9.5, "y": 1},
+ {"matrix": [6, 4], "x": 10.5, "y": 1},
+ {"matrix": [6, 3], "x": 11.5, "y": 1},
+ {"matrix": [6, 2], "x": 12.5, "y": 1},
+ {"matrix": [6, 1], "x": 13.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [7, 6], "x": 7.75, "y": 2},
+ {"matrix": [7, 5], "x": 8.75, "y": 2},
+ {"matrix": [7, 4], "x": 9.75, "y": 2},
+ {"matrix": [7, 3], "x": 10.75, "y": 2},
+ {"matrix": [7, 2], "x": 11.75, "y": 2},
+ {"matrix": [7, 1], "x": 12.75, "y": 2},
+ {"matrix": [6, 0], "x": 13.75, "y": 2},
+ {"matrix": [7, 0], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+
+ {"matrix": [8, 6], "x": 8.25, "y": 3},
+ {"matrix": [8, 5], "x": 9.25, "y": 3},
+ {"matrix": [8, 4], "x": 10.25, "y": 3},
+ {"matrix": [8, 3], "x": 11.25, "y": 3},
+ {"matrix": [8, 2], "x": 12.25, "y": 3},
+ {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 3], "x": 4, "y": 4, "w": 2.75},
+ {"matrix": [4, 4], "x": 6.75, "y": 4},
+
+ {"matrix": [9, 4], "x": 8.75, "y": 4},
+ {"matrix": [9, 3], "x": 9.75, "y": 4, "w": 2.25},
+ {"matrix": [9, 2], "x": 12, "y": 4, "w": 1.5},
+ {"matrix": [9, 1], "x": 13.5, "y": 4},
+ {"matrix": [9, 0], "x": 14.5, "y": 4, "w": 1.5}
]
},
-
"LAYOUT_hhkb_default": {
"layout": [
- {"label":"L00", "x":0, "y":0},
- {"label":"L01", "x":1, "y":0},
- {"label":"L02", "x":2, "y":0},
- {"label":"L03", "x":3, "y":0},
- {"label":"L04", "x":4, "y":0},
- {"label":"L05", "x":5, "y":0},
- {"label":"L06", "x":6, "y":0},
-
- {"label":"R00", "x":8, "y":0},
- {"label":"R01", "x":9, "y":0},
- {"label":"R02", "x":10, "y":0},
- {"label":"R03", "x":11, "y":0},
- {"label":"R04", "x":12, "y":0},
- {"label":"R05", "x":13, "y":0},
- {"label":"R06", "x":14, "y":0},
- {"label":"R07", "x":15, "y":0},
-
- {"label":"L10", "x":0, "y":1, "w":1.5},
- {"label":"L11", "x":1.5, "y":1},
- {"label":"L12", "x":2.5, "y":1},
- {"label":"L13", "x":3.5, "y":1},
- {"label":"L14", "x":4.5, "y":1},
- {"label":"L15", "x":5.5, "y":1},
-
- {"label":"R10", "x":7.5, "y":1},
- {"label":"R11", "x":8.5, "y":1},
- {"label":"R12", "x":9.5, "y":1},
- {"label":"R13", "x":10.5, "y":1},
- {"label":"R14", "x":11.5, "y":1},
- {"label":"R15", "x":12.5, "y":1},
- {"label":"R16", "x":13.5, "y":1},
- {"label":"R17", "x":14.5, "y":1, "w":1.5},
-
- {"label":"L20", "x":0, "y":2, "w":1.75},
- {"label":"L21", "x":1.75, "y":2},
- {"label":"L22", "x":2.75, "y":2},
- {"label":"L23", "x":3.75, "y":2},
- {"label":"L24", "x":4.75, "y":2},
- {"label":"L25", "x":5.75, "y":2},
-
- {"label":"R21", "x":7.75, "y":2},
- {"label":"R22", "x":8.75, "y":2},
- {"label":"R23", "x":9.75, "y":2},
- {"label":"R24", "x":10.75, "y":2},
- {"label":"R25", "x":11.75, "y":2},
- {"label":"R26", "x":12.75, "y":2},
- {"label":"R27", "x":13.75, "y":2, "w":2.25},
-
- {"label":"L31", "x":0, "y":3, "w":2.25},
- {"label":"L32", "x":2.25, "y":3},
- {"label":"L33", "x":3.25, "y":3},
- {"label":"L34", "x":4.25, "y":3},
- {"label":"L35", "x":5.25, "y":3},
- {"label":"L36", "x":6.25, "y":3},
-
- {"label":"R31", "x":8.25, "y":3},
- {"label":"R32", "x":9.25, "y":3},
- {"label":"R33", "x":10.25, "y":3},
- {"label":"R34", "x":11.25, "y":3},
- {"label":"R35", "x":12.25, "y":3},
- {"label":"R36", "x":13.25, "y":3, "w":1.75},
- {"label":"R37", "x":15, "y":3},
-
- {"label":"L41", "x":1.5, "y":4},
- {"label":"L42", "x":2.5, "y":4, "w":1.5},
- {"label":"L43", "x":4, "y":4, "w":2.75},
- {"label":"L44", "x":6.75, "y":4},
-
- {"label":"R43", "x":8.75, "y":4},
- {"label":"R44", "x":9.75, "y":4, "w":2.25},
- {"label":"R45", "x":12, "y":4, "w":1.5},
- {"label":"R46", "x":13.5, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+
+ {"matrix": [5, 7], "x": 8, "y": 0},
+ {"matrix": [5, 6], "x": 9, "y": 0},
+ {"matrix": [5, 5], "x": 10, "y": 0},
+ {"matrix": [5, 4], "x": 11, "y": 0},
+ {"matrix": [5, 3], "x": 12, "y": 0},
+ {"matrix": [5, 2], "x": 13, "y": 0},
+ {"matrix": [5, 1], "x": 14, "y": 0},
+ {"matrix": [5, 0], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+ {"matrix": [6, 7], "x": 7.5, "y": 1},
+ {"matrix": [6, 6], "x": 8.5, "y": 1},
+ {"matrix": [6, 5], "x": 9.5, "y": 1},
+ {"matrix": [6, 4], "x": 10.5, "y": 1},
+ {"matrix": [6, 3], "x": 11.5, "y": 1},
+ {"matrix": [6, 2], "x": 12.5, "y": 1},
+ {"matrix": [6, 1], "x": 13.5, "y": 1},
+ {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [7, 6], "x": 7.75, "y": 2},
+ {"matrix": [7, 5], "x": 8.75, "y": 2},
+ {"matrix": [7, 4], "x": 9.75, "y": 2},
+ {"matrix": [7, 3], "x": 10.75, "y": 2},
+ {"matrix": [7, 2], "x": 11.75, "y": 2},
+ {"matrix": [7, 1], "x": 12.75, "y": 2},
+ {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+
+ {"matrix": [8, 6], "x": 8.25, "y": 3},
+ {"matrix": [8, 5], "x": 9.25, "y": 3},
+ {"matrix": [8, 4], "x": 10.25, "y": 3},
+ {"matrix": [8, 3], "x": 11.25, "y": 3},
+ {"matrix": [8, 2], "x": 12.25, "y": 3},
+ {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 1.75},
+ {"matrix": [8, 0], "x": 15, "y": 3},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 3], "x": 4, "y": 4, "w": 2.75},
+ {"matrix": [4, 4], "x": 6.75, "y": 4},
+
+ {"matrix": [9, 4], "x": 8.75, "y": 4},
+ {"matrix": [9, 3], "x": 9.75, "y": 4, "w": 2.25},
+ {"matrix": [9, 2], "x": 12, "y": 4, "w": 1.5},
+ {"matrix": [9, 1], "x": 13.5, "y": 4}
]
},
-
"LAYOUT_hhkb_split_lshift": {
"layout": [
- {"label":"L00", "x":0, "y":0},
- {"label":"L01", "x":1, "y":0},
- {"label":"L02", "x":2, "y":0},
- {"label":"L03", "x":3, "y":0},
- {"label":"L04", "x":4, "y":0},
- {"label":"L05", "x":5, "y":0},
- {"label":"L06", "x":6, "y":0},
-
- {"label":"R00", "x":8, "y":0},
- {"label":"R01", "x":9, "y":0},
- {"label":"R02", "x":10, "y":0},
- {"label":"R03", "x":11, "y":0},
- {"label":"R04", "x":12, "y":0},
- {"label":"R05", "x":13, "y":0},
- {"label":"R06", "x":14, "y":0},
- {"label":"R07", "x":15, "y":0},
-
- {"label":"L10", "x":0, "y":1, "w":1.5},
- {"label":"L11", "x":1.5, "y":1},
- {"label":"L12", "x":2.5, "y":1},
- {"label":"L13", "x":3.5, "y":1},
- {"label":"L14", "x":4.5, "y":1},
- {"label":"L15", "x":5.5, "y":1},
-
- {"label":"R10", "x":7.5, "y":1},
- {"label":"R11", "x":8.5, "y":1},
- {"label":"R12", "x":9.5, "y":1},
- {"label":"R13", "x":10.5, "y":1},
- {"label":"R14", "x":11.5, "y":1},
- {"label":"R15", "x":12.5, "y":1},
- {"label":"R16", "x":13.5, "y":1},
- {"label":"R17", "x":14.5, "y":1, "w":1.5},
-
- {"label":"L20", "x":0, "y":2, "w":1.75},
- {"label":"L21", "x":1.75, "y":2},
- {"label":"L22", "x":2.75, "y":2},
- {"label":"L23", "x":3.75, "y":2},
- {"label":"L24", "x":4.75, "y":2},
- {"label":"L25", "x":5.75, "y":2},
-
- {"label":"R21", "x":7.75, "y":2},
- {"label":"R22", "x":8.75, "y":2},
- {"label":"R23", "x":9.75, "y":2},
- {"label":"R24", "x":10.75, "y":2},
- {"label":"R25", "x":11.75, "y":2},
- {"label":"R26", "x":12.75, "y":2},
- {"label":"R27", "x":13.75, "y":2, "w":2.25},
-
- {"label":"L30", "x":0, "y":3, "w":1.25},
- {"label":"L31", "x":1.25, "y":3},
- {"label":"L32", "x":2.25, "y":3},
- {"label":"L33", "x":3.25, "y":3},
- {"label":"L34", "x":4.25, "y":3},
- {"label":"L35", "x":5.25, "y":3},
- {"label":"L36", "x":6.25, "y":3},
-
- {"label":"R31", "x":8.25, "y":3},
- {"label":"R32", "x":9.25, "y":3},
- {"label":"R33", "x":10.25, "y":3},
- {"label":"R34", "x":11.25, "y":3},
- {"label":"R35", "x":12.25, "y":3},
- {"label":"R36", "x":13.25, "y":3, "w":1.75},
- {"label":"R37", "x":15, "y":3},
-
- {"label":"L41", "x":1.5, "y":4},
- {"label":"L42", "x":2.5, "y":4, "w":1.5},
- {"label":"L43", "x":4, "y":4, "w":2.75},
- {"label":"L44", "x":6.75, "y":4},
-
- {"label":"R43", "x":8.75, "y":4},
- {"label":"R44", "x":9.75, "y":4, "w":2.25},
- {"label":"R45", "x":12, "y":4, "w":1.5},
- {"label":"R46", "x":13.5, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+
+ {"matrix": [5, 7], "x": 8, "y": 0},
+ {"matrix": [5, 6], "x": 9, "y": 0},
+ {"matrix": [5, 5], "x": 10, "y": 0},
+ {"matrix": [5, 4], "x": 11, "y": 0},
+ {"matrix": [5, 3], "x": 12, "y": 0},
+ {"matrix": [5, 2], "x": 13, "y": 0},
+ {"matrix": [5, 1], "x": 14, "y": 0},
+ {"matrix": [5, 0], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+ {"matrix": [6, 7], "x": 7.5, "y": 1},
+ {"matrix": [6, 6], "x": 8.5, "y": 1},
+ {"matrix": [6, 5], "x": 9.5, "y": 1},
+ {"matrix": [6, 4], "x": 10.5, "y": 1},
+ {"matrix": [6, 3], "x": 11.5, "y": 1},
+ {"matrix": [6, 2], "x": 12.5, "y": 1},
+ {"matrix": [6, 1], "x": 13.5, "y": 1},
+ {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [7, 6], "x": 7.75, "y": 2},
+ {"matrix": [7, 5], "x": 8.75, "y": 2},
+ {"matrix": [7, 4], "x": 9.75, "y": 2},
+ {"matrix": [7, 3], "x": 10.75, "y": 2},
+ {"matrix": [7, 2], "x": 11.75, "y": 2},
+ {"matrix": [7, 1], "x": 12.75, "y": 2},
+ {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+
+ {"matrix": [8, 6], "x": 8.25, "y": 3},
+ {"matrix": [8, 5], "x": 9.25, "y": 3},
+ {"matrix": [8, 4], "x": 10.25, "y": 3},
+ {"matrix": [8, 3], "x": 11.25, "y": 3},
+ {"matrix": [8, 2], "x": 12.25, "y": 3},
+ {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 1.75},
+ {"matrix": [8, 0], "x": 15, "y": 3},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 3], "x": 4, "y": 4, "w": 2.75},
+ {"matrix": [4, 4], "x": 6.75, "y": 4},
+
+ {"matrix": [9, 4], "x": 8.75, "y": 4},
+ {"matrix": [9, 3], "x": 9.75, "y": 4, "w": 2.25},
+ {"matrix": [9, 2], "x": 12, "y": 4, "w": 1.5},
+ {"matrix": [9, 1], "x": 13.5, "y": 4}
]
},
-
"LAYOUT_wkl_default": {
"layout": [
- {"label":"L00", "x":0, "y":0},
- {"label":"L01", "x":1, "y":0},
- {"label":"L02", "x":2, "y":0},
- {"label":"L03", "x":3, "y":0},
- {"label":"L04", "x":4, "y":0},
- {"label":"L05", "x":5, "y":0},
- {"label":"L06", "x":6, "y":0},
-
- {"label":"R00", "x":8, "y":0},
- {"label":"R01", "x":9, "y":0},
- {"label":"R02", "x":10, "y":0},
- {"label":"R03", "x":11, "y":0},
- {"label":"R04", "x":12, "y":0},
- {"label":"R05", "x":13, "y":0},
- {"label":"R07", "x":14, "y":0, "w":2},
-
- {"label":"L10", "x":0, "y":1, "w":1.5},
- {"label":"L11", "x":1.5, "y":1},
- {"label":"L12", "x":2.5, "y":1},
- {"label":"L13", "x":3.5, "y":1},
- {"label":"L14", "x":4.5, "y":1},
- {"label":"L15", "x":5.5, "y":1},
-
- {"label":"R10", "x":7.5, "y":1},
- {"label":"R11", "x":8.5, "y":1},
- {"label":"R12", "x":9.5, "y":1},
- {"label":"R13", "x":10.5, "y":1},
- {"label":"R14", "x":11.5, "y":1},
- {"label":"R15", "x":12.5, "y":1},
- {"label":"R16", "x":13.5, "y":1},
- {"label":"R17", "x":14.5, "y":1, "w":1.5},
-
- {"label":"L20", "x":0, "y":2, "w":1.75},
- {"label":"L21", "x":1.75, "y":2},
- {"label":"L22", "x":2.75, "y":2},
- {"label":"L23", "x":3.75, "y":2},
- {"label":"L24", "x":4.75, "y":2},
- {"label":"L25", "x":5.75, "y":2},
-
- {"label":"R21", "x":7.75, "y":2},
- {"label":"R22", "x":8.75, "y":2},
- {"label":"R23", "x":9.75, "y":2},
- {"label":"R24", "x":10.75, "y":2},
- {"label":"R25", "x":11.75, "y":2},
- {"label":"R26", "x":12.75, "y":2},
- {"label":"R27", "x":13.75, "y":2, "w":2.25},
-
- {"label":"L31", "x":0, "y":3, "w":2.25},
- {"label":"L32", "x":2.25, "y":3},
- {"label":"L33", "x":3.25, "y":3},
- {"label":"L34", "x":4.25, "y":3},
- {"label":"L35", "x":5.25, "y":3},
- {"label":"L36", "x":6.25, "y":3},
-
- {"label":"R31", "x":8.25, "y":3},
- {"label":"R32", "x":9.25, "y":3},
- {"label":"R33", "x":10.25, "y":3},
- {"label":"R34", "x":11.25, "y":3},
- {"label":"R35", "x":12.25, "y":3},
- {"label":"R36", "x":13.25, "y":3, "w":2.75},
-
- {"label":"L40", "x":0, "y":4, "w":1.5},
- {"label":"L42", "x":2.5, "y":4, "w":1.5},
- {"label":"L43", "x":4, "y":4, "w":2.75},
- {"label":"L44", "x":6.75, "y":4},
-
- {"label":"R43", "x":8.75, "y":4},
- {"label":"R44", "x":9.75, "y":4, "w":2.25},
- {"label":"R45", "x":12, "y":4, "w":1.5},
- {"label":"R47", "x":14.5, "y":4, "w":1.5}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+
+ {"matrix": [5, 7], "x": 8, "y": 0},
+ {"matrix": [5, 6], "x": 9, "y": 0},
+ {"matrix": [5, 5], "x": 10, "y": 0},
+ {"matrix": [5, 4], "x": 11, "y": 0},
+ {"matrix": [5, 3], "x": 12, "y": 0},
+ {"matrix": [5, 2], "x": 13, "y": 0},
+ {"matrix": [5, 0], "x": 14, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+ {"matrix": [6, 7], "x": 7.5, "y": 1},
+ {"matrix": [6, 6], "x": 8.5, "y": 1},
+ {"matrix": [6, 5], "x": 9.5, "y": 1},
+ {"matrix": [6, 4], "x": 10.5, "y": 1},
+ {"matrix": [6, 3], "x": 11.5, "y": 1},
+ {"matrix": [6, 2], "x": 12.5, "y": 1},
+ {"matrix": [6, 1], "x": 13.5, "y": 1},
+ {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [7, 6], "x": 7.75, "y": 2},
+ {"matrix": [7, 5], "x": 8.75, "y": 2},
+ {"matrix": [7, 4], "x": 9.75, "y": 2},
+ {"matrix": [7, 3], "x": 10.75, "y": 2},
+ {"matrix": [7, 2], "x": 11.75, "y": 2},
+ {"matrix": [7, 1], "x": 12.75, "y": 2},
+ {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+
+ {"matrix": [8, 6], "x": 8.25, "y": 3},
+ {"matrix": [8, 5], "x": 9.25, "y": 3},
+ {"matrix": [8, 4], "x": 10.25, "y": 3},
+ {"matrix": [8, 3], "x": 11.25, "y": 3},
+ {"matrix": [8, 2], "x": 12.25, "y": 3},
+ {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 3], "x": 4, "y": 4, "w": 2.75},
+ {"matrix": [4, 4], "x": 6.75, "y": 4},
+
+ {"matrix": [9, 4], "x": 8.75, "y": 4},
+ {"matrix": [9, 3], "x": 9.75, "y": 4, "w": 2.25},
+ {"matrix": [9, 2], "x": 12, "y": 4, "w": 1.5},
+ {"matrix": [9, 0], "x": 14.5, "y": 4, "w": 1.5}
]
}
}
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 @@
-/* Copyright 2018 Michael Pio Mayol <mfmayol@up.edu.ph>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-// readability
-#define XXX KC_NO
-
-/* Split Backspace
- * {R07, XXX, R05, R04, R03, R02, R01, R00}
- *
- * Split Right Shift
- * {R37, R36, R35, R34, R33, R32, R31, XXX}
- *
- * Split Left Shift
- * {L30, L31, L32, L33, L34, L35, L36, XXX}
- *
- * 6-key Bottom-left row
- * {R47, R46, R45, R44, R43, R42, XXX, XXX}
- */
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, \
- L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, R27, \
- L30, L31, L32, L33, L34, L35, L36, R31, R32, R33, R34, R35, R36, R37, \
- L40, L41, L42, L43, L44, R43, R44, R42, R45, R46, R47 \
-) \
-{ \
- {L00, L01, L02, L03, L04, L05, L06, XXX}, \
- {L10, L11, L12, L13, L14, L15, XXX, XXX}, \
- {L20, L21, L22, L23, L24, L25, XXX, XXX}, \
- {L30, L31, L32, L33, L34, L35, L36, XXX}, \
- {L40, L41, L42, L43, L44, XXX, XXX, XXX}, \
- {R07, R06, R05, R04, R03, R02, R01, R00}, \
- {R17, R16, R15, R14, R13, R12, R11, R10}, \
- {R27, R26, R25, R24, R23, R22, R21, XXX}, \
- {R37, R36, R35, R34, R33, R32, R31, XXX}, \
- {R47, R46, R45, R44, R43, R42, XXX, XXX}, \
-}
-
-#define LAYOUT_ansi_default( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R07, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, \
- L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, R27, \
- L31, L32, L33, L34, L35, L36, R31, R32, R33, R34, R35, R36, \
- L40, L41, L42, L43, L44, R43, R44, R42, R45, R46, R47 \
-) \
-{ \
- {L00, L01, L02, L03, L04, L05, L06, XXX}, \
- {L10, L11, L12, L13, L14, L15, XXX, XXX}, \
- {L20, L21, L22, L23, L24, L25, XXX, XXX}, \
- {XXX, L31, L32, L33, L34, L35, L36, XXX}, \
- {L40, L41, L42, L43, L44, XXX, XXX, XXX}, \
- {R07, XXX, R05, R04, R03, R02, R01, R00}, \
- {R17, R16, R15, R14, R13, R12, R11, R10}, \
- {R27, R26, R25, R24, R23, R22, R21, XXX}, \
- {XXX, R36, R35, R34, R33, R32, R31, XXX}, \
- {R47, R46, R45, R44, R43, R42, XXX, XXX}, \
-}
-
-#define LAYOUT_ansi_alt( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R07, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, \
- L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, R27, \
- L31, L32, L33, L34, L35, L36, R31, R32, R33, R34, R35, R36, \
- L40, L41, L42, L43, L44, R43, R44, R45, R46, R47 \
-) \
-{ \
- {L00, L01, L02, L03, L04, L05, L06, XXX}, \
- {L10, L11, L12, L13, L14, L15, XXX, XXX}, \
- {L20, L21, L22, L23, L24, L25, XXX, XXX}, \
- {XXX, L31, L32, L33, L34, L35, L36, XXX}, \
- {L40, L41, L42, L43, L44, XXX, XXX, XXX}, \
- {R07, XXX, R05, R04, R03, R02, R01, R00}, \
- {R17, R16, R15, R14, R13, R12, R11, R10}, \
- {R27, R26, R25, R24, R23, R22, R21, XXX}, \
- {XXX, R36, R35, R34, R33, R32, R31, XXX}, \
- {R47, R46, R45, R44, R43, XXX, XXX, XXX}, \
-}
-
-#define LAYOUT_iso_default( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R07, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, \
- L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, R17, R27, \
- L30, L31, L32, L33, L34, L35, L36, R31, R32, R33, R34, R35, R36, \
- L40, L41, L42, L43, L44, R43, R44, R42, R45, R46, R47 \
-) \
-{ \
- {L00, L01, L02, L03, L04, L05, L06, XXX}, \
- {L10, L11, L12, L13, L14, L15, XXX, XXX}, \
- {L20, L21, L22, L23, L24, L25, XXX, XXX}, \
- {L30, L31, L32, L33, L34, L35, L36, XXX}, \
- {L40, L41, L42, L43, L44, XXX, XXX, XXX}, \
- {R07, XXX, R05, R04, R03, R02, R01, R00}, \
- {R17, R16, R15, R14, R13, R12, R11, R10}, \
- {R27, R26, R25, R24, R23, R22, R21, XXX}, \
- {XXX, R36, R35, R34, R33, R32, R31, XXX}, \
- {R47, R46, R45, R44, R43, R42, XXX, XXX}, \
-}
-
-#define LAYOUT_iso_alt( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R07, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, \
- L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, R17, R27, \
- L30, L31, L32, L33, L34, L35, L36, R31, R32, R33, R34, R35, R36, \
- L40, L41, L42, L43, L44, R43, R44, R45, R46, R47 \
-) \
-{ \
- {L00, L01, L02, L03, L04, L05, L06, XXX}, \
- {L10, L11, L12, L13, L14, L15, XXX, XXX}, \
- {L20, L21, L22, L23, L24, L25, XXX, XXX}, \
- {L30, L31, L32, L33, L34, L35, L36, XXX}, \
- {L40, L41, L42, L43, L44, XXX, XXX, XXX}, \
- {R07, XXX, R05, R04, R03, R02, R01, R00}, \
- {R17, R16, R15, R14, R13, R12, R11, R10}, \
- {R27, R26, R25, R24, R23, R22, R21, XXX}, \
- {XXX, R36, R35, R34, R33, R32, R31, XXX}, \
- {R47, R46, R45, R44, R43, XXX, XXX, XXX}, \
-}
-
-#define LAYOUT_hhkb_default( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, \
- L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, R27, \
- L31, L32, L33, L34, L35, L36, R31, R32, R33, R34, R35, R36, R37, \
- L41, L42, L43, L44, R43, R44, R45, R46 \
-) \
-{ \
- {L00, L01, L02, L03, L04, L05, L06, XXX}, \
- {L10, L11, L12, L13, L14, L15, XXX, XXX}, \
- {L20, L21, L22, L23, L24, L25, XXX, XXX}, \
- {XXX, L31, L32, L33, L34, L35, L36, XXX}, \
- {XXX, L41, L42, L43, L44, XXX, XXX, XXX}, \
- {R07, R06, R05, R04, R03, R02, R01, R00}, \
- {R17, R16, R15, R14, R13, R12, R11, R10}, \
- {R27, R26, R25, R24, R23, R22, R21, XXX}, \
- {R37, R36, R35, R34, R33, R32, R31, XXX}, \
- {XXX, R46, R45, R44, R43, XXX, XXX, XXX}, \
-}
-
-#define LAYOUT_hhkb_split_lshift( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, \
- L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, R27, \
- L30, L31, L32, L33, L34, L35, L36, R31, R32, R33, R34, R35, R36, R37, \
- L41, L42, L43, L44, R43, R44, R45, R46 \
-) \
-{ \
- {L00, L01, L02, L03, L04, L05, L06, XXX}, \
- {L10, L11, L12, L13, L14, L15, XXX, XXX}, \
- {L20, L21, L22, L23, L24, L25, XXX, XXX}, \
- {L30, L31, L32, L33, L34, L35, L36, XXX}, \
- {XXX, L41, L42, L43, L44, XXX, XXX, XXX}, \
- {R07, R06, R05, R04, R03, R02, R01, R00}, \
- {R17, R16, R15, R14, R13, R12, R11, R10}, \
- {R27, R26, R25, R24, R23, R22, R21, XXX}, \
- {R37, R36, R35, R34, R33, R32, R31, XXX}, \
- {XXX, R46, R45, R44, R43, XXX, XXX, XXX}, \
-}
-
-#define LAYOUT_wkl_default( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R07, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, \
- L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, R27, \
- L31, L32, L33, L34, L35, L36, R31, R32, R33, R34, R35, R36, \
- L40, L42, L43, L44, R43, R44, R45, R47 \
-) \
-{ \
- {L00, L01, L02, L03, L04, L05, L06, XXX}, \
- {L10, L11, L12, L13, L14, L15, XXX, XXX}, \
- {L20, L21, L22, L23, L24, L25, XXX, XXX}, \
- {XXX, L31, L32, L33, L34, L35, L36, XXX}, \
- {L40, XXX, L42, L43, L44, XXX, XXX, XXX}, \
- {R07, XXX, R05, R04, R03, R02, R01, R00}, \
- {R17, R16, R15, R14, R13, R12, R11, R10}, \
- {R27, R26, R25, R24, R23, R22, R21, XXX}, \
- {XXX, R36, R35, R34, R33, R32, R31, XXX}, \
- {R47, XXX, R45, R44, R43, XXX, XXX, XXX}, \
-}
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 @@
},
"layouts": {
"LAYOUT": {
- "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}]
+ "layout": [
+ {"matrix": [1, 0], "x": 0, "y": 0},
+
+ {"matrix": [1, 11], "x": 2, "y": 0},
+ {"matrix": [2, 11], "x": 3, "y": 0},
+ {"matrix": [2, 7], "x": 4, "y": 0},
+ {"matrix": [1, 7], "x": 5, "y": 0},
+
+ {"matrix": [1, 5], "x": 6.5, "y": 0},
+ {"matrix": [2, 5], "x": 7.5, "y": 0},
+ {"matrix": [1, 4], "x": 8.5, "y": 0},
+ {"matrix": [1, 3], "x": 9.5, "y": 0},
+
+ {"matrix": [2, 4], "x": 11, "y": 0},
+ {"matrix": [3, 5], "x": 12, "y": 0},
+ {"matrix": [2, 6], "x": 13, "y": 0},
+ {"matrix": [1, 6], "x": 14, "y": 0},
+
+ {"matrix": [1, 12], "x": 15.25, "y": 0},
+ {"matrix": [2, 12], "x": 16.25, "y": 0},
+ {"matrix": [1, 13], "x": 17.25, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1.5},
+ {"matrix": [3, 0], "x": 1, "y": 1.5},
+ {"matrix": [3, 11], "x": 2, "y": 1.5},
+ {"matrix": [3, 7], "x": 3, "y": 1.5},
+ {"matrix": [2, 1], "x": 4, "y": 1.5},
+ {"matrix": [1, 1], "x": 5, "y": 1.5},
+ {"matrix": [1, 2], "x": 6, "y": 1.5},
+ {"matrix": [2, 2], "x": 7, "y": 1.5},
+ {"matrix": [4, 5], "x": 8, "y": 1.5},
+ {"matrix": [3, 4], "x": 9, "y": 1.5},
+ {"matrix": [2, 3], "x": 10, "y": 1.5},
+ {"matrix": [3, 3], "x": 11, "y": 1.5},
+ {"matrix": [4, 4], "x": 12, "y": 1.5},
+ {"matrix": [0, 6], "x": 13, "y": 1.5},
+ {"matrix": [4, 6], "x": 14, "y": 1.5},
+
+ {"matrix": [3, 6], "x": 15.25, "y": 1.5},
+ {"matrix": [3, 12], "x": 16.25, "y": 1.5},
+ {"matrix": [3, 13], "x": 17.25, "y": 1.5},
+
+ {"matrix": [2, 13], "x": 18.5, "y": 1.5},
+ {"matrix": [3, 14], "x": 19.5, "y": 1.5},
+ {"matrix": [4, 14], "x": 20.5, "y": 1.5},
+ {"matrix": [3, 15], "x": 21.5, "y": 1.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [0, 0], "x": 1.5, "y": 2.5},
+ {"matrix": [4, 11], "x": 2.5, "y": 2.5},
+ {"matrix": [4, 7], "x": 3.5, "y": 2.5},
+ {"matrix": [4, 1], "x": 4.5, "y": 2.5},
+ {"matrix": [3, 1], "x": 5.5, "y": 2.5},
+ {"matrix": [3, 2], "x": 6.5, "y": 2.5},
+ {"matrix": [4, 2], "x": 7.5, "y": 2.5},
+ {"matrix": [5, 5], "x": 8.5, "y": 2.5},
+ {"matrix": [0, 4], "x": 9.5, "y": 2.5},
+ {"matrix": [4, 3], "x": 10.5, "y": 2.5},
+ {"matrix": [0, 3], "x": 11.5, "y": 2.5},
+ {"matrix": [5, 4], "x": 12.5, "y": 2.5},
+ {"matrix": [0, 7], "x": 13.5, "y": 2.5, "w": 1.5, "h": 2},
+
+ {"matrix": [0, 5], "x": 15.25, "y": 2.5},
+ {"matrix": [4, 12], "x": 16.25, "y": 2.5},
+ {"matrix": [0, 12], "x": 17.25, "y": 2.5},
+
+ {"matrix": [0, 13], "x": 18.5, "y": 2.5},
+ {"matrix": [4, 13], "x": 19.5, "y": 2.5},
+ {"matrix": [0, 14], "x": 20.5, "y": 2.5},
+ {"matrix": [4, 15], "x": 21.5, "y": 2.5, "h": 2},
+
+ {"matrix": [7, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [5, 0], "x": 1.75, "y": 3.5},
+ {"matrix": [0, 11], "x": 2.75, "y": 3.5},
+ {"matrix": [6, 7], "x": 3.75, "y": 3.5},
+ {"matrix": [5, 1], "x": 4.75, "y": 3.5},
+ {"matrix": [0, 1], "x": 5.75, "y": 3.5},
+ {"matrix": [0, 2], "x": 6.75, "y": 3.5},
+ {"matrix": [5, 2], "x": 7.75, "y": 3.5},
+ {"matrix": [6, 5], "x": 8.75, "y": 3.5},
+ {"matrix": [6, 4], "x": 9.75, "y": 3.5},
+ {"matrix": [5, 3], "x": 10.75, "y": 3.5},
+ {"matrix": [6, 3], "x": 11.75, "y": 3.5},
+
+ {"matrix": [5, 12], "x": 18.5, "y": 3.5},
+ {"matrix": [5, 13], "x": 19.5, "y": 3.5},
+ {"matrix": [5, 14], "x": 20.5, "y": 3.5},
+
+ {"matrix": [7, 10], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [6, 11], "x": 2.25, "y": 4.5},
+ {"matrix": [5, 11], "x": 3.25, "y": 4.5},
+ {"matrix": [7, 7], "x": 4.25, "y": 4.5},
+ {"matrix": [7, 1], "x": 5.25, "y": 4.5},
+ {"matrix": [6, 1], "x": 6.25, "y": 4.5},
+ {"matrix": [6, 2], "x": 7.25, "y": 4.5},
+ {"matrix": [7, 2], "x": 8.25, "y": 4.5},
+ {"matrix": [7, 5], "x": 9.25, "y": 4.5},
+ {"matrix": [7, 4], "x": 10.25, "y": 4.5},
+ {"matrix": [7, 3], "x": 11.25, "y": 4.5},
+ {"matrix": [6, 10], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"matrix": [5, 6], "x": 16.25, "y": 4.5},
+
+ {"matrix": [6, 12], "x": 18.5, "y": 4.5},
+ {"matrix": [6, 13], "x": 19.5, "y": 4.5},
+ {"matrix": [6, 14], "x": 20.5, "y": 4.5},
+ {"matrix": [5, 15], "x": 21.5, "y": 4.5, "h": 2},
+
+ {"matrix": [7, 9], "x": 0, "y": 5.5, "w": 1.5},
+ {"matrix": [7, 8], "x": 2.5, "y": 5.5, "w": 1.5},
+ {"matrix": [7, 11], "x": 4, "y": 5.5, "w": 7},
+ {"matrix": [6, 8], "x": 11, "y": 5.5, "w": 1.5},
+ {"matrix": [6, 9], "x": 13.5, "y": 5.5, "w": 1.5},
+
+ {"matrix": [6, 6], "x": 15.25, "y": 5.5},
+ {"matrix": [7, 6], "x": 16.25, "y": 5.5},
+ {"matrix": [7, 12], "x": 17.25, "y": 5.5},
+
+ {"matrix": [7, 14], "x": 18.5, "y": 5.5, "w": 2},
+ {"matrix": [7, 15], "x": 20.5, "y": 5.5}
+ ]
}
}
}
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 @@
*/
#include QMK_KEYBOARD_H
+#define LAYOUT_debug( \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
+ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \
+ K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, \
+ K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F, \
+ K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K6F, \
+ K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, K7D, K7E, K7F \
+) { \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
+ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
+ { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
+ { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F }, \
+ { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K6F }, \
+ { K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, K7D, K7E, K7F } \
+}
+
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base */
[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 @@
-/* Copyright 2023 DmNosachev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* readability */
-#define XXX KC_NO
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT( \
- K10, K1B, K2B, K27, K17, K15, K25, K14, K13, K24, K35, K26, K16, K1C, K2C, K1D, \
- K20, K30, K3B, K37, K21, K11, K12, K22, K45, K34, K23, K33, K44, K06, K46, K36, K3C, K3D, K2D, K3E, K4E, K3F, \
- K40, K00, K4B, K47, K41, K31, K32, K42, K55, K04, K43, K03, K54, K07, K05, K4C, K0C, K0D, K4D, K0E, K4F, \
- K70, K50, K0B, K67, K51, K01, K02, K52, K65, K64, K53, K63, K5C, K5D, K5E, \
- K7A, K6B, K5B, K77, K71, K61, K62, K72, K75, K74, K73, K6A, K56, K6C, K6D, K6E, K5F, \
- K79, K78, K7B, K68, K69, K66, K76, K7C, K7E, K7F \
-) \
-{ \
-/* 0 */ { K00, K01, K02, K03, K04, K05, K06, K07, XXX, XXX, XXX, K0B, K0C, K0D, K0E, XXX }, \
-/* 1 */ { K10, K11, K12, K13, K14, K15, K16, K17, XXX, XXX, XXX, K1B, K1C, K1D, XXX, XXX }, \
-/* 2 */ { K20, K21, K22, K23, K24, K25, K26, K27, XXX, XXX, XXX, K2B, K2C, K2D, XXX, XXX }, \
-/* 3 */ { K30, K31, K32, K33, K34, K35, K36, K37, XXX, XXX, XXX, K3B, K3C, K3D, K3E, K3F }, \
-/* 4 */ { K40, K41, K42, K43, K44, K45, K46, K47, XXX, XXX, XXX, K4B, K4C, K4D, K4E, K4F }, \
-/* 5 */ { K50, K51, K52, K53, K54, K55, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F }, \
-/* 6 */ { XXX, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, XXX }, \
-/* 7 */ { K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, XXX, K7E, K7F } \
-}
-/* 0 1 2 3 4 5 6 7 8 9 A B C D E F */
-
-#define LAYOUT_debug( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \
- K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, \
- K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F, \
- K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K6F, \
- K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, K7D, K7E, K7F \
-) \
-{ \
-/* 0 */ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-/* 1 */ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-/* 2 */ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
-/* 3 */ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
-/* 4 */ { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
-/* 5 */ { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F }, \
-/* 6 */ { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K6F }, \
-/* 7 */ { K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, K7D, K7E, K7F } \
-}
-/* 0 1 2 3 4 5 6 7 8 9 A B C D E F */
-
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 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"F11", "x":0, "y":0},
- {"label":"F12", "x":1.25, "y":0},
- {"label":"F1", "x":2.75, "y":0, "w":1.25},
- {"label":"F2", "x":4, "y":0, "w":1.25},
- {"label":"F3", "x":5.25, "y":0, "w":1.25},
- {"label":"F4", "x":6.5, "y":0, "w":1.25},
- {"label":"F5", "x":7.75, "y":0, "w":1.25},
- {"label":"F6", "x":9.25, "y":0, "w":1.25},
- {"label":"F7", "x":10.5, "y":0, "w":1.25},
- {"label":"F8", "x":11.75, "y":0, "w":1.25},
- {"label":"F9", "x":13, "y":0, "w":1.25},
- {"label":"F10", "x":14.25, "y":0, "w":1.25},
- {"label":"PgUp", "x":16, "y":0},
- {"label":"PgDn", "x":17, "y":0},
- {"label":"LOCK", "x":18.5, "y":0.5},
-
- {"label":"Esc", "x":0, "y":1.5, "w":1.25},
- {"label":"!", "x":1.25, "y":1.5},
- {"label":"@", "x":2.25, "y":1.5},
- {"label":"#", "x":3.25, "y":1.5},
- {"label":"$", "x":4.25, "y":1.5},
- {"label":"%", "x":5.25, "y":1.5},
- {"label":"^", "x":6.25, "y":1.5},
- {"label":"&", "x":7.25, "y":1.5},
- {"label":"*", "x":8.25, "y":1.5},
- {"label":"(", "x":9.25, "y":1.5},
- {"label":")", "x":10.25, "y":1.5},
- {"label":"_", "x":11.25, "y":1.5},
- {"label":"+", "x":12.25, "y":1.5},
- {"label":"~", "x":13.25, "y":1.5},
- {"label":"BksSpc", "x":14.25, "y":1.5, "w":1.25},
- {"label":"Home", "x":16, "y":1},
- {"label":"End", "x":17, "y":1},
- {"label":"/", "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.75, "y":2.5, "w":1.75, "h":2},
- {"label":"Ins", "x":16, "y":2},
- {"label":"Del", "x":17, "y":2},
- {"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},
-
- {"label":"Ctrl", "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":"|", "x":12.75, "y":3.5},
- {"label":"Up", "x":16, "y":3.5, "w":2},
- {"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":".", "x":21.5, "y":3.5},
-
- {"label":"Shift", "x":0, "y":4.5, "w":2.5},
- {"label":"Z", "x":2.5, "y":4.5},
- {"label":"X", "x":3.5, "y":4.5},
- {"label":"C", "x":4.5, "y":4.5},
- {"label":"V", "x":5.5, "y":4.5},
- {"label":"B", "x":6.5, "y":4.5},
- {"label":"N", "x":7.5, "y":4.5},
- {"label":"M", "x":8.5, "y":4.5},
- {"label":"<", "x":9.5, "y":4.5},
- {"label":">", "x":10.5, "y":4.5},
- {"label":"?", "x":11.5, "y":4.5},
- {"label":"MUS", "x":12.5, "y":4.5},
- {"label":"Shift", "x":13.5, "y":4.5, "w":2},
- {"label":"Left", "x":16, "y":4.5},
- {"label":"Right", "x":17, "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":"<", "x":21.5, "y":4.5},
-
- {"label":"Caps", "x":0, "y":5.5},
- {"label":"Alt", "x":1, "y":5.5},
- {"label":"App", "x":2, "y":5.5, "w":1.25},
- {"label":"GUI", "x":3.25, "y":5.5, "w":1.5},
- {"label":"Space", "x":4.75, "y":5.5, "w":2.25},
- {"label":"Space", "x":7, "y":5.5, "w":2.25},
- {"label":"Enter", "x":9.25, "y":5.5, "w":3},
- {"label":"Ctrl", "x":12.25, "y":5.5, "w":1.5},
- {"label":"Alt", "x":14.5, "y":5.5},
- {"label":"Down", "x":16, "y":5.5, "w":2},
- {"label":"0", "x":18.5, "y":5.5},
- {"label":"000", "x":19.5, "y":5.5},
- {"label":"Enter", "x":20.5, "y":5.5, "w":2},
- {"label":"Fn", "x":5.75, "y":6.5, "w":1.25},
- {"label":"BkSpc", "x":7, "y":6.5, "w":1.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+
+ {"matrix": [0, 2], "x": 2.75, "y": 0, "w": 1.25},
+ {"matrix": [0, 3], "x": 4, "y": 0, "w": 1.25},
+ {"matrix": [0, 4], "x": 5.25, "y": 0, "w": 1.25},
+ {"matrix": [0, 5], "x": 6.5, "y": 0, "w": 1.25},
+ {"matrix": [0, 6], "x": 7.75, "y": 0, "w": 1.25},
+
+ {"matrix": [0, 7], "x": 9.25, "y": 0, "w": 1.25},
+ {"matrix": [1, 0], "x": 10.5, "y": 0, "w": 1.25},
+ {"matrix": [1, 1], "x": 11.75, "y": 0, "w": 1.25},
+ {"matrix": [1, 2], "x": 13, "y": 0, "w": 1.25},
+ {"matrix": [1, 3], "x": 14.25, "y": 0, "w": 1.25},
+
+ {"matrix": [9, 7], "x": 16, "y": 0},
+ {"matrix": [10, 0], "x": 17, "y": 0},
+
+ {"matrix": [13, 6], "x": 18.5, "y": 0.5},
+
+ {"matrix": [1, 4], "x": 0, "y": 1.5, "w": 1.25},
+ {"matrix": [1, 5], "x": 1.25, "y": 1.5},
+ {"matrix": [1, 6], "x": 2.25, "y": 1.5},
+ {"matrix": [1, 7], "x": 3.25, "y": 1.5},
+ {"matrix": [2, 0], "x": 4.25, "y": 1.5},
+ {"matrix": [2, 1], "x": 5.25, "y": 1.5},
+ {"matrix": [2, 2], "x": 6.25, "y": 1.5},
+ {"matrix": [2, 3], "x": 7.25, "y": 1.5},
+ {"matrix": [2, 4], "x": 8.25, "y": 1.5},
+ {"matrix": [2, 5], "x": 9.25, "y": 1.5},
+ {"matrix": [2, 6], "x": 10.25, "y": 1.5},
+ {"matrix": [2, 7], "x": 11.25, "y": 1.5},
+ {"matrix": [3, 0], "x": 12.25, "y": 1.5},
+ {"matrix": [3, 1], "x": 13.25, "y": 1.5},
+ {"matrix": [7, 4], "x": 14.25, "y": 1.5, "w": 1.25},
+
+ {"matrix": [10, 1], "x": 16, "y": 1},
+ {"matrix": [10, 2], "x": 17, "y": 1},
+
+ {"matrix": [12, 0], "x": 18.5, "y": 1.5},
+ {"matrix": [13, 0], "x": 19.5, "y": 1.5},
+ {"matrix": [14, 0], "x": 20.5, "y": 1.5},
+ {"matrix": [12, 1], "x": 21.5, "y": 1.5},
+
+ {"matrix": [7, 5], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [3, 2], "x": 1.5, "y": 2.5},
+ {"matrix": [3, 3], "x": 2.5, "y": 2.5},
+ {"matrix": [3, 4], "x": 3.5, "y": 2.5},
+ {"matrix": [3, 5], "x": 4.5, "y": 2.5},
+ {"matrix": [3, 6], "x": 5.5, "y": 2.5},
+ {"matrix": [3, 7], "x": 6.5, "y": 2.5},
+ {"matrix": [4, 0], "x": 7.5, "y": 2.5},
+ {"matrix": [4, 1], "x": 8.5, "y": 2.5},
+ {"matrix": [4, 2], "x": 9.5, "y": 2.5},
+ {"matrix": [4, 3], "x": 10.5, "y": 2.5},
+ {"matrix": [4, 4], "x": 11.5, "y": 2.5},
+ {"matrix": [4, 5], "x": 12.5, "y": 2.5},
+ {"matrix": [7, 6], "x": 13.75, "y": 2.5, "w": 1.75, "h": 2},
+
+ {"matrix": [10, 3], "x": 16, "y": 2},
+ {"matrix": [10, 4], "x": 17, "y": 2},
+
+ {"matrix": [13, 1], "x": 18.5, "y": 2.5},
+ {"matrix": [14, 1], "x": 19.5, "y": 2.5},
+ {"matrix": [12, 2], "x": 20.5, "y": 2.5},
+ {"matrix": [13, 2], "x": 21.5, "y": 2.5},
+
+ {"matrix": [7, 7], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [4, 7], "x": 1.75, "y": 3.5},
+ {"matrix": [5, 0], "x": 2.75, "y": 3.5},
+ {"matrix": [5, 1], "x": 3.75, "y": 3.5},
+ {"matrix": [5, 2], "x": 4.75, "y": 3.5},
+ {"matrix": [5, 3], "x": 5.75, "y": 3.5},
+ {"matrix": [5, 4], "x": 6.75, "y": 3.5},
+ {"matrix": [5, 5], "x": 7.75, "y": 3.5},
+ {"matrix": [5, 6], "x": 8.75, "y": 3.5},
+ {"matrix": [5, 7], "x": 9.75, "y": 3.5},
+ {"matrix": [6, 0], "x": 10.75, "y": 3.5},
+ {"matrix": [8, 0], "x": 11.75, "y": 3.5},
+ {"matrix": [8, 1], "x": 12.75, "y": 3.5},
+
+ {"matrix": [11, 0], "x": 16, "y": 3.5, "w": 2},
+
+ {"matrix": [14, 2], "x": 18.5, "y": 3.5},
+ {"matrix": [12, 3], "x": 19.5, "y": 3.5},
+ {"matrix": [13, 3], "x": 20.5, "y": 3.5},
+ {"matrix": [14, 3], "x": 21.5, "y": 3.5},
+
+ {"matrix": [8, 2], "x": 0, "y": 4.5, "w": 2.5},
+ {"matrix": [6, 1], "x": 2.5, "y": 4.5},
+ {"matrix": [6, 2], "x": 3.5, "y": 4.5},
+ {"matrix": [6, 3], "x": 4.5, "y": 4.5},
+ {"matrix": [6, 4], "x": 5.5, "y": 4.5},
+ {"matrix": [6, 5], "x": 6.5, "y": 4.5},
+ {"matrix": [6, 6], "x": 7.5, "y": 4.5},
+ {"matrix": [6, 7], "x": 8.5, "y": 4.5},
+ {"matrix": [7, 0], "x": 9.5, "y": 4.5},
+ {"matrix": [7, 1], "x": 10.5, "y": 4.5},
+ {"matrix": [7, 2], "x": 11.5, "y": 4.5},
+ {"matrix": [7, 3], "x": 12.5, "y": 4.5},
+ {"matrix": [8, 3], "x": 13.5, "y": 4.5, "w": 2},
+
+ {"matrix": [11, 1], "x": 16, "y": 4.5},
+ {"matrix": [11, 2], "x": 17, "y": 4.5},
+
+ {"matrix": [12, 4], "x": 18.5, "y": 4.5},
+ {"matrix": [13, 4], "x": 19.5, "y": 4.5},
+ {"matrix": [14, 4], "x": 20.5, "y": 4.5},
+ {"matrix": [12, 5], "x": 21.5, "y": 4.5},
+
+ {"matrix": [8, 4], "x": 0, "y": 5.5},
+ {"matrix": [8, 5], "x": 1, "y": 5.5},
+ {"matrix": [8, 6], "x": 2, "y": 5.5, "w": 1.25},
+ {"matrix": [8, 7], "x": 3.25, "y": 5.5, "w": 1.5},
+ {"matrix": [9, 0], "x": 4.75, "y": 5.5, "w": 2.25},
+ {"matrix": [9, 1], "x": 7, "y": 5.5, "w": 2.25},
+ {"matrix": [9, 2], "x": 9.25, "y": 5.5, "w": 3},
+ {"matrix": [9, 3], "x": 12.25, "y": 5.5, "w": 1.5},
+ {"matrix": [9, 4], "x": 14.5, "y": 5.5},
+
+ {"matrix": [11, 3], "x": 16, "y": 5.5, "w": 2},
+
+ {"matrix": [13, 5], "x": 18.5, "y": 5.5},
+ {"matrix": [14, 5], "x": 19.5, "y": 5.5},
+ {"matrix": [12, 6], "x": 20.5, "y": 5.5, "w": 2},
+
+ {"matrix": [9, 5], "x": 5.75, "y": 6.5, "w": 1.25},
+ {"matrix": [9, 6], "x": 7, "y": 6.5, "w": 1.25}
]
}
}
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 @@
*/
#include QMK_KEYBOARD_H
+#define LAYOUT_debug( \
+ K00, K01, K02, K03, K04, K05, K06, K07, \
+ K10, K11, K12, K13, K14, K15, K16, K17, \
+ K20, K21, K22, K23, K24, K25, K26, K27, \
+ K30, K31, K32, K33, K34, K35, K36, K37, \
+ K40, K41, K42, K43, K44, K45, K46, K47, \
+ K50, K51, K52, K53, K54, K55, K56, K57, \
+ K60, K61, K62, K63, K64, K65, K66, K67, \
+ K70, K71, K72, K73, K74, K75, K76, K77, \
+ K80, K81, K82, K83, K84, K85, K86, K87, \
+ K90, K91, K92, K93, K94, K95, K96, K97, \
+ KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7, \
+ KB0, KB1, KB2, KB3, KB4, KB5, KB6, KB7, \
+ KC0, KC1, KC2, KC3, KC4, KC5, KC6, KC7, \
+ KD0, KD1, KD2, KD3, KD4, KD5, KD6, KD7, \
+ KE0, KE1, KE2, KE3, KE4, KE5, KE6, KE7 \
+) { \
+ { K00, K01, K02, K03, K04, K05, K06, K07 }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17 }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27 }, \
+ { K30, K31, K32, K33, K34, K35, K36, K37 }, \
+ { K40, K41, K42, K43, K44, K45, K46, K47 }, \
+ { K50, K51, K52, K53, K54, K55, K56, K57 }, \
+ { K60, K61, K62, K63, K64, K65, K66, K67 }, \
+ { K70, K71, K72, K73, K74, K75, K76, K77 }, \
+ { K80, K81, K82, K83, K84, K85, K86, K87 }, \
+ { K90, K91, K92, K93, K94, K95, K96, K97 }, \
+ { KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7 }, \
+ { KB0, KB1, KB2, KB3, KB4, KB5, KB6, KB7 }, \
+ { KC0, KC1, KC2, KC3, KC4, KC5, KC6, KC7 }, \
+ { KD0, KD1, KD2, KD3, KD4, KD5, KD6, KD7 }, \
+ { KE0, KE1, KE2, KE3, KE4, KE5, KE6, KE7 } \
+}
+
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base */
[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 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "sono1.h"
+#include "quantum.h"
void matrix_init_kb(void) {
/* 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 @@
-/* Copyright 2020 DmNosachev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-/*
-,---------------------------------------------------------------------------------------------------------, ,-----,
-| < | |NumLk| | f1 | f2 | f3 | f4 | f5 | | f6 | f7 | f8 | f9 | f10 | |RlUp |RlDn | |CurLk|
-|-------------------------------------------------------------------------------------------| |-----------| |-----|-----------------,
-| Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | = - | ^ | ^ | BS | |Home |Help | | * | / | - | + |
-|-------------------------------------------------------------------------------------------| |-----------| |-----------------------|
-| Tab | Q | W | E | R | T | Y | U | I | O | P | ~@ | {[ | Return | | Ins | Del | | 7 | 8 | 9 | = |
-|--------------------------------------------------------------------------------| | `-----------' |-----------------------|
-| Ctrl | A | S | D | F | G | H | J | K | L | +; | *: | }] | | | Up | | 4 | 5 | 6 | . |
-|--------------------------------------------------------------------------------`----------' |-----------| |-----------------------|
-| Shift | Z | X | C | V | B | N | M | , | . | ?/ | -- | Shift | |Left |Right| | 1 | 2 | 3 | , |
-|-------------------------------------------------------------------------------------------| |-----------| |-----------------------|
-|Caps | Opt |Kana | Cmd | Space1 | Space2 | Space3 | Enter | | Alt | | Down | | 0 | 000 | Enter |
-`-------------------------------------------------------------------------------------------' `-----------' '-----------------------'
- |Thumb1|Thumb2|
- `-------------'
-*/
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K10, K11, K12, K13, K97, KA0, KD6, \
- K14, K15, K16, K17, K20, K21, K22, K23, K24, K25, K26, K27, K30, K31, K74, KA1, KA2, KC0, KD0, KE0, KC1, \
- K75, K32, K33, K34, K35, K36, K37, K40, K41, K42, K43, K44, K45, K76, KA3, KA4, KD1, KE1, KC2, KD2, \
- K77, K47, K50, K51, K52, K53, K54, K55, K56, K57, K60, K80, K81, KB0, KE2, KC3, KD3, KE3, \
- K82, K61, K62, K63, K64, K65, K66, K67, K70, K71, K72, K73, K83, KB1, KB2, KC4, KD4, KE4, KC5,\
- K84, K85, K86, K87, K90, K91, K92, K93, K94, KB3, KD5, KE5, KC6, \
- K95, K96 \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27 }, \
- { K30, K31, K32, K33, K34, K35, K36, K37 }, \
- { K40, K41, K42, K43, K44, K45, XXX, K47 }, \
- { K50, K51, K52, K53, K54, K55, K56, K57 }, \
- { K60, K61, K62, K63, K64, K65, K66, K67 }, \
- { K70, K71, K72, K73, K74, K75, K76, K77 }, \
- { K80, K81, K82, K83, K84, K85, K86, K87 }, \
- { K90, K91, K92, K93, K94, K95, K96, K97 }, \
- { KA0, KA1, KA2, KA3, KA4, XXX, XXX, XXX }, \
- { KB0, KB1, KB2, KB3, XXX, XXX, XXX, XXX }, \
- { KC0, KC1, KC2, KC3, KC4, KC5, KC6, XXX }, \
- { KD0, KD1, KD2, KD3, KD4, KD5, KD6, XXX }, \
- { KE0, KE1, KE2, KE3, KE4, KE5, XXX, XXX } \
-}
-
-#define LAYOUT_debug( \
- K00, K01, K02, K03, K04, K05, K06, K07, \
- K10, K11, K12, K13, K14, K15, K16, K17, \
- K20, K21, K22, K23, K24, K25, K26, K27, \
- K30, K31, K32, K33, K34, K35, K36, K37, \
- K40, K41, K42, K43, K44, K45, K46, K47, \
- K50, K51, K52, K53, K54, K55, K56, K57, \
- K60, K61, K62, K63, K64, K65, K66, K67, \
- K70, K71, K72, K73, K74, K75, K76, K77, \
- K80, K81, K82, K83, K84, K85, K86, K87, \
- K90, K91, K92, K93, K94, K95, K96, K97, \
- KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7, \
- KB0, KB1, KB2, KB3, KB4, KB5, KB6, KB7, \
- KC0, KC1, KC2, KC3, KC4, KC5, KC6, KC7, \
- KD0, KD1, KD2, KD3, KD4, KD5, KD6, KD7, \
- KE0, KE1, KE2, KE3, KE4, KE5, KE6, KE7 \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27 }, \
- { K30, K31, K32, K33, K34, K35, K36, K37 }, \
- { K40, K41, K42, K43, K44, K45, K46, K47 }, \
- { K50, K51, K52, K53, K54, K55, K56, K57 }, \
- { K60, K61, K62, K63, K64, K65, K66, K67 }, \
- { K70, K71, K72, K73, K74, K75, K76, K77 }, \
- { K80, K81, K82, K83, K84, K85, K86, K87 }, \
- { K90, K91, K92, K93, K94, K95, K96, K97 }, \
- { KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7 }, \
- { KB0, KB1, KB2, KB3, KB4, KB5, KB6, KB7 }, \
- { KC0, KC1, KC2, KC3, KC4, KC5, KC6, KC7 }, \
- { KD0, KD1, KD2, KD3, KD4, KD5, KD6, KD7 }, \
- { KE0, KE1, KE2, KE3, KE4, KE5, KE6, KE7 } \
-}
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 @@
-/* Copyright 2019 ENDO Katsuhiro <ka2hiro@kagizaraya.jp>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-// clang-format off
-#define LAYOUT( \
- L01, L02, L03, L04, L05, L06, R01, R02, R03, R04, R05, R06, \
- L07, L08, L09, L10, L11, L12, R07, R08, R09, R10, R11, R12, \
- L13, L14, L15, L16, L17, L18, R13, R14, R15, R16, R17, R18, \
- L19, L20, L21, L22, L23, L24, R19, R20, R21, R22, R23, R24 \
-) { \
- { L01, L02, L03, L04, L05, L06 }, \
- { L07, L08, L09, L10, L11, L12 }, \
- { L13, L14, L15, L16, L17, L18 }, \
- { L19, L20, L21, L22, L23, L24 }, \
- { R01, R02, R03, R04, R05, R06 }, \
- { R07, R08, R09, R10, R11, R12 }, \
- { R13, R14, R15, R16, R17, R18 }, \
- { R19, R20, R21, R22, R23, R24 } \
-}
-
-#define LAYOUT_extended( \
- L01, L02, L03, L04, L05, L06, M01, M02, M03, M04, M05, M06, R01, R02, R03, R04, R05, R06, \
- L07, L08, L09, L10, L11, L12, M07, M08, M09, M10, M11, M12, R07, R08, R09, R10, R11, R12, \
- L13, L14, L15, L16, L17, L18, M13, M14, M15, M16, M17, M18, R13, R14, R15, R16, R17, R18, \
- L19, L20, L21, L22, L23, L24, M19, M20, M21, M22, M23, M24, R19, R20, R21, R22, R23, R24 \
-) { \
- { L01, L02, L03, L04, L05, L06 }, \
- { L07, L08, L09, L10, L11, L12 }, \
- { L13, L14, L15, L16, L17, L18 }, \
- { L19, L20, L21, L22, L23, L24 }, \
- { M01, M02, M03, M04, M05, M06 }, \
- { M07, M08, M09, M10, M11, M12 }, \
- { M13, M14, M15, M16, M17, M18 }, \
- { M19, M20, M21, M22, M23, M24 }, \
- { R01, R02, R03, R04, R05, R06 }, \
- { R07, R08, R09, R10, R11, R12 }, \
- { R13, R14, R15, R16, R17, R18 }, \
- { R19, R20, R21, R22, R23, R24 } \
-}
-// 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 @@
"layouts": {
"LAYOUT": {
"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":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "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":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "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":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2},
- {"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}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [4, 0], "x": 7, "y": 0},
+ {"matrix": [4, 1], "x": 8, "y": 0},
+ {"matrix": [4, 2], "x": 9, "y": 0},
+ {"matrix": [4, 3], "x": 10, "y": 0},
+ {"matrix": [4, 4], "x": 11, "y": 0},
+ {"matrix": [4, 5], "x": 12, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+
+ {"matrix": [5, 0], "x": 7, "y": 1},
+ {"matrix": [5, 1], "x": 8, "y": 1},
+ {"matrix": [5, 2], "x": 9, "y": 1},
+ {"matrix": [5, 3], "x": 10, "y": 1},
+ {"matrix": [5, 4], "x": 11, "y": 1},
+ {"matrix": [5, 5], "x": 12, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+
+ {"matrix": [6, 0], "x": 7, "y": 2},
+ {"matrix": [6, 1], "x": 8, "y": 2},
+ {"matrix": [6, 2], "x": 9, "y": 2},
+ {"matrix": [6, 3], "x": 10, "y": 2},
+ {"matrix": [6, 4], "x": 11, "y": 2},
+ {"matrix": [6, 5], "x": 12, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+
+ {"matrix": [7, 0], "x": 7, "y": 3},
+ {"matrix": [7, 1], "x": 8, "y": 3},
+ {"matrix": [7, 2], "x": 9, "y": 3},
+ {"matrix": [7, 3], "x": 10, "y": 3},
+ {"matrix": [7, 4], "x": 11, "y": 3},
+ {"matrix": [7, 5], "x": 12, "y": 3}
]
},
"LAYOUT_extended": {
"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":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},
- {"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},
- {"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},
- {"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}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [4, 0], "x": 7, "y": 0},
+ {"matrix": [4, 1], "x": 8, "y": 0},
+ {"matrix": [4, 2], "x": 9, "y": 0},
+ {"matrix": [4, 3], "x": 10, "y": 0},
+ {"matrix": [4, 4], "x": 11, "y": 0},
+ {"matrix": [4, 5], "x": 12, "y": 0},
+
+ {"matrix": [8, 0], "x": 14, "y": 0},
+ {"matrix": [8, 1], "x": 15, "y": 0},
+ {"matrix": [8, 2], "x": 16, "y": 0},
+ {"matrix": [8, 3], "x": 17, "y": 0},
+ {"matrix": [8, 4], "x": 18, "y": 0},
+ {"matrix": [8, 5], "x": 19, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+
+ {"matrix": [5, 0], "x": 7, "y": 1},
+ {"matrix": [5, 1], "x": 8, "y": 1},
+ {"matrix": [5, 2], "x": 9, "y": 1},
+ {"matrix": [5, 3], "x": 10, "y": 1},
+ {"matrix": [5, 4], "x": 11, "y": 1},
+ {"matrix": [5, 5], "x": 12, "y": 1},
+
+ {"matrix": [9, 0], "x": 14, "y": 1},
+ {"matrix": [9, 1], "x": 15, "y": 1},
+ {"matrix": [9, 2], "x": 16, "y": 1},
+ {"matrix": [9, 3], "x": 17, "y": 1},
+ {"matrix": [9, 4], "x": 18, "y": 1},
+ {"matrix": [9, 5], "x": 19, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+
+ {"matrix": [6, 0], "x": 7, "y": 2},
+ {"matrix": [6, 1], "x": 8, "y": 2},
+ {"matrix": [6, 2], "x": 9, "y": 2},
+ {"matrix": [6, 3], "x": 10, "y": 2},
+ {"matrix": [6, 4], "x": 11, "y": 2},
+ {"matrix": [6, 5], "x": 12, "y": 2},
+
+ {"matrix": [10, 0], "x": 14, "y": 2},
+ {"matrix": [10, 1], "x": 15, "y": 2},
+ {"matrix": [10, 2], "x": 16, "y": 2},
+ {"matrix": [10, 3], "x": 17, "y": 2},
+ {"matrix": [10, 4], "x": 18, "y": 2},
+ {"matrix": [10, 5], "x": 19, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+
+ {"matrix": [7, 0], "x": 7, "y": 3},
+ {"matrix": [7, 1], "x": 8, "y": 3},
+ {"matrix": [7, 2], "x": 9, "y": 3},
+ {"matrix": [7, 3], "x": 10, "y": 3},
+ {"matrix": [7, 4], "x": 11, "y": 3},
+ {"matrix": [7, 5], "x": 12, "y": 3},
+
+ {"matrix": [11, 0], "x": 14, "y": 3},
+ {"matrix": [11, 1], "x": 15, "y": 3},
+ {"matrix": [11, 2], "x": 16, "y": 3},
+ {"matrix": [11, 3], "x": 17, "y": 3},
+ {"matrix": [11, 4], "x": 18, "y": 3},
+ {"matrix": [11, 5], "x": 19, "y": 3}
]
}
}
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 @@
"layouts": {
"LAYOUT_all": {
"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},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [4, 9], "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},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "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},
- {"x": 13.75, "y": 2, "w": 1.25},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
- {"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},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 12], "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": 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": 13.75, "y": 4, "w": 1.25}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
]
},
"LAYOUT": {
"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},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "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},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "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},
- {"x": 13.75, "y": 2, "w": 1.25},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
- {"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},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "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": 6.25},
- {"x": 14, "y": 0},
- {"x": 10, "y": 4, "w": 1.25},
- {"x": 11.25, "y": 4, "w": 1.25},
- {"x": 12.5, "y": 4, "w": 1.25},
- {"x": 13.75, "y": 4, "w": 1.25}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 14, "y": 0},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
]
},
"LAYOUT_60_ansi": {
"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},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "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},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "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},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "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},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
- {"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": 13.75, "y": 4, "w": 1.25}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
]
}
}
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 @@
-#include "kc60.h"
+#include "quantum.h"
void led_update_ports(led_t led_state) {
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 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* LAYOUT_all
- * ,-----------------------------------------------------------.
- * |00 |01 |02 |03 |04 |05 |06 |07 |08 |09 |0A |0B |0C |0D |49 |
- * |-----------------------------------------------------------| ,-----.
- * |10 |11 |12 |13 |14 |15 |16 |17 |18 |19 |1A |1B |1C |1D | | |
- * |-----------------------------------------------------------| ,---. |
- * |20 |21 |22 |23 |24 |25 |26 |17 |28 |29 |2A |2B |2D | |2C |2D |
- * |-----------------------------------------------------------| `--------'
- * |30 |31 |32 |33 |34 |35 |36 |37 |38 |39 |3A |3B |3D |3C |
- * |-----------------------------------------------------------|
- * |40 |41 |42 | 45 |4A |4B |4C |4D |
- * `-----------------------------------------------------------'
- * 2u Backspace = k0D
- * 2.25u left Shift = k30
- * 2.75u right Shift = k3D
- */
-#define LAYOUT_all( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k49, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3C, \
- k40, k41, k42, k45, k4A, k4B, k4C, k4D \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \
- { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4A, k4B, k4C, k4D } \
-}
-
-/* LAYOUT
- * Present for backwards compatibility with older keymaps. The commit that added
- * split Backspace support put the right 1u key of the split on the bottom row,
- * next to right Alt. The arguments for 1.75/1u right Shift are also in reverse
- * order.
- * ,-----------------------------------------------------------.
- * |00 |01 |02 |03 |04 |05 |06 |07 |08 |09 |0A |0B |0C |0D |49 |
- * |-----------------------------------------------------------| ,-----.
- * |10 |11 |12 |13 |14 |15 |16 |17 |18 |19 |1A |1B |1C |1D | | |
- * |-----------------------------------------------------------| ,---. |
- * |20 |21 |22 |23 |24 |25 |26 |17 |28 |29 |2A |2B |2D | |2C |2D |
- * |-----------------------------------------------------------| `--------'
- * |30 |31 |32 |33 |34 |35 |36 |37 |38 |39 |3A |3B |3D |3C |
- * |-----------------------------------------------------------|
- * |40 |41 |42 | 45 |4A |4B |4C |4D |
- * `-----------------------------------------------------------'
- */
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, \
- k40, k41, k42, k45, k49, k4A, k4B, k4C, k4D \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \
- { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4A, k4B, k4C, k4D } \
-}
-
-/* LAYOUT_60_ansi
- * ,-----------------------------------------------------------.
- * |00 |01 |02 |03 |04 |05 |06 |07 |08 |09 |0A |0B |0C |0D |
- * |-----------------------------------------------------------|
- * |10 |11 |12 |13 |14 |15 |16 |17 |18 |19 |1A |1B |1C |1D |
- * |-----------------------------------------------------------|
- * |20 |21 |22 |23 |24 |25 |26 |17 |28 |29 |2A |2B |2D |
- * |-----------------------------------------------------------|
- * |30 |32 |33 |34 |35 |36 |37 |38 |39 |3A |3B |3D |
- * |-----------------------------------------------------------|
- * |40 |41 |42 | 45 |4A |4B |4C |4D |
- * `-----------------------------------------------------------'
- */
-#define LAYOUT_60_ansi( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, \
- k40, k41, k42, k45, k4A, k4B, k4C, k4D \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D }, \
- { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D }, \
- { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4A, k4B, k4C, k4D } \
-}
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 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- {"label":"Esc", "x":0, "y":0},{"label":"!", "x":1, "y":0},{"label":"@", "x":2, "y":0},{"label":"#", "x":3, "y":0},{"label":"$", "x":4, "y":0},{"label":"%", "x":5, "y":0},{"label":"^", "x":6, "y":0},{"label":"&", "x":7, "y":0},{"label":"*", "x":8, "y":0},{"label":"(", "x":9, "y":0},{"label":")", "x":10, "y":0},{"label":"_", "x":11, "y":0},{"label":"+", "x":12, "y":0},{"label":"|", "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":"#", "x":12.75, "y":2},{"label":"Enter", "x":13.75, "y":2, "w":1.25},
- {"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},
- {"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}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [4, 9], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 12], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
]
},
"LAYOUT_60_ansi": {
"layout": [
- {"label":"Esc", "x":0, "y":0},{"label":"!", "x":1, "y":0},{"label":"@", "x":2, "y":0},{"label":"#", "x":3, "y":0},{"label":"$", "x":4, "y":0},{"label":"%", "x":5, "y":0},{"label":"^", "x":6, "y":0},{"label":"&", "x":7, "y":0},{"label":"*", "x":8, "y":0},{"label":"(", "x":9, "y":0},{"label":")", "x":10, "y":0},{"label":"_", "x":11, "y":0},{"label":"+", "x":12, "y":0},{"label":"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":"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},
- {"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":"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}]
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
},
"LAYOUT_60_iso": {
"layout": [
- {"label":"Esc", "x":0, "y":0},{"label":"!", "x":1, "y":0},{"label":"@", "x":2, "y":0},{"label":"#", "x":3, "y":0},{"label":"$", "x":4, "y":0},{"label":"%", "x":5, "y":0},{"label":"^", "x":6, "y":0},{"label":"&", "x":7, "y":0},{"label":"*", "x":8, "y":0},{"label":"(", "x":9, "y":0},{"label":")", "x":10, "y":0},{"label":"_", "x":11, "y":0},{"label":"+", "x":12, "y":0},{"label":"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}
- ]
- },
- "LAYOUT_60_ansi_split_bs_rshift": {
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_ansi_split_bs_rshift": {
"layout": [
- {"label":"Esc~", "x":0, "y":0},{"label":"!", "x":1, "y":0},{"label":"@", "x":2, "y":0},{"label":"#", "x":3, "y":0},{"label":"$", "x":4, "y":0},{"label":"%", "x":5, "y":0},{"label":"^", "x":6, "y":0},{"label":"&", "x":7, "y":0},{"label":"*", "x":8, "y":0},{"label":"(", "x":9, "y":0},{"label":")", "x":10, "y":0},{"label":"_", "x":11, "y":0},{"label":"+", "x":12, "y":0},{"label":"|", "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":"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}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [4, 9], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 12], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
]
},
"LAYOUT_60_iso_split_bs_rshift": {
"layout": [
- {"label":"Esc", "x":0, "y":0},{"label":"!", "x":1, "y":0},{"label":"@", "x":2, "y":0},{"label":"#", "x":3, "y":0},{"label":"$", "x":4, "y":0},{"label":"%", "x":5, "y":0},{"label":"^", "x":6, "y":0},{"label":"&", "x":7, "y":0},{"label":"*", "x":8, "y":0},{"label":"(", "x":9, "y":0},{"label":")", "x":10, "y":0},{"label":"_", "x":11, "y":0},{"label":"+", "x":12, "y":0},{"label":"`", "x":13, "y":0},{"label":"Backspace", "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":"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":1.75},{"label":"Fn", "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":"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}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [4, 9], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 12], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
]
}
}
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 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "kc60se.h"
+#include "quantum.h"
void matrix_init_kb(void){
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 @@
-/* Copyright 2017 Blake C. Lewis
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-// clang-format off
-#define LAYOUT_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K49, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \
- K40, K41, K42, K45, K4A, K4B, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
- { K40, K41, K42, ___, ___, K45, ___, ___, ___, K49, K4A, K4B, K4C, K4D } \
-}
-
-#define LAYOUT_60_ansi( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
- K40, K41, K42, K45, K4A, K4B, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D }, \
- { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D }, \
- { K40, K41, K42, ___, ___, K45, ___, ___, ___, ___, K4A, K4B, K4C, K4D } \
-}
-
-#define LAYOUT_60_ansi_split_bs_rshift( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K49, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \
- K40, K41, K42, K45, K4A, K4B, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D }, \
- { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
- { K40, K41, K42, ___, ___, K45, ___, ___, ___, K49, K4A, K4B, K4C, K4D } \
-}
-#define LAYOUT_60_iso( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
- K40, K41, K42, K45, K4A, K4B, K4C, K4D \
-){ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___ }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D }, \
- { K40, K41, K42, ___, ___, K45, ___, ___, ___, ___, K4A, K4B, K4C, K4D } \
-}
-
-#define LAYOUT_60_iso_split_bs_rshift( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, k49, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \
- K40, K41, K42, K45, K4A, K4B, K4C, K4D \
-){ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___ }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
- { K40, K41, K42, ___, ___, K45, ___, ___, ___, k49, K4A, K4B, K4C, K4D } \
-}
-#define LAYOUT LAYOUT_all
-// 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 @@
-/* Copyright 2020 KnoblesseOblige
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define kxx KC_NO
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3c, \
- k40, k41, k42, k45, k49, k4a, k4b, k4d \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, kxx, k2d }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, kxx, k3c, kxx }, \
- { k40, k41, k42, kxx, kxx, k45, kxx, kxx, kxx, k49, k4a, k4b, kxx, k4d } \
-}
-
-#define LAYOUT_all( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3c, k3d, \
- k40, k41, k42, k45, k49, k4a, k4b, k4c, k4d \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, kxx, k2d }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, kxx, k3c, k3d }, \
- { k40, k41, k42, kxx, kxx, k45, kxx, kxx, kxx, k49, k4a, k4b, k4c, k4d } \
-}
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 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
},
"LAYOUT_all": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 12], "x": 13, "y": 3},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4},
+ {"matrix": [4, 10], "x": 11, "y": 4},
+ {"matrix": [4, 11], "x": 12, "y": 4},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4}
+ ]
}
}
}
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 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"PROG", "x":0, "y":0.4, "h":1.3},
- {"label":"1", "x":1, "y":0.2, "h":1.5},
- {"label":"2", "x":2, "y":0.1, "h":1.1},
- {"label":"3", "x":3, "y":0},
- {"label":"4", "x":4, "y":0.1},
- {"label":"5", "x":5, "y":0.3},
+ {"matrix": [0, 7], "x": 0, "y": 0.4, "h": 1.3},
+ {"matrix": [0, 6], "x": 1, "y": 0.2, "h": 1.5},
+ {"matrix": [0, 5], "x": 2, "y": 0.1, "h": 1.1},
+ {"matrix": [0, 4], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0.1},
+ {"matrix": [0, 2], "x": 5, "y": 0.3},
- {"label":"6", "x":12.5, "y":0.3},
- {"label":"7", "x":13.5, "y":0.1},
- {"label":"8", "x":14.5, "y":0},
- {"label":"9", "x":15.5, "y":0.1, "h":1.1},
- {"label":"0", "x":16.5, "y":0.2, "h":1.5},
- {"label":"NUM", "x":17.5, "y":0.4, "h":1.3},
+ {"matrix": [4, 5], "x": 12.5, "y": 0.3},
+ {"matrix": [4, 4], "x": 13.5, "y": 0.1},
+ {"matrix": [4, 3], "x": 14.5, "y": 0},
+ {"matrix": [4, 2], "x": 15.5, "y": 0.1, "h": 1.1},
+ {"matrix": [4, 1], "x": 16.5, "y": 0.2, "h": 1.5},
+ {"matrix": [4, 0], "x": 17.5, "y": 0.4, "h": 1.3},
- {"label":"GRAVE", "x":0, "y":1.7},
- {"label":"Q", "x":1, "y":1.7},
- {"label":"W", "x":2, "y":1.2},
- {"label":"E", "x":3, "y":1},
- {"label":"R", "x":4, "y":1.1},
- {"label":"T", "x":5, "y":1.3},
- {"label":"LED", "x":6, "y":0.6, "h":1.5},
+ {"matrix": [1, 7], "x": 0, "y": 1.7},
+ {"matrix": [1, 6], "x": 1, "y": 1.7},
+ {"matrix": [1, 5], "x": 2, "y": 1.2},
+ {"matrix": [1, 4], "x": 3, "y": 1},
+ {"matrix": [1, 3], "x": 4, "y": 1.1},
+ {"matrix": [1, 2], "x": 5, "y": 1.3},
+ {"matrix": [0, 1], "x": 6, "y": 0.6, "h": 1.5},
- {"label":"ANY", "x":11.5, "y":0.6, "h":1.5},
- {"label":"Y", "x":12.5, "y":1.3},
- {"label":"U", "x":13.5, "y":1.1},
- {"label":"I", "x":14.5, "y":1},
- {"label":"O", "x":15.5, "y":1.2},
- {"label":"P", "x":16.5, "y":1.7},
- {"label":"EQUAL", "x":17.5, "y":1.7},
+ {"matrix": [4, 6], "x": 11.5, "y": 0.6, "h": 1.5},
+ {"matrix": [5, 5], "x": 12.5, "y": 1.3},
+ {"matrix": [5, 4], "x": 13.5, "y": 1.1},
+ {"matrix": [5, 3], "x": 14.5, "y": 1},
+ {"matrix": [5, 2], "x": 15.5, "y": 1.2},
+ {"matrix": [5, 1], "x": 16.5, "y": 1.7},
+ {"matrix": [5, 0], "x": 17.5, "y": 1.7},
- {"label":"PAGEUP", "x":0, "y":2.7},
- {"label":"A", "x":1, "y":2.7},
- {"label":"S", "x":2, "y":2.2},
- {"label":"D", "x":3, "y":2},
- {"label":"F", "x":4, "y":2.1},
- {"label":"G", "x":5, "y":2.3},
- {"label":"TAB", "x":6, "y":2.1, "h":1.3},
+ {"matrix": [2, 7], "x": 0, "y": 2.7},
+ {"matrix": [2, 6], "x": 1, "y": 2.7},
+ {"matrix": [2, 5], "x": 2, "y": 2.2},
+ {"matrix": [2, 4], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2.1},
+ {"matrix": [2, 2], "x": 5, "y": 2.3},
+ {"matrix": [1, 1], "x": 6, "y": 2.1, "h": 1.3},
- {"label":"ENTER", "x":11.5, "y":2.1, "h":1.3},
- {"label":"H", "x":12.5, "y":2.3},
- {"label":"J", "x":13.5, "y":2.1},
- {"label":"K", "x":14.5, "y":2},
- {"label":"L", "x":15.5, "y":2.2},
- {"label":"SEMICOLON", "x":16.5, "y":2.7},
- {"label":"QUOTE", "x":17.5, "y":2.7},
+ {"matrix": [5, 6], "x": 11.5, "y": 2.1, "h": 1.3},
+ {"matrix": [6, 5], "x": 12.5, "y": 2.3},
+ {"matrix": [6, 4], "x": 13.5, "y": 2.1},
+ {"matrix": [6, 3], "x": 14.5, "y": 2},
+ {"matrix": [6, 2], "x": 15.5, "y": 2.2},
+ {"matrix": [6, 1], "x": 16.5, "y": 2.7},
+ {"matrix": [6, 0], "x": 17.5, "y": 2.7},
- {"label":"PAGEDOWN", "x":0, "y":3.7, "h":1.2},
- {"label":"Z", "x":1, "y":3.7},
- {"label":"X", "x":2, "y":3.2, "h":1.15},
- {"label":"C", "x":3, "y":3},
- {"label":"V", "x":4, "y":3.1},
- {"label":"B", "x":5, "y":3.3},
- {"label":"ESC", "x":6, "y":3.4, "h":1.1},
+ {"matrix": [3, 7], "x": 0, "y": 3.7, "h": 1.2},
+ {"matrix": [3, 6], "x": 1, "y": 3.7},
+ {"matrix": [3, 5], "x": 2, "y": 3.2, "h": 1.15},
+ {"matrix": [3, 4], "x": 3, "y": 3},
+ {"matrix": [3, 3], "x": 4, "y": 3.1},
+ {"matrix": [3, 2], "x": 5, "y": 3.3},
+ {"matrix": [2, 1], "x": 6, "y": 3.4, "h": 1.1},
- {"label":"BUTTERFLY", "x":11.5, "y":3.4, "h":1.1},
- {"label":"N", "x":12.5, "y":3.3},
- {"label":"M", "x":13.5, "y":3.1},
- {"label":"COMMA", "x":14.5, "y":3},
- {"label":"DOT", "x":15.5, "y":3.2, "h":1.15},
- {"label":"SLASH", "x":16.5, "y":3.7},
- {"label":"MINS", "x":17.5, "y":3.7, "h":1.2},
+ {"matrix": [6, 6], "x": 11.5, "y": 3.4, "h": 1.1},
+ {"matrix": [7, 5], "x": 12.5, "y": 3.3},
+ {"matrix": [7, 4], "x": 13.5, "y": 3.1},
+ {"matrix": [7, 3], "x": 14.5, "y": 3},
+ {"matrix": [7, 2], "x": 15.5, "y": 3.2, "h": 1.15},
+ {"matrix": [7, 1], "x": 16.5, "y": 3.7},
+ {"matrix": [7, 0], "x": 17.5, "y": 3.7, "h": 1.2},
- {"label":"LCTL", "x":4.75, "y":4.3},
- {"label":"RCTL", "x":12.75, "y":4.3},
- {"label":"BACKSPACE", "x":5.75, "y":4.5},
- {"label":"SPACE", "x":11.75, "y":4.5},
- {"label":"LGUI", "x":6.75, "y":4.7},
- {"label":"RALT", "x":10.75, "y":4.7},
- {"label":"LSHIFT", "x":7.75, "y":5.1},
- {"label":"RSHIFT", "x":9.75, "y":5.1},
+ {"matrix": [0, 0], "x": 4.75, "y": 4.3},
+ {"matrix": [4, 7], "x": 12.75, "y": 4.3},
- {"label":"FN", "x":6.25, "y":6.1, "h":1.4},
- {"label":"FN", "x":11.25, "y":6.1, "h":1.4}
+ {"matrix": [1, 0], "x": 5.75, "y": 4.5},
+ {"matrix": [5, 7], "x": 11.75, "y": 4.5},
+
+ {"matrix": [2, 0], "x": 6.75, "y": 4.7},
+ {"matrix": [6, 7], "x": 10.75, "y": 4.7},
+
+ {"matrix": [3, 0], "x": 7.75, "y": 5.1},
+ {"matrix": [7, 7], "x": 9.75, "y": 5.1},
+
+ {"matrix": [3, 1], "x": 6.25, "y": 6.1, "h": 1.4},
+ {"matrix": [7, 6], "x": 11.25, "y": 6.1, "h": 1.4}
+ ]
+ },
+ "LAYOUT_thumb_row": {
+ "layout": [
+ {"matrix": [0, 7], "x": 0, "y": 0},
+ {"matrix": [0, 6], "x": 1, "y": 0},
+ {"matrix": [0, 5], "x": 2, "y": 0},
+ {"matrix": [0, 4], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 2], "x": 5, "y": 0},
+ {"matrix": [4, 5], "x": 6, "y": 0},
+ {"matrix": [4, 4], "x": 7, "y": 0},
+ {"matrix": [4, 3], "x": 8, "y": 0},
+ {"matrix": [4, 2], "x": 9, "y": 0},
+ {"matrix": [4, 1], "x": 10, "y": 0},
+ {"matrix": [4, 0], "x": 11, "y": 0},
+ {"matrix": [1, 7], "x": 12, "y": 0},
+ {"matrix": [1, 6], "x": 13, "y": 0},
+ {"matrix": [1, 5], "x": 14, "y": 0},
+ {"matrix": [1, 4], "x": 15, "y": 0},
+ {"matrix": [1, 3], "x": 16, "y": 0},
+ {"matrix": [1, 2], "x": 17, "y": 0},
+ {"matrix": [0, 1], "x": 18, "y": 0},
+ {"matrix": [4, 6], "x": 19, "y": 0},
+ {"matrix": [5, 5], "x": 20, "y": 0},
+ {"matrix": [5, 4], "x": 21, "y": 0},
+ {"matrix": [5, 3], "x": 22, "y": 0},
+ {"matrix": [5, 2], "x": 23, "y": 0},
+ {"matrix": [5, 1], "x": 24, "y": 0},
+ {"matrix": [5, 0], "x": 25, "y": 0},
+ {"matrix": [2, 7], "x": 26, "y": 0},
+ {"matrix": [2, 6], "x": 27, "y": 0},
+ {"matrix": [2, 5], "x": 28, "y": 0},
+ {"matrix": [2, 4], "x": 29, "y": 0},
+ {"matrix": [2, 3], "x": 30, "y": 0},
+ {"matrix": [2, 2], "x": 31, "y": 0},
+ {"matrix": [1, 1], "x": 32, "y": 0},
+ {"matrix": [5, 6], "x": 33, "y": 0},
+ {"matrix": [6, 5], "x": 34, "y": 0},
+ {"matrix": [6, 4], "x": 35, "y": 0},
+ {"matrix": [6, 3], "x": 36, "y": 0},
+ {"matrix": [6, 2], "x": 37, "y": 0},
+ {"matrix": [6, 1], "x": 38, "y": 0},
+ {"matrix": [6, 0], "x": 39, "y": 0},
+ {"matrix": [3, 7], "x": 40, "y": 0},
+ {"matrix": [3, 6], "x": 41, "y": 0},
+ {"matrix": [3, 5], "x": 42, "y": 0},
+ {"matrix": [3, 4], "x": 43, "y": 0},
+ {"matrix": [3, 3], "x": 44, "y": 0},
+ {"matrix": [3, 2], "x": 45, "y": 0},
+ {"matrix": [2, 1], "x": 46, "y": 0},
+ {"matrix": [6, 6], "x": 47, "y": 0},
+ {"matrix": [7, 5], "x": 48, "y": 0},
+ {"matrix": [7, 4], "x": 49, "y": 0},
+ {"matrix": [7, 3], "x": 50, "y": 0},
+ {"matrix": [7, 2], "x": 51, "y": 0},
+ {"matrix": [7, 1], "x": 52, "y": 0},
+ {"matrix": [7, 0], "x": 53, "y": 0},
+ {"matrix": [0, 0], "x": 54, "y": 0},
+ {"matrix": [1, 0], "x": 55, "y": 0},
+ {"matrix": [2, 0], "x": 56, "y": 0},
+ {"matrix": [3, 0], "x": 57, "y": 0},
+ {"matrix": [7, 7], "x": 58, "y": 0},
+ {"matrix": [6, 7], "x": 59, "y": 0},
+ {"matrix": [5, 7], "x": 60, "y": 0},
+ {"matrix": [4, 7], "x": 61, "y": 0},
+ {"matrix": [3, 1], "x": 62, "y": 0},
+ {"matrix": [7, 6], "x": 63, "y": 0}
]
}
}
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 @@
#include "quantum.h"
-#define LAYOUT( \
- L07, L06, L05, L04, L03, L02, R05, R04, R03, R02, R01, R00, \
- L17, L16, L15, L14, L13, L12, L01, R06, R15, R14, R13, R12, R11, R10, \
- L27, L26, L25, L24, L23, L22, L11, R16, R25, R24, R23, R22, R21, R20, \
- L37, L36, L35, L34, L33, L32, L21, R26, R35, R34, R33, R32, R31, R30, \
- L00, R07, \
- L10, R17, \
- L20, R27, \
- L30, R37, \
- L31, R36 \
- ) { \
- {L00, L01, L02, L03, L04, L05, L06, L07}, \
- {L10, L11, L12, L13, L14, L15, L16, L17}, \
- {L20, L21, L22, L23, L24, L25, L26, L27}, \
- {L30, L31, L32, L33, L34, L35, L36, L37}, \
- {R00, R01, R02, R03, R04, R05, R06, R07}, \
- {R10, R11, R12, R13, R14, R15, R16, R17}, \
- {R20, R21, R22, R23, R24, R25, R26, R27}, \
- {R30, R31, R32, R33, R34, R35, R36, R37} \
- }
-
-#define LAYOUT_thumb_row( \
- L07, L06, L05, L04, L03, L02, R05, R04, R03, R02, R01, R00, \
- L17, L16, L15, L14, L13, L12, L01, R06, R15, R14, R13, R12, R11, R10, \
- L27, L26, L25, L24, L23, L22, L11, R16, R25, R24, R23, R22, R21, R20, \
- L37, L36, L35, L34, L33, L32, L21, R26, R35, R34, R33, R32, R31, R30, \
- L00, L10, L20, L30, R37, R27, R17, R07, \
- L31, R36 \
- ) { \
- {L00, L01, L02, L03, L04, L05, L06, L07}, \
- {L10, L11, L12, L13, L14, L15, L16, L17}, \
- {L20, L21, L22, L23, L24, L25, L26, L27}, \
- {L30, L31, L32, L33, L34, L35, L36, L37}, \
- {R00, R01, R02, R03, R04, R05, R06, R07}, \
- {R10, R11, R12, R13, R14, R15, R16, R17}, \
- {R20, R21, R22, R23, R24, R25, R26, R27}, \
- {R30, R31, R32, R33, R34, R35, R36, R37} \
- }
-
#include "wire-protocol-constants.h"
#define I2C_ADDR_LEFT (0x58 << 1)
#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 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "bison.h"
+#include "quantum.h"
bool encoder_update_kb(uint8_t index, bool clockwise) {
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 @@
-/* Copyright 2021 csandven
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R07, \
- L10, L11, L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, \
- L20, L21, L22, L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25, R26, R27, \
- L30, L31, L32, L33, L34, L35, L36, L37, L44, R40, R30, R31, R32, R33, R34, R35, R36, R37, \
- L40, L41, L42, L43, R41, R42, R43, R44 \
- ) \
- { \
- { L07, L06, L05, L04, L03, L02, L01, L00 }, \
- { L17, L16, L15, L14, L13, L12, L11, L10 }, \
- { L27, L26, L25, L24, L23, L22, L21, L20 }, \
- { L37, L36, L35, L34, L33, L32, L31, L30 }, \
- { L43, L42, L41, L40, L44, KC_NO, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, R06, R07 }, \
- { R10, R11, R12, R13, R14, R15, R16, R17 }, \
- { R20, R21, R22, R23, R24, R25, R26, R27 }, \
- { R30, R31, R32, R33, R34, R35, R36, R37 }, \
- { R41, R42, R43, R44, R40, KC_NO, KC_NO } \
- }
-
-#define LAYOUT_6_8( \
- L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R07, \
- L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, \
- L22, L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25, R26, R27, \
- L32, L33, L34, L35, L36, L37, L44, R40, R30, R31, R32, R33, R34, R35, R36, R37, \
- L40, L41, L42, L43, R41, R42, R43, R44 \
- ) \
- { \
- { L07, L06, L05, L04, L03, L02, KC_NO, KC_NO }, \
- { L17, L16, L15, L14, L13, L12, KC_NO, KC_NO }, \
- { L27, L26, L25, L24, L23, L22, KC_NO, KC_NO }, \
- { L37, L36, L35, L34, L33, L32, KC_NO, KC_NO }, \
- { L43, L42, L41, L40, L44, KC_NO, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, R06, R07 }, \
- { R10, R11, R12, R13, R14, R15, R16, R17 }, \
- { R20, R21, R22, R23, R24, R25, R26, R27 }, \
- { R30, R31, R32, R33, R34, R35, R36, R37 }, \
- { R41, R42, R43, R44, R40, KC_NO, KC_NO } \
- }
-
-#define LAYOUT_8_6( \
- L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, L36, L37, L44, R40, R30, R31, R32, R33, R34, R35, \
- L40, L41, L42, L43, R41, R42, R43, R44 \
- ) \
- { \
- { L07, L06, L05, L04, L03, L02, L01, L00 }, \
- { L17, L16, L15, L14, L13, L12, L11, L10 }, \
- { L27, L26, L25, L24, L23, L22, L21, L20 }, \
- { L37, L36, L35, L34, L33, L32, L31, L30 }, \
- { L43, L42, L41, L40, L44, KC_NO, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, KC_NO, KC_NO }, \
- { R10, R11, R12, R13, R14, R15, KC_NO, KC_NO }, \
- { R20, R21, R22, R23, R24, R25, KC_NO, KC_NO }, \
- { R30, R31, R32, R33, R34, R35, KC_NO, KC_NO }, \
- { R41, R42, R43, R44, R40, KC_NO, KC_NO } \
- }
-
-#define LAYOUT_6_6( \
- L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, \
- L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, \
- L22, L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25, \
- L32, L33, L34, L35, L36, L37, L44, R40, R30, R31, R32, R33, R34, R35, \
- L40, L41, L42, L43, R41, R42, R43, R44 \
- ) \
- { \
- { L07, L06, L05, L04, L03, L02, KC_NO, KC_NO }, \
- { L17, L16, L15, L14, L13, L12, KC_NO, KC_NO }, \
- { L27, L26, L25, L24, L23, L22, KC_NO, KC_NO }, \
- { L37, L36, L35, L34, L33, L32, KC_NO, KC_NO }, \
- { L43, L42, L41, L40, L44, KC_NO, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, KC_NO, KC_NO }, \
- { R10, R11, R12, R13, R14, R15, KC_NO, KC_NO }, \
- { R20, R21, R22, R23, R24, R25, KC_NO, KC_NO }, \
- { R30, R31, R32, R33, R34, R35, KC_NO, KC_NO }, \
- { R41, R42, R43, R44, R40, KC_NO, KC_NO } \
- }
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 @@
"layouts": {
"LAYOUT": {
"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": 10, "y": 0},
- {"x": 11, "y": 0},
- {"x": 12, "y": 0},
- {"x": 13, "y": 0},
- {"x": 14, "y": 0},
- {"x": 15, "y": 0},
- {"x": 16, "y": 0},
- {"x": 17, "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": 6, "y": 1},
- {"x": 7, "y": 1},
- {"x": 10, "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": 17, "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": 6, "y": 2},
- {"x": 7, "y": 2},
- {"x": 10, "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": 17, "y": 2},
-
- {"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": 15, "y": 3},
- {"x": 16, "y": 3},
- {"x": 17, "y": 3},
-
- {"x": 3.75, "y": 4},
- {"x": 4.75, "y": 4},
- {"x": 5.75, "y": 4},
- {"x": 6.75, "y": 4, "w": 1.5},
- {"x": 9.75, "y": 4, "w": 1.5},
- {"x": 11.25, "y": 4},
- {"x": 12.25, "y": 4},
- {"x": 13.25, "y": 4}
+ {"matrix": [0, 7], "x": 0, "y": 0},
+ {"matrix": [0, 6], "x": 1, "y": 0},
+ {"matrix": [0, 5], "x": 2, "y": 0},
+ {"matrix": [0, 4], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 2], "x": 5, "y": 0},
+ {"matrix": [0, 1], "x": 6, "y": 0},
+ {"matrix": [0, 0], "x": 7, "y": 0},
+
+ {"matrix": [5, 0], "x": 10, "y": 0},
+ {"matrix": [5, 1], "x": 11, "y": 0},
+ {"matrix": [5, 2], "x": 12, "y": 0},
+ {"matrix": [5, 3], "x": 13, "y": 0},
+ {"matrix": [5, 4], "x": 14, "y": 0},
+ {"matrix": [5, 5], "x": 15, "y": 0},
+ {"matrix": [5, 6], "x": 16, "y": 0},
+ {"matrix": [5, 7], "x": 17, "y": 0},
+
+ {"matrix": [1, 7], "x": 0, "y": 1},
+ {"matrix": [1, 6], "x": 1, "y": 1},
+ {"matrix": [1, 5], "x": 2, "y": 1},
+ {"matrix": [1, 4], "x": 3, "y": 1},
+ {"matrix": [1, 3], "x": 4, "y": 1},
+ {"matrix": [1, 2], "x": 5, "y": 1},
+ {"matrix": [1, 1], "x": 6, "y": 1},
+ {"matrix": [1, 0], "x": 7, "y": 1},
+
+ {"matrix": [6, 0], "x": 10, "y": 1},
+ {"matrix": [6, 1], "x": 11, "y": 1},
+ {"matrix": [6, 2], "x": 12, "y": 1},
+ {"matrix": [6, 3], "x": 13, "y": 1},
+ {"matrix": [6, 4], "x": 14, "y": 1},
+ {"matrix": [6, 5], "x": 15, "y": 1},
+ {"matrix": [6, 6], "x": 16, "y": 1},
+ {"matrix": [6, 7], "x": 17, "y": 1},
+
+ {"matrix": [2, 7], "x": 0, "y": 2},
+ {"matrix": [2, 6], "x": 1, "y": 2},
+ {"matrix": [2, 5], "x": 2, "y": 2},
+ {"matrix": [2, 4], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 2], "x": 5, "y": 2},
+ {"matrix": [2, 1], "x": 6, "y": 2},
+ {"matrix": [2, 0], "x": 7, "y": 2},
+
+ {"matrix": [7, 0], "x": 10, "y": 2},
+ {"matrix": [7, 1], "x": 11, "y": 2},
+ {"matrix": [7, 2], "x": 12, "y": 2},
+ {"matrix": [7, 3], "x": 13, "y": 2},
+ {"matrix": [7, 4], "x": 14, "y": 2},
+ {"matrix": [7, 5], "x": 15, "y": 2},
+ {"matrix": [7, 6], "x": 16, "y": 2},
+ {"matrix": [7, 7], "x": 17, "y": 2},
+
+ {"matrix": [3, 7], "x": 0, "y": 3},
+ {"matrix": [3, 6], "x": 1, "y": 3},
+ {"matrix": [3, 5], "x": 2, "y": 3},
+ {"matrix": [3, 4], "x": 3, "y": 3},
+ {"matrix": [3, 3], "x": 4, "y": 3},
+ {"matrix": [3, 2], "x": 5, "y": 3},
+ {"matrix": [3, 1], "x": 6, "y": 3},
+ {"matrix": [3, 0], "x": 7, "y": 3},
+ {"matrix": [4, 4], "x": 8, "y": 3},
+
+ {"matrix": [9, 4], "x": 9, "y": 3},
+ {"matrix": [8, 0], "x": 10, "y": 3},
+ {"matrix": [8, 1], "x": 11, "y": 3},
+ {"matrix": [8, 2], "x": 12, "y": 3},
+ {"matrix": [8, 3], "x": 13, "y": 3},
+ {"matrix": [8, 4], "x": 14, "y": 3},
+ {"matrix": [8, 5], "x": 15, "y": 3},
+ {"matrix": [8, 6], "x": 16, "y": 3},
+ {"matrix": [8, 7], "x": 17, "y": 3},
+
+ {"matrix": [4, 3], "x": 3.75, "y": 4},
+ {"matrix": [4, 2], "x": 4.75, "y": 4},
+ {"matrix": [4, 1], "x": 5.75, "y": 4},
+ {"matrix": [4, 0], "x": 6.75, "y": 4, "w": 1.5},
+
+ {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 1.5},
+ {"matrix": [9, 1], "x": 11.25, "y": 4},
+ {"matrix": [9, 2], "x": 12.25, "y": 4},
+ {"matrix": [9, 3], "x": 13.25, "y": 4}
]
},
-
"LAYOUT_6_8": {
"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": 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, "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": 8, "y": 1},
- {"x": 9, "y": 1},
- {"x": 10, "y": 1},
- {"x": 11, "y": 1},
- {"x": 12, "y": 1},
- {"x": 13, "y": 1},
- {"x": 14, "y": 1},
- {"x": 15, "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": 8, "y": 2},
- {"x": 9, "y": 2},
- {"x": 10, "y": 2},
- {"x": 11, "y": 2},
- {"x": 12, "y": 2},
- {"x": 13, "y": 2},
- {"x": 14, "y": 2},
- {"x": 15, "y": 2},
-
- {"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": 15, "y": 3},
-
- {"x": 1.75, "y": 4},
- {"x": 2.75, "y": 4},
- {"x": 3.75, "y": 4},
- {"x": 4.75, "y": 4, "w": 1.5},
- {"x": 7.75, "y": 4, "w": 1.5},
- {"x": 9.25, "y": 4},
- {"x": 10.25, "y": 4},
- {"x": 11.25, "y": 4}
+ {"matrix": [0, 5], "x": 0, "y": 0},
+ {"matrix": [0, 4], "x": 1, "y": 0},
+ {"matrix": [0, 3], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 1], "x": 4, "y": 0},
+ {"matrix": [0, 0], "x": 5, "y": 0},
+
+ {"matrix": [5, 0], "x": 8, "y": 0},
+ {"matrix": [5, 1], "x": 9, "y": 0},
+ {"matrix": [5, 2], "x": 10, "y": 0},
+ {"matrix": [5, 3], "x": 11, "y": 0},
+ {"matrix": [5, 4], "x": 12, "y": 0},
+ {"matrix": [5, 5], "x": 13, "y": 0},
+ {"matrix": [5, 6], "x": 14, "y": 0},
+ {"matrix": [5, 7], "x": 15, "y": 0},
+
+ {"matrix": [1, 5], "x": 0, "y": 1},
+ {"matrix": [1, 4], "x": 1, "y": 1},
+ {"matrix": [1, 3], "x": 2, "y": 1},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"matrix": [1, 1], "x": 4, "y": 1},
+ {"matrix": [1, 0], "x": 5, "y": 1},
+
+ {"matrix": [6, 0], "x": 8, "y": 1},
+ {"matrix": [6, 1], "x": 9, "y": 1},
+ {"matrix": [6, 2], "x": 10, "y": 1},
+ {"matrix": [6, 3], "x": 11, "y": 1},
+ {"matrix": [6, 4], "x": 12, "y": 1},
+ {"matrix": [6, 5], "x": 13, "y": 1},
+ {"matrix": [6, 6], "x": 14, "y": 1},
+ {"matrix": [6, 7], "x": 15, "y": 1},
+
+ {"matrix": [2, 5], "x": 0, "y": 2},
+ {"matrix": [2, 4], "x": 1, "y": 2},
+ {"matrix": [2, 3], "x": 2, "y": 2},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 1], "x": 4, "y": 2},
+ {"matrix": [2, 0], "x": 5, "y": 2},
+
+ {"matrix": [7, 0], "x": 8, "y": 2},
+ {"matrix": [7, 1], "x": 9, "y": 2},
+ {"matrix": [7, 2], "x": 10, "y": 2},
+ {"matrix": [7, 3], "x": 11, "y": 2},
+ {"matrix": [7, 4], "x": 12, "y": 2},
+ {"matrix": [7, 5], "x": 13, "y": 2},
+ {"matrix": [7, 6], "x": 14, "y": 2},
+ {"matrix": [7, 7], "x": 15, "y": 2},
+
+ {"matrix": [3, 5], "x": 0, "y": 3},
+ {"matrix": [3, 4], "x": 1, "y": 3},
+ {"matrix": [3, 3], "x": 2, "y": 3},
+ {"matrix": [3, 2], "x": 3, "y": 3},
+ {"matrix": [3, 1], "x": 4, "y": 3},
+ {"matrix": [3, 0], "x": 5, "y": 3},
+ {"matrix": [4, 4], "x": 6, "y": 3},
+
+ {"matrix": [9, 4], "x": 7, "y": 3},
+ {"matrix": [8, 0], "x": 8, "y": 3},
+ {"matrix": [8, 1], "x": 9, "y": 3},
+ {"matrix": [8, 2], "x": 10, "y": 3},
+ {"matrix": [8, 3], "x": 11, "y": 3},
+ {"matrix": [8, 4], "x": 12, "y": 3},
+ {"matrix": [8, 5], "x": 13, "y": 3},
+ {"matrix": [8, 6], "x": 14, "y": 3},
+ {"matrix": [8, 7], "x": 15, "y": 3},
+
+ {"matrix": [4, 3], "x": 1.75, "y": 4},
+ {"matrix": [4, 2], "x": 2.75, "y": 4},
+ {"matrix": [4, 1], "x": 3.75, "y": 4},
+ {"matrix": [4, 0], "x": 4.75, "y": 4, "w": 1.5},
+
+ {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 1.5},
+ {"matrix": [9, 1], "x": 9.25, "y": 4},
+ {"matrix": [9, 2], "x": 10.25, "y": 4},
+ {"matrix": [9, 3], "x": 11.25, "y": 4}
]
},
-
"LAYOUT_8_6": {
"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": 10, "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": 6, "y": 1},
- {"x": 7, "y": 1},
- {"x": 10, "y": 1},
- {"x": 11, "y": 1},
- {"x": 12, "y": 1},
- {"x": 13, "y": 1},
- {"x": 14, "y": 1},
- {"x": 15, "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": 6, "y": 2},
- {"x": 7, "y": 2},
- {"x": 10, "y": 2},
- {"x": 11, "y": 2},
- {"x": 12, "y": 2},
- {"x": 13, "y": 2},
- {"x": 14, "y": 2},
- {"x": 15, "y": 2},
-
- {"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": 15, "y": 3},
-
- {"x": 3.75, "y": 4},
- {"x": 4.75, "y": 4},
- {"x": 5.75, "y": 4},
- {"x": 6.75, "y": 4, "w": 1.5},
- {"x": 9.75, "y": 4, "w": 1.5},
- {"x": 11.25, "y": 4},
- {"x": 12.25, "y": 4},
- {"x": 13.25, "y": 4}
+ {"matrix": [0, 7], "x": 0, "y": 0},
+ {"matrix": [0, 6], "x": 1, "y": 0},
+ {"matrix": [0, 5], "x": 2, "y": 0},
+ {"matrix": [0, 4], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 2], "x": 5, "y": 0},
+ {"matrix": [0, 1], "x": 6, "y": 0},
+ {"matrix": [0, 0], "x": 7, "y": 0},
+
+ {"matrix": [5, 0], "x": 10, "y": 0},
+ {"matrix": [5, 1], "x": 11, "y": 0},
+ {"matrix": [5, 2], "x": 12, "y": 0},
+ {"matrix": [5, 3], "x": 13, "y": 0},
+ {"matrix": [5, 4], "x": 14, "y": 0},
+ {"matrix": [5, 5], "x": 15, "y": 0},
+
+ {"matrix": [1, 7], "x": 0, "y": 1},
+ {"matrix": [1, 6], "x": 1, "y": 1},
+ {"matrix": [1, 5], "x": 2, "y": 1},
+ {"matrix": [1, 4], "x": 3, "y": 1},
+ {"matrix": [1, 3], "x": 4, "y": 1},
+ {"matrix": [1, 2], "x": 5, "y": 1},
+ {"matrix": [1, 1], "x": 6, "y": 1},
+ {"matrix": [1, 0], "x": 7, "y": 1},
+
+ {"matrix": [6, 0], "x": 10, "y": 1},
+ {"matrix": [6, 1], "x": 11, "y": 1},
+ {"matrix": [6, 2], "x": 12, "y": 1},
+ {"matrix": [6, 3], "x": 13, "y": 1},
+ {"matrix": [6, 4], "x": 14, "y": 1},
+ {"matrix": [6, 5], "x": 15, "y": 1},
+
+ {"matrix": [2, 7], "x": 0, "y": 2},
+ {"matrix": [2, 6], "x": 1, "y": 2},
+ {"matrix": [2, 5], "x": 2, "y": 2},
+ {"matrix": [2, 4], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 2], "x": 5, "y": 2},
+ {"matrix": [2, 1], "x": 6, "y": 2},
+ {"matrix": [2, 0], "x": 7, "y": 2},
+
+ {"matrix": [7, 0], "x": 10, "y": 2},
+ {"matrix": [7, 1], "x": 11, "y": 2},
+ {"matrix": [7, 2], "x": 12, "y": 2},
+ {"matrix": [7, 3], "x": 13, "y": 2},
+ {"matrix": [7, 4], "x": 14, "y": 2},
+ {"matrix": [7, 5], "x": 15, "y": 2},
+
+ {"matrix": [3, 7], "x": 0, "y": 3},
+ {"matrix": [3, 6], "x": 1, "y": 3},
+ {"matrix": [3, 5], "x": 2, "y": 3},
+ {"matrix": [3, 4], "x": 3, "y": 3},
+ {"matrix": [3, 3], "x": 4, "y": 3},
+ {"matrix": [3, 2], "x": 5, "y": 3},
+ {"matrix": [3, 1], "x": 6, "y": 3},
+ {"matrix": [3, 0], "x": 7, "y": 3},
+ {"matrix": [4, 4], "x": 8, "y": 3},
+
+ {"matrix": [9, 4], "x": 9, "y": 3},
+ {"matrix": [8, 0], "x": 10, "y": 3},
+ {"matrix": [8, 1], "x": 11, "y": 3},
+ {"matrix": [8, 2], "x": 12, "y": 3},
+ {"matrix": [8, 3], "x": 13, "y": 3},
+ {"matrix": [8, 4], "x": 14, "y": 3},
+ {"matrix": [8, 5], "x": 15, "y": 3},
+
+ {"matrix": [4, 3], "x": 3.75, "y": 4},
+ {"matrix": [4, 2], "x": 4.75, "y": 4},
+ {"matrix": [4, 1], "x": 5.75, "y": 4},
+ {"matrix": [4, 0], "x": 6.75, "y": 4, "w": 1.5},
+
+ {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 1.5},
+ {"matrix": [9, 1], "x": 11.25, "y": 4},
+ {"matrix": [9, 2], "x": 12.25, "y": 4},
+ {"matrix": [9, 3], "x": 13.25, "y": 4}
]
},
-
"LAYOUT_6_6": {
"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": 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},
- {"x": 1, "y": 1},
- {"x": 2, "y": 1},
- {"x": 3, "y": 1},
- {"x": 4, "y": 1},
- {"x": 5, "y": 1},
- {"x": 8, "y": 1},
- {"x": 9, "y": 1},
- {"x": 10, "y": 1},
- {"x": 11, "y": 1},
- {"x": 12, "y": 1},
- {"x": 13, "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": 8, "y": 2},
- {"x": 9, "y": 2},
- {"x": 10, "y": 2},
- {"x": 11, "y": 2},
- {"x": 12, "y": 2},
- {"x": 13, "y": 2},
-
- {"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": 1.75, "y": 4},
- {"x": 2.75, "y": 4},
- {"x": 3.75, "y": 4},
- {"x": 4.75, "y": 4, "w": 1.5},
- {"x": 7.75, "y": 4, "w": 1.5},
- {"x": 9.25, "y": 4},
- {"x": 10.25, "y": 4},
- {"x": 11.25, "y": 4}
+ {"matrix": [0, 5], "x": 0, "y": 0},
+ {"matrix": [0, 4], "x": 1, "y": 0},
+ {"matrix": [0, 3], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 1], "x": 4, "y": 0},
+ {"matrix": [0, 0], "x": 5, "y": 0},
+
+ {"matrix": [5, 0], "x": 8, "y": 0},
+ {"matrix": [5, 1], "x": 9, "y": 0},
+ {"matrix": [5, 2], "x": 10, "y": 0},
+ {"matrix": [5, 3], "x": 11, "y": 0},
+ {"matrix": [5, 4], "x": 12, "y": 0},
+ {"matrix": [5, 5], "x": 13, "y": 0},
+
+ {"matrix": [1, 5], "x": 0, "y": 1},
+ {"matrix": [1, 4], "x": 1, "y": 1},
+ {"matrix": [1, 3], "x": 2, "y": 1},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"matrix": [1, 1], "x": 4, "y": 1},
+ {"matrix": [1, 0], "x": 5, "y": 1},
+
+ {"matrix": [6, 0], "x": 8, "y": 1},
+ {"matrix": [6, 1], "x": 9, "y": 1},
+ {"matrix": [6, 2], "x": 10, "y": 1},
+ {"matrix": [6, 3], "x": 11, "y": 1},
+ {"matrix": [6, 4], "x": 12, "y": 1},
+ {"matrix": [6, 5], "x": 13, "y": 1},
+
+ {"matrix": [2, 5], "x": 0, "y": 2},
+ {"matrix": [2, 4], "x": 1, "y": 2},
+ {"matrix": [2, 3], "x": 2, "y": 2},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 1], "x": 4, "y": 2},
+ {"matrix": [2, 0], "x": 5, "y": 2},
+
+ {"matrix": [7, 0], "x": 8, "y": 2},
+ {"matrix": [7, 1], "x": 9, "y": 2},
+ {"matrix": [7, 2], "x": 10, "y": 2},
+ {"matrix": [7, 3], "x": 11, "y": 2},
+ {"matrix": [7, 4], "x": 12, "y": 2},
+ {"matrix": [7, 5], "x": 13, "y": 2},
+
+ {"matrix": [3, 5], "x": 0, "y": 3},
+ {"matrix": [3, 4], "x": 1, "y": 3},
+ {"matrix": [3, 3], "x": 2, "y": 3},
+ {"matrix": [3, 2], "x": 3, "y": 3},
+ {"matrix": [3, 1], "x": 4, "y": 3},
+ {"matrix": [3, 0], "x": 5, "y": 3},
+ {"matrix": [4, 4], "x": 6, "y": 3},
+
+ {"matrix": [9, 4], "x": 7, "y": 3},
+ {"matrix": [8, 0], "x": 8, "y": 3},
+ {"matrix": [8, 1], "x": 9, "y": 3},
+ {"matrix": [8, 2], "x": 10, "y": 3},
+ {"matrix": [8, 3], "x": 11, "y": 3},
+ {"matrix": [8, 4], "x": 12, "y": 3},
+ {"matrix": [8, 5], "x": 13, "y": 3},
+
+ {"matrix": [4, 3], "x": 1.75, "y": 4},
+ {"matrix": [4, 2], "x": 2.75, "y": 4},
+ {"matrix": [4, 1], "x": 3.75, "y": 4},
+ {"matrix": [4, 0], "x": 4.75, "y": 4, "w": 1.5},
+
+ {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 1.5},
+ {"matrix": [9, 1], "x": 9.25, "y": 4},
+ {"matrix": [9, 2], "x": 10.25, "y": 4},
+ {"matrix": [9, 3], "x": 11.25, "y": 4}
]
}
}
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 @@
-/*
-Copyright 2022 @RoyMeetsWorld
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "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 @@
-/*
-Copyright 2022 @RoyMeetsWorld
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/**
- * The layout macro for ANSI boards, with illustrative grid of a typical assignment.
- * ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───────┐
- * │ESC│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ │ 7 │ 8 │ 9 │ 0 │ - │ + │ BACK │
- * ┌─┴───┼───┼───┼───┼───┼───┼───┤┌───┬───┐ ┌───┬───┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │ TAB │ Q │ W │ E │ R │ T │ Y ││F1 │F2 │ │F7 │F8 │ │ Y │ U │ I │ O │ P │ [ │ ] │ \ │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘├───┼───┤ ├───┼───┤ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │ CAPS │ A │ S │ D │ F │ G │ │F3 │F4 │ │F9 │F10│ │ H │ J │ K │ L │ ; │ ' │ Enter │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ├───┼───┤ ├───┼───┤ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
- * │ LSHIFT │ Z │ X │ C │ V │ B │ │F5 │F6 │ │F11│F12│ │ B │ N │ M │ , │ . │ / │ RSHIFT │
- * ├────┬───┴┬──┴─┬─┴──┬┴───┼───┴┬┴───┼───┘ └───┼───┴┬┴───┼───┴───┴──┬┴───┼───┴┬────┬────│
- * │LCTL│LGUI│LALT│ FN │ │SPC │MUTE│ │MUTE│SPCE│ │RALT│ FN │RGUI│RCTL│
- * └────┴────┴────┴────┘ └────┼────┤ ├────┼────┘ └────┴────┴────┴────┘
- * │ENTR│ │ENTR│
- * └────┘ └────┘
- */
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R07, \
- L10, L11, L12, L13, L14, L15, L16, L17, L18, R10, R11, R12, R13, R14, R15, R16, R17, R18, R28, \
- L20, L21, L22, L23, L24, L25, L27, L28, R20, R21, R22, R23, R24, R25, R26, R27, R38, \
- L30, L31, L32, L33, L34, L35, L37, L38, R30, R31, R32, R33, R34, R35, R36, R37, R46, \
- L40, L41, L42, L43, L45, L48, R40, R42, R43, R44, R45, R47, \
- L47, R41 \
-) \
-{ \
- { L00, L01, L02, L03, L04, L05, L06, KC_NO, KC_NO }, \
- { L10, L11, L12, L13, L14, L15, L16, L17, L18 }, \
- { L20, L21, L22, L23, L24, L25, KC_NO, L27, L28 }, \
- { L30, L31, L32, L33, L34, L35, KC_NO, L37, L38 }, \
- { L40, L41, L42, L43, KC_NO, L45, KC_NO, L47, L48 }, \
- { R00, R01, R02, R03, R04, R05, KC_NO, R07, KC_NO }, \
- { R10, R11, R12, R13, R14, R15, R16, R17, R18 }, \
- { R20, R21, R22, R23, R24, R25, R26, R27, R28 }, \
- { R30, R31, R32, R33, R34, R35, R36, R37, R38 }, \
- { R40, R41, R42, R43, R44, R45, R46, R47, KC_NO } \
-}
-
-/**
- * The layout macro for split-key boards, with illustrative grid of a typical assignment.
- *
- * Backspace has two options with three distinct pads:
- * - center pad (regular 2u backspace)
- * - left pad + right pad (split backspace)
- *
- * You may wish to set the unused pad(s) to KC_NO or XXXXXX, as they will be ignored.
- * ┌───────┐
- * │ BACK │ (R07)
- * └───────┘
- * |
- * ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┐
- * │ESC│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ │ 7 │ 8 │ 9 │ 0 │ - │ + │ \ │BCK│ (R06 R08)
- * ┌─┴───┼───┼───┼───┼───┼───┼───┤┌───┬───┐ ┌───┬───┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │ TAB │ Q │ W │ E │ R │ T │ Y ││F1 │F2 │ │F7 │F8 │ │ Y │ U │ I │ O │ P │ [ │ ] │ \ │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘├───┼───┤ ├───┼───┤ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │ CAPS │ A │ S │ D │ F │ G │ │F3 │F4 │ │F9 │F10│ │ H │ J │ K │ L │ ; │ ' │ Enter │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ├───┼───┤ ├───┼───┤ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
- * │LSFT│ \ │ Z │ X │ C │ V │ B │ │F5 │F6 │ │F11│F12│ │ B │ N │ M │ , │ . │ / │RSHIFT│PSC│
- * ├────┼───┴┬──┴─┬─┴──┬┴───┼───┴┬┴───┼───┘ └───┼───┴┬┴───┼───┴───┴──┬┴───┼───┴┬────┬┴───│
- * │LCTL│LGUI│LALT│ FN │ │SPC │MUTE│ │MUTE│SPCE│ │RALT│ FN │RGUI│RCTL│
- * └────┴────┴────┴────┘ └────┼────┤ ├────┼────┘ └────┴────┴────┴────┘
- * │ENTR│ │ENTR│
- * └────┘ └────┘
- */
-#define LAYOUT_all( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, R08, \
- L10, L11, L12, L13, L14, L15, L16, L17, L18, R10, R11, R12, R13, R14, R15, R16, R17, R18, R28, \
- L20, L21, L22, L23, L24, L25, L27, L28, R20, R21, R22, R23, R24, R25, R26, R27, R38, \
- L30, L44, L31, L32, L33, L34, L35, L37, L38, R30, R31, R32, R33, R34, R35, R36, R37, R46, R48, \
- L40, L41, L42, L43, L45, L48, R40, R42, R43, R44, R45, R47, \
- L47, R41 \
-) \
-{ \
- { L00, L01, L02, L03, L04, L05, L06, KC_NO, KC_NO }, \
- { L10, L11, L12, L13, L14, L15, L16, L17, L18 }, \
- { L20, L21, L22, L23, L24, L25, KC_NO, L27, L28 }, \
- { L30, L31, L32, L33, L34, L35, KC_NO, L37, L38 }, \
- { L40, L41, L42, L43, L44, L45, KC_NO, L47, L48 }, \
- { R00, R01, R02, R03, R04, R05, R06, R07, R08 }, \
- { R10, R11, R12, R13, R14, R15, R16, R17, R18 }, \
- { R20, R21, R22, R23, R24, R25, R26, R27, R28 }, \
- { R30, R31, R32, R33, R34, R35, R36, R37, R38 }, \
- { R40, R41, R42, R43, R44, R45, R46, R47, R48 } \
-}
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 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "x": 0.5, "y": 0 },
- { "x": 1.5, "y": 0 },
- { "x": 2.5, "y": 0 },
- { "x": 3.5, "y": 0 },
- { "x": 4.5, "y": 0 },
- { "x": 5.5, "y": 0 },
- { "x": 6.5, "y": 0 },
-
- { "x": 13.25, "y": 0 },
- { "x": 14.25, "y": 0 },
- { "x": 15.25, "y": 0 },
- { "x": 16.25, "y": 0 },
- { "x": 17.25, "y": 0 },
- { "x": 18.25, "y": 0 },
- { "x": 19.25, "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.75, "y": 1 },
- { "x": 8.75, "y": 1 },
-
- { "x": 10.5, "y": 1 },
- { "x": 11.5, "y": 1 },
-
- { "x": 13.25, "y": 1 },
- { "x": 14.25, "y": 1 },
- { "x": 15.25, "y": 1 },
- { "x": 16.25, "y": 1 },
- { "x": 17.25, "y": 1 },
- { "x": 18.25, "y": 1 },
- { "x": 19.25, "y": 1 },
- { "x": 20.25, "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": 7.75, "y": 2 },
- { "x": 8.75, "y": 2 },
-
- { "x": 10.5, "y": 2 },
- { "x": 11.5, "y": 2 },
-
- { "x": 13.5, "y": 2 },
- { "x": 14.5, "y": 2 },
- { "x": 15.5, "y": 2 },
- { "x": 16.5, "y": 2 },
- { "x": 17.5, "y": 2 },
- { "x": 18.5, "y": 2 },
- { "x": 19.5, "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.75, "y": 3 },
- { "x": 8.75, "y": 3 },
-
- { "x": 10.5, "y": 3 },
- { "x": 11.5, "y": 3 },
-
- { "x": 13, "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, "w": 2.75 },
-
- { "x": 0.5, "y": 4, "w": 1.25 },
- { "x": 1.75, "y": 4, "w": 1.25 },
- { "x": 3, "y": 4, "w": 1.25 },
- { "x": 4.25, "y": 4, "w": 1.25 },
-
- { "x": 6.5, "y": 4, "h": 1.5 },
- { "x": 7.5, "y": 4 },
-
- { "x": 11.75, "y": 4 },
- { "x": 12.75, "y": 4, "h": 1.5 },
-
- { "x": 16.25, "y": 4, "w": 1.25 },
- { "x": 17.5, "y": 4, "w": 1.25 },
- { "x": 18.75, "y": 4, "w": 1.25 },
- { "x": 20, "y": 4, "w": 1.25 },
-
- { "x": 7.5, "y": 5, "h": 1.5 },
- { "x": 11.75, "y": 5, "h": 1.5 }
- ] },
+ {"matrix": [0, 0], "x": 0.5, "y": 0},
+ {"matrix": [0, 1], "x": 1.5, "y": 0},
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+
+ {"matrix": [5, 0], "x": 13.25, "y": 0},
+ {"matrix": [5, 1], "x": 14.25, "y": 0},
+ {"matrix": [5, 2], "x": 15.25, "y": 0},
+ {"matrix": [5, 3], "x": 16.25, "y": 0},
+ {"matrix": [5, 4], "x": 17.25, "y": 0},
+ {"matrix": [5, 5], "x": 18.25, "y": 0},
+ {"matrix": [5, 7], "x": 19.25, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [1, 8], "x": 8.75, "y": 1},
+
+ {"matrix": [6, 0], "x": 10.5, "y": 1},
+ {"matrix": [6, 1], "x": 11.5, "y": 1},
+ {"matrix": [6, 2], "x": 13.25, "y": 1},
+ {"matrix": [6, 3], "x": 14.25, "y": 1},
+ {"matrix": [6, 4], "x": 15.25, "y": 1},
+ {"matrix": [6, 5], "x": 16.25, "y": 1},
+ {"matrix": [6, 6], "x": 17.25, "y": 1},
+ {"matrix": [6, 7], "x": 18.25, "y": 1},
+ {"matrix": [6, 8], "x": 19.25, "y": 1},
+ {"matrix": [7, 8], "x": 20.25, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+
+ {"matrix": [7, 0], "x": 10.5, "y": 2},
+ {"matrix": [7, 1], "x": 11.5, "y": 2},
+ {"matrix": [7, 2], "x": 13.5, "y": 2},
+ {"matrix": [7, 3], "x": 14.5, "y": 2},
+ {"matrix": [7, 4], "x": 15.5, "y": 2},
+ {"matrix": [7, 5], "x": 16.5, "y": 2},
+ {"matrix": [7, 6], "x": 17.5, "y": 2},
+ {"matrix": [7, 7], "x": 18.5, "y": 2},
+ {"matrix": [8, 8], "x": 19.5, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+
+ {"matrix": [8, 0], "x": 10.5, "y": 3},
+ {"matrix": [8, 1], "x": 11.5, "y": 3},
+ {"matrix": [8, 2], "x": 13, "y": 3},
+ {"matrix": [8, 3], "x": 14, "y": 3},
+ {"matrix": [8, 4], "x": 15, "y": 3},
+ {"matrix": [8, 5], "x": 16, "y": 3},
+ {"matrix": [8, 6], "x": 17, "y": 3},
+ {"matrix": [8, 7], "x": 18, "y": 3},
+ {"matrix": [9, 6], "x": 19, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 6.5, "y": 4, "h": 1.5},
+ {"matrix": [4, 8], "x": 7.5, "y": 4},
+
+ {"matrix": [9, 0], "x": 11.75, "y": 4},
+ {"matrix": [9, 2], "x": 12.75, "y": 4, "h": 1.5},
+ {"matrix": [9, 3], "x": 16.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 17.5, "y": 4, "w": 1.25},
+ {"matrix": [9, 5], "x": 18.75, "y": 4, "w": 1.25},
+ {"matrix": [9, 7], "x": 20, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 7], "x": 7.5, "y": 5, "h": 1.5},
+
+ {"matrix": [9, 1], "x": 11.75, "y": 5, "h": 1.5}
+ ]
+ },
"LAYOUT_all": {
"layout": [
- { "x": 0.5, "y": 0 },
- { "x": 1.5, "y": 0 },
- { "x": 2.5, "y": 0 },
- { "x": 3.5, "y": 0 },
- { "x": 4.5, "y": 0 },
- { "x": 5.5, "y": 0 },
- { "x": 6.5, "y": 0 },
-
- { "x": 13.25, "y": 0 },
- { "x": 14.25, "y": 0 },
- { "x": 15.25, "y": 0 },
- { "x": 16.25, "y": 0 },
- { "x": 17.25, "y": 0 },
- { "x": 18.25, "y": 0 },
- { "x": 19.25, "y": 0 },
- { "x": 22.25, "y": 0, "w": 2 },
- { "x": 20.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.75, "y": 1 },
- { "x": 8.75, "y": 1 },
-
- { "x": 10.5, "y": 1 },
- { "x": 11.5, "y": 1 },
-
- { "x": 13.25, "y": 1 },
- { "x": 14.25, "y": 1 },
- { "x": 15.25, "y": 1 },
- { "x": 16.25, "y": 1 },
- { "x": 17.25, "y": 1 },
- { "x": 18.25, "y": 1 },
- { "x": 19.25, "y": 1 },
- { "x": 20.25, "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": 7.75, "y": 2 },
- { "x": 8.75, "y": 2 },
-
- { "x": 10.5, "y": 2 },
- { "x": 11.5, "y": 2 },
-
- { "x": 13.5, "y": 2 },
- { "x": 14.5, "y": 2 },
- { "x": 15.5, "y": 2 },
- { "x": 16.5, "y": 2 },
- { "x": 17.5, "y": 2 },
- { "x": 18.5, "y": 2 },
- { "x": 19.5, "y": 2, "w": 2.25 },
-
- { "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.75, "y": 3 },
- { "x": 8.75, "y": 3 },
-
- { "x": 10.5, "y": 3 },
- { "x": 11.5, "y": 3 },
-
- { "x": 13, "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, "w": 1.75 },
- { "x": 20.75, "y": 3 },
-
- { "x": 0.5, "y": 4, "w": 1.25 },
- { "x": 1.75, "y": 4, "w": 1.25 },
- { "x": 3, "y": 4, "w": 1.25 },
- { "x": 4.25, "y": 4, "w": 1.25 },
-
- { "x": 6.5, "y": 4, "h": 1.5 },
- { "x": 7.5, "y": 4 },
-
- { "x": 11.75, "y": 4 },
- { "x": 12.75, "y": 4, "h": 1.5 },
-
- { "x": 16.25, "y": 4, "w": 1.25 },
- { "x": 17.5, "y": 4, "w": 1.25 },
- { "x": 18.75, "y": 4, "w": 1.25 },
- { "x": 20, "y": 4, "w": 1.25 },
-
- { "x": 7.5, "y": 5, "h": 1.5 },
- { "x": 11.75, "y": 5, "h": 1.5 }
+ {"matrix": [0, 0], "x": 0.5, "y": 0},
+ {"matrix": [0, 1], "x": 1.5, "y": 0},
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+
+ {"matrix": [5, 0], "x": 13.25, "y": 0},
+ {"matrix": [5, 1], "x": 14.25, "y": 0},
+ {"matrix": [5, 2], "x": 15.25, "y": 0},
+ {"matrix": [5, 3], "x": 16.25, "y": 0},
+ {"matrix": [5, 4], "x": 17.25, "y": 0},
+ {"matrix": [5, 5], "x": 18.25, "y": 0},
+ {"matrix": [5, 6], "x": 19.25, "y": 0},
+ {"matrix": [5, 7], "x": 22.25, "y": 0, "w": 2},
+ {"matrix": [5, 8], "x": 20.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [1, 8], "x": 8.75, "y": 1},
+
+ {"matrix": [6, 0], "x": 10.5, "y": 1},
+ {"matrix": [6, 1], "x": 11.5, "y": 1},
+ {"matrix": [6, 2], "x": 13.25, "y": 1},
+ {"matrix": [6, 3], "x": 14.25, "y": 1},
+ {"matrix": [6, 4], "x": 15.25, "y": 1},
+ {"matrix": [6, 5], "x": 16.25, "y": 1},
+ {"matrix": [6, 6], "x": 17.25, "y": 1},
+ {"matrix": [6, 7], "x": 18.25, "y": 1},
+ {"matrix": [6, 8], "x": 19.25, "y": 1},
+ {"matrix": [7, 8], "x": 20.25, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+
+ {"matrix": [7, 0], "x": 10.5, "y": 2},
+ {"matrix": [7, 1], "x": 11.5, "y": 2},
+ {"matrix": [7, 2], "x": 13.5, "y": 2},
+ {"matrix": [7, 3], "x": 14.5, "y": 2},
+ {"matrix": [7, 4], "x": 15.5, "y": 2},
+ {"matrix": [7, 5], "x": 16.5, "y": 2},
+ {"matrix": [7, 6], "x": 17.5, "y": 2},
+ {"matrix": [7, 7], "x": 18.5, "y": 2},
+ {"matrix": [8, 8], "x": 19.5, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [4, 4], "x": 1.25, "y": 3},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+
+ {"matrix": [8, 0], "x": 10.5, "y": 3},
+ {"matrix": [8, 1], "x": 11.5, "y": 3},
+ {"matrix": [8, 2], "x": 13, "y": 3},
+ {"matrix": [8, 3], "x": 14, "y": 3},
+ {"matrix": [8, 4], "x": 15, "y": 3},
+ {"matrix": [8, 5], "x": 16, "y": 3},
+ {"matrix": [8, 6], "x": 17, "y": 3},
+ {"matrix": [8, 7], "x": 18, "y": 3},
+ {"matrix": [9, 6], "x": 19, "y": 3, "w": 1.75},
+ {"matrix": [9, 8], "x": 20.75, "y": 3},
+
+ {"matrix": [4, 0], "x": 0.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 6.5, "y": 4, "h": 1.5},
+ {"matrix": [4, 8], "x": 7.5, "y": 4},
+
+ {"matrix": [9, 0], "x": 11.75, "y": 4},
+ {"matrix": [9, 2], "x": 12.75, "y": 4, "h": 1.5},
+ {"matrix": [9, 3], "x": 16.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 17.5, "y": 4, "w": 1.25},
+ {"matrix": [9, 5], "x": 18.75, "y": 4, "w": 1.25},
+ {"matrix": [9, 7], "x": 20, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 7], "x": 7.5, "y": 5, "h": 1.5},
+
+ {"matrix": [9, 1], "x": 11.75, "y": 5, "h": 1.5}
]
}
}
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 @@
"layouts": {
"LAYOUT": {
"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":11.5, "y":0},
- {"x":12.5, "y":0},
- {"x":13.5, "y":0},
- {"x":14.5, "y":0},
- {"x":15.5, "y":0},
- {"x":16.5, "y":0},
-
- {"x":0, "y":1.25, "w":1.25},
- {"x":1.25, "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":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, "w":1.25},
-
- {"x":0, "y":2.25, "w":1.25},
- {"x":1.25, "y":2.25},
- {"x":2.25, "y":2.25},
- {"x":3.25, "y":2.25},
- {"x":4.25, "y":2.25},
- {"x":5.25, "y":2.25},
- {"x":11.25, "y":2.25},
- {"x":12.25, "y":2.25},
- {"x":13.25, "y":2.25},
- {"x":14.25, "y":2.25},
- {"x":15.25, "y":2.25},
- {"x":16.25, "y":2.25, "w":1.25},
-
- {"x":0, "y":3.25, "w":1.25},
- {"x":1.25, "y":3.25},
- {"x":2.25, "y":3.25},
- {"x":3.25, "y":3.25},
- {"x":4.25, "y":3.25},
- {"x":5.25, "y":3.25},
- {"x":11.25, "y":3.25},
- {"x":12.25, "y":3.25},
- {"x":13.25, "y":3.25},
- {"x":14.25, "y":3.25},
- {"x":15.25, "y":3.25},
- {"x":16.25, "y":3.25, "w":1.25},
-
- {"x":0, "y":4.25, "w":1.25},
- {"x":1.25, "y":4.25},
- {"x":2.25, "y":4.25},
- {"x":3.25, "y":4.25},
- {"x":4.25, "y":4.25},
- {"x":5.25, "y":4.25},
- {"x":11.25, "y":4.25},
- {"x":12.25, "y":4.25},
- {"x":13.25, "y":4.25},
- {"x":14.25, "y":4.25},
- {"x":15.25, "y":4.25},
- {"x":16.25, "y":4.25, "w":1.25},
-
- {"x":1.25, "y":5.25},
- {"x":2.25, "y":5.25},
- {"x":3.25, "y":5.25},
- {"x":4.25, "y":5.25},
- {"x":12.25, "y":5.25},
- {"x":13.25, "y":5.25},
- {"x":14.25, "y":5.25},
- {"x":15.25, "y":5.25},
-
- {"x":6.25, "y":6},
- {"x":7.25, "y":6},
- {"x":9.25, "y":6},
- {"x":10.25, "y":6},
-
- {"x":7.25, "y":7},
- {"x":9.25, "y":7},
-
- {"x":5.25, "y":7, "h":2},
- {"x":6.25, "y":7, "h":2},
- {"x":7.25, "y":8},
- {"x":9.25, "y":8},
- {"x":10.25, "y":7, "h":2},
- {"x":11.25, "y":7, "h":2}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [0, 6], "x": 11.5, "y": 0},
+ {"matrix": [0, 7], "x": 12.5, "y": 0},
+ {"matrix": [0, 8], "x": 13.5, "y": 0},
+ {"matrix": [0, 9], "x": 14.5, "y": 0},
+ {"matrix": [0, 10], "x": 15.5, "y": 0},
+ {"matrix": [0, 11], "x": 16.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1.25},
+ {"matrix": [1, 2], "x": 2.25, "y": 1.25},
+ {"matrix": [1, 3], "x": 3.25, "y": 1.25},
+ {"matrix": [1, 4], "x": 4.25, "y": 1.25},
+ {"matrix": [1, 5], "x": 5.25, "y": 1.25},
+
+ {"matrix": [1, 6], "x": 11.25, "y": 1.25},
+ {"matrix": [1, 7], "x": 12.25, "y": 1.25},
+ {"matrix": [1, 8], "x": 13.25, "y": 1.25},
+ {"matrix": [1, 9], "x": 14.25, "y": 1.25},
+ {"matrix": [1, 10], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 11], "x": 16.25, "y": 1.25, "w": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.25},
+ {"matrix": [2, 1], "x": 1.25, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.25, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.25, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.25, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.25, "y": 2.25},
+
+ {"matrix": [2, 6], "x": 11.25, "y": 2.25},
+ {"matrix": [2, 7], "x": 12.25, "y": 2.25},
+ {"matrix": [2, 8], "x": 13.25, "y": 2.25},
+ {"matrix": [2, 9], "x": 14.25, "y": 2.25},
+ {"matrix": [2, 10], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 11], "x": 16.25, "y": 2.25, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.25, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.25, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.25, "y": 3.25},
+
+ {"matrix": [3, 6], "x": 11.25, "y": 3.25},
+ {"matrix": [3, 7], "x": 12.25, "y": 3.25},
+ {"matrix": [3, 8], "x": 13.25, "y": 3.25},
+ {"matrix": [3, 9], "x": 14.25, "y": 3.25},
+ {"matrix": [3, 10], "x": 15.25, "y": 3.25},
+ {"matrix": [3, 11], "x": 16.25, "y": 3.25, "w": 1.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+
+ {"matrix": [4, 6], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 12.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 13.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 14.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 15.25, "y": 4.25},
+ {"matrix": [4, 11], "x": 16.25, "y": 4.25, "w": 1.25},
+
+ {"matrix": [5, 1], "x": 1.25, "y": 5.25},
+ {"matrix": [5, 2], "x": 2.25, "y": 5.25},
+ {"matrix": [5, 3], "x": 3.25, "y": 5.25},
+ {"matrix": [5, 4], "x": 4.25, "y": 5.25},
+
+ {"matrix": [5, 7], "x": 12.25, "y": 5.25},
+ {"matrix": [5, 8], "x": 13.25, "y": 5.25},
+ {"matrix": [5, 9], "x": 14.25, "y": 5.25},
+ {"matrix": [5, 10], "x": 15.25, "y": 5.25},
+
+ {"matrix": [6, 2], "x": 6.25, "y": 6},
+ {"matrix": [6, 3], "x": 7.25, "y": 6},
+
+ {"matrix": [6, 9], "x": 9.25, "y": 6},
+ {"matrix": [6, 8], "x": 10.25, "y": 6},
+
+ {"matrix": [6, 4], "x": 7.25, "y": 7},
+
+ {"matrix": [6, 10], "x": 9.25, "y": 7},
+
+ {"matrix": [6, 0], "x": 5.25, "y": 7, "h": 2},
+ {"matrix": [6, 1], "x": 6.25, "y": 7, "h": 2},
+ {"matrix": [6, 5], "x": 7.25, "y": 8},
+
+ {"matrix": [6, 11], "x": 9.25, "y": 8},
+ {"matrix": [6, 7], "x": 10.25, "y": 7, "h": 2},
+ {"matrix": [6, 6], "x": 11.25, "y": 7, "h": 2}
]
},
"LAYOUT_all": {
"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":11.5, "y":0},
- {"x":12.5, "y":0},
- {"x":13.5, "y":0},
- {"x":14.5, "y":0},
- {"x":15.5, "y":0},
- {"x":16.5, "y":0},
-
- {"x":0, "y":1.25, "w":1.25},
- {"x":1.25, "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":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, "w":1.25},
-
- {"x":0, "y":2.25, "w":1.25},
- {"x":1.25, "y":2.25},
- {"x":2.25, "y":2.25},
- {"x":3.25, "y":2.25},
- {"x":4.25, "y":2.25},
- {"x":5.25, "y":2.25},
- {"x":11.25, "y":2.25},
- {"x":12.25, "y":2.25},
- {"x":13.25, "y":2.25},
- {"x":14.25, "y":2.25},
- {"x":15.25, "y":2.25},
- {"x":16.25, "y":2.25, "w":1.25},
-
- {"x":0, "y":3.25, "w":1.25},
- {"x":1.25, "y":3.25},
- {"x":2.25, "y":3.25},
- {"x":3.25, "y":3.25},
- {"x":4.25, "y":3.25},
- {"x":5.25, "y":3.25},
- {"x":11.25, "y":3.25},
- {"x":12.25, "y":3.25},
- {"x":13.25, "y":3.25},
- {"x":14.25, "y":3.25},
- {"x":15.25, "y":3.25},
- {"x":16.25, "y":3.25, "w":1.25},
-
- {"x":0, "y":4.25, "w":1.25},
- {"x":1.25, "y":4.25},
- {"x":2.25, "y":4.25},
- {"x":3.25, "y":4.25},
- {"x":4.25, "y":4.25},
- {"x":5.25, "y":4.25},
- {"x":11.25, "y":4.25},
- {"x":12.25, "y":4.25},
- {"x":13.25, "y":4.25},
- {"x":14.25, "y":4.25},
- {"x":15.25, "y":4.25},
- {"x":16.25, "y":4.25, "w":1.25},
-
- {"x":0.25, "y":5.25},
- {"x":1.25, "y":5.25},
- {"x":2.25, "y":5.25},
- {"x":3.25, "y":5.25},
- {"x":4.25, "y":5.25},
- {"x":5.25, "y":5.25},
- {"x":11.25, "y":5.25},
- {"x":12.25, "y":5.25},
- {"x":13.25, "y":5.25},
- {"x":14.25, "y":5.25},
- {"x":15.25, "y":5.25},
- {"x":16.25, "y":5.25},
-
- {"x":6.25, "y":6},
- {"x":7.25, "y":6},
- {"x":9.25, "y":6},
- {"x":10.25, "y":6},
-
- {"x":7.25, "y":7},
- {"x":9.25, "y":7},
-
- {"x":5.25, "y":7, "h":2},
- {"x":6.25, "y":7, "h":2},
- {"x":7.25, "y":8},
- {"x":9.25, "y":8},
- {"x":10.25, "y":7, "h":2},
- {"x":11.25, "y":7, "h":2}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [0, 6], "x": 11.5, "y": 0},
+ {"matrix": [0, 7], "x": 12.5, "y": 0},
+ {"matrix": [0, 8], "x": 13.5, "y": 0},
+ {"matrix": [0, 9], "x": 14.5, "y": 0},
+ {"matrix": [0, 10], "x": 15.5, "y": 0},
+ {"matrix": [0, 11], "x": 16.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1.25},
+ {"matrix": [1, 2], "x": 2.25, "y": 1.25},
+ {"matrix": [1, 3], "x": 3.25, "y": 1.25},
+ {"matrix": [1, 4], "x": 4.25, "y": 1.25},
+ {"matrix": [1, 5], "x": 5.25, "y": 1.25},
+
+ {"matrix": [1, 6], "x": 11.25, "y": 1.25},
+ {"matrix": [1, 7], "x": 12.25, "y": 1.25},
+ {"matrix": [1, 8], "x": 13.25, "y": 1.25},
+ {"matrix": [1, 9], "x": 14.25, "y": 1.25},
+ {"matrix": [1, 10], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 11], "x": 16.25, "y": 1.25, "w": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.25},
+ {"matrix": [2, 1], "x": 1.25, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.25, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.25, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.25, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.25, "y": 2.25},
+
+ {"matrix": [2, 6], "x": 11.25, "y": 2.25},
+ {"matrix": [2, 7], "x": 12.25, "y": 2.25},
+ {"matrix": [2, 8], "x": 13.25, "y": 2.25},
+ {"matrix": [2, 9], "x": 14.25, "y": 2.25},
+ {"matrix": [2, 10], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 11], "x": 16.25, "y": 2.25, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.25, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.25, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.25, "y": 3.25},
+
+ {"matrix": [3, 6], "x": 11.25, "y": 3.25},
+ {"matrix": [3, 7], "x": 12.25, "y": 3.25},
+ {"matrix": [3, 8], "x": 13.25, "y": 3.25},
+ {"matrix": [3, 9], "x": 14.25, "y": 3.25},
+ {"matrix": [3, 10], "x": 15.25, "y": 3.25},
+ {"matrix": [3, 11], "x": 16.25, "y": 3.25, "w": 1.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+
+ {"matrix": [4, 6], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 12.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 13.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 14.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 15.25, "y": 4.25},
+ {"matrix": [4, 11], "x": 16.25, "y": 4.25, "w": 1.25},
+
+ {"matrix": [5, 0], "x": 0.25, "y": 5.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.25},
+ {"matrix": [5, 2], "x": 2.25, "y": 5.25},
+ {"matrix": [5, 3], "x": 3.25, "y": 5.25},
+ {"matrix": [5, 4], "x": 4.25, "y": 5.25},
+ {"matrix": [5, 5], "x": 5.25, "y": 5.25},
+
+ {"matrix": [5, 6], "x": 11.25, "y": 5.25},
+ {"matrix": [5, 7], "x": 12.25, "y": 5.25},
+ {"matrix": [5, 8], "x": 13.25, "y": 5.25},
+ {"matrix": [5, 9], "x": 14.25, "y": 5.25},
+ {"matrix": [5, 10], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 11], "x": 16.25, "y": 5.25},
+
+ {"matrix": [6, 2], "x": 6.25, "y": 6},
+ {"matrix": [6, 3], "x": 7.25, "y": 6},
+
+ {"matrix": [6, 9], "x": 9.25, "y": 6},
+ {"matrix": [6, 8], "x": 10.25, "y": 6},
+
+ {"matrix": [6, 4], "x": 7.25, "y": 7},
+
+ {"matrix": [6, 10], "x": 9.25, "y": 7},
+
+ {"matrix": [6, 0], "x": 5.25, "y": 7, "h": 2},
+ {"matrix": [6, 1], "x": 6.25, "y": 7, "h": 2},
+ {"matrix": [6, 5], "x": 7.25, "y": 8},
+
+ {"matrix": [6, 11], "x": 9.25, "y": 8},
+ {"matrix": [6, 7], "x": 10.25, "y": 7, "h": 2},
+ {"matrix": [6, 6], "x": 11.25, "y": 7, "h": 2}
]
}
}
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 @@
-/* Copyright 2022 DmNosachev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* readability */
-#define XXX KC_NO
-
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, \
- k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, \
- k51, k52, k53, k54, k57, k58, k59, k5A, \
- k62, k63, k69, k68, \
- k64, k6A, \
- k60, k61, k65, k6B, k67, k66 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B }, \
- { XXX, k51, k52, k53, k54, XXX, XXX, k57, k58, k59, k5A, XXX }, \
- { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B } \
-}
-
-#define LAYOUT_all( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, \
- k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, \
- k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, \
- k62, k63, k69, k68, \
- k64, k6A, \
- k60, k61, k65, k6B, k67, k66 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B }, \
- { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B }, \
- { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B } \
-}
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);
void caps_lock_led_on(void);
void scroll_lock_led_on(void);
void keypad_led_on(void);
-
-#define ___ KC_NO
-
-#define LAYOUT( \
- k02, k22, k12, k01, k21, k11, k00, k20, k10, \
- k80, k70, k60, k50, k40, k30, \
- k81, k71, k61, k51, k41, k31, \
- k82, k72, k62, k52, k42, k32, \
- k83, k73, k63, k53, k43, k33, \
- k74, k64, k54, k34, \
- k36, k35, \
- k55, \
- k56, k46, k75, \
-\
- k03, k23, k13, k04, k24, k14, k05, k85, k84, \
- k94, kA4, kB4, kD4, kE4, kF4, \
- k95, kA5, kB5, kD5, kE5, kF5, \
- k96, kA6, kB6, kD6, kE6, kF6, \
- k97, kA7, kB7, kD7, kE7, kF7, \
- k93, kB3, kD3, kE3, \
- k47, k66, \
- k67, \
- k87, k76, k86 \
-) { \
- { k00, k01, k02, k03, k04, k05, ___, ___ }, \
- { k10, k11, k12, k13, k14, ___, ___, ___ }, \
- { k20, k21, k22, k23, k24, ___, ___, ___ }, \
- { k30, k31, k32, k33, k34, k35, k36, ___ }, \
- { k40, k41, k42, k43, ___, ___, k46, k47 }, \
- { k50, k51, k52, k53, k54, k55, k56, ___ }, \
- { k60, k61, k62, k63, k64, ___, k66, k67 }, \
- { k70, k71, k72, k73, k74, k75, k76, ___ }, \
- { k80, k81, k82, k83, k84, k85, k86, k87 }, \
- { ___, ___, ___, k93, k94, k95, k96, k97 }, \
- { ___, ___, ___, ___, kA4, kA5, kA6, kA7 }, \
- { ___, ___, ___, kB3, kB4, kB5, kB6, kB7 }, \
- { ___, ___, ___, ___, ___, ___, ___, ___ }, \
- { ___, ___, ___, kD3, kD4, kD5, kD6, kD7 }, \
- { ___, ___, ___, kE3, kE4, kE5, kE6, kE7 }, \
- { ___, ___, ___, ___, kF4, kF5, kF6, kF7 } \
-}
-
-#define LAYOUT_pretty( \
- k02, k22, k12, k01, k21, k11, k00, k20, k10, k03, k23, k13, k04, k24, k14, k05, k85, k84, \
- k80, k70, k60, k50, k40, k30, k94, kA4, kB4, kD4, kE4, kF4, \
- k81, k71, k61, k51, k41, k31, k95, kA5, kB5, kD5, kE5, kF5, \
- k82, k72, k62, k52, k42, k32, k96, kA6, kB6, kD6, kE6, kF6, \
- k83, k73, k63, k53, k43, k33, k97, kA7, kB7, kD7, kE7, kF7, \
- k74, k64, k54, k34, k93, kB3, kD3, kE3, \
- k36, k35, k47, k66, \
- k55, k67, \
- k56, k46, k75, k87, k76, k86 \
-) { \
- { k00, k01, k02, k03, k04, k05, ___, ___ }, \
- { k10, k11, k12, k13, k14, ___, ___, ___ }, \
- { k20, k21, k22, k23, k24, ___, ___, ___ }, \
- { k30, k31, k32, k33, k34, k35, k36, ___ }, \
- { k40, k41, k42, k43, ___, ___, k46, k47 }, \
- { k50, k51, k52, k53, k54, k55, k56, ___ }, \
- { k60, k61, k62, k63, k64, ___, k66, k67 }, \
- { k70, k71, k72, k73, k74, k75, k76, ___ }, \
- { k80, k81, k82, k83, k84, k85, k86, k87 }, \
- { ___, ___, ___, k93, k94, k95, k96, k97 }, \
- { ___, ___, ___, ___, kA4, kA5, kA6, kA7 }, \
- { ___, ___, ___, kB3, kB4, kB5, kB6, kB7 }, \
- { ___, ___, ___, ___, ___, ___, ___, ___ }, \
- { ___, ___, ___, kD3, kD4, kD5, kD6, kD7 }, \
- { ___, ___, ___, kE3, kE4, kE5, kE6, kE7 }, \
- { ___, ___, ___, ___, kF4, kF5, kF6, kF7 } \
-}
-
-/*
- Row pin configuration
-
- PF0 A
- PF1 B
- PF2 C
- PF3 G 0 = U4, 1 = U5
-
-
- Matrix Map (US QWERTY keyboard layout shown)
-
- | 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
- ----------------------------------------------------------------------------------------------------------------------------------------------------
- PB0 col0 | F6 | F8 | F7 | 5% | 4$ | 3# | 2@ | 1! | =+ | | | | | | |
- PB1 col1 | F3 | F5 | F4 | T | R | E | W | Q | Tab | | | | | | |
- PB2 col2 | Esc | F2 | F1 | G | F | D | S | A | CapsLk | | | | | | |
- PB3 col3 | F9 | F11 | F10 | B | V | C | X | Z | LShift | Up | | Down | | [{ | ]} |
- PB4 col4 | F12 | ScrLk | PrtSc | Right | | Left | Insert | `~ | 1! | 6^ | 7& | 8* | | 9( | 0) | -_
- PB5 col5 | Pause | | | LAlt | | Home | | End | Fn | Y | U | I | | O | P | \|
- PB6 col6 | | | | LCtrl | Delete | Bksp | RCtrl | Enter | Space | H | J | K | | L | ;: | '"
- PB7 col7 | | | | | RGUI | | PageUp | | PageDn | N | M | ,< | | .> | /? | RShift
-*/
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 @@
"device_version": "0.0.1"
},
"processor": "at90usb1286",
- "bootloader": "halfkay"
+ "bootloader": "halfkay",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 2], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [2, 2], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [1, 2], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [0, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [2, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [1, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [0, 0], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [2, 0], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [1, 0], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [8, 0], "x": 0, "y": 1.25, "w": 1.25},
+ {"matrix": [7, 0], "x": 1.25, "y": 1.25},
+ {"matrix": [6, 0], "x": 2.25, "y": 1},
+ {"matrix": [5, 0], "x": 3.25, "y": 1},
+ {"matrix": [4, 0], "x": 4.25, "y": 1},
+ {"matrix": [3, 0], "x": 5.25, "y": 1},
+ {"matrix": [8, 1], "x": 0, "y": 2.25, "w": 1.25},
+ {"matrix": [7, 1], "x": 1.25, "y": 2.25},
+ {"matrix": [6, 1], "x": 2.25, "y": 2},
+ {"matrix": [5, 1], "x": 3.25, "y": 2},
+ {"matrix": [4, 1], "x": 4.25, "y": 2},
+ {"matrix": [3, 1], "x": 5.25, "y": 2},
+ {"matrix": [8, 2], "x": 0, "y": 3.25, "w": 1.25},
+ {"matrix": [7, 2], "x": 1.25, "y": 3.25},
+ {"matrix": [6, 2], "x": 2.25, "y": 3},
+ {"matrix": [5, 2], "x": 3.25, "y": 3},
+ {"matrix": [4, 2], "x": 4.25, "y": 3},
+ {"matrix": [3, 2], "x": 5.25, "y": 3},
+ {"matrix": [8, 3], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [7, 3], "x": 1.25, "y": 4.25},
+ {"matrix": [6, 3], "x": 2.25, "y": 4},
+ {"matrix": [5, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 3], "x": 4.25, "y": 4},
+ {"matrix": [3, 3], "x": 5.25, "y": 4},
+ {"matrix": [7, 4], "x": 1.25, "y": 5.25},
+ {"matrix": [6, 4], "x": 2.25, "y": 5},
+ {"matrix": [5, 4], "x": 3.25, "y": 5},
+ {"matrix": [3, 4], "x": 4.25, "y": 5},
+ {"matrix": [3, 6], "x": 5.25, "y": 6},
+ {"matrix": [3, 5], "x": 6.25, "y": 6},
+ {"matrix": [5, 5], "x": 6.25, "y": 7},
+ {"matrix": [5, 6], "x": 4.25, "y": 7, "h": 2},
+ {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
+ {"matrix": [7, 5], "x": 6.25, "y": 8},
+ {"matrix": [0, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [2, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [1, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [0, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [2, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [1, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [0, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [8, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [8, 4], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [9, 4], "x": 9.25, "y": 1},
+ {"matrix": [10, 4], "x": 10.25, "y": 1},
+ {"matrix": [11, 4], "x": 11.25, "y": 1},
+ {"matrix": [13, 4], "x": 12.25, "y": 1},
+ {"matrix": [14, 4], "x": 13.25, "y": 1.25},
+ {"matrix": [15, 4], "x": 14.25, "y": 1.25, "w": 1.25},
+ {"matrix": [9, 5], "x": 9.25, "y": 2},
+ {"matrix": [10, 5], "x": 10.25, "y": 2},
+ {"matrix": [11, 5], "x": 11.25, "y": 2},
+ {"matrix": [13, 5], "x": 12.25, "y": 2},
+ {"matrix": [14, 5], "x": 13.25, "y": 2.25},
+ {"matrix": [15, 5], "x": 14.25, "y": 2.25, "w": 1.25},
+ {"matrix": [9, 6], "x": 9.25, "y": 3},
+ {"matrix": [10, 6], "x": 10.25, "y": 3},
+ {"matrix": [11, 6], "x": 11.25, "y": 3},
+ {"matrix": [13, 6], "x": 12.25, "y": 3},
+ {"matrix": [14, 6], "x": 13.25, "y": 3.25},
+ {"matrix": [15, 6], "x": 14.25, "y": 3.25, "w": 1.25},
+ {"matrix": [9, 7], "x": 9.25, "y": 4},
+ {"matrix": [10, 7], "x": 10.25, "y": 4},
+ {"matrix": [11, 7], "x": 11.25, "y": 4},
+ {"matrix": [13, 7], "x": 12.25, "y": 4},
+ {"matrix": [14, 7], "x": 13.25, "y": 4.25},
+ {"matrix": [15, 7], "x": 14.25, "y": 4.25, "w": 1.25},
+ {"matrix": [9, 3], "x": 10.25, "y": 5},
+ {"matrix": [11, 3], "x": 11.25, "y": 5},
+ {"matrix": [13, 3], "x": 12.25, "y": 5},
+ {"matrix": [14, 3], "x": 13.25, "y": 5.25},
+ {"matrix": [4, 7], "x": 8.25, "y": 6},
+ {"matrix": [6, 6], "x": 9.25, "y": 6},
+ {"matrix": [6, 7], "x": 8.25, "y": 7},
+ {"matrix": [8, 7], "x": 8.25, "y": 8},
+ {"matrix": [7, 6], "x": 9.25, "y": 7, "h": 2},
+ {"matrix": [8, 6], "x": 10.25, "y": 7, "h": 2}
+ ]
+ },
+ "LAYOUT_pretty": {
+ "layout": [
+ {"matrix": [0, 2], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [2, 2], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [1, 2], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [0, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [2, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [1, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [0, 0], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [2, 0], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [1, 0], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [0, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [2, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [1, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [0, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [2, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [1, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [0, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [8, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [8, 4], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [8, 0], "x": 0, "y": 1.25, "w": 1.25},
+ {"matrix": [7, 0], "x": 1.25, "y": 1.25},
+ {"matrix": [6, 0], "x": 2.25, "y": 1},
+ {"matrix": [5, 0], "x": 3.25, "y": 1},
+ {"matrix": [4, 0], "x": 4.25, "y": 1},
+ {"matrix": [3, 0], "x": 5.25, "y": 1},
+ {"matrix": [9, 4], "x": 9.25, "y": 1},
+ {"matrix": [10, 4], "x": 10.25, "y": 1},
+ {"matrix": [11, 4], "x": 11.25, "y": 1},
+ {"matrix": [13, 4], "x": 12.25, "y": 1},
+ {"matrix": [14, 4], "x": 13.25, "y": 1.25},
+ {"matrix": [15, 4], "x": 14.25, "y": 1.25, "w": 1.25},
+ {"matrix": [8, 1], "x": 0, "y": 2.25, "w": 1.25},
+ {"matrix": [7, 1], "x": 1.25, "y": 2.25},
+ {"matrix": [6, 1], "x": 2.25, "y": 2},
+ {"matrix": [5, 1], "x": 3.25, "y": 2},
+ {"matrix": [4, 1], "x": 4.25, "y": 2},
+ {"matrix": [3, 1], "x": 5.25, "y": 2},
+ {"matrix": [9, 5], "x": 9.25, "y": 2},
+ {"matrix": [10, 5], "x": 10.25, "y": 2},
+ {"matrix": [11, 5], "x": 11.25, "y": 2},
+ {"matrix": [13, 5], "x": 12.25, "y": 2},
+ {"matrix": [14, 5], "x": 13.25, "y": 2.25},
+ {"matrix": [15, 5], "x": 14.25, "y": 2.25, "w": 1.25},
+ {"matrix": [8, 2], "x": 0, "y": 3.25, "w": 1.25},
+ {"matrix": [7, 2], "x": 1.25, "y": 3.25},
+ {"matrix": [6, 2], "x": 2.25, "y": 3},
+ {"matrix": [5, 2], "x": 3.25, "y": 3},
+ {"matrix": [4, 2], "x": 4.25, "y": 3},
+ {"matrix": [3, 2], "x": 5.25, "y": 3},
+ {"matrix": [9, 6], "x": 9.25, "y": 3},
+ {"matrix": [10, 6], "x": 10.25, "y": 3},
+ {"matrix": [11, 6], "x": 11.25, "y": 3},
+ {"matrix": [13, 6], "x": 12.25, "y": 3},
+ {"matrix": [14, 6], "x": 13.25, "y": 3.25},
+ {"matrix": [15, 6], "x": 14.25, "y": 3.25, "w": 1.25},
+ {"matrix": [8, 3], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [7, 3], "x": 1.25, "y": 4.25},
+ {"matrix": [6, 3], "x": 2.25, "y": 4},
+ {"matrix": [5, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 3], "x": 4.25, "y": 4},
+ {"matrix": [3, 3], "x": 5.25, "y": 4},
+ {"matrix": [9, 7], "x": 9.25, "y": 4},
+ {"matrix": [10, 7], "x": 10.25, "y": 4},
+ {"matrix": [11, 7], "x": 11.25, "y": 4},
+ {"matrix": [13, 7], "x": 12.25, "y": 4},
+ {"matrix": [14, 7], "x": 13.25, "y": 4.25},
+ {"matrix": [15, 7], "x": 14.25, "y": 4.25, "w": 1.25},
+ {"matrix": [7, 4], "x": 1.25, "y": 5.25},
+ {"matrix": [6, 4], "x": 2.25, "y": 5},
+ {"matrix": [5, 4], "x": 3.25, "y": 5},
+ {"matrix": [3, 4], "x": 4.25, "y": 5},
+ {"matrix": [9, 3], "x": 10.25, "y": 5},
+ {"matrix": [11, 3], "x": 11.25, "y": 5},
+ {"matrix": [13, 3], "x": 12.25, "y": 5},
+ {"matrix": [14, 3], "x": 13.25, "y": 5.25},
+ {"matrix": [3, 6], "x": 5.25, "y": 6},
+ {"matrix": [3, 5], "x": 6.25, "y": 6},
+ {"matrix": [4, 7], "x": 8.25, "y": 6},
+ {"matrix": [6, 6], "x": 9.25, "y": 6},
+ {"matrix": [5, 5], "x": 6.25, "y": 7},
+ {"matrix": [6, 7], "x": 8.25, "y": 7},
+ {"matrix": [5, 6], "x": 4.25, "y": 7, "h": 2},
+ {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
+ {"matrix": [7, 5], "x": 6.25, "y": 8},
+ {"matrix": [8, 7], "x": 8.25, "y": 8},
+ {"matrix": [7, 6], "x": 9.25, "y": 7, "h": 2},
+ {"matrix": [8, 6], "x": 10.25, "y": 7, "h": 2}
+ ]
+ }
+ }
}
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 @@
{
"url": "",
- "maintainer": "qmk",
- "layouts": {
- "LAYOUT": {
- "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}]
- },
-
- "LAYOUT_pretty": {
- "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}]
- }
- }
+ "maintainer": "qmk"
}
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 @@
},
"processor": "at90usb1286",
"bootloader": "halfkay",
- "debounce": 20
+ "debounce": 20,
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 0], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
+ {"matrix": [1, 0], "x": 1.25, "y": 1.25},
+ {"matrix": [2, 0], "x": 2.25, "y": 1},
+ {"matrix": [3, 0], "x": 3.25, "y": 1},
+ {"matrix": [4, 0], "x": 4.25, "y": 1},
+ {"matrix": [5, 0], "x": 5.25, "y": 1},
+ {"matrix": [0, 1], "x": 0, "y": 2.25, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 2.25},
+ {"matrix": [2, 1], "x": 2.25, "y": 2},
+ {"matrix": [3, 1], "x": 3.25, "y": 2},
+ {"matrix": [4, 1], "x": 4.25, "y": 2},
+ {"matrix": [5, 1], "x": 5.25, "y": 2},
+ {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.25},
+ {"matrix": [1, 2], "x": 1.25, "y": 3.25},
+ {"matrix": [2, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [4, 2], "x": 4.25, "y": 3},
+ {"matrix": [5, 2], "x": 5.25, "y": 3},
+ {"matrix": [0, 3], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [1, 3], "x": 1.25, "y": 4.25},
+ {"matrix": [2, 3], "x": 2.25, "y": 4},
+ {"matrix": [3, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 3], "x": 4.25, "y": 4},
+ {"matrix": [5, 3], "x": 5.25, "y": 4},
+ {"matrix": [1, 4], "x": 1.25, "y": 5.25},
+ {"matrix": [2, 4], "x": 2.25, "y": 5},
+ {"matrix": [3, 4], "x": 3.25, "y": 5},
+ {"matrix": [5, 4], "x": 4.25, "y": 5},
+ {"matrix": [5, 6], "x": 5.25, "y": 6},
+ {"matrix": [5, 5], "x": 6.25, "y": 6},
+ {"matrix": [3, 5], "x": 6.25, "y": 7},
+ {"matrix": [3, 6], "x": 4.25, "y": 7, "h": 2},
+ {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
+ {"matrix": [2, 5], "x": 6.25, "y": 8},
+ {"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 5], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [6, 0], "x": 9.25, "y": 1},
+ {"matrix": [7, 0], "x": 10.25, "y": 1},
+ {"matrix": [8, 0], "x": 11.25, "y": 1},
+ {"matrix": [9, 0], "x": 12.25, "y": 1},
+ {"matrix": [10, 0], "x": 13.25, "y": 1.25},
+ {"matrix": [11, 0], "x": 14.25, "y": 1.25, "w": 1.25},
+ {"matrix": [6, 1], "x": 9.25, "y": 2},
+ {"matrix": [7, 1], "x": 10.25, "y": 2},
+ {"matrix": [8, 1], "x": 11.25, "y": 2},
+ {"matrix": [9, 1], "x": 12.25, "y": 2},
+ {"matrix": [10, 1], "x": 13.25, "y": 2.25},
+ {"matrix": [11, 1], "x": 14.25, "y": 2.25, "w": 1.25},
+ {"matrix": [6, 2], "x": 9.25, "y": 3},
+ {"matrix": [7, 2], "x": 10.25, "y": 3},
+ {"matrix": [8, 2], "x": 11.25, "y": 3},
+ {"matrix": [9, 2], "x": 12.25, "y": 3},
+ {"matrix": [10, 2], "x": 13.25, "y": 3.25},
+ {"matrix": [11, 2], "x": 14.25, "y": 3.25, "w": 1.25},
+ {"matrix": [6, 3], "x": 9.25, "y": 4},
+ {"matrix": [7, 3], "x": 10.25, "y": 4},
+ {"matrix": [8, 3], "x": 11.25, "y": 4},
+ {"matrix": [9, 3], "x": 12.25, "y": 4},
+ {"matrix": [10, 3], "x": 13.25, "y": 4.25},
+ {"matrix": [11, 3], "x": 14.25, "y": 4.25, "w": 1.25},
+ {"matrix": [6, 4], "x": 10.25, "y": 5},
+ {"matrix": [8, 4], "x": 11.25, "y": 5},
+ {"matrix": [9, 4], "x": 12.25, "y": 5},
+ {"matrix": [10, 4], "x": 13.25, "y": 5.25},
+ {"matrix": [9, 6], "x": 8.25, "y": 6},
+ {"matrix": [8, 5], "x": 9.25, "y": 6},
+ {"matrix": [8, 6], "x": 8.25, "y": 7},
+ {"matrix": [6, 6], "x": 8.25, "y": 8},
+ {"matrix": [7, 5], "x": 9.25, "y": 7, "h": 2},
+ {"matrix": [6, 5], "x": 10.25, "y": 7, "h": 2}
+ ]
+ },
+ "LAYOUT_pretty": {
+ "layout": [
+ {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 0], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 5], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
+ {"matrix": [1, 0], "x": 1.25, "y": 1.25},
+ {"matrix": [2, 0], "x": 2.25, "y": 1},
+ {"matrix": [3, 0], "x": 3.25, "y": 1},
+ {"matrix": [4, 0], "x": 4.25, "y": 1},
+ {"matrix": [5, 0], "x": 5.25, "y": 1},
+ {"matrix": [6, 0], "x": 9.25, "y": 1},
+ {"matrix": [7, 0], "x": 10.25, "y": 1},
+ {"matrix": [8, 0], "x": 11.25, "y": 1},
+ {"matrix": [9, 0], "x": 12.25, "y": 1},
+ {"matrix": [10, 0], "x": 13.25, "y": 1.25},
+ {"matrix": [11, 0], "x": 14.25, "y": 1.25, "w": 1.25},
+ {"matrix": [0, 1], "x": 0, "y": 2.25, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 2.25},
+ {"matrix": [2, 1], "x": 2.25, "y": 2},
+ {"matrix": [3, 1], "x": 3.25, "y": 2},
+ {"matrix": [4, 1], "x": 4.25, "y": 2},
+ {"matrix": [5, 1], "x": 5.25, "y": 2},
+ {"matrix": [6, 1], "x": 9.25, "y": 2},
+ {"matrix": [7, 1], "x": 10.25, "y": 2},
+ {"matrix": [8, 1], "x": 11.25, "y": 2},
+ {"matrix": [9, 1], "x": 12.25, "y": 2},
+ {"matrix": [10, 1], "x": 13.25, "y": 2.25},
+ {"matrix": [11, 1], "x": 14.25, "y": 2.25, "w": 1.25},
+ {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.25},
+ {"matrix": [1, 2], "x": 1.25, "y": 3.25},
+ {"matrix": [2, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [4, 2], "x": 4.25, "y": 3},
+ {"matrix": [5, 2], "x": 5.25, "y": 3},
+ {"matrix": [6, 2], "x": 9.25, "y": 3},
+ {"matrix": [7, 2], "x": 10.25, "y": 3},
+ {"matrix": [8, 2], "x": 11.25, "y": 3},
+ {"matrix": [9, 2], "x": 12.25, "y": 3},
+ {"matrix": [10, 2], "x": 13.25, "y": 3.25},
+ {"matrix": [11, 2], "x": 14.25, "y": 3.25, "w": 1.25},
+ {"matrix": [0, 3], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [1, 3], "x": 1.25, "y": 4.25},
+ {"matrix": [2, 3], "x": 2.25, "y": 4},
+ {"matrix": [3, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 3], "x": 4.25, "y": 4},
+ {"matrix": [5, 3], "x": 5.25, "y": 4},
+ {"matrix": [6, 3], "x": 9.25, "y": 4},
+ {"matrix": [7, 3], "x": 10.25, "y": 4},
+ {"matrix": [8, 3], "x": 11.25, "y": 4},
+ {"matrix": [9, 3], "x": 12.25, "y": 4},
+ {"matrix": [10, 3], "x": 13.25, "y": 4.25},
+ {"matrix": [11, 3], "x": 14.25, "y": 4.25, "w": 1.25},
+ {"matrix": [1, 4], "x": 1.25, "y": 5.25},
+ {"matrix": [2, 4], "x": 2.25, "y": 5},
+ {"matrix": [3, 4], "x": 3.25, "y": 5},
+ {"matrix": [5, 4], "x": 4.25, "y": 5},
+ {"matrix": [6, 4], "x": 10.25, "y": 5},
+ {"matrix": [8, 4], "x": 11.25, "y": 5},
+ {"matrix": [9, 4], "x": 12.25, "y": 5},
+ {"matrix": [10, 4], "x": 13.25, "y": 5.25},
+ {"matrix": [5, 6], "x": 5.25, "y": 6},
+ {"matrix": [5, 5], "x": 6.25, "y": 6},
+ {"matrix": [9, 6], "x": 8.25, "y": 6},
+ {"matrix": [8, 5], "x": 9.25, "y": 6},
+ {"matrix": [3, 5], "x": 6.25, "y": 7},
+ {"matrix": [8, 6], "x": 8.25, "y": 7},
+ {"matrix": [3, 6], "x": 4.25, "y": 7, "h": 2},
+ {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
+ {"matrix": [2, 5], "x": 6.25, "y": 8},
+ {"matrix": [6, 6], "x": 8.25, "y": 8},
+ {"matrix": [7, 5], "x": 9.25, "y": 7, "h": 2},
+ {"matrix": [6, 5], "x": 10.25, "y": 7, "h": 2}
+ ]
+ }
+ }
}
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 @@
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments as on the physical keyboard
-// The second converts the arguments into the 2-D scanned array
-
-#define LAYOUT( \
- kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2, \
- k00, k10, k20, k30, k40, k50, \
- k01, k11, k21, k31, k41, k51, \
- k02, k12, k22, k32, k42, k52, \
- k03, k13, k23, k33, k43, k53, \
- k14, k24, k34, k54, \
- k56, k55, \
- k35, \
- k36, k46, k25, \
- \
- kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5, \
- k60, k70, k80, k90, kA0, kB0, \
- k61, k71, k81, k91, kA1, kB1, \
- k62, k72, k82, k92, kA2, kB2, \
- k63, k73, k83, k93, kA3, kB3, \
- k64, k84, k94, kA4, \
- k96, k85, \
- k86, \
- k66, k75, k65 \
-) { \
- { k00, k01, k02, k03, ___, ___, ___ }, \
- { k10, k11, k12, k13, k14, ___, ___ }, \
- { k20, k21, k22, k23, k24, k25, ___ }, \
- { k30, k31, k32, k33, k34, k35, k36 }, \
- { k40, k41, k42, k43, ___, ___, k46 }, \
- { k50, k51, k52, k53, k54, k55, k56 }, \
- { k60, k61, k62, k63, k64, k65, k66 }, \
- { k70, k71, k72, k73, ___, k75, ___ }, \
- { k80, k81, k82, k83, k84, k85, k86 }, \
- { k90, k91, k92, k93, k94, ___, k96 }, \
- { kA0, kA1, kA2, kA3, kA4, ___, ___ }, \
- { kB0, kB1, kB2, kB3, ___, ___, ___ }, \
- { kC0, kC1, kC2, kC3, kC4, kC5, ___ }, \
- { kD0, kD1, kD2, kD3, kD4, kD5, ___ }, \
- { kE0, kE1, kE2, kE3, kE4, kE5, ___ } \
-}
-
-/* ---------------- LEFT HAND ----------------- ---------------- RIGHT HAND ---------------- */
-#define LAYOUT_pretty( \
- kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2, kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5, \
- k00, k10, k20, k30, k40, k50, k60, k70, k80, k90, kA0, kB0, \
- k01, k11, k21, k31, k41, k51, k61, k71, k81, k91, kA1, kB1, \
- k02, k12, k22, k32, k42, k52, k62, k72, k82, k92, kA2, kB2, \
- k03, k13, k23, k33, k43, k53, k63, k73, k83, k93, kA3, kB3, \
- k14, k24, k34, k54, k64, k84, k94, kA4, \
- k56, k55, k96, k85, \
- k35, k86, \
- k36, k46, k25, k66, k75, k65 \
-) { \
- { k00, k01, k02, k03, ___, ___, ___ }, \
- { k10, k11, k12, k13, k14, ___, ___ }, \
- { k20, k21, k22, k23, k24, k25, ___ }, \
- { k30, k31, k32, k33, k34, k35, k36 }, \
- { k40, k41, k42, k43, ___, ___, k46 }, \
- { k50, k51, k52, k53, k54, k55, k56 }, \
- { k60, k61, k62, k63, k64, k65, k66 }, \
- { k70, k71, k72, k73, ___, k75, ___ }, \
- { k80, k81, k82, k83, k84, k85, k86 }, \
- { k90, k91, k92, k93, k94, ___, k96 }, \
- { kA0, kA1, kA2, kA3, kA4, ___, ___ }, \
- { kB0, kB1, kB2, kB3, ___, ___, ___ }, \
- { kC0, kC1, kC2, kC3, kC4, kC5, ___ }, \
- { kD0, kD1, kD2, kD3, kD4, kD5, ___ }, \
- { kE0, kE1, kE2, kE3, kE4, kE5, ___ } \
-}
-
-/*
-This is the Stapelberg matrix as published at
-https://github.com/stapelberg/kinesis-firmware/blob/master/kb_kinesis/config.kspec
-Along with the pins for each row and column
- PB0 PB1 PB2 PB3 PB4 PB5 PB6
- kx0 kx1 kx2 kx3 kx4 kx5 kx6
-PD0 k0x Row: EQL TAB CAP LSH X2 -- --
-PD1 k1x Row: 1 Q A Z BQ -- --
-PD2 k2x Row: 2 W S X INS END --
-PD3 k3x Row: 3 E D C LFT HOM BAK
-PD4 k4x Row: 4 R F V -- -- DEL
-PD5 k5x Row: 5 T G B RT LAL LCT
-PD6 k6x Row: 6 Y H N UP SPC PGD
-PD7 k7x Row: 7 U J M -- RET --
-PC0 k8x Row: 8 I K COM DWN RCT PGU
-PC1 k9x Row: 9 O L PER LBR -- RAL
-PC2 kAx Row: 0 P SEM SLA RBR -- --
-PC3 kBx Row: MIN BSL APO RSH X1 -- --
-PC4 kCx Row: ESC F3 F6 F9 F12 PAU --
-PC5 kDx Row: F1 F4 F7 F10 PRT PRG --
-PC6 kEx Row: F2 F5 F8 F11 SLK KEY --
-*/
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 @@
},
"processor": "MK66FX1M0",
"bootloader": "halfkay",
- "debounce": 20
+ "debounce": 20,
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 0], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
+ {"matrix": [1, 0], "x": 1.25, "y": 1.25},
+ {"matrix": [2, 0], "x": 2.25, "y": 1},
+ {"matrix": [3, 0], "x": 3.25, "y": 1},
+ {"matrix": [4, 0], "x": 4.25, "y": 1},
+ {"matrix": [5, 0], "x": 5.25, "y": 1},
+ {"matrix": [0, 1], "x": 0, "y": 2.25, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 2.25},
+ {"matrix": [2, 1], "x": 2.25, "y": 2},
+ {"matrix": [3, 1], "x": 3.25, "y": 2},
+ {"matrix": [4, 1], "x": 4.25, "y": 2},
+ {"matrix": [5, 1], "x": 5.25, "y": 2},
+ {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.25},
+ {"matrix": [1, 2], "x": 1.25, "y": 3.25},
+ {"matrix": [2, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [4, 2], "x": 4.25, "y": 3},
+ {"matrix": [5, 2], "x": 5.25, "y": 3},
+ {"matrix": [0, 3], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [1, 3], "x": 1.25, "y": 4.25},
+ {"matrix": [2, 3], "x": 2.25, "y": 4},
+ {"matrix": [3, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 3], "x": 4.25, "y": 4},
+ {"matrix": [5, 3], "x": 5.25, "y": 4},
+ {"matrix": [1, 4], "x": 1.25, "y": 5.25},
+ {"matrix": [2, 4], "x": 2.25, "y": 5},
+ {"matrix": [3, 4], "x": 3.25, "y": 5},
+ {"matrix": [5, 4], "x": 4.25, "y": 5},
+ {"matrix": [5, 6], "x": 5.25, "y": 6},
+ {"matrix": [5, 5], "x": 6.25, "y": 6},
+ {"matrix": [3, 5], "x": 6.25, "y": 7},
+ {"matrix": [3, 6], "x": 4.25, "y": 7, "h": 2},
+ {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
+ {"matrix": [2, 5], "x": 6.25, "y": 8},
+ {"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 5], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [6, 0], "x": 9.25, "y": 1},
+ {"matrix": [7, 0], "x": 10.25, "y": 1},
+ {"matrix": [8, 0], "x": 11.25, "y": 1},
+ {"matrix": [9, 0], "x": 12.25, "y": 1},
+ {"matrix": [10, 0], "x": 13.25, "y": 1.25},
+ {"matrix": [11, 0], "x": 14.25, "y": 1.25, "w": 1.25},
+ {"matrix": [6, 1], "x": 9.25, "y": 2},
+ {"matrix": [7, 1], "x": 10.25, "y": 2},
+ {"matrix": [8, 1], "x": 11.25, "y": 2},
+ {"matrix": [9, 1], "x": 12.25, "y": 2},
+ {"matrix": [10, 1], "x": 13.25, "y": 2.25},
+ {"matrix": [11, 1], "x": 14.25, "y": 2.25, "w": 1.25},
+ {"matrix": [6, 2], "x": 9.25, "y": 3},
+ {"matrix": [7, 2], "x": 10.25, "y": 3},
+ {"matrix": [8, 2], "x": 11.25, "y": 3},
+ {"matrix": [9, 2], "x": 12.25, "y": 3},
+ {"matrix": [10, 2], "x": 13.25, "y": 3.25},
+ {"matrix": [11, 2], "x": 14.25, "y": 3.25, "w": 1.25},
+ {"matrix": [6, 3], "x": 9.25, "y": 4},
+ {"matrix": [7, 3], "x": 10.25, "y": 4},
+ {"matrix": [8, 3], "x": 11.25, "y": 4},
+ {"matrix": [9, 3], "x": 12.25, "y": 4},
+ {"matrix": [10, 3], "x": 13.25, "y": 4.25},
+ {"matrix": [11, 3], "x": 14.25, "y": 4.25, "w": 1.25},
+ {"matrix": [6, 4], "x": 10.25, "y": 5},
+ {"matrix": [8, 4], "x": 11.25, "y": 5},
+ {"matrix": [9, 4], "x": 12.25, "y": 5},
+ {"matrix": [10, 4], "x": 13.25, "y": 5.25},
+ {"matrix": [9, 6], "x": 8.25, "y": 6},
+ {"matrix": [8, 5], "x": 9.25, "y": 6},
+ {"matrix": [8, 6], "x": 8.25, "y": 7},
+ {"matrix": [6, 6], "x": 8.25, "y": 8},
+ {"matrix": [7, 5], "x": 9.25, "y": 7, "h": 2},
+ {"matrix": [6, 5], "x": 10.25, "y": 7, "h": 2}
+ ]
+ },
+ "LAYOUT_pretty": {
+ "layout": [
+ {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 0], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 5], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
+ {"matrix": [1, 0], "x": 1.25, "y": 1.25},
+ {"matrix": [2, 0], "x": 2.25, "y": 1},
+ {"matrix": [3, 0], "x": 3.25, "y": 1},
+ {"matrix": [4, 0], "x": 4.25, "y": 1},
+ {"matrix": [5, 0], "x": 5.25, "y": 1},
+ {"matrix": [6, 0], "x": 9.25, "y": 1},
+ {"matrix": [7, 0], "x": 10.25, "y": 1},
+ {"matrix": [8, 0], "x": 11.25, "y": 1},
+ {"matrix": [9, 0], "x": 12.25, "y": 1},
+ {"matrix": [10, 0], "x": 13.25, "y": 1.25},
+ {"matrix": [11, 0], "x": 14.25, "y": 1.25, "w": 1.25},
+ {"matrix": [0, 1], "x": 0, "y": 2.25, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 2.25},
+ {"matrix": [2, 1], "x": 2.25, "y": 2},
+ {"matrix": [3, 1], "x": 3.25, "y": 2},
+ {"matrix": [4, 1], "x": 4.25, "y": 2},
+ {"matrix": [5, 1], "x": 5.25, "y": 2},
+ {"matrix": [6, 1], "x": 9.25, "y": 2},
+ {"matrix": [7, 1], "x": 10.25, "y": 2},
+ {"matrix": [8, 1], "x": 11.25, "y": 2},
+ {"matrix": [9, 1], "x": 12.25, "y": 2},
+ {"matrix": [10, 1], "x": 13.25, "y": 2.25},
+ {"matrix": [11, 1], "x": 14.25, "y": 2.25, "w": 1.25},
+ {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.25},
+ {"matrix": [1, 2], "x": 1.25, "y": 3.25},
+ {"matrix": [2, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [4, 2], "x": 4.25, "y": 3},
+ {"matrix": [5, 2], "x": 5.25, "y": 3},
+ {"matrix": [6, 2], "x": 9.25, "y": 3},
+ {"matrix": [7, 2], "x": 10.25, "y": 3},
+ {"matrix": [8, 2], "x": 11.25, "y": 3},
+ {"matrix": [9, 2], "x": 12.25, "y": 3},
+ {"matrix": [10, 2], "x": 13.25, "y": 3.25},
+ {"matrix": [11, 2], "x": 14.25, "y": 3.25, "w": 1.25},
+ {"matrix": [0, 3], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [1, 3], "x": 1.25, "y": 4.25},
+ {"matrix": [2, 3], "x": 2.25, "y": 4},
+ {"matrix": [3, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 3], "x": 4.25, "y": 4},
+ {"matrix": [5, 3], "x": 5.25, "y": 4},
+ {"matrix": [6, 3], "x": 9.25, "y": 4},
+ {"matrix": [7, 3], "x": 10.25, "y": 4},
+ {"matrix": [8, 3], "x": 11.25, "y": 4},
+ {"matrix": [9, 3], "x": 12.25, "y": 4},
+ {"matrix": [10, 3], "x": 13.25, "y": 4.25},
+ {"matrix": [11, 3], "x": 14.25, "y": 4.25, "w": 1.25},
+ {"matrix": [1, 4], "x": 1.25, "y": 5.25},
+ {"matrix": [2, 4], "x": 2.25, "y": 5},
+ {"matrix": [3, 4], "x": 3.25, "y": 5},
+ {"matrix": [5, 4], "x": 4.25, "y": 5},
+ {"matrix": [6, 4], "x": 10.25, "y": 5},
+ {"matrix": [8, 4], "x": 11.25, "y": 5},
+ {"matrix": [9, 4], "x": 12.25, "y": 5},
+ {"matrix": [10, 4], "x": 13.25, "y": 5.25},
+ {"matrix": [5, 6], "x": 5.25, "y": 6},
+ {"matrix": [5, 5], "x": 6.25, "y": 6},
+ {"matrix": [9, 6], "x": 8.25, "y": 6},
+ {"matrix": [8, 5], "x": 9.25, "y": 6},
+ {"matrix": [3, 5], "x": 6.25, "y": 7},
+ {"matrix": [8, 6], "x": 8.25, "y": 7},
+ {"matrix": [3, 6], "x": 4.25, "y": 7, "h": 2},
+ {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
+ {"matrix": [2, 5], "x": 6.25, "y": 8},
+ {"matrix": [6, 6], "x": 8.25, "y": 8},
+ {"matrix": [7, 5], "x": 9.25, "y": 7, "h": 2},
+ {"matrix": [6, 5], "x": 10.25, "y": 7, "h": 2}
+ ]
+ }
+ }
}
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 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "kint36.h"
+#include "quantum.h"
#define LED_POWER C5
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 @@
-/* Copyright 2020 QMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments as on the physical keyboard
-// The second converts the arguments into the 2-D scanned array
-
-#define LAYOUT( \
- kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2, \
- k00, k10, k20, k30, k40, k50, \
- k01, k11, k21, k31, k41, k51, \
- k02, k12, k22, k32, k42, k52, \
- k03, k13, k23, k33, k43, k53, \
- k14, k24, k34, k54, \
- k56, k55, \
- k35, \
- k36, k46, k25, \
- \
- kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5, \
- k60, k70, k80, k90, kA0, kB0, \
- k61, k71, k81, k91, kA1, kB1, \
- k62, k72, k82, k92, kA2, kB2, \
- k63, k73, k83, k93, kA3, kB3, \
- k64, k84, k94, kA4, \
- k96, k85, \
- k86, \
- k66, k75, k65 \
-) { \
- { k00, k01, k02, k03, ___, ___, ___ }, \
- { k10, k11, k12, k13, k14, ___, ___ }, \
- { k20, k21, k22, k23, k24, k25, ___ }, \
- { k30, k31, k32, k33, k34, k35, k36 }, \
- { k40, k41, k42, k43, ___, ___, k46 }, \
- { k50, k51, k52, k53, k54, k55, k56 }, \
- { k60, k61, k62, k63, k64, k65, k66 }, \
- { k70, k71, k72, k73, ___, k75, ___ }, \
- { k80, k81, k82, k83, k84, k85, k86 }, \
- { k90, k91, k92, k93, k94, ___, k96 }, \
- { kA0, kA1, kA2, kA3, kA4, ___, ___ }, \
- { kB0, kB1, kB2, kB3, ___, ___, ___ }, \
- { kC0, kC1, kC2, kC3, kC4, kC5, ___ }, \
- { kD0, kD1, kD2, kD3, kD4, kD5, ___ }, \
- { kE0, kE1, kE2, kE3, kE4, kE5, ___ }, \
-}
-
-/* ---------------- LEFT HAND ----------------- ---------------- RIGHT HAND ---------------- */
-#define LAYOUT_pretty( \
- kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2, kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5, \
- k00, k10, k20, k30, k40, k50, k60, k70, k80, k90, kA0, kB0, \
- k01, k11, k21, k31, k41, k51, k61, k71, k81, k91, kA1, kB1, \
- k02, k12, k22, k32, k42, k52, k62, k72, k82, k92, kA2, kB2, \
- k03, k13, k23, k33, k43, k53, k63, k73, k83, k93, kA3, kB3, \
- k14, k24, k34, k54, k64, k84, k94, kA4, \
- k56, k55, k96, k85, \
- k35, k86, \
- k36, k46, k25, k66, k75, k65 \
-) { \
- { k00, k01, k02, k03, ___, ___, ___ }, \
- { k10, k11, k12, k13, k14, ___, ___ }, \
- { k20, k21, k22, k23, k24, k25, ___ }, \
- { k30, k31, k32, k33, k34, k35, k36 }, \
- { k40, k41, k42, k43, ___, ___, k46 }, \
- { k50, k51, k52, k53, k54, k55, k56 }, \
- { k60, k61, k62, k63, k64, k65, k66 }, \
- { k70, k71, k72, k73, ___, k75, ___ }, \
- { k80, k81, k82, k83, k84, k85, k86 }, \
- { k90, k91, k92, k93, k94, ___, k96 }, \
- { kA0, kA1, kA2, kA3, kA4, ___, ___ }, \
- { kB0, kB1, kB2, kB3, ___, ___, ___ }, \
- { kC0, kC1, kC2, kC3, kC4, kC5, ___ }, \
- { kD0, kD1, kD2, kD3, kD4, kD5, ___ }, \
- { kE0, kE1, kE2, kE3, kE4, kE5, ___ } \
-}
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 @@
"compose": "LINE_PIN24",
"on_state": 0
},
- "debounce": 20
+ "debounce": 20,
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 0], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
+ {"matrix": [1, 0], "x": 1.25, "y": 1.25},
+ {"matrix": [2, 0], "x": 2.25, "y": 1},
+ {"matrix": [3, 0], "x": 3.25, "y": 1},
+ {"matrix": [4, 0], "x": 4.25, "y": 1},
+ {"matrix": [5, 0], "x": 5.25, "y": 1},
+ {"matrix": [0, 1], "x": 0, "y": 2.25, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 2.25},
+ {"matrix": [2, 1], "x": 2.25, "y": 2},
+ {"matrix": [3, 1], "x": 3.25, "y": 2},
+ {"matrix": [4, 1], "x": 4.25, "y": 2},
+ {"matrix": [5, 1], "x": 5.25, "y": 2},
+ {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.25},
+ {"matrix": [1, 2], "x": 1.25, "y": 3.25},
+ {"matrix": [2, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [4, 2], "x": 4.25, "y": 3},
+ {"matrix": [5, 2], "x": 5.25, "y": 3},
+ {"matrix": [0, 3], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [1, 3], "x": 1.25, "y": 4.25},
+ {"matrix": [2, 3], "x": 2.25, "y": 4},
+ {"matrix": [3, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 3], "x": 4.25, "y": 4},
+ {"matrix": [5, 3], "x": 5.25, "y": 4},
+ {"matrix": [1, 4], "x": 1.25, "y": 5.25},
+ {"matrix": [2, 4], "x": 2.25, "y": 5},
+ {"matrix": [3, 4], "x": 3.25, "y": 5},
+ {"matrix": [5, 4], "x": 4.25, "y": 5},
+ {"matrix": [5, 6], "x": 5.25, "y": 6},
+ {"matrix": [5, 5], "x": 6.25, "y": 6},
+ {"matrix": [3, 5], "x": 6.25, "y": 7},
+ {"matrix": [3, 6], "x": 4.25, "y": 7, "h": 2},
+ {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
+ {"matrix": [2, 5], "x": 6.25, "y": 8},
+ {"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 5], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [6, 0], "x": 9.25, "y": 1},
+ {"matrix": [7, 0], "x": 10.25, "y": 1},
+ {"matrix": [8, 0], "x": 11.25, "y": 1},
+ {"matrix": [9, 0], "x": 12.25, "y": 1},
+ {"matrix": [10, 0], "x": 13.25, "y": 1.25},
+ {"matrix": [11, 0], "x": 14.25, "y": 1.25, "w": 1.25},
+ {"matrix": [6, 1], "x": 9.25, "y": 2},
+ {"matrix": [7, 1], "x": 10.25, "y": 2},
+ {"matrix": [8, 1], "x": 11.25, "y": 2},
+ {"matrix": [9, 1], "x": 12.25, "y": 2},
+ {"matrix": [10, 1], "x": 13.25, "y": 2.25},
+ {"matrix": [11, 1], "x": 14.25, "y": 2.25, "w": 1.25},
+ {"matrix": [6, 2], "x": 9.25, "y": 3},
+ {"matrix": [7, 2], "x": 10.25, "y": 3},
+ {"matrix": [8, 2], "x": 11.25, "y": 3},
+ {"matrix": [9, 2], "x": 12.25, "y": 3},
+ {"matrix": [10, 2], "x": 13.25, "y": 3.25},
+ {"matrix": [11, 2], "x": 14.25, "y": 3.25, "w": 1.25},
+ {"matrix": [6, 3], "x": 9.25, "y": 4},
+ {"matrix": [7, 3], "x": 10.25, "y": 4},
+ {"matrix": [8, 3], "x": 11.25, "y": 4},
+ {"matrix": [9, 3], "x": 12.25, "y": 4},
+ {"matrix": [10, 3], "x": 13.25, "y": 4.25},
+ {"matrix": [11, 3], "x": 14.25, "y": 4.25, "w": 1.25},
+ {"matrix": [6, 4], "x": 10.25, "y": 5},
+ {"matrix": [8, 4], "x": 11.25, "y": 5},
+ {"matrix": [9, 4], "x": 12.25, "y": 5},
+ {"matrix": [10, 4], "x": 13.25, "y": 5.25},
+ {"matrix": [9, 6], "x": 8.25, "y": 6},
+ {"matrix": [8, 5], "x": 9.25, "y": 6},
+ {"matrix": [8, 6], "x": 8.25, "y": 7},
+ {"matrix": [6, 6], "x": 8.25, "y": 8},
+ {"matrix": [7, 5], "x": 9.25, "y": 7, "h": 2},
+ {"matrix": [6, 5], "x": 10.25, "y": 7, "h": 2}
+ ]
+ },
+ "LAYOUT_pretty": {
+ "layout": [
+ {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 0], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 5], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
+ {"matrix": [1, 0], "x": 1.25, "y": 1.25},
+ {"matrix": [2, 0], "x": 2.25, "y": 1},
+ {"matrix": [3, 0], "x": 3.25, "y": 1},
+ {"matrix": [4, 0], "x": 4.25, "y": 1},
+ {"matrix": [5, 0], "x": 5.25, "y": 1},
+ {"matrix": [6, 0], "x": 9.25, "y": 1},
+ {"matrix": [7, 0], "x": 10.25, "y": 1},
+ {"matrix": [8, 0], "x": 11.25, "y": 1},
+ {"matrix": [9, 0], "x": 12.25, "y": 1},
+ {"matrix": [10, 0], "x": 13.25, "y": 1.25},
+ {"matrix": [11, 0], "x": 14.25, "y": 1.25, "w": 1.25},
+ {"matrix": [0, 1], "x": 0, "y": 2.25, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 2.25},
+ {"matrix": [2, 1], "x": 2.25, "y": 2},
+ {"matrix": [3, 1], "x": 3.25, "y": 2},
+ {"matrix": [4, 1], "x": 4.25, "y": 2},
+ {"matrix": [5, 1], "x": 5.25, "y": 2},
+ {"matrix": [6, 1], "x": 9.25, "y": 2},
+ {"matrix": [7, 1], "x": 10.25, "y": 2},
+ {"matrix": [8, 1], "x": 11.25, "y": 2},
+ {"matrix": [9, 1], "x": 12.25, "y": 2},
+ {"matrix": [10, 1], "x": 13.25, "y": 2.25},
+ {"matrix": [11, 1], "x": 14.25, "y": 2.25, "w": 1.25},
+ {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.25},
+ {"matrix": [1, 2], "x": 1.25, "y": 3.25},
+ {"matrix": [2, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [4, 2], "x": 4.25, "y": 3},
+ {"matrix": [5, 2], "x": 5.25, "y": 3},
+ {"matrix": [6, 2], "x": 9.25, "y": 3},
+ {"matrix": [7, 2], "x": 10.25, "y": 3},
+ {"matrix": [8, 2], "x": 11.25, "y": 3},
+ {"matrix": [9, 2], "x": 12.25, "y": 3},
+ {"matrix": [10, 2], "x": 13.25, "y": 3.25},
+ {"matrix": [11, 2], "x": 14.25, "y": 3.25, "w": 1.25},
+ {"matrix": [0, 3], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [1, 3], "x": 1.25, "y": 4.25},
+ {"matrix": [2, 3], "x": 2.25, "y": 4},
+ {"matrix": [3, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 3], "x": 4.25, "y": 4},
+ {"matrix": [5, 3], "x": 5.25, "y": 4},
+ {"matrix": [6, 3], "x": 9.25, "y": 4},
+ {"matrix": [7, 3], "x": 10.25, "y": 4},
+ {"matrix": [8, 3], "x": 11.25, "y": 4},
+ {"matrix": [9, 3], "x": 12.25, "y": 4},
+ {"matrix": [10, 3], "x": 13.25, "y": 4.25},
+ {"matrix": [11, 3], "x": 14.25, "y": 4.25, "w": 1.25},
+ {"matrix": [1, 4], "x": 1.25, "y": 5.25},
+ {"matrix": [2, 4], "x": 2.25, "y": 5},
+ {"matrix": [3, 4], "x": 3.25, "y": 5},
+ {"matrix": [5, 4], "x": 4.25, "y": 5},
+ {"matrix": [6, 4], "x": 10.25, "y": 5},
+ {"matrix": [8, 4], "x": 11.25, "y": 5},
+ {"matrix": [9, 4], "x": 12.25, "y": 5},
+ {"matrix": [10, 4], "x": 13.25, "y": 5.25},
+ {"matrix": [5, 6], "x": 5.25, "y": 6},
+ {"matrix": [5, 5], "x": 6.25, "y": 6},
+ {"matrix": [9, 6], "x": 8.25, "y": 6},
+ {"matrix": [8, 5], "x": 9.25, "y": 6},
+ {"matrix": [3, 5], "x": 6.25, "y": 7},
+ {"matrix": [8, 6], "x": 8.25, "y": 7},
+ {"matrix": [3, 6], "x": 4.25, "y": 7, "h": 2},
+ {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
+ {"matrix": [2, 5], "x": 6.25, "y": 8},
+ {"matrix": [6, 6], "x": 8.25, "y": 8},
+ {"matrix": [7, 5], "x": 9.25, "y": 7, "h": 2},
+ {"matrix": [6, 5], "x": 10.25, "y": 7, "h": 2}
+ ]
+ }
+ }
}
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 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "kint41.h"
+#include "quantum.h"
#define LED_POWER LINE_PIN13
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 @@
-/* Copyright 2020 QMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments as on the physical keyboard
-// The second converts the arguments into the 2-D scanned array
-
-#define LAYOUT( \
- kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2, \
- k00, k10, k20, k30, k40, k50, \
- k01, k11, k21, k31, k41, k51, \
- k02, k12, k22, k32, k42, k52, \
- k03, k13, k23, k33, k43, k53, \
- k14, k24, k34, k54, \
- k56, k55, \
- k35, \
- k36, k46, k25, \
- \
- kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5, \
- k60, k70, k80, k90, kA0, kB0, \
- k61, k71, k81, k91, kA1, kB1, \
- k62, k72, k82, k92, kA2, kB2, \
- k63, k73, k83, k93, kA3, kB3, \
- k64, k84, k94, kA4, \
- k96, k85, \
- k86, \
- k66, k75, k65 \
-) { \
- { k00, k01, k02, k03, ___, ___, ___ }, \
- { k10, k11, k12, k13, k14, ___, ___ }, \
- { k20, k21, k22, k23, k24, k25, ___ }, \
- { k30, k31, k32, k33, k34, k35, k36 }, \
- { k40, k41, k42, k43, ___, ___, k46 }, \
- { k50, k51, k52, k53, k54, k55, k56 }, \
- { k60, k61, k62, k63, k64, k65, k66 }, \
- { k70, k71, k72, k73, ___, k75, ___ }, \
- { k80, k81, k82, k83, k84, k85, k86 }, \
- { k90, k91, k92, k93, k94, ___, k96 }, \
- { kA0, kA1, kA2, kA3, kA4, ___, ___ }, \
- { kB0, kB1, kB2, kB3, ___, ___, ___ }, \
- { kC0, kC1, kC2, kC3, kC4, kC5, ___ }, \
- { kD0, kD1, kD2, kD3, kD4, kD5, ___ }, \
- { kE0, kE1, kE2, kE3, kE4, kE5, ___ }, \
-}
-
-/* ---------------- LEFT HAND ----------------- ---------------- RIGHT HAND ---------------- */
-#define LAYOUT_pretty( \
- kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2, kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5, \
- k00, k10, k20, k30, k40, k50, k60, k70, k80, k90, kA0, kB0, \
- k01, k11, k21, k31, k41, k51, k61, k71, k81, k91, kA1, kB1, \
- k02, k12, k22, k32, k42, k52, k62, k72, k82, k92, kA2, kB2, \
- k03, k13, k23, k33, k43, k53, k63, k73, k83, k93, kA3, kB3, \
- k14, k24, k34, k54, k64, k84, k94, kA4, \
- k56, k55, k96, k85, \
- k35, k86, \
- k36, k46, k25, k66, k75, k65 \
-) { \
- { k00, k01, k02, k03, ___, ___, ___ }, \
- { k10, k11, k12, k13, k14, ___, ___ }, \
- { k20, k21, k22, k23, k24, k25, ___ }, \
- { k30, k31, k32, k33, k34, k35, k36 }, \
- { k40, k41, k42, k43, ___, ___, k46 }, \
- { k50, k51, k52, k53, k54, k55, k56 }, \
- { k60, k61, k62, k63, k64, k65, k66 }, \
- { k70, k71, k72, k73, ___, k75, ___ }, \
- { k80, k81, k82, k83, k84, k85, k86 }, \
- { k90, k91, k92, k93, k94, ___, k96 }, \
- { kA0, kA1, kA2, kA3, kA4, ___, ___ }, \
- { kB0, kB1, kB2, kB3, ___, ___, ___ }, \
- { kC0, kC1, kC2, kC3, kC4, kC5, ___ }, \
- { kD0, kD1, kD2, kD3, kD4, kD5, ___ }, \
- { kE0, kE1, kE2, kE3, kE4, kE5, ___ } \
-}
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 @@
},
"processor": "MKL26Z64",
"bootloader": "halfkay",
- "debounce": 20
+ "debounce": 20,
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 0], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
+ {"matrix": [1, 0], "x": 1.25, "y": 1.25},
+ {"matrix": [2, 0], "x": 2.25, "y": 1},
+ {"matrix": [3, 0], "x": 3.25, "y": 1},
+ {"matrix": [4, 0], "x": 4.25, "y": 1},
+ {"matrix": [5, 0], "x": 5.25, "y": 1},
+ {"matrix": [0, 1], "x": 0, "y": 2.25, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 2.25},
+ {"matrix": [2, 1], "x": 2.25, "y": 2},
+ {"matrix": [3, 1], "x": 3.25, "y": 2},
+ {"matrix": [4, 1], "x": 4.25, "y": 2},
+ {"matrix": [5, 1], "x": 5.25, "y": 2},
+ {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.25},
+ {"matrix": [1, 2], "x": 1.25, "y": 3.25},
+ {"matrix": [2, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [4, 2], "x": 4.25, "y": 3},
+ {"matrix": [5, 2], "x": 5.25, "y": 3},
+ {"matrix": [0, 3], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [1, 3], "x": 1.25, "y": 4.25},
+ {"matrix": [2, 3], "x": 2.25, "y": 4},
+ {"matrix": [3, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 3], "x": 4.25, "y": 4},
+ {"matrix": [5, 3], "x": 5.25, "y": 4},
+ {"matrix": [1, 4], "x": 1.25, "y": 5.25},
+ {"matrix": [2, 4], "x": 2.25, "y": 5},
+ {"matrix": [3, 4], "x": 3.25, "y": 5},
+ {"matrix": [5, 4], "x": 4.25, "y": 5},
+ {"matrix": [5, 6], "x": 5.25, "y": 6},
+ {"matrix": [5, 5], "x": 6.25, "y": 6},
+ {"matrix": [3, 5], "x": 6.25, "y": 7},
+ {"matrix": [3, 6], "x": 4.25, "y": 7, "h": 2},
+ {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
+ {"matrix": [2, 5], "x": 6.25, "y": 8},
+ {"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 5], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [6, 0], "x": 9.25, "y": 1},
+ {"matrix": [7, 0], "x": 10.25, "y": 1},
+ {"matrix": [8, 0], "x": 11.25, "y": 1},
+ {"matrix": [9, 0], "x": 12.25, "y": 1},
+ {"matrix": [10, 0], "x": 13.25, "y": 1.25},
+ {"matrix": [11, 0], "x": 14.25, "y": 1.25, "w": 1.25},
+ {"matrix": [6, 1], "x": 9.25, "y": 2},
+ {"matrix": [7, 1], "x": 10.25, "y": 2},
+ {"matrix": [8, 1], "x": 11.25, "y": 2},
+ {"matrix": [9, 1], "x": 12.25, "y": 2},
+ {"matrix": [10, 1], "x": 13.25, "y": 2.25},
+ {"matrix": [11, 1], "x": 14.25, "y": 2.25, "w": 1.25},
+ {"matrix": [6, 2], "x": 9.25, "y": 3},
+ {"matrix": [7, 2], "x": 10.25, "y": 3},
+ {"matrix": [8, 2], "x": 11.25, "y": 3},
+ {"matrix": [9, 2], "x": 12.25, "y": 3},
+ {"matrix": [10, 2], "x": 13.25, "y": 3.25},
+ {"matrix": [11, 2], "x": 14.25, "y": 3.25, "w": 1.25},
+ {"matrix": [6, 3], "x": 9.25, "y": 4},
+ {"matrix": [7, 3], "x": 10.25, "y": 4},
+ {"matrix": [8, 3], "x": 11.25, "y": 4},
+ {"matrix": [9, 3], "x": 12.25, "y": 4},
+ {"matrix": [10, 3], "x": 13.25, "y": 4.25},
+ {"matrix": [11, 3], "x": 14.25, "y": 4.25, "w": 1.25},
+ {"matrix": [6, 4], "x": 10.25, "y": 5},
+ {"matrix": [8, 4], "x": 11.25, "y": 5},
+ {"matrix": [9, 4], "x": 12.25, "y": 5},
+ {"matrix": [10, 4], "x": 13.25, "y": 5.25},
+ {"matrix": [9, 6], "x": 8.25, "y": 6},
+ {"matrix": [8, 5], "x": 9.25, "y": 6},
+ {"matrix": [8, 6], "x": 8.25, "y": 7},
+ {"matrix": [6, 6], "x": 8.25, "y": 8},
+ {"matrix": [7, 5], "x": 9.25, "y": 7, "h": 2},
+ {"matrix": [6, 5], "x": 10.25, "y": 7, "h": 2}
+ ]
+ },
+ "LAYOUT_pretty": {
+ "layout": [
+ {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 0], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 5], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
+ {"matrix": [1, 0], "x": 1.25, "y": 1.25},
+ {"matrix": [2, 0], "x": 2.25, "y": 1},
+ {"matrix": [3, 0], "x": 3.25, "y": 1},
+ {"matrix": [4, 0], "x": 4.25, "y": 1},
+ {"matrix": [5, 0], "x": 5.25, "y": 1},
+ {"matrix": [6, 0], "x": 9.25, "y": 1},
+ {"matrix": [7, 0], "x": 10.25, "y": 1},
+ {"matrix": [8, 0], "x": 11.25, "y": 1},
+ {"matrix": [9, 0], "x": 12.25, "y": 1},
+ {"matrix": [10, 0], "x": 13.25, "y": 1.25},
+ {"matrix": [11, 0], "x": 14.25, "y": 1.25, "w": 1.25},
+ {"matrix": [0, 1], "x": 0, "y": 2.25, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 2.25},
+ {"matrix": [2, 1], "x": 2.25, "y": 2},
+ {"matrix": [3, 1], "x": 3.25, "y": 2},
+ {"matrix": [4, 1], "x": 4.25, "y": 2},
+ {"matrix": [5, 1], "x": 5.25, "y": 2},
+ {"matrix": [6, 1], "x": 9.25, "y": 2},
+ {"matrix": [7, 1], "x": 10.25, "y": 2},
+ {"matrix": [8, 1], "x": 11.25, "y": 2},
+ {"matrix": [9, 1], "x": 12.25, "y": 2},
+ {"matrix": [10, 1], "x": 13.25, "y": 2.25},
+ {"matrix": [11, 1], "x": 14.25, "y": 2.25, "w": 1.25},
+ {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.25},
+ {"matrix": [1, 2], "x": 1.25, "y": 3.25},
+ {"matrix": [2, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [4, 2], "x": 4.25, "y": 3},
+ {"matrix": [5, 2], "x": 5.25, "y": 3},
+ {"matrix": [6, 2], "x": 9.25, "y": 3},
+ {"matrix": [7, 2], "x": 10.25, "y": 3},
+ {"matrix": [8, 2], "x": 11.25, "y": 3},
+ {"matrix": [9, 2], "x": 12.25, "y": 3},
+ {"matrix": [10, 2], "x": 13.25, "y": 3.25},
+ {"matrix": [11, 2], "x": 14.25, "y": 3.25, "w": 1.25},
+ {"matrix": [0, 3], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [1, 3], "x": 1.25, "y": 4.25},
+ {"matrix": [2, 3], "x": 2.25, "y": 4},
+ {"matrix": [3, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 3], "x": 4.25, "y": 4},
+ {"matrix": [5, 3], "x": 5.25, "y": 4},
+ {"matrix": [6, 3], "x": 9.25, "y": 4},
+ {"matrix": [7, 3], "x": 10.25, "y": 4},
+ {"matrix": [8, 3], "x": 11.25, "y": 4},
+ {"matrix": [9, 3], "x": 12.25, "y": 4},
+ {"matrix": [10, 3], "x": 13.25, "y": 4.25},
+ {"matrix": [11, 3], "x": 14.25, "y": 4.25, "w": 1.25},
+ {"matrix": [1, 4], "x": 1.25, "y": 5.25},
+ {"matrix": [2, 4], "x": 2.25, "y": 5},
+ {"matrix": [3, 4], "x": 3.25, "y": 5},
+ {"matrix": [5, 4], "x": 4.25, "y": 5},
+ {"matrix": [6, 4], "x": 10.25, "y": 5},
+ {"matrix": [8, 4], "x": 11.25, "y": 5},
+ {"matrix": [9, 4], "x": 12.25, "y": 5},
+ {"matrix": [10, 4], "x": 13.25, "y": 5.25},
+ {"matrix": [5, 6], "x": 5.25, "y": 6},
+ {"matrix": [5, 5], "x": 6.25, "y": 6},
+ {"matrix": [9, 6], "x": 8.25, "y": 6},
+ {"matrix": [8, 5], "x": 9.25, "y": 6},
+ {"matrix": [3, 5], "x": 6.25, "y": 7},
+ {"matrix": [8, 6], "x": 8.25, "y": 7},
+ {"matrix": [3, 6], "x": 4.25, "y": 7, "h": 2},
+ {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
+ {"matrix": [2, 5], "x": 6.25, "y": 8},
+ {"matrix": [6, 6], "x": 8.25, "y": 8},
+ {"matrix": [7, 5], "x": 9.25, "y": 7, "h": 2},
+ {"matrix": [6, 5], "x": 10.25, "y": 7, "h": 2}
+ ]
+ }
+ }
}
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 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "kintlc.h"
+#include "quantum.h"
#define LED_POWER LINE_PIN13
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 @@
-/* Copyright 2020 QMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments as on the physical keyboard
-// The second converts the arguments into the 2-D scanned array
-
-#define LAYOUT( \
- kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2, \
- k00, k10, k20, k30, k40, k50, \
- k01, k11, k21, k31, k41, k51, \
- k02, k12, k22, k32, k42, k52, \
- k03, k13, k23, k33, k43, k53, \
- k14, k24, k34, k54, \
- k56, k55, \
- k35, \
- k36, k46, k25, \
- \
- kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5, \
- k60, k70, k80, k90, kA0, kB0, \
- k61, k71, k81, k91, kA1, kB1, \
- k62, k72, k82, k92, kA2, kB2, \
- k63, k73, k83, k93, kA3, kB3, \
- k64, k84, k94, kA4, \
- k96, k85, \
- k86, \
- k66, k75, k65 \
-) { \
- { k00, k01, k02, k03, ___, ___, ___ }, \
- { k10, k11, k12, k13, k14, ___, ___ }, \
- { k20, k21, k22, k23, k24, k25, ___ }, \
- { k30, k31, k32, k33, k34, k35, k36 }, \
- { k40, k41, k42, k43, ___, ___, k46 }, \
- { k50, k51, k52, k53, k54, k55, k56 }, \
- { k60, k61, k62, k63, k64, k65, k66 }, \
- { k70, k71, k72, k73, ___, k75, ___ }, \
- { k80, k81, k82, k83, k84, k85, k86 }, \
- { k90, k91, k92, k93, k94, ___, k96 }, \
- { kA0, kA1, kA2, kA3, kA4, ___, ___ }, \
- { kB0, kB1, kB2, kB3, ___, ___, ___ }, \
- { kC0, kC1, kC2, kC3, kC4, kC5, ___ }, \
- { kD0, kD1, kD2, kD3, kD4, kD5, ___ }, \
- { kE0, kE1, kE2, kE3, kE4, kE5, ___ }, \
-}
-
-/* ---------------- LEFT HAND ----------------- ---------------- RIGHT HAND ---------------- */
-#define LAYOUT_pretty( \
- kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2, kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5, \
- k00, k10, k20, k30, k40, k50, k60, k70, k80, k90, kA0, kB0, \
- k01, k11, k21, k31, k41, k51, k61, k71, k81, k91, kA1, kB1, \
- k02, k12, k22, k32, k42, k52, k62, k72, k82, k92, kA2, kB2, \
- k03, k13, k23, k33, k43, k53, k63, k73, k83, k93, kA3, kB3, \
- k14, k24, k34, k54, k64, k84, k94, kA4, \
- k56, k55, k96, k85, \
- k35, k86, \
- k36, k46, k25, k66, k75, k65 \
-) { \
- { k00, k01, k02, k03, ___, ___, ___ }, \
- { k10, k11, k12, k13, k14, ___, ___ }, \
- { k20, k21, k22, k23, k24, k25, ___ }, \
- { k30, k31, k32, k33, k34, k35, k36 }, \
- { k40, k41, k42, k43, ___, ___, k46 }, \
- { k50, k51, k52, k53, k54, k55, k56 }, \
- { k60, k61, k62, k63, k64, k65, k66 }, \
- { k70, k71, k72, k73, ___, k75, ___ }, \
- { k80, k81, k82, k83, k84, k85, k86 }, \
- { k90, k91, k92, k93, k94, ___, k96 }, \
- { kA0, kA1, kA2, kA3, kA4, ___, ___ }, \
- { kB0, kB1, kB2, kB3, ___, ___, ___ }, \
- { kC0, kC1, kC2, kC3, kC4, kC5, ___ }, \
- { kD0, kD1, kD2, kD3, kD4, kD5, ___ }, \
- { kE0, kE1, kE2, kE3, kE4, kE5, ___ } \
-}
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 @@
"on_state": 0
},
"processor": "atmega32u4",
- "bootloader": "caterina"
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 2], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [2, 2], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [1, 2], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [0, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [2, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [1, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [0, 0], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [2, 0], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [1, 0], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [8, 0], "x": 0, "y": 1.25, "w": 1.25},
+ {"matrix": [7, 0], "x": 1.25, "y": 1.25},
+ {"matrix": [6, 0], "x": 2.25, "y": 1},
+ {"matrix": [5, 0], "x": 3.25, "y": 1},
+ {"matrix": [4, 0], "x": 4.25, "y": 1},
+ {"matrix": [3, 0], "x": 5.25, "y": 1},
+ {"matrix": [8, 1], "x": 0, "y": 2.25, "w": 1.25},
+ {"matrix": [7, 1], "x": 1.25, "y": 2.25},
+ {"matrix": [6, 1], "x": 2.25, "y": 2},
+ {"matrix": [5, 1], "x": 3.25, "y": 2},
+ {"matrix": [4, 1], "x": 4.25, "y": 2},
+ {"matrix": [3, 1], "x": 5.25, "y": 2},
+ {"matrix": [8, 2], "x": 0, "y": 3.25, "w": 1.25},
+ {"matrix": [7, 2], "x": 1.25, "y": 3.25},
+ {"matrix": [6, 2], "x": 2.25, "y": 3},
+ {"matrix": [5, 2], "x": 3.25, "y": 3},
+ {"matrix": [4, 2], "x": 4.25, "y": 3},
+ {"matrix": [3, 2], "x": 5.25, "y": 3},
+ {"matrix": [8, 3], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [7, 3], "x": 1.25, "y": 4.25},
+ {"matrix": [6, 3], "x": 2.25, "y": 4},
+ {"matrix": [5, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 3], "x": 4.25, "y": 4},
+ {"matrix": [3, 3], "x": 5.25, "y": 4},
+ {"matrix": [7, 4], "x": 1.25, "y": 5.25},
+ {"matrix": [6, 4], "x": 2.25, "y": 5},
+ {"matrix": [5, 4], "x": 3.25, "y": 5},
+ {"matrix": [3, 4], "x": 4.25, "y": 5},
+ {"matrix": [3, 6], "x": 5.25, "y": 6},
+ {"matrix": [3, 5], "x": 6.25, "y": 6},
+ {"matrix": [5, 5], "x": 6.25, "y": 7},
+ {"matrix": [5, 6], "x": 4.25, "y": 7, "h": 2},
+ {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
+ {"matrix": [7, 5], "x": 6.25, "y": 8},
+ {"matrix": [0, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [2, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [1, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [0, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [2, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [1, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [0, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 0], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 1], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [9, 4], "x": 9.25, "y": 1},
+ {"matrix": [10, 4], "x": 10.25, "y": 1},
+ {"matrix": [11, 4], "x": 11.25, "y": 1},
+ {"matrix": [13, 4], "x": 12.25, "y": 1},
+ {"matrix": [14, 4], "x": 13.25, "y": 1.25},
+ {"matrix": [15, 4], "x": 14.25, "y": 1.25, "w": 1.25},
+ {"matrix": [9, 5], "x": 9.25, "y": 2},
+ {"matrix": [10, 5], "x": 10.25, "y": 2},
+ {"matrix": [11, 5], "x": 11.25, "y": 2},
+ {"matrix": [13, 5], "x": 12.25, "y": 2},
+ {"matrix": [14, 5], "x": 13.25, "y": 2.25},
+ {"matrix": [15, 5], "x": 14.25, "y": 2.25, "w": 1.25},
+ {"matrix": [9, 6], "x": 9.25, "y": 3},
+ {"matrix": [10, 6], "x": 10.25, "y": 3},
+ {"matrix": [11, 6], "x": 11.25, "y": 3},
+ {"matrix": [13, 6], "x": 12.25, "y": 3},
+ {"matrix": [14, 6], "x": 13.25, "y": 3.25},
+ {"matrix": [15, 6], "x": 14.25, "y": 3.25, "w": 1.25},
+ {"matrix": [9, 7], "x": 9.25, "y": 4},
+ {"matrix": [10, 7], "x": 10.25, "y": 4},
+ {"matrix": [11, 7], "x": 11.25, "y": 4},
+ {"matrix": [13, 7], "x": 12.25, "y": 4},
+ {"matrix": [14, 7], "x": 13.25, "y": 4.25},
+ {"matrix": [15, 7], "x": 14.25, "y": 4.25, "w": 1.25},
+ {"matrix": [9, 3], "x": 10.25, "y": 5},
+ {"matrix": [11, 3], "x": 11.25, "y": 5},
+ {"matrix": [13, 3], "x": 12.25, "y": 5},
+ {"matrix": [14, 3], "x": 13.25, "y": 5.25},
+ {"matrix": [4, 7], "x": 8.25, "y": 6},
+ {"matrix": [6, 6], "x": 9.25, "y": 6},
+ {"matrix": [6, 7], "x": 8.25, "y": 7},
+ {"matrix": [8, 7], "x": 8.25, "y": 8},
+ {"matrix": [7, 6], "x": 9.25, "y": 7, "h": 2},
+ {"matrix": [8, 6], "x": 10.25, "y": 7, "h": 2}
+ ]
+ },
+ "LAYOUT_pretty": {
+ "layout": [
+ {"matrix": [0, 2], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [2, 2], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [1, 2], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [0, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [2, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [1, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [0, 0], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [2, 0], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [1, 0], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [0, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [2, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [1, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [0, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [2, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [1, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [0, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 0], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 1], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [8, 0], "x": 0, "y": 1.25, "w": 1.25},
+ {"matrix": [7, 0], "x": 1.25, "y": 1.25},
+ {"matrix": [6, 0], "x": 2.25, "y": 1},
+ {"matrix": [5, 0], "x": 3.25, "y": 1},
+ {"matrix": [4, 0], "x": 4.25, "y": 1},
+ {"matrix": [3, 0], "x": 5.25, "y": 1},
+ {"matrix": [9, 4], "x": 9.25, "y": 1},
+ {"matrix": [10, 4], "x": 10.25, "y": 1},
+ {"matrix": [11, 4], "x": 11.25, "y": 1},
+ {"matrix": [13, 4], "x": 12.25, "y": 1},
+ {"matrix": [14, 4], "x": 13.25, "y": 1.25},
+ {"matrix": [15, 4], "x": 14.25, "y": 1.25, "w": 1.25},
+ {"matrix": [8, 1], "x": 0, "y": 2.25, "w": 1.25},
+ {"matrix": [7, 1], "x": 1.25, "y": 2.25},
+ {"matrix": [6, 1], "x": 2.25, "y": 2},
+ {"matrix": [5, 1], "x": 3.25, "y": 2},
+ {"matrix": [4, 1], "x": 4.25, "y": 2},
+ {"matrix": [3, 1], "x": 5.25, "y": 2},
+ {"matrix": [9, 5], "x": 9.25, "y": 2},
+ {"matrix": [10, 5], "x": 10.25, "y": 2},
+ {"matrix": [11, 5], "x": 11.25, "y": 2},
+ {"matrix": [13, 5], "x": 12.25, "y": 2},
+ {"matrix": [14, 5], "x": 13.25, "y": 2.25},
+ {"matrix": [15, 5], "x": 14.25, "y": 2.25, "w": 1.25},
+ {"matrix": [8, 2], "x": 0, "y": 3.25, "w": 1.25},
+ {"matrix": [7, 2], "x": 1.25, "y": 3.25},
+ {"matrix": [6, 2], "x": 2.25, "y": 3},
+ {"matrix": [5, 2], "x": 3.25, "y": 3},
+ {"matrix": [4, 2], "x": 4.25, "y": 3},
+ {"matrix": [3, 2], "x": 5.25, "y": 3},
+ {"matrix": [9, 6], "x": 9.25, "y": 3},
+ {"matrix": [10, 6], "x": 10.25, "y": 3},
+ {"matrix": [11, 6], "x": 11.25, "y": 3},
+ {"matrix": [13, 6], "x": 12.25, "y": 3},
+ {"matrix": [14, 6], "x": 13.25, "y": 3.25},
+ {"matrix": [15, 6], "x": 14.25, "y": 3.25, "w": 1.25},
+ {"matrix": [8, 3], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [7, 3], "x": 1.25, "y": 4.25},
+ {"matrix": [6, 3], "x": 2.25, "y": 4},
+ {"matrix": [5, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 3], "x": 4.25, "y": 4},
+ {"matrix": [3, 3], "x": 5.25, "y": 4},
+ {"matrix": [9, 7], "x": 9.25, "y": 4},
+ {"matrix": [10, 7], "x": 10.25, "y": 4},
+ {"matrix": [11, 7], "x": 11.25, "y": 4},
+ {"matrix": [13, 7], "x": 12.25, "y": 4},
+ {"matrix": [14, 7], "x": 13.25, "y": 4.25},
+ {"matrix": [15, 7], "x": 14.25, "y": 4.25, "w": 1.25},
+ {"matrix": [7, 4], "x": 1.25, "y": 5.25},
+ {"matrix": [6, 4], "x": 2.25, "y": 5},
+ {"matrix": [5, 4], "x": 3.25, "y": 5},
+ {"matrix": [3, 4], "x": 4.25, "y": 5},
+ {"matrix": [9, 3], "x": 10.25, "y": 5},
+ {"matrix": [11, 3], "x": 11.25, "y": 5},
+ {"matrix": [13, 3], "x": 12.25, "y": 5},
+ {"matrix": [14, 3], "x": 13.25, "y": 5.25},
+ {"matrix": [3, 6], "x": 5.25, "y": 6},
+ {"matrix": [3, 5], "x": 6.25, "y": 6},
+ {"matrix": [4, 7], "x": 8.25, "y": 6},
+ {"matrix": [6, 6], "x": 9.25, "y": 6},
+ {"matrix": [5, 5], "x": 6.25, "y": 7},
+ {"matrix": [6, 7], "x": 8.25, "y": 7},
+ {"matrix": [5, 6], "x": 4.25, "y": 7, "h": 2},
+ {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
+ {"matrix": [7, 5], "x": 6.25, "y": 8},
+ {"matrix": [8, 7], "x": 8.25, "y": 8},
+ {"matrix": [7, 6], "x": 9.25, "y": 7, "h": 2},
+ {"matrix": [8, 6], "x": 10.25, "y": 7, "h": 2}
+ ]
+ }
+ }
}
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 @@
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT( \
- k02, k22, k12, k01, k21, k11, k00, k20, k10, \
- k80, k70, k60, k50, k40, k30, \
- k81, k71, k61, k51, k41, k31, \
- k82, k72, k62, k52, k42, k32, \
- k83, k73, k63, k53, k43, k33, \
- k74, k64, k54, k34, \
- k36, k35, \
- k55, \
- k56, k46, k75, \
- \
- k03, k23, k13, k04, k24, k14, k05, kC0, kC1, \
- k94, kA4, kB4, kD4, kE4, kF4, \
- k95, kA5, kB5, kD5, kE5, kF5, \
- k96, kA6, kB6, kD6, kE6, kF6, \
- k97, kA7, kB7, kD7, kE7, kF7, \
- k93, kB3, kD3, kE3, \
- k47, k66, \
- k67, \
- k87, k76, k86 \
-) { \
- { k00, k01, k02, k03, k04, k05, ___, ___ }, \
- { k10, k11, k12, k13, k14, ___, ___, ___ }, \
- { k20, k21, k22, k23, k24, ___, ___, ___ }, \
- { k30, k31, k32, k33, k34, k35, k36, ___ }, \
- { k40, k41, k42, k43, ___, ___, k46, k47 }, \
- { k50, k51, k52, k53, k54, k55, k56, ___ }, \
- { k60, k61, k62, k63, k64, ___, k66, k67 }, \
- { k70, k71, k72, k73, k74, k75, k76, ___ }, \
- { k80, k81, k82, k83, ___, ___, k86, k87 }, \
- { ___, ___, ___, k93, k94, k95, k96, k97 }, \
- { ___, ___, ___, ___, kA4, kA5, kA6, kA7 }, \
- { ___, ___, ___, kB3, kB4, kB5, kB6, kB7 }, \
- { kC0, kC1, ___, ___, ___, ___, ___, ___ }, \
- { ___, ___, ___, kD3, kD4, kD5, kD6, kD7 }, \
- { ___, ___, ___, kE3, kE4, kE5, kE6, kE7 }, \
- { ___, ___, ___, ___, kF4, kF5, kF6, kF7 } \
-}
-
-/* ---------------- LEFT HAND ----------------- ---------------- RIGHT HAND ---------------- */
-#define LAYOUT_pretty( \
- k02, k22, k12, k01, k21, k11, k00, k20, k10, k03, k23, k13, k04, k24, k14, k05, kC0, kC1, \
- k80, k70, k60, k50, k40, k30, k94, kA4, kB4, kD4, kE4, kF4, \
- k81, k71, k61, k51, k41, k31, k95, kA5, kB5, kD5, kE5, kF5, \
- k82, k72, k62, k52, k42, k32, k96, kA6, kB6, kD6, kE6, kF6, \
- k83, k73, k63, k53, k43, k33, k97, kA7, kB7, kD7, kE7, kF7, \
- k74, k64, k54, k34, k93, kB3, kD3, kE3, \
- k36, k35, k47, k66, \
- k55, k67, \
- k56, k46, k75, k87, k76, k86 \
-) { \
- { k00, k01, k02, k03, k04, k05, ___, ___ }, \
- { k10, k11, k12, k13, k14, ___, ___, ___ }, \
- { k20, k21, k22, k23, k24, ___, ___, ___ }, \
- { k30, k31, k32, k33, k34, k35, k36, ___ }, \
- { k40, k41, k42, k43, ___, ___, k46, k47 }, \
- { k50, k51, k52, k53, k54, k55, k56, ___ }, \
- { k60, k61, k62, k63, k64, ___, k66, k67 }, \
- { k70, k71, k72, k73, k74, k75, k76, ___ }, \
- { k80, k81, k82, k83, ___, ___, k86, k87 }, \
- { ___, ___, ___, k93, k94, k95, k96, k97 }, \
- { ___, ___, ___, ___, kA4, kA5, kA6, kA7 }, \
- { ___, ___, ___, kB3, kB4, kB5, kB6, kB7 }, \
- { kC0, kC1, ___, ___, ___, ___, ___, ___ }, \
- { ___, ___, ___, kD3, kD4, kD5, kD6, kD7 }, \
- { ___, ___, ___, kE3, kE4, kE5, kE6, kE7 }, \
- { ___, ___, ___, ___, kF4, kF5, kF6, kF7 } \
-}
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 @@
"on_state": 0
},
"processor": "at90usb1286",
- "bootloader": "halfkay"
+ "bootloader": "halfkay",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 0], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
+ {"matrix": [1, 0], "x": 1.25, "y": 1.25},
+ {"matrix": [2, 0], "x": 2.25, "y": 1},
+ {"matrix": [3, 0], "x": 3.25, "y": 1},
+ {"matrix": [4, 0], "x": 4.25, "y": 1},
+ {"matrix": [5, 0], "x": 5.25, "y": 1},
+ {"matrix": [0, 1], "x": 0, "y": 2.25, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 2.25},
+ {"matrix": [2, 1], "x": 2.25, "y": 2},
+ {"matrix": [3, 1], "x": 3.25, "y": 2},
+ {"matrix": [4, 1], "x": 4.25, "y": 2},
+ {"matrix": [5, 1], "x": 5.25, "y": 2},
+ {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.25},
+ {"matrix": [1, 2], "x": 1.25, "y": 3.25},
+ {"matrix": [2, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [4, 2], "x": 4.25, "y": 3},
+ {"matrix": [5, 2], "x": 5.25, "y": 3},
+ {"matrix": [0, 3], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [1, 3], "x": 1.25, "y": 4.25},
+ {"matrix": [2, 3], "x": 2.25, "y": 4},
+ {"matrix": [3, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 3], "x": 4.25, "y": 4},
+ {"matrix": [5, 3], "x": 5.25, "y": 4},
+ {"matrix": [1, 4], "x": 1.25, "y": 5.25},
+ {"matrix": [2, 4], "x": 2.25, "y": 5},
+ {"matrix": [3, 4], "x": 3.25, "y": 5},
+ {"matrix": [5, 4], "x": 4.25, "y": 5},
+ {"matrix": [5, 6], "x": 5.25, "y": 6},
+ {"matrix": [5, 5], "x": 6.25, "y": 6},
+ {"matrix": [3, 5], "x": 6.25, "y": 7},
+ {"matrix": [3, 6], "x": 4.25, "y": 7, "h": 2},
+ {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
+ {"matrix": [2, 5], "x": 6.25, "y": 8},
+ {"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 5], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [6, 0], "x": 9.25, "y": 1},
+ {"matrix": [7, 0], "x": 10.25, "y": 1},
+ {"matrix": [8, 0], "x": 11.25, "y": 1},
+ {"matrix": [9, 0], "x": 12.25, "y": 1},
+ {"matrix": [10, 0], "x": 13.25, "y": 1.25},
+ {"matrix": [11, 0], "x": 14.25, "y": 1.25, "w": 1.25},
+ {"matrix": [6, 1], "x": 9.25, "y": 2},
+ {"matrix": [7, 1], "x": 10.25, "y": 2},
+ {"matrix": [8, 1], "x": 11.25, "y": 2},
+ {"matrix": [9, 1], "x": 12.25, "y": 2},
+ {"matrix": [10, 1], "x": 13.25, "y": 2.25},
+ {"matrix": [11, 1], "x": 14.25, "y": 2.25, "w": 1.25},
+ {"matrix": [6, 2], "x": 9.25, "y": 3},
+ {"matrix": [7, 2], "x": 10.25, "y": 3},
+ {"matrix": [8, 2], "x": 11.25, "y": 3},
+ {"matrix": [9, 2], "x": 12.25, "y": 3},
+ {"matrix": [10, 2], "x": 13.25, "y": 3.25},
+ {"matrix": [11, 2], "x": 14.25, "y": 3.25, "w": 1.25},
+ {"matrix": [6, 3], "x": 9.25, "y": 4},
+ {"matrix": [7, 3], "x": 10.25, "y": 4},
+ {"matrix": [8, 3], "x": 11.25, "y": 4},
+ {"matrix": [9, 3], "x": 12.25, "y": 4},
+ {"matrix": [10, 3], "x": 13.25, "y": 4.25},
+ {"matrix": [11, 3], "x": 14.25, "y": 4.25, "w": 1.25},
+ {"matrix": [6, 4], "x": 10.25, "y": 5},
+ {"matrix": [8, 4], "x": 11.25, "y": 5},
+ {"matrix": [9, 4], "x": 12.25, "y": 5},
+ {"matrix": [10, 4], "x": 13.25, "y": 5.25},
+ {"matrix": [9, 6], "x": 8.25, "y": 6},
+ {"matrix": [8, 5], "x": 9.25, "y": 6},
+ {"matrix": [8, 6], "x": 8.25, "y": 7},
+ {"matrix": [6, 6], "x": 8.25, "y": 8},
+ {"matrix": [7, 5], "x": 9.25, "y": 7, "h": 2},
+ {"matrix": [6, 5], "x": 10.25, "y": 7, "h": 2}
+ ]
+ },
+ "LAYOUT_pretty": {
+ "layout": [
+ {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 0], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [12, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [14, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [13, 5], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
+ {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
+ {"matrix": [1, 0], "x": 1.25, "y": 1.25},
+ {"matrix": [2, 0], "x": 2.25, "y": 1},
+ {"matrix": [3, 0], "x": 3.25, "y": 1},
+ {"matrix": [4, 0], "x": 4.25, "y": 1},
+ {"matrix": [5, 0], "x": 5.25, "y": 1},
+ {"matrix": [6, 0], "x": 9.25, "y": 1},
+ {"matrix": [7, 0], "x": 10.25, "y": 1},
+ {"matrix": [8, 0], "x": 11.25, "y": 1},
+ {"matrix": [9, 0], "x": 12.25, "y": 1},
+ {"matrix": [10, 0], "x": 13.25, "y": 1.25},
+ {"matrix": [11, 0], "x": 14.25, "y": 1.25, "w": 1.25},
+ {"matrix": [0, 1], "x": 0, "y": 2.25, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 2.25},
+ {"matrix": [2, 1], "x": 2.25, "y": 2},
+ {"matrix": [3, 1], "x": 3.25, "y": 2},
+ {"matrix": [4, 1], "x": 4.25, "y": 2},
+ {"matrix": [5, 1], "x": 5.25, "y": 2},
+ {"matrix": [6, 1], "x": 9.25, "y": 2},
+ {"matrix": [7, 1], "x": 10.25, "y": 2},
+ {"matrix": [8, 1], "x": 11.25, "y": 2},
+ {"matrix": [9, 1], "x": 12.25, "y": 2},
+ {"matrix": [10, 1], "x": 13.25, "y": 2.25},
+ {"matrix": [11, 1], "x": 14.25, "y": 2.25, "w": 1.25},
+ {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.25},
+ {"matrix": [1, 2], "x": 1.25, "y": 3.25},
+ {"matrix": [2, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [4, 2], "x": 4.25, "y": 3},
+ {"matrix": [5, 2], "x": 5.25, "y": 3},
+ {"matrix": [6, 2], "x": 9.25, "y": 3},
+ {"matrix": [7, 2], "x": 10.25, "y": 3},
+ {"matrix": [8, 2], "x": 11.25, "y": 3},
+ {"matrix": [9, 2], "x": 12.25, "y": 3},
+ {"matrix": [10, 2], "x": 13.25, "y": 3.25},
+ {"matrix": [11, 2], "x": 14.25, "y": 3.25, "w": 1.25},
+ {"matrix": [0, 3], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [1, 3], "x": 1.25, "y": 4.25},
+ {"matrix": [2, 3], "x": 2.25, "y": 4},
+ {"matrix": [3, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 3], "x": 4.25, "y": 4},
+ {"matrix": [5, 3], "x": 5.25, "y": 4},
+ {"matrix": [6, 3], "x": 9.25, "y": 4},
+ {"matrix": [7, 3], "x": 10.25, "y": 4},
+ {"matrix": [8, 3], "x": 11.25, "y": 4},
+ {"matrix": [9, 3], "x": 12.25, "y": 4},
+ {"matrix": [10, 3], "x": 13.25, "y": 4.25},
+ {"matrix": [11, 3], "x": 14.25, "y": 4.25, "w": 1.25},
+ {"matrix": [1, 4], "x": 1.25, "y": 5.25},
+ {"matrix": [2, 4], "x": 2.25, "y": 5},
+ {"matrix": [3, 4], "x": 3.25, "y": 5},
+ {"matrix": [5, 4], "x": 4.25, "y": 5},
+ {"matrix": [6, 4], "x": 10.25, "y": 5},
+ {"matrix": [8, 4], "x": 11.25, "y": 5},
+ {"matrix": [9, 4], "x": 12.25, "y": 5},
+ {"matrix": [10, 4], "x": 13.25, "y": 5.25},
+ {"matrix": [5, 6], "x": 5.25, "y": 6},
+ {"matrix": [5, 5], "x": 6.25, "y": 6},
+ {"matrix": [9, 6], "x": 8.25, "y": 6},
+ {"matrix": [8, 5], "x": 9.25, "y": 6},
+ {"matrix": [3, 5], "x": 6.25, "y": 7},
+ {"matrix": [8, 6], "x": 8.25, "y": 7},
+ {"matrix": [3, 6], "x": 4.25, "y": 7, "h": 2},
+ {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
+ {"matrix": [2, 5], "x": 6.25, "y": 8},
+ {"matrix": [6, 6], "x": 8.25, "y": 8},
+ {"matrix": [7, 5], "x": 9.25, "y": 7, "h": 2},
+ {"matrix": [6, 5], "x": 10.25, "y": 7, "h": 2}
+ ]
+ }
+ }
}
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 @@
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments as on the physical keyboard
-// The second converts the arguments into the 2-D scanned array
-
-#define LAYOUT( \
- kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2, \
- k00, k10, k20, k30, k40, k50, \
- k01, k11, k21, k31, k41, k51, \
- k02, k12, k22, k32, k42, k52, \
- k03, k13, k23, k33, k43, k53, \
- k14, k24, k34, k54, \
- k56, k55, \
- k35, \
- k36, k46, k25, \
-\
- kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5, \
- k60, k70, k80, k90, kA0, kB0, \
- k61, k71, k81, k91, kA1, kB1, \
- k62, k72, k82, k92, kA2, kB2, \
- k63, k73, k83, k93, kA3, kB3, \
- k64, k84, k94, kA4, \
- k96, k85, \
- k86, \
- k66, k75, k65 \
-) { \
- { k00, k01, k02, k03, ___, ___, ___ }, \
- { k10, k11, k12, k13, k14, ___, ___ }, \
- { k20, k21, k22, k23, k24, k25, ___ }, \
- { k30, k31, k32, k33, k34, k35, k36 }, \
- { k40, k41, k42, k43, ___, ___, k46 }, \
- { k50, k51, k52, k53, k54, k55, k56 }, \
- { k60, k61, k62, k63, k64, k65, k66 }, \
- { k70, k71, k72, k73, ___, k75, ___ }, \
- { k80, k81, k82, k83, k84, k85, k86 }, \
- { k90, k91, k92, k93, k94, ___, k96 }, \
- { kA0, kA1, kA2, kA3, kA4, ___, ___ }, \
- { kB0, kB1, kB2, kB3, ___, ___, ___ }, \
- { kC0, kC1, kC2, kC3, kC4, kC5, ___ }, \
- { kD0, kD1, kD2, kD3, kD4, kD5, ___ }, \
- { kE0, kE1, kE2, kE3, kE4, kE5, ___ } \
-}
-
-#define LAYOUT_pretty( \
- kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2, kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5, \
- k00, k10, k20, k30, k40, k50, k60, k70, k80, k90, kA0, kB0, \
- k01, k11, k21, k31, k41, k51, k61, k71, k81, k91, kA1, kB1, \
- k02, k12, k22, k32, k42, k52, k62, k72, k82, k92, kA2, kB2, \
- k03, k13, k23, k33, k43, k53, k63, k73, k83, k93, kA3, kB3, \
- k14, k24, k34, k54, k64, k84, k94, kA4, \
- k56, k55, k96, k85, \
- k35, k86, \
- k36, k46, k25, k66, k75, k65 \
-) { \
- { k00, k01, k02, k03, ___, ___, ___ }, \
- { k10, k11, k12, k13, k14, ___, ___ }, \
- { k20, k21, k22, k23, k24, k25, ___ }, \
- { k30, k31, k32, k33, k34, k35, k36 }, \
- { k40, k41, k42, k43, ___, ___, k46 }, \
- { k50, k51, k52, k53, k54, k55, k56 }, \
- { k60, k61, k62, k63, k64, k65, k66 }, \
- { k70, k71, k72, k73, ___, k75, ___ }, \
- { k80, k81, k82, k83, k84, k85, k86 }, \
- { k90, k91, k92, k93, k94, ___, k96 }, \
- { kA0, kA1, kA2, kA3, kA4, ___, ___ }, \
- { kB0, kB1, kB2, kB3, ___, ___, ___ }, \
- { kC0, kC1, kC2, kC3, kC4, kC5, ___ }, \
- { kD0, kD1, kD2, kD3, kD4, kD5, ___ }, \
- { kE0, kE1, kE2, kE3, kE4, kE5, ___ } \
-}
-
-/*
-This is the Stapelberg matrix as published at
-https://github.com/stapelberg/kinesis-firmware/blob/master/kb_kinesis/config.kspec
-Along with the pins for each row and column
- PB0 PB1 PB2 PB3 PB4 PB5 PB6
- kx0 kx1 kx2 kx3 kx4 kx5 kx6
-PD0 k0x Row: EQL TAB CAP LSH X2 -- --
-PD1 k1x Row: 1 Q A Z BQ -- --
-PD2 k2x Row: 2 W S X INS END --
-PD3 k3x Row: 3 E D C LFT HOM BAK
-PD4 k4x Row: 4 R F V -- -- DEL
-PD5 k5x Row: 5 T G B RT LAL LCT
-PD6 k6x Row: 6 Y H N UP SPC PGD
-PD7 k7x Row: 7 U J M -- RET --
-PC0 k8x Row: 8 I K COM DWN RCT PGU
-PC1 k9x Row: 9 O L PER LBR -- RAL
-PC2 kAx Row: 0 P SEM SLA RBR -- --
-PC3 kBx Row: MIN BSL APO RSH X1 -- --
-PC4 kCx Row: ESC F3 F6 F9 F12 PAU --
-PC5 kDx Row: F1 F4 F7 F10 PRT PRG --
-PC6 kEx Row: F2 F5 F8 F11 SLK KEY --
-*/
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 @@
-/* Copyright 2020
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K3A, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
- K30, K31, K32, K34, K35, K37, K38, K39 \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A }, \
- { K30, K31, K32, KC_NO, K34, K35, KC_NO, K37, K38, K39, K3A } \
-}
-
-#define LAYOUT_625_space( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K3A, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
- K30, K31, K32, K35, K38, K39 \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A }, \
- { K30, K31, K32, KC_NO, KC_NO, K35, KC_NO, KC_NO, K38, K39, K3A } \
-}
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 @@
"layouts": {
"LAYOUT": {
"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},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [3, 10], "x": 11, "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, "w": 1.75},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.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},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
- {"x": 0, "y": 3, "w": 1.25},
- {"x": 1.25, "y": 3},
- {"x": 2.25, "y": 3, "w": 1.25},
- {"x": 3.5, "y": 3, "w": 2.25},
- {"x": 5.75, "y": 3, "w": 2.75},
- {"x": 8.5, "y": 3, "w": 1.25},
- {"x": 9.75, "y": 3},
- {"x": 10.75, "y": 3, "w": 1.25}
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3, "w": 2.75},
+ {"matrix": [3, 7], "x": 8.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 8], "x": 9.75, "y": 3},
+ {"matrix": [3, 9], "x": 10.75, "y": 3, "w": 1.25}
]
},
"LAYOUT_625_space": {
"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},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [3, 10], "x": 11, "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, "w": 1.75},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.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},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
- {"x": 0, "y": 3, "w": 1.25},
- {"x": 1.25, "y": 3},
- {"x": 2.25, "y": 3},
- {"x": 3.25, "y": 3, "w": 6.25},
- {"x": 9.5, "y": 3, "w": 1.25},
- {"x": 10.75, "y": 3, "w": 1.25}
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 5], "x": 3.25, "y": 3, "w": 6.25},
+ {"matrix": [3, 8], "x": 9.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 9], "x": 10.75, "y": 3, "w": 1.25}
]
}
}
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 @@
-/*
-Copyright 2020 LAZYDESIGNERS
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, \
- K400, K402, K403, K404, K406, K407, K408, K409 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, KC_NO }, \
- { K400, KC_NO, K402, K403, K404, KC_NO, K406, K407, K408, K409, KC_NO, KC_NO } \
-}
-
-#define LAYOUT_7u( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K211, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, \
- K400, K402, K404, K408, K409 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, KC_NO, K211 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310 }, \
- { K400, KC_NO, K402, KC_NO, K404, KC_NO, KC_NO, KC_NO, K408, K409, KC_NO, KC_NO } \
-}
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 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K000 (B3,F1)", "x":0, "y":0},
- {"label":"K001 (B3,D5)", "x":1.5, "y":0},
- {"label":"K002 (B3,F6)", "x":2.5, "y":0},
- {"label":"K003 (B3,F7)", "x":3.5, "y":0},
- {"label":"K004 (B3,C7)", "x":4.5, "y":0},
- {"label":"K005 (B3,C6)", "x":5.5, "y":0},
- {"label":"K006 (B3,B6)", "x":6.5, "y":0},
- {"label":"K007 (B3,B5)", "x":7.5, "y":0},
- {"label":"K008 (B3,B4)", "x":8.5, "y":0},
- {"label":"K009 (B3,D7)", "x":9.5, "y":0},
- {"label":"K010 (B3,D6)", "x":10.5, "y":0},
- {"label":"K011 (B3,D4)", "x":11.5, "y":0},
- {"label":"K100 (F0,F1)", "x":0, "y":1.25},
- {"label":"K101 (F0,D5)", "x":1, "y":1.25},
- {"label":"K102 (F0,F6)", "x":2, "y":1.25},
- {"label":"K103 (F0,F7)", "x":3, "y":1.25},
- {"label":"K104 (F0,C7)", "x":4, "y":1.25},
- {"label":"K105 (F0,C6)", "x":5, "y":1.25},
- {"label":"K106 (F0,B6)", "x":6, "y":1.25},
- {"label":"K107 (F0,B5)", "x":7, "y":1.25},
- {"label":"K108 (F0,B4)", "x":8, "y":1.25},
- {"label":"K109 (F0,D7)", "x":9, "y":1.25},
- {"label":"K110 (F0,D6)", "x":10, "y":1.25},
- {"label":"K111 (F0,D4)", "x":11, "y":1.25, "w":1.5},
- {"label":"K200 (E6,F1)", "x":0, "y":2.25, "w":1.25},
- {"label":"K201 (E6,D5)", "x":1.25, "y":2.25},
- {"label":"K202 (E6,F6)", "x":2.25, "y":2.25},
- {"label":"K203 (E6,F7)", "x":3.25, "y":2.25},
- {"label":"K204 (E6,C7)", "x":4.25, "y":2.25},
- {"label":"K205 (E6,C6)", "x":5.25, "y":2.25},
- {"label":"K206 (E6,B6)", "x":6.25, "y":2.25},
- {"label":"K207 (E6,B5)", "x":7.25, "y":2.25},
- {"label":"K208 (E6,B4)", "x":8.25, "y":2.25},
- {"label":"K209 (E6,D7)", "x":9.25, "y":2.25},
- {"label":"K210 (E6,D6)", "x":10.25, "y":2.25},
- {"label":"K211 (E6,D4)", "x":11.25, "y":2.25, "w":1.25},
- {"label":"K300 (F4,F1)", "x":0, "y":3.25, "w":1.75},
- {"label":"K301 (F4,D5)", "x":1.75, "y":3.25},
- {"label":"K302 (F4,F6)", "x":2.75, "y":3.25},
- {"label":"K303 (F4,F7)", "x":3.75, "y":3.25},
- {"label":"K304 (F4,C7)", "x":4.75, "y":3.25},
- {"label":"K305 (F4,C6)", "x":5.75, "y":3.25},
- {"label":"K306 (F4,B6)", "x":6.75, "y":3.25},
- {"label":"K307 (F4,B5)", "x":7.75, "y":3.25},
- {"label":"K308 (F4,B4)", "x":8.75, "y":3.25},
- {"label":"K309 (F4,D7)", "x":9.75, "y":3.25},
- {"label":"K310 (F4,D6)", "x":10.75, "y":3.25, "w":1.75},
- {"label":"K400 (F5,F1)", "x":0.75, "y":4.25},
- {"label":"K402 (F5,F6)", "x":1.75, "y":4.25},
- {"label":"K403 (F5,F7)", "x":2.75, "y":4.25},
- {"label":"K404 (F5,C7)", "x":3.75, "y":4.25, "w":2.25},
- {"label":"K406 (F5,B6)", "x":6, "y":4.25, "w":2.75},
- {"label":"K407 (F5,B5)", "x":8.75, "y":4.25},
- {"label":"K408 (F5,B4)", "x":9.75, "y":4.25},
- {"label":"K409 (F5,D7)", "x":10.75, "y":4.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.5, "y": 0},
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [0, 9], "x": 9.5, "y": 0},
+ {"matrix": [0, 10], "x": 10.5, "y": 0},
+ {"matrix": [0, 11], "x": 11.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.25},
+ {"matrix": [2, 1], "x": 1.25, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.25, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.25, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.25, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.25, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.25, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.25, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.25, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.25, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.25, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.25, "y": 2.25, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25, "w": 1.75},
+
+ {"matrix": [4, 0], "x": 0.75, "y": 4.25},
+ {"matrix": [4, 2], "x": 1.75, "y": 4.25},
+ {"matrix": [4, 3], "x": 2.75, "y": 4.25},
+ {"matrix": [4, 4], "x": 3.75, "y": 4.25, "w": 2.25},
+ {"matrix": [4, 6], "x": 6, "y": 4.25, "w": 2.75},
+ {"matrix": [4, 7], "x": 8.75, "y": 4.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4.25},
+ {"matrix": [4, 9], "x": 10.75, "y": 4.25}
]
},
"LAYOUT_7u": {
"layout": [
- {"label":"K000 (B3,F1)", "x":0, "y":0},
- {"label":"K001 (B3,D5)", "x":1.5, "y":0},
- {"label":"K002 (B3,F6)", "x":2.5, "y":0},
- {"label":"K003 (B3,F7)", "x":3.5, "y":0},
- {"label":"K004 (B3,C7)", "x":4.5, "y":0},
- {"label":"K005 (B3,C6)", "x":5.5, "y":0},
- {"label":"K006 (B3,B6)", "x":6.5, "y":0},
- {"label":"K007 (B3,B5)", "x":7.5, "y":0},
- {"label":"K008 (B3,B4)", "x":8.5, "y":0},
- {"label":"K009 (B3,D7)", "x":9.5, "y":0},
- {"label":"K010 (B3,D6)", "x":10.5, "y":0, "w":2},
- {"label":"K100 (F0,F1)", "x":0, "y":1.25},
- {"label":"K101 (F0,D5)", "x":1, "y":1.25},
- {"label":"K102 (F0,F6)", "x":2, "y":1.25},
- {"label":"K103 (F0,F7)", "x":3, "y":1.25},
- {"label":"K104 (F0,C7)", "x":4, "y":1.25},
- {"label":"K105 (F0,C6)", "x":5, "y":1.25},
- {"label":"K106 (F0,B6)", "x":6, "y":1.25},
- {"label":"K107 (F0,B5)", "x":7, "y":1.25},
- {"label":"K108 (F0,B4)", "x":8, "y":1.25},
- {"label":"K109 (F0,D7)", "x":9, "y":1.25},
- {"label":"K110 (F0,D6)", "x":10, "y":1.25},
- {"label":"K111 (F0,D4)", "x":11, "y":1.25, "w":1.5},
- {"label":"K200 (E6,F1)", "x":0, "y":2.25, "w":1.25},
- {"label":"K201 (E6,D5)", "x":1.25, "y":2.25},
- {"label":"K202 (E6,F6)", "x":2.25, "y":2.25},
- {"label":"K203 (E6,F7)", "x":3.25, "y":2.25},
- {"label":"K204 (E6,C7)", "x":4.25, "y":2.25},
- {"label":"K205 (E6,C6)", "x":5.25, "y":2.25},
- {"label":"K206 (E6,B6)", "x":6.25, "y":2.25},
- {"label":"K207 (E6,B5)", "x":7.25, "y":2.25},
- {"label":"K208 (E6,B4)", "x":8.25, "y":2.25},
- {"label":"K209 (E6,D7)", "x":9.25, "y":2.25},
- {"label":"K211 (E6,D4)", "x":10.25, "y":2.25, "w":2.25},
- {"label":"K300 (F4,F1)", "x":0, "y":3.25, "w":1.75},
- {"label":"K301 (F4,D5)", "x":1.75, "y":3.25},
- {"label":"K302 (F4,F6)", "x":2.75, "y":3.25},
- {"label":"K303 (F4,F7)", "x":3.75, "y":3.25},
- {"label":"K304 (F4,C7)", "x":4.75, "y":3.25},
- {"label":"K305 (F4,C6)", "x":5.75, "y":3.25},
- {"label":"K306 (F4,B6)", "x":6.75, "y":3.25},
- {"label":"K307 (F4,B5)", "x":7.75, "y":3.25},
- {"label":"K308 (F4,B4)", "x":8.75, "y":3.25},
- {"label":"K309 (F4,D7)", "x":9.75, "y":3.25},
- {"label":"K310 (F4,D6)", "x":10.75, "y":3.25, "w":1.75},
- {"label":"K400 (F5,F1)", "x":0.75, "y":4.25},
- {"label":"K402 (F5,F6)", "x":1.75, "y":4.25},
- {"label":"K404 (F5,C7)", "x":2.75, "y":4.25, "w":7},
- {"label":"K408 (F5,B4)", "x":9.75, "y":4.25},
- {"label":"K409 (F5,D7)", "x":10.75, "y":4.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.5, "y": 0},
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [0, 9], "x": 9.5, "y": 0},
+ {"matrix": [0, 10], "x": 10.5, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.25},
+ {"matrix": [2, 1], "x": 1.25, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.25, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.25, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.25, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.25, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.25, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.25, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.25, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.25, "y": 2.25},
+ {"matrix": [2, 11], "x": 10.25, "y": 2.25, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25, "w": 1.75},
+
+ {"matrix": [4, 0], "x": 0.75, "y": 4.25},
+ {"matrix": [4, 2], "x": 1.75, "y": 4.25},
+ {"matrix": [4, 4], "x": 2.75, "y": 4.25, "w": 7},
+ {"matrix": [4, 8], "x": 9.75, "y": 4.25},
+ {"matrix": [4, 9], "x": 10.75, "y": 4.25}
]
}
}
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 @@
#pragma once
+#include QMK_KEYBOARD_H
#include "quantum.h"
-#if defined(KEYBOARD_lfkeyboards_lfk78_revb)
-# include QMK_KEYBOARD_H
-#elif defined(KEYBOARD_lfkeyboards_lfk78_revc)
-# include "revc.h"
-#elif defined(KEYBOARD_lfkeyboards_lfk78_revj)
-# include "revj.h"
-#endif
-
typedef struct RGB_Color {
uint16_t red;
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 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
-
- {"x":2.25, "y":0},
- {"x":3.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.25, "y":0},
- {"x":9.25, "y":0},
- {"x":10.25, "y":0},
- {"x":11.25, "y":0},
- {"x":12.25, "y":0},
- {"x":13.25, "y":0},
- {"x":14.25, "y":0},
- {"x":15.25, "y":0, "w":2},
-
- {"x":17.5, "y":0},
- {"x":18.5, "y":0},
-
- {"x":0, "y":1},
- {"x":1, "y":1},
-
- {"x":2.25, "y":1, "w":1.5},
- {"x":3.75, "y":1},
- {"x":4.75, "y":1},
- {"x":5.75, "y":1},
- {"x":6.75, "y":1},
- {"x":7.75, "y":1},
- {"x":8.75, "y":1},
- {"x":9.75, "y":1},
- {"x":10.75, "y":1},
- {"x":11.75, "y":1},
- {"x":12.75, "y":1},
- {"x":13.75, "y":1},
- {"x":14.75, "y":1},
- {"x":15.75, "y":1, "w":1.5},
-
- {"x":17.5, "y":1},
- {"x":18.5, "y":1},
-
- {"x":0, "y":2},
- {"x":1, "y":2},
-
- {"x":2.25, "y":2, "w":1.75},
- {"x":4, "y":2},
- {"x":5, "y":2},
- {"x":6, "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":13, "y":2},
- {"x":14, "y":2},
- {"x":15, "y":2, "w":2.25},
-
- {"x":0, "y":3},
- {"x":1, "y":3},
-
- {"x":2.25, "y":3, "w":2.25},
- {"x":4.5, "y":3},
- {"x":5.5, "y":3},
- {"x":6.5, "y":3},
- {"x":7.5, "y":3},
- {"x":8.5, "y":3},
- {"x":9.5, "y":3},
- {"x":10.5, "y":3},
- {"x":11.5, "y":3},
- {"x":12.5, "y":3},
- {"x":13.5, "y":3},
- {"x":14.5, "y":3, "w":2.75},
-
- {"x":17.5, "y":3},
-
- {"x":0, "y":4},
- {"x":1, "y":4},
-
- {"x":2.25, "y":4, "w":1.25},
- {"x":3.5, "y":4, "w":1.25},
- {"x":4.75, "y":4, "w":1.25},
- {"x":6, "y":4, "w":6.25},
- {"x":12.25, "y":4, "w":1.25},
- {"x":13.5, "y":4, "w":1.25},
- {"x":14.75, "y":4, "w":1.25},
-
- {"x":16.5, "y":4},
- {"x":17.5, "y":4},
- {"x":18.5, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [0, 8], "x": 8.25, "y": 0},
+ {"matrix": [0, 9], "x": 9.25, "y": 0},
+ {"matrix": [0, 10], "x": 10.25, "y": 0},
+ {"matrix": [0, 11], "x": 11.25, "y": 0},
+ {"matrix": [0, 12], "x": 12.25, "y": 0},
+ {"matrix": [0, 13], "x": 13.25, "y": 0},
+ {"matrix": [0, 14], "x": 14.25, "y": 0},
+ {"matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
+
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+
+ {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [1, 8], "x": 8.75, "y": 1},
+ {"matrix": [1, 9], "x": 9.75, "y": 1},
+ {"matrix": [1, 10], "x": 10.75, "y": 1},
+ {"matrix": [1, 11], "x": 11.75, "y": 1},
+ {"matrix": [1, 12], "x": 12.75, "y": 1},
+ {"matrix": [1, 13], "x": 13.75, "y": 1},
+ {"matrix": [1, 14], "x": 14.75, "y": 1},
+ {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 16], "x": 17.5, "y": 1},
+ {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+
+ {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 9], "x": 10, "y": 2},
+ {"matrix": [2, 10], "x": 11, "y": 2},
+ {"matrix": [2, 11], "x": 12, "y": 2},
+ {"matrix": [2, 12], "x": 13, "y": 2},
+ {"matrix": [2, 13], "x": 14, "y": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+
+ {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.5, "y": 3},
+ {"matrix": [3, 7], "x": 7.5, "y": 3},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [3, 9], "x": 9.5, "y": 3},
+ {"matrix": [3, 10], "x": 10.5, "y": 3},
+ {"matrix": [3, 11], "x": 11.5, "y": 3},
+ {"matrix": [3, 12], "x": 12.5, "y": 3},
+ {"matrix": [3, 13], "x": 13.5, "y": 3},
+ {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
+
+ {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 6, "y": 4, "w": 6.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 15], "x": 16.5, "y": 4},
+ {"matrix": [4, 16], "x": 17.5, "y": 4},
+ {"matrix": [4, 17], "x": 18.5, "y": 4}
]
},
"LAYOUT_split_bs": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
-
- {"x":2.25, "y":0},
- {"x":3.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.25, "y":0},
- {"x":9.25, "y":0},
- {"x":10.25, "y":0},
- {"x":11.25, "y":0},
- {"x":12.25, "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},
- {"x":1, "y":1},
-
- {"x":2.25, "y":1, "w":1.5},
- {"x":3.75, "y":1},
- {"x":4.75, "y":1},
- {"x":5.75, "y":1},
- {"x":6.75, "y":1},
- {"x":7.75, "y":1},
- {"x":8.75, "y":1},
- {"x":9.75, "y":1},
- {"x":10.75, "y":1},
- {"x":11.75, "y":1},
- {"x":12.75, "y":1},
- {"x":13.75, "y":1},
- {"x":14.75, "y":1},
- {"x":15.75, "y":1, "w":1.5},
-
- {"x":17.5, "y":1},
- {"x":18.5, "y":1},
-
- {"x":0, "y":2},
- {"x":1, "y":2},
-
- {"x":2.25, "y":2, "w":1.75},
- {"x":4, "y":2},
- {"x":5, "y":2},
- {"x":6, "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":13, "y":2},
- {"x":14, "y":2},
- {"x":15, "y":2, "w":2.25},
-
- {"x":0, "y":3},
- {"x":1, "y":3},
-
- {"x":2.25, "y":3, "w":2.25},
- {"x":4.5, "y":3},
- {"x":5.5, "y":3},
- {"x":6.5, "y":3},
- {"x":7.5, "y":3},
- {"x":8.5, "y":3},
- {"x":9.5, "y":3},
- {"x":10.5, "y":3},
- {"x":11.5, "y":3},
- {"x":12.5, "y":3},
- {"x":13.5, "y":3},
- {"x":14.5, "y":3, "w":2.75},
-
- {"x":17.5, "y":3},
-
- {"x":0, "y":4},
- {"x":1, "y":4},
-
- {"x":2.25, "y":4, "w":1.25},
- {"x":3.5, "y":4, "w":1.25},
- {"x":4.75, "y":4, "w":1.25},
- {"x":6, "y":4, "w":6.25},
- {"x":12.25, "y":4, "w":1.25},
- {"x":13.5, "y":4, "w":1.25},
- {"x":14.75, "y":4, "w":1.25},
-
- {"x":16.5, "y":4},
- {"x":17.5, "y":4},
- {"x":18.5, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [0, 8], "x": 8.25, "y": 0},
+ {"matrix": [0, 9], "x": 9.25, "y": 0},
+ {"matrix": [0, 10], "x": 10.25, "y": 0},
+ {"matrix": [0, 11], "x": 11.25, "y": 0},
+ {"matrix": [0, 12], "x": 12.25, "y": 0},
+ {"matrix": [0, 13], "x": 13.25, "y": 0},
+ {"matrix": [0, 14], "x": 14.25, "y": 0},
+ {"matrix": [0, 15], "x": 15.25, "y": 0},
+ {"matrix": [2, 15], "x": 16.25, "y": 0},
+
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+
+ {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [1, 8], "x": 8.75, "y": 1},
+ {"matrix": [1, 9], "x": 9.75, "y": 1},
+ {"matrix": [1, 10], "x": 10.75, "y": 1},
+ {"matrix": [1, 11], "x": 11.75, "y": 1},
+ {"matrix": [1, 12], "x": 12.75, "y": 1},
+ {"matrix": [1, 13], "x": 13.75, "y": 1},
+ {"matrix": [1, 14], "x": 14.75, "y": 1},
+ {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 16], "x": 17.5, "y": 1},
+ {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+
+ {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 9], "x": 10, "y": 2},
+ {"matrix": [2, 10], "x": 11, "y": 2},
+ {"matrix": [2, 11], "x": 12, "y": 2},
+ {"matrix": [2, 12], "x": 13, "y": 2},
+ {"matrix": [2, 13], "x": 14, "y": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+
+ {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.5, "y": 3},
+ {"matrix": [3, 7], "x": 7.5, "y": 3},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [3, 9], "x": 9.5, "y": 3},
+ {"matrix": [3, 10], "x": 10.5, "y": 3},
+ {"matrix": [3, 11], "x": 11.5, "y": 3},
+ {"matrix": [3, 12], "x": 12.5, "y": 3},
+ {"matrix": [3, 13], "x": 13.5, "y": 3},
+ {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
+
+ {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 6, "y": 4, "w": 6.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 15], "x": 16.5, "y": 4},
+ {"matrix": [4, 16], "x": 17.5, "y": 4},
+ {"matrix": [4, 17], "x": 18.5, "y": 4}
]
},
"LAYOUT_split_rshift": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
-
- {"x":2.25, "y":0},
- {"x":3.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.25, "y":0},
- {"x":9.25, "y":0},
- {"x":10.25, "y":0},
- {"x":11.25, "y":0},
- {"x":12.25, "y":0},
- {"x":13.25, "y":0},
- {"x":14.25, "y":0},
- {"x":15.25, "y":0, "w":2},
-
- {"x":17.5, "y":0},
- {"x":18.5, "y":0},
-
- {"x":0, "y":1},
- {"x":1, "y":1},
-
- {"x":2.25, "y":1, "w":1.5},
- {"x":3.75, "y":1},
- {"x":4.75, "y":1},
- {"x":5.75, "y":1},
- {"x":6.75, "y":1},
- {"x":7.75, "y":1},
- {"x":8.75, "y":1},
- {"x":9.75, "y":1},
- {"x":10.75, "y":1},
- {"x":11.75, "y":1},
- {"x":12.75, "y":1},
- {"x":13.75, "y":1},
- {"x":14.75, "y":1},
- {"x":15.75, "y":1, "w":1.5},
-
- {"x":17.5, "y":1},
- {"x":18.5, "y":1},
-
- {"x":0, "y":2},
- {"x":1, "y":2},
-
- {"x":2.25, "y":2, "w":1.75},
- {"x":4, "y":2},
- {"x":5, "y":2},
- {"x":6, "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":13, "y":2},
- {"x":14, "y":2},
- {"x":15, "y":2, "w":2.25},
-
- {"x":0, "y":3},
- {"x":1, "y":3},
-
- {"x":2.25, "y":3, "w":2.25},
- {"x":4.5, "y":3},
- {"x":5.5, "y":3},
- {"x":6.5, "y":3},
- {"x":7.5, "y":3},
- {"x":8.5, "y":3},
- {"x":9.5, "y":3},
- {"x":10.5, "y":3},
- {"x":11.5, "y":3},
- {"x":12.5, "y":3},
- {"x":13.5, "y":3},
- {"x":14.5, "y":3, "w":1.75},
- {"x":16.25, "y":3},
-
- {"x":17.5, "y":3},
-
- {"x":0, "y":4},
- {"x":1, "y":4},
-
- {"x":2.25, "y":4, "w":1.25},
- {"x":3.5, "y":4, "w":1.25},
- {"x":4.75, "y":4, "w":1.25},
- {"x":6, "y":4, "w":6.25},
- {"x":12.25, "y":4, "w":1.25},
- {"x":13.5, "y":4, "w":1.25},
- {"x":14.75, "y":4, "w":1.25},
-
- {"x":16.5, "y":4},
- {"x":17.5, "y":4},
- {"x":18.5, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [0, 8], "x": 8.25, "y": 0},
+ {"matrix": [0, 9], "x": 9.25, "y": 0},
+ {"matrix": [0, 10], "x": 10.25, "y": 0},
+ {"matrix": [0, 11], "x": 11.25, "y": 0},
+ {"matrix": [0, 12], "x": 12.25, "y": 0},
+ {"matrix": [0, 13], "x": 13.25, "y": 0},
+ {"matrix": [0, 14], "x": 14.25, "y": 0},
+ {"matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
+
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+
+ {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [1, 8], "x": 8.75, "y": 1},
+ {"matrix": [1, 9], "x": 9.75, "y": 1},
+ {"matrix": [1, 10], "x": 10.75, "y": 1},
+ {"matrix": [1, 11], "x": 11.75, "y": 1},
+ {"matrix": [1, 12], "x": 12.75, "y": 1},
+ {"matrix": [1, 13], "x": 13.75, "y": 1},
+ {"matrix": [1, 14], "x": 14.75, "y": 1},
+ {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 16], "x": 17.5, "y": 1},
+ {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+
+ {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 9], "x": 10, "y": 2},
+ {"matrix": [2, 10], "x": 11, "y": 2},
+ {"matrix": [2, 11], "x": 12, "y": 2},
+ {"matrix": [2, 12], "x": 13, "y": 2},
+ {"matrix": [2, 13], "x": 14, "y": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+
+ {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.5, "y": 3},
+ {"matrix": [3, 7], "x": 7.5, "y": 3},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [3, 9], "x": 9.5, "y": 3},
+ {"matrix": [3, 10], "x": 10.5, "y": 3},
+ {"matrix": [3, 11], "x": 11.5, "y": 3},
+ {"matrix": [3, 12], "x": 12.5, "y": 3},
+ {"matrix": [3, 13], "x": 13.5, "y": 3},
+ {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
+ {"matrix": [3, 15], "x": 16.25, "y": 3},
+
+ {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 6, "y": 4, "w": 6.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 15], "x": 16.5, "y": 4},
+ {"matrix": [4, 16], "x": 17.5, "y": 4},
+ {"matrix": [4, 17], "x": 18.5, "y": 4}
]
},
"LAYOUT_iso": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
-
- {"x":2.25, "y":0},
- {"x":3.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.25, "y":0},
- {"x":9.25, "y":0},
- {"x":10.25, "y":0},
- {"x":11.25, "y":0},
- {"x":12.25, "y":0},
- {"x":13.25, "y":0},
- {"x":14.25, "y":0},
- {"x":15.25, "y":0, "w":2},
-
- {"x":17.5, "y":0},
- {"x":18.5, "y":0},
-
- {"x":0, "y":1},
- {"x":1, "y":1},
-
- {"x":2.25, "y":1, "w":1.5},
- {"x":3.75, "y":1},
- {"x":4.75, "y":1},
- {"x":5.75, "y":1},
- {"x":6.75, "y":1},
- {"x":7.75, "y":1},
- {"x":8.75, "y":1},
- {"x":9.75, "y":1},
- {"x":10.75, "y":1},
- {"x":11.75, "y":1},
- {"x":12.75, "y":1},
- {"x":13.75, "y":1},
- {"x":14.75, "y":1},
- {"x":16, "y":1, "w":1.25, "h":2},
-
- {"x":17.5, "y":1},
- {"x":18.5, "y":1},
-
- {"x":0, "y":2},
- {"x":1, "y":2},
-
- {"x":2.25, "y":2, "w":1.75},
- {"x":4, "y":2},
- {"x":5, "y":2},
- {"x":6, "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":13, "y":2},
- {"x":14, "y":2},
- {"x":15, "y":2},
-
- {"x":0, "y":3},
- {"x":1, "y":3},
-
- {"x":2.25, "y":3, "w":1.25},
- {"x":3.5, "y":3},
- {"x":4.5, "y":3},
- {"x":5.5, "y":3},
- {"x":6.5, "y":3},
- {"x":7.5, "y":3},
- {"x":8.5, "y":3},
- {"x":9.5, "y":3},
- {"x":10.5, "y":3},
- {"x":11.5, "y":3},
- {"x":12.5, "y":3},
- {"x":13.5, "y":3},
- {"x":14.5, "y":3, "w":2.75},
-
- {"x":17.5, "y":3},
-
- {"x":0, "y":4},
- {"x":1, "y":4},
-
- {"x":2.25, "y":4, "w":1.25},
- {"x":3.5, "y":4, "w":1.25},
- {"x":4.75, "y":4, "w":1.25},
- {"x":6, "y":4, "w":6.25},
- {"x":12.25, "y":4, "w":1.25},
- {"x":13.5, "y":4, "w":1.25},
- {"x":14.75, "y":4, "w":1.25},
-
- {"x":16.5, "y":4},
- {"x":17.5, "y":4},
- {"x":18.5, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [0, 8], "x": 8.25, "y": 0},
+ {"matrix": [0, 9], "x": 9.25, "y": 0},
+ {"matrix": [0, 10], "x": 10.25, "y": 0},
+ {"matrix": [0, 11], "x": 11.25, "y": 0},
+ {"matrix": [0, 12], "x": 12.25, "y": 0},
+ {"matrix": [0, 13], "x": 13.25, "y": 0},
+ {"matrix": [0, 14], "x": 14.25, "y": 0},
+ {"matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
+
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+
+ {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [1, 8], "x": 8.75, "y": 1},
+ {"matrix": [1, 9], "x": 9.75, "y": 1},
+ {"matrix": [1, 10], "x": 10.75, "y": 1},
+ {"matrix": [1, 11], "x": 11.75, "y": 1},
+ {"matrix": [1, 12], "x": 12.75, "y": 1},
+ {"matrix": [1, 13], "x": 13.75, "y": 1},
+ {"matrix": [1, 14], "x": 14.75, "y": 1},
+ {"matrix": [1, 15], "x": 16, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [1, 16], "x": 17.5, "y": 1},
+ {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+
+ {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 9], "x": 10, "y": 2},
+ {"matrix": [2, 10], "x": 11, "y": 2},
+ {"matrix": [2, 11], "x": 12, "y": 2},
+ {"matrix": [2, 12], "x": 13, "y": 2},
+ {"matrix": [2, 13], "x": 14, "y": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+
+ {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.5, "y": 3},
+ {"matrix": [3, 7], "x": 7.5, "y": 3},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [3, 9], "x": 9.5, "y": 3},
+ {"matrix": [3, 10], "x": 10.5, "y": 3},
+ {"matrix": [3, 11], "x": 11.5, "y": 3},
+ {"matrix": [3, 12], "x": 12.5, "y": 3},
+ {"matrix": [3, 13], "x": 13.5, "y": 3},
+ {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
+
+ {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 6, "y": 4, "w": 6.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 15], "x": 16.5, "y": 4},
+ {"matrix": [4, 16], "x": 17.5, "y": 4},
+ {"matrix": [4, 17], "x": 18.5, "y": 4}
]
}
}
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 @@
-#pragma once
-
-#include "lfk78.h"
-
-// readability
-#define XXX KC_NO
-
-// This is a shortcut to help you visually see your layout.
-/*
- * ,---------. ,-----------------------------------------------------------------------. ,---------.
- * | 11 | 12 | | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 1A | 1B | 1C | 1D | 1E | 1F | 1G | | 1H | 1I |
- * |---------| |-----------------------------------------------------------------------| |---------|
- * | 21 | 22 | | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 2A | 2B | 2C | 2D | 2E | 2F | 2G | | 2H | 2I |
- * |---------| |-----------------------------------------------------------------------| `---------'
- * | 31 | 32 | | 33 | 34 | 35 | 36 | 37 | 38 | 39 | 3A | 3B | 3C | 3D | 3E | 3F |
- * |---------| |-----------------------------------------------------------------------| ,----.
- * | 41 | 42 | | 43 | 45 | 46 | 47 | 48 | 49 | 4A | 4B | 4C | 4D | 4E | 4F | | 4H |
- * |---------| |-------------------------------------------------------------------------------------.
- * | 51 | 52 | | 53 | 54 | 55 | 59 | 5D | 5E | 5F | | 5G | 5H | 5I |
- * `---------' `--------------------------------------------------------------------' `--------------'
- */
-// The first section contains all of the arguements
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
- k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I, \
- k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I, \
- k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, \
- k41, k42, k43, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4H, \
- k51, k52, k53, k54, k55, k59, k5D, k5E, k5F, k5G, k5H, k5I \
-) { \
- { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I }, \
- { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I }, \
- { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, XXX, XXX, XXX }, \
- { k41, k42, k43, XXX, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, XXX, k4H, XXX }, \
- { k51, k52, k53, k54, k55, XXX, XXX, XXX, k59, XXX, XXX, XXX, k5D, k5E, k5F, k5G, k5H, k5I } \
-}
-
-#define LAYOUT_split_bs( \
- k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k3G, k1H, k1I, \
- k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I, \
- k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, \
- k41, k42, k43, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4H, \
- k51, k52, k53, k54, k55, k59, k5D, k5E, k5F, k5G, k5H, k5I \
-) { \
- { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I }, \
- { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I }, \
- { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G, XXX, XXX }, \
- { k41, k42, k43, XXX, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, XXX, k4H, XXX }, \
- { k51, k52, k53, k54, k55, XXX, XXX, XXX, k59, XXX, XXX, XXX, k5D, k5E, k5F, k5G, k5H, k5I } \
-}
-
-#define LAYOUT_split_rshift( \
- k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I, \
- k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I, \
- k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, \
- k41, k42, k43, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, \
- k51, k52, k53, k54, k55, k59, k5D, k5E, k5F, k5G, k5H, k5I \
-) { \
- { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I }, \
- { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I }, \
- { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, XXX, XXX, XXX }, \
- { k41, k42, k43, XXX, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, XXX }, \
- { k51, k52, k53, k54, k55, XXX, XXX, XXX, k59, XXX, XXX, XXX, k5D, k5E, k5F, k5G, k5H, k5I } \
-}
-
-#define LAYOUT_iso( \
- k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I, \
- k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I, \
- k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, \
- k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4H, \
- k51, k52, k53, k54, k55, k59, k5D, k5E, k5F, k5G, k5H, k5I \
-) { \
- { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I }, \
- { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I }, \
- { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, XXX, XXX, XXX }, \
- { k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, XXX, k4H, XXX }, \
- { k51, k52, k53, k54, k55, XXX, XXX, XXX, k59, XXX, XXX, XXX, k5D, k5E, k5F, k5G, k5H, k5I } \
-}
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 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
-
- {"x":2.25, "y":0},
- {"x":3.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.25, "y":0},
- {"x":9.25, "y":0},
- {"x":10.25, "y":0},
- {"x":11.25, "y":0},
- {"x":12.25, "y":0},
- {"x":13.25, "y":0},
- {"x":14.25, "y":0},
- {"x":15.25, "y":0, "w":2},
-
- {"x":17.5, "y":0},
- {"x":18.5, "y":0},
-
- {"x":0, "y":1},
- {"x":1, "y":1},
-
- {"x":2.25, "y":1, "w":1.5},
- {"x":3.75, "y":1},
- {"x":4.75, "y":1},
- {"x":5.75, "y":1},
- {"x":6.75, "y":1},
- {"x":7.75, "y":1},
- {"x":8.75, "y":1},
- {"x":9.75, "y":1},
- {"x":10.75, "y":1},
- {"x":11.75, "y":1},
- {"x":12.75, "y":1},
- {"x":13.75, "y":1},
- {"x":14.75, "y":1},
- {"x":15.75, "y":1, "w":1.5},
-
- {"x":17.5, "y":1},
- {"x":18.5, "y":1},
-
- {"x":0, "y":2},
- {"x":1, "y":2},
-
- {"x":2.25, "y":2, "w":1.75},
- {"x":4, "y":2},
- {"x":5, "y":2},
- {"x":6, "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":13, "y":2},
- {"x":14, "y":2},
- {"x":15, "y":2, "w":2.25},
-
- {"x":0, "y":3},
- {"x":1, "y":3},
-
- {"x":2.25, "y":3, "w":2.25},
- {"x":4.5, "y":3},
- {"x":5.5, "y":3},
- {"x":6.5, "y":3},
- {"x":7.5, "y":3},
- {"x":8.5, "y":3},
- {"x":9.5, "y":3},
- {"x":10.5, "y":3},
- {"x":11.5, "y":3},
- {"x":12.5, "y":3},
- {"x":13.5, "y":3},
- {"x":14.5, "y":3, "w":2.75},
-
- {"x":17.5, "y":3},
-
- {"x":0, "y":4},
- {"x":1, "y":4},
-
- {"x":2.25, "y":4, "w":1.25},
- {"x":3.5, "y":4, "w":1.25},
- {"x":4.75, "y":4, "w":1.25},
- {"x":6, "y":4, "w":6.25},
- {"x":12.25, "y":4, "w":1.25},
- {"x":13.5, "y":4, "w":1.25},
- {"x":14.75, "y":4, "w":1.25},
-
- {"x":16.5, "y":4},
- {"x":17.5, "y":4},
- {"x":18.5, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [0, 8], "x": 8.25, "y": 0},
+ {"matrix": [0, 9], "x": 9.25, "y": 0},
+ {"matrix": [0, 10], "x": 10.25, "y": 0},
+ {"matrix": [0, 11], "x": 11.25, "y": 0},
+ {"matrix": [0, 12], "x": 12.25, "y": 0},
+ {"matrix": [0, 13], "x": 13.25, "y": 0},
+ {"matrix": [0, 14], "x": 14.25, "y": 0},
+ {"matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
+
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+
+ {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [1, 8], "x": 8.75, "y": 1},
+ {"matrix": [1, 9], "x": 9.75, "y": 1},
+ {"matrix": [1, 10], "x": 10.75, "y": 1},
+ {"matrix": [1, 11], "x": 11.75, "y": 1},
+ {"matrix": [1, 12], "x": 12.75, "y": 1},
+ {"matrix": [1, 13], "x": 13.75, "y": 1},
+ {"matrix": [1, 14], "x": 14.75, "y": 1},
+ {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 16], "x": 17.5, "y": 1},
+ {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+
+ {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 9], "x": 10, "y": 2},
+ {"matrix": [2, 10], "x": 11, "y": 2},
+ {"matrix": [2, 11], "x": 12, "y": 2},
+ {"matrix": [2, 12], "x": 13, "y": 2},
+ {"matrix": [2, 13], "x": 14, "y": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+
+ {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.5, "y": 3},
+ {"matrix": [3, 7], "x": 7.5, "y": 3},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [3, 9], "x": 9.5, "y": 3},
+ {"matrix": [3, 10], "x": 10.5, "y": 3},
+ {"matrix": [3, 11], "x": 11.5, "y": 3},
+ {"matrix": [3, 12], "x": 12.5, "y": 3},
+ {"matrix": [3, 13], "x": 13.5, "y": 3},
+ {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
+
+ {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 6, "y": 4, "w": 6.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 15], "x": 16.5, "y": 4},
+ {"matrix": [4, 16], "x": 17.5, "y": 4},
+ {"matrix": [4, 17], "x": 18.5, "y": 4}
]
},
"LAYOUT_split_bs": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
-
- {"x":2.25, "y":0},
- {"x":3.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.25, "y":0},
- {"x":9.25, "y":0},
- {"x":10.25, "y":0},
- {"x":11.25, "y":0},
- {"x":12.25, "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},
- {"x":1, "y":1},
-
- {"x":2.25, "y":1, "w":1.5},
- {"x":3.75, "y":1},
- {"x":4.75, "y":1},
- {"x":5.75, "y":1},
- {"x":6.75, "y":1},
- {"x":7.75, "y":1},
- {"x":8.75, "y":1},
- {"x":9.75, "y":1},
- {"x":10.75, "y":1},
- {"x":11.75, "y":1},
- {"x":12.75, "y":1},
- {"x":13.75, "y":1},
- {"x":14.75, "y":1},
- {"x":15.75, "y":1, "w":1.5},
-
- {"x":17.5, "y":1},
- {"x":18.5, "y":1},
-
- {"x":0, "y":2},
- {"x":1, "y":2},
-
- {"x":2.25, "y":2, "w":1.75},
- {"x":4, "y":2},
- {"x":5, "y":2},
- {"x":6, "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":13, "y":2},
- {"x":14, "y":2},
- {"x":15, "y":2, "w":2.25},
-
- {"x":0, "y":3},
- {"x":1, "y":3},
-
- {"x":2.25, "y":3, "w":2.25},
- {"x":4.5, "y":3},
- {"x":5.5, "y":3},
- {"x":6.5, "y":3},
- {"x":7.5, "y":3},
- {"x":8.5, "y":3},
- {"x":9.5, "y":3},
- {"x":10.5, "y":3},
- {"x":11.5, "y":3},
- {"x":12.5, "y":3},
- {"x":13.5, "y":3},
- {"x":14.5, "y":3, "w":2.75},
-
- {"x":17.5, "y":3},
-
- {"x":0, "y":4},
- {"x":1, "y":4},
-
- {"x":2.25, "y":4, "w":1.25},
- {"x":3.5, "y":4, "w":1.25},
- {"x":4.75, "y":4, "w":1.25},
- {"x":6, "y":4, "w":6.25},
- {"x":12.25, "y":4, "w":1.25},
- {"x":13.5, "y":4, "w":1.25},
- {"x":14.75, "y":4, "w":1.25},
-
- {"x":16.5, "y":4},
- {"x":17.5, "y":4},
- {"x":18.5, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [0, 8], "x": 8.25, "y": 0},
+ {"matrix": [0, 9], "x": 9.25, "y": 0},
+ {"matrix": [0, 10], "x": 10.25, "y": 0},
+ {"matrix": [0, 11], "x": 11.25, "y": 0},
+ {"matrix": [0, 12], "x": 12.25, "y": 0},
+ {"matrix": [0, 13], "x": 13.25, "y": 0},
+ {"matrix": [0, 14], "x": 14.25, "y": 0},
+ {"matrix": [0, 15], "x": 15.25, "y": 0},
+ {"matrix": [2, 15], "x": 16.25, "y": 0},
+
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+
+ {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [1, 8], "x": 8.75, "y": 1},
+ {"matrix": [1, 9], "x": 9.75, "y": 1},
+ {"matrix": [1, 10], "x": 10.75, "y": 1},
+ {"matrix": [1, 11], "x": 11.75, "y": 1},
+ {"matrix": [1, 12], "x": 12.75, "y": 1},
+ {"matrix": [1, 13], "x": 13.75, "y": 1},
+ {"matrix": [1, 14], "x": 14.75, "y": 1},
+ {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 16], "x": 17.5, "y": 1},
+ {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+
+ {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 9], "x": 10, "y": 2},
+ {"matrix": [2, 10], "x": 11, "y": 2},
+ {"matrix": [2, 11], "x": 12, "y": 2},
+ {"matrix": [2, 12], "x": 13, "y": 2},
+ {"matrix": [2, 13], "x": 14, "y": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+
+ {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.5, "y": 3},
+ {"matrix": [3, 7], "x": 7.5, "y": 3},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [3, 9], "x": 9.5, "y": 3},
+ {"matrix": [3, 10], "x": 10.5, "y": 3},
+ {"matrix": [3, 11], "x": 11.5, "y": 3},
+ {"matrix": [3, 12], "x": 12.5, "y": 3},
+ {"matrix": [3, 13], "x": 13.5, "y": 3},
+ {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
+
+ {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 6, "y": 4, "w": 6.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 15], "x": 16.5, "y": 4},
+ {"matrix": [4, 16], "x": 17.5, "y": 4},
+ {"matrix": [4, 17], "x": 18.5, "y": 4}
]
},
"LAYOUT_split_rshift": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
-
- {"x":2.25, "y":0},
- {"x":3.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.25, "y":0},
- {"x":9.25, "y":0},
- {"x":10.25, "y":0},
- {"x":11.25, "y":0},
- {"x":12.25, "y":0},
- {"x":13.25, "y":0},
- {"x":14.25, "y":0},
- {"x":15.25, "y":0, "w":2},
-
- {"x":17.5, "y":0},
- {"x":18.5, "y":0},
-
- {"x":0, "y":1},
- {"x":1, "y":1},
-
- {"x":2.25, "y":1, "w":1.5},
- {"x":3.75, "y":1},
- {"x":4.75, "y":1},
- {"x":5.75, "y":1},
- {"x":6.75, "y":1},
- {"x":7.75, "y":1},
- {"x":8.75, "y":1},
- {"x":9.75, "y":1},
- {"x":10.75, "y":1},
- {"x":11.75, "y":1},
- {"x":12.75, "y":1},
- {"x":13.75, "y":1},
- {"x":14.75, "y":1},
- {"x":15.75, "y":1, "w":1.5},
-
- {"x":17.5, "y":1},
- {"x":18.5, "y":1},
-
- {"x":0, "y":2},
- {"x":1, "y":2},
-
- {"x":2.25, "y":2, "w":1.75},
- {"x":4, "y":2},
- {"x":5, "y":2},
- {"x":6, "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":13, "y":2},
- {"x":14, "y":2},
- {"x":15, "y":2, "w":2.25},
-
- {"x":0, "y":3},
- {"x":1, "y":3},
-
- {"x":2.25, "y":3, "w":2.25},
- {"x":4.5, "y":3},
- {"x":5.5, "y":3},
- {"x":6.5, "y":3},
- {"x":7.5, "y":3},
- {"x":8.5, "y":3},
- {"x":9.5, "y":3},
- {"x":10.5, "y":3},
- {"x":11.5, "y":3},
- {"x":12.5, "y":3},
- {"x":13.5, "y":3},
- {"x":14.5, "y":3, "w":1.75},
- {"x":16.25, "y":3},
-
- {"x":17.5, "y":3},
-
- {"x":0, "y":4},
- {"x":1, "y":4},
-
- {"x":2.25, "y":4, "w":1.25},
- {"x":3.5, "y":4, "w":1.25},
- {"x":4.75, "y":4, "w":1.25},
- {"x":6, "y":4, "w":6.25},
- {"x":12.25, "y":4, "w":1.25},
- {"x":13.5, "y":4, "w":1.25},
- {"x":14.75, "y":4, "w":1.25},
-
- {"x":16.5, "y":4},
- {"x":17.5, "y":4},
- {"x":18.5, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [0, 8], "x": 8.25, "y": 0},
+ {"matrix": [0, 9], "x": 9.25, "y": 0},
+ {"matrix": [0, 10], "x": 10.25, "y": 0},
+ {"matrix": [0, 11], "x": 11.25, "y": 0},
+ {"matrix": [0, 12], "x": 12.25, "y": 0},
+ {"matrix": [0, 13], "x": 13.25, "y": 0},
+ {"matrix": [0, 14], "x": 14.25, "y": 0},
+ {"matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
+
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+
+ {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [1, 8], "x": 8.75, "y": 1},
+ {"matrix": [1, 9], "x": 9.75, "y": 1},
+ {"matrix": [1, 10], "x": 10.75, "y": 1},
+ {"matrix": [1, 11], "x": 11.75, "y": 1},
+ {"matrix": [1, 12], "x": 12.75, "y": 1},
+ {"matrix": [1, 13], "x": 13.75, "y": 1},
+ {"matrix": [1, 14], "x": 14.75, "y": 1},
+ {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 16], "x": 17.5, "y": 1},
+ {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+
+ {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 9], "x": 10, "y": 2},
+ {"matrix": [2, 10], "x": 11, "y": 2},
+ {"matrix": [2, 11], "x": 12, "y": 2},
+ {"matrix": [2, 12], "x": 13, "y": 2},
+ {"matrix": [2, 13], "x": 14, "y": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+
+ {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.5, "y": 3},
+ {"matrix": [3, 7], "x": 7.5, "y": 3},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [3, 9], "x": 9.5, "y": 3},
+ {"matrix": [3, 10], "x": 10.5, "y": 3},
+ {"matrix": [3, 11], "x": 11.5, "y": 3},
+ {"matrix": [3, 12], "x": 12.5, "y": 3},
+ {"matrix": [3, 13], "x": 13.5, "y": 3},
+ {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
+ {"matrix": [3, 15], "x": 16.25, "y": 3},
+
+ {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 6, "y": 4, "w": 6.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 15], "x": 16.5, "y": 4},
+ {"matrix": [4, 16], "x": 17.5, "y": 4},
+ {"matrix": [4, 17], "x": 18.5, "y": 4}
]
},
"LAYOUT_iso": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
-
- {"x":2.25, "y":0},
- {"x":3.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.25, "y":0},
- {"x":9.25, "y":0},
- {"x":10.25, "y":0},
- {"x":11.25, "y":0},
- {"x":12.25, "y":0},
- {"x":13.25, "y":0},
- {"x":14.25, "y":0},
- {"x":15.25, "y":0, "w":2},
-
- {"x":17.5, "y":0},
- {"x":18.5, "y":0},
-
- {"x":0, "y":1},
- {"x":1, "y":1},
-
- {"x":2.25, "y":1, "w":1.5},
- {"x":3.75, "y":1},
- {"x":4.75, "y":1},
- {"x":5.75, "y":1},
- {"x":6.75, "y":1},
- {"x":7.75, "y":1},
- {"x":8.75, "y":1},
- {"x":9.75, "y":1},
- {"x":10.75, "y":1},
- {"x":11.75, "y":1},
- {"x":12.75, "y":1},
- {"x":13.75, "y":1},
- {"x":14.75, "y":1},
- {"x":16, "y":1, "w":1.25, "h":2},
-
- {"x":17.5, "y":1},
- {"x":18.5, "y":1},
-
- {"x":0, "y":2},
- {"x":1, "y":2},
-
- {"x":2.25, "y":2, "w":1.75},
- {"x":4, "y":2},
- {"x":5, "y":2},
- {"x":6, "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":13, "y":2},
- {"x":14, "y":2},
- {"x":15, "y":2},
-
- {"x":0, "y":3},
- {"x":1, "y":3},
-
- {"x":2.25, "y":3, "w":1.25},
- {"x":3.5, "y":3},
- {"x":4.5, "y":3},
- {"x":5.5, "y":3},
- {"x":6.5, "y":3},
- {"x":7.5, "y":3},
- {"x":8.5, "y":3},
- {"x":9.5, "y":3},
- {"x":10.5, "y":3},
- {"x":11.5, "y":3},
- {"x":12.5, "y":3},
- {"x":13.5, "y":3},
- {"x":14.5, "y":3, "w":2.75},
-
- {"x":17.5, "y":3},
-
- {"x":0, "y":4},
- {"x":1, "y":4},
-
- {"x":2.25, "y":4, "w":1.25},
- {"x":3.5, "y":4, "w":1.25},
- {"x":4.75, "y":4, "w":1.25},
- {"x":6, "y":4, "w":6.25},
- {"x":12.25, "y":4, "w":1.25},
- {"x":13.5, "y":4, "w":1.25},
- {"x":14.75, "y":4, "w":1.25},
-
- {"x":16.5, "y":4},
- {"x":17.5, "y":4},
- {"x":18.5, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [0, 8], "x": 8.25, "y": 0},
+ {"matrix": [0, 9], "x": 9.25, "y": 0},
+ {"matrix": [0, 10], "x": 10.25, "y": 0},
+ {"matrix": [0, 11], "x": 11.25, "y": 0},
+ {"matrix": [0, 12], "x": 12.25, "y": 0},
+ {"matrix": [0, 13], "x": 13.25, "y": 0},
+ {"matrix": [0, 14], "x": 14.25, "y": 0},
+ {"matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
+
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+
+ {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [1, 8], "x": 8.75, "y": 1},
+ {"matrix": [1, 9], "x": 9.75, "y": 1},
+ {"matrix": [1, 10], "x": 10.75, "y": 1},
+ {"matrix": [1, 11], "x": 11.75, "y": 1},
+ {"matrix": [1, 12], "x": 12.75, "y": 1},
+ {"matrix": [1, 13], "x": 13.75, "y": 1},
+ {"matrix": [1, 14], "x": 14.75, "y": 1},
+ {"matrix": [1, 15], "x": 16, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [1, 16], "x": 17.5, "y": 1},
+ {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+
+ {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 9], "x": 10, "y": 2},
+ {"matrix": [2, 10], "x": 11, "y": 2},
+ {"matrix": [2, 11], "x": 12, "y": 2},
+ {"matrix": [2, 12], "x": 13, "y": 2},
+ {"matrix": [2, 13], "x": 14, "y": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+
+ {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.5, "y": 3},
+ {"matrix": [3, 7], "x": 7.5, "y": 3},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [3, 9], "x": 9.5, "y": 3},
+ {"matrix": [3, 10], "x": 10.5, "y": 3},
+ {"matrix": [3, 11], "x": 11.5, "y": 3},
+ {"matrix": [3, 12], "x": 12.5, "y": 3},
+ {"matrix": [3, 13], "x": 13.5, "y": 3},
+ {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
+
+ {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 6, "y": 4, "w": 6.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 15], "x": 16.5, "y": 4},
+ {"matrix": [4, 16], "x": 17.5, "y": 4},
+ {"matrix": [4, 17], "x": 18.5, "y": 4}
]
}
}
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 @@
-#pragma once
-
-#include "lfk78.h"
-
-// readability
-#define XXX KC_NO
-
-// This is a shortcut to help you visually see your layout.
-/*
- * ,---------. ,-----------------------------------------------------------------------. ,---------.
- * | 11 | 12 | | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 1A | 1B | 1C | 1D | 1E | 1F | 1G | | 1H | 1I |
- * |---------| |-----------------------------------------------------------------------| |---------|
- * | 21 | 22 | | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 2A | 2B | 2C | 2D | 2E | 2F | 2G | | 2H | 2I |
- * |---------| |-----------------------------------------------------------------------| `---------'
- * | 31 | 32 | | 33 | 34 | 35 | 36 | 37 | 38 | 39 | 3A | 3B | 3C | 3D | 3E | 3F |
- * |---------| |-----------------------------------------------------------------------| ,----.
- * | 41 | 42 | | 43 | 45 | 46 | 47 | 48 | 49 | 4A | 4B | 4C | 4D | 4E | 4F | | 4H |
- * |---------| |-------------------------------------------------------------------------------------.
- * | 51 | 52 | | 53 | 54 | 55 | 59 | 5D | 5E | 5F | | 5G | 5H | 5I |
- * `---------' `--------------------------------------------------------------------' `--------------'
- */
-// The first section contains all of the arguements
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
- k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I, \
- k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I, \
- k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, \
- k41, k42, k43, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4H, \
- k51, k52, k53, k54, k55, k59, k5D, k5E, k5F, k5G, k5H, k5I \
-) { \
- { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I }, \
- { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I }, \
- { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, XXX, XXX, XXX }, \
- { k41, k42, k43, XXX, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, XXX, k4H, XXX }, \
- { k51, k52, k53, k54, k55, XXX, XXX, XXX, k59, XXX, XXX, XXX, k5D, k5E, k5F, k5G, k5H, k5I } \
-}
-
-#define LAYOUT_split_bs( \
- k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k3G, k1H, k1I, \
- k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I, \
- k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, \
- k41, k42, k43, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4H, \
- k51, k52, k53, k54, k55, k59, k5D, k5E, k5F, k5G, k5H, k5I \
-) { \
- { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I }, \
- { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I }, \
- { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G, XXX, XXX }, \
- { k41, k42, k43, XXX, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, XXX, k4H, XXX }, \
- { k51, k52, k53, k54, k55, XXX, XXX, XXX, k59, XXX, XXX, XXX, k5D, k5E, k5F, k5G, k5H, k5I } \
-}
-
-#define LAYOUT_split_rshift( \
- k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I, \
- k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I, \
- k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, \
- k41, k42, k43, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, \
- k51, k52, k53, k54, k55, k59, k5D, k5E, k5F, k5G, k5H, k5I \
-) { \
- { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I }, \
- { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I }, \
- { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, XXX, XXX, XXX }, \
- { k41, k42, k43, XXX, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, XXX }, \
- { k51, k52, k53, k54, k55, XXX, XXX, XXX, k59, XXX, XXX, XXX, k5D, k5E, k5F, k5G, k5H, k5I } \
-}
-
-#define LAYOUT_iso( \
- k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I, \
- k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I, \
- k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, \
- k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4H, \
- k51, k52, k53, k54, k55, k59, k5D, k5E, k5F, k5G, k5H, k5I \
-) { \
- { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I }, \
- { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I }, \
- { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, XXX, XXX, XXX }, \
- { k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, XXX, k4H, XXX }, \
- { k51, k52, k53, k54, k55, XXX, XXX, XXX, k59, XXX, XXX, XXX, k5D, k5E, k5F, k5G, k5H, k5I } \
-}
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 @@
},
"layouts": {
"LAYOUT": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+
+ {"matrix": [1, 0], "x": 0.25, "y": 1},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0.5, "y": 2},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+
+ {"matrix": [3, 0], "x": 0.75, "y": 3},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 5], "x": 2.75, "y": 3, "w": 6},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3}
+ ]
},
"LAYOUT_6u_bar": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+
+ {"matrix": [1, 0], "x": 0.25, "y": 1},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0.5, "y": 2},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+
+ {"matrix": [3, 0], "x": 0.75, "y": 3},
+ {"matrix": [3, 5], "x": 1.75, "y": 3, "w": 8},
+ {"matrix": [3, 9], "x": 9.75, "y": 3}
+ ]
},
"LAYOUT_10u_bar": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+
+ {"matrix": [1, 0], "x": 0.25, "y": 1},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0.5, "y": 2},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+
+ {"matrix": [3, 5], "x": 0.75, "y": 3, "w": 10}
+ ]
}
}
} \ 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 @@
-// Copyright 2022 makenova (@makenova)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
- K30, K31, K35, K38, K39 \
-){ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
- { K30, K31, KC_NO, KC_NO, KC_NO, K35, KC_NO, KC_NO, K38, K39 } \
-}
-
-#define LAYOUT_6u_bar( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
- K30, K35, K39 \
-){ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
- { K30, KC_NO, KC_NO, KC_NO, KC_NO, K35, KC_NO, KC_NO, KC_NO, K39 } \
-}
-
-#define LAYOUT_10u_bar( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
- K35 \
-){ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K35, KC_NO, KC_NO, KC_NO, KC_NO } \
-}
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 @@
"layouts": {
"LAYOUT": {
"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": "Backspace", "x": 11, "y": 0, "w": 1.75 },
- { "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": "Enter", "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 },
- { "label": "Shift", "x": 11.75, "y": 2 },
- { "label": "Ctrl", "x": 0, "y": 3 },
- { "label": "Alt", "x": 1, "y": 3, "w": 1.25 },
- { "label": "Meta", "x": 2.25, "y": 3 },
- { "x": 3.25, "y": 3, "w": 3 },
- { "x": 6.25, "y": 3, "w": 3 },
- { "label": "Meta", "x": 9.25, "y": 3, "w": 1.25 },
- { "label": "Alt", "x": 10.5, "y": 3 },
- { "label": "Ctrl", "x": 11.5, "y": 3, "w": 1.25 }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 12], "x": 11, "y": 0, "w": 1.75},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.25, "y": 1},
+ {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2},
+ {"matrix": [2, 12], "x": 11.75, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3, "w": 1.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 4], "x": 3.25, "y": 3, "w": 3},
+ {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 11], "x": 10.5, "y": 3},
+ {"matrix": [3, 12], "x": 11.5, "y": 3, "w": 1.25}
+ ]
+ },
+ "LAYOUT_encoder": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [1, 0], "x": 13, "y": 0},
+ {"matrix": [1, 1], "x": 14, "y": 0},
+ {"matrix": [1, 2], "x": 15, "y": 0},
+ {"matrix": [1, 3], "x": 16, "y": 0},
+ {"matrix": [1, 4], "x": 17, "y": 0},
+ {"matrix": [1, 5], "x": 18, "y": 0},
+ {"matrix": [1, 6], "x": 19, "y": 0},
+ {"matrix": [1, 7], "x": 20, "y": 0},
+ {"matrix": [1, 8], "x": 21, "y": 0},
+ {"matrix": [1, 9], "x": 22, "y": 0},
+ {"matrix": [1, 10], "x": 23, "y": 0},
+ {"matrix": [1, 12], "x": 24, "y": 0},
+ {"matrix": [2, 0], "x": 25, "y": 0},
+ {"matrix": [2, 2], "x": 26, "y": 0},
+ {"matrix": [2, 3], "x": 27, "y": 0},
+ {"matrix": [2, 4], "x": 28, "y": 0},
+ {"matrix": [2, 5], "x": 29, "y": 0},
+ {"matrix": [2, 6], "x": 30, "y": 0},
+ {"matrix": [2, 7], "x": 31, "y": 0},
+ {"matrix": [2, 8], "x": 32, "y": 0},
+ {"matrix": [2, 9], "x": 33, "y": 0},
+ {"matrix": [2, 10], "x": 34, "y": 0},
+ {"matrix": [2, 11], "x": 35, "y": 0},
+ {"matrix": [2, 12], "x": 36, "y": 0},
+ {"matrix": [3, 0], "x": 37, "y": 0},
+ {"matrix": [3, 1], "x": 38, "y": 0},
+ {"matrix": [3, 2], "x": 39, "y": 0},
+ {"matrix": [3, 4], "x": 40, "y": 0},
+ {"matrix": [3, 7], "x": 41, "y": 0},
+ {"matrix": [3, 9], "x": 42, "y": 0},
+ {"matrix": [3, 11], "x": 43, "y": 0},
+ {"matrix": [3, 12], "x": 44, "y": 0}
]
}
}
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 @@
-/*
-Copyright 2021 Matthew Dias <matthewdias@me.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0C, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1C, \
- K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
- K30, K31, K32, K34, K37, K39, K3B, K3C \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, XXX, K0C }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, XXX, K1C }, \
- { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \
- { K30, K31, K32, XXX, K34, XXX, XXX, K37, XXX, K39, XXX, K3B, K3C } \
-}
-
-#define LAYOUT_encoder( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1C, \
- K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
- K30, K31, K32, K34, K37, K39, K3B, K3C \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, XXX, K1C }, \
- { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \
- { K30, K31, K32, XXX, K34, XXX, XXX, K37, XXX, K39, XXX, K3B, K3C } \
-}
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 @@
-/* Copyright 2017 Ryan Mitchell (@newtmitch)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
- K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
- K40, K41, K43, K44, K46, K48, K4A, K4B, K4C, K4D, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___ }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, ___, K43, K44, ___, K46, ___, K48, ___, K4A, K4B, K4C, K4D, K4E } \
-}
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
- K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
- K40, K41, K43, K44, K46, K48, K4A, K4B, K4C, K4D, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___ }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \
- { K40, K41, ___, K43, K44, ___, K46, ___, K48, ___, K4A, K4B, K4C, K4D, K4E } \
-}
-
-#define LAYOUT_hhkb( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
- K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
- K41, K43, K46, K4B, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___ }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \
- { ___, K41, ___, K43, ___, ___, K46, ___, ___, ___, ___, K4B, ___, K4D, ___ } \
-}
-
-#define LAYOUT_true_hhkb( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
- K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
- K41, K43, K46, K4A, K4B \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___ }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \
- { ___, K41, ___, K43, ___, ___, K46, ___, ___, ___, K4A, K4B, ___, ___, ___ } \
-}
-
-#define LAYOUT_directional( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
- K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3C, K3D, K3E, \
- K40, K41, K43, K44, K46, K48, K4A, K4B, K4C, K4D, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___ }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, ___, K3C, K3D, K3E }, \
- { K40, K41, ___, K43, K44, ___, K46, ___, K48, ___, K4A, K4B, K4C, K4D, K4E } \
-}
-
-/* Mitch's keymap, "MitchSplit":
- * Standard 60% base, split right shift, 3-split space, standard modifier row.
- * Split shift is 2.75u + 1.25u + 2.25u (total of 6.25u). Might not work with other orientations.
- */
-/*
- * ,-----------------------------------------------------------.
- * |00 |01 |02 |03 |04 |05 |06 |07 |08 |09 |0A |0B |0C |0E |
- * |-----------------------------------------------------------|
- * |10 |12 |13 |14 |15 |16 |17 |18 |19 |1A |1B |1C |1D |1E |
- * |-----------------------------------------------------------|
- * |20 |22 |23 |24 |25 |26 |27 |28 |29 |2A |2B |2C |2D |
- * |-----------------------------------------------------------|
- * |30 |32 |33 |34 |35 |36 |37 |38 |39 |3A |3B |3D |3E |
- * |-----------------------------------------------------------|
- * |40 |41 |43 |44 |46 |48 |4A |4B |4D |4E |
- * `-----------------------------------------------------------'
- */
-#define LAYOUT_mitchsplit( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \
- K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
- K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
- K40, K41, K43, K44, K46, K48, K4A, K4B, K4D, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, ___, K0E }, \
- { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___ }, \
- { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \
- { K40, K41, ___, K43, K44, ___, K46, ___, K48, ___, K4A, K4B, ___, K4D, K4E } \
-}
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 @@
"layouts": {
"LAYOUT_all": {
"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":"K0E", "x":14, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
- {"label":"K10", "x":0, "y":1, "w":1.5},
- {"label":"K12", "x":1.5, "y":1},
- {"label":"K13", "x":2.5, "y":1},
- {"label":"K14", "x":3.5, "y":1},
- {"label":"K15", "x":4.5, "y":1},
- {"label":"K16", "x":5.5, "y":1},
- {"label":"K17", "x":6.5, "y":1},
- {"label":"K18", "x":7.5, "y":1},
- {"label":"K19", "x":8.5, "y":1},
- {"label":"K1A", "x":9.5, "y":1},
- {"label":"K1B", "x":10.5, "y":1},
- {"label":"K1C", "x":11.5, "y":1},
- {"label":"K1D", "x":12.5, "y":1},
- {"label":"K1E", "x":13.5, "y":1, "w":1.5},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 1},
+ {"matrix": [1, 3], "x": 2.5, "y": 1},
+ {"matrix": [1, 4], "x": 3.5, "y": 1},
+ {"matrix": [1, 5], "x": 4.5, "y": 1},
+ {"matrix": [1, 6], "x": 5.5, "y": 1},
+ {"matrix": [1, 7], "x": 6.5, "y": 1},
+ {"matrix": [1, 8], "x": 7.5, "y": 1},
+ {"matrix": [1, 9], "x": 8.5, "y": 1},
+ {"matrix": [1, 10], "x": 9.5, "y": 1},
+ {"matrix": [1, 11], "x": 10.5, "y": 1},
+ {"matrix": [1, 12], "x": 11.5, "y": 1},
+ {"matrix": [1, 13], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
- {"label":"K20", "x":0, "y":2, "w":1.75},
- {"label":"K22", "x":1.75, "y":2},
- {"label":"K23", "x":2.75, "y":2},
- {"label":"K24", "x":3.75, "y":2},
- {"label":"K25", "x":4.75, "y":2},
- {"label":"K26", "x":5.75, "y":2},
- {"label":"K27", "x":6.75, "y":2},
- {"label":"K28", "x":7.75, "y":2},
- {"label":"K29", "x":8.75, "y":2},
- {"label":"K2A", "x":9.75, "y":2},
- {"label":"K2B", "x":10.75, "y":2},
- {"label":"K2C", "x":11.75, "y":2},
- {"label":"K2D", "x":12.75, "y":2, "w":2.25},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2},
+ {"matrix": [2, 12], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.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":"K3C", "x":12, "y":3},
- {"label":"K3D", "x":13, "y":3},
- {"label":"K3E", "x":14, "y":3},
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3},
+ {"matrix": [3, 12], "x": 12, "y": 3},
+ {"matrix": [3, 13], "x": 13, "y": 3},
+ {"matrix": [3, 14], "x": 14, "y": 3},
- {"label":"K40", "x":0, "y":4, "w":1.25},
- {"label":"K41", "x":1.25, "y":4, "w":1.25},
- {"label":"K43", "x":2.5, "y":4, "w":1.25},
- {"label":"K44", "x":3.75, "y":4, "w":2.25},
- {"label":"K46", "x":6, "y":4, "w":1.25},
- {"label":"K48", "x":7.25, "y":4, "w":2.75},
- {"label":"K4A", "x":10, "y":4},
- {"label":"K4B", "x":11, "y":4},
- {"label":"K4C", "x":12, "y":4},
- {"label":"K4D", "x":13, "y":4},
- {"label":"K4E", "x":14, "y":4}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 10, "y": 4},
+ {"matrix": [4, 11], "x": 11, "y": 4},
+ {"matrix": [4, 12], "x": 12, "y": 4},
+ {"matrix": [4, 13], "x": 13, "y": 4},
+ {"matrix": [4, 14], "x": 14, "y": 4}
]
},
"LAYOUT": {
"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":"K0E", "x":14, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
- {"label":"K10", "x":0, "y":1, "w":1.5},
- {"label":"K12", "x":1.5, "y":1},
- {"label":"K13", "x":2.5, "y":1},
- {"label":"K14", "x":3.5, "y":1},
- {"label":"K15", "x":4.5, "y":1},
- {"label":"K16", "x":5.5, "y":1},
- {"label":"K17", "x":6.5, "y":1},
- {"label":"K18", "x":7.5, "y":1},
- {"label":"K19", "x":8.5, "y":1},
- {"label":"K1A", "x":9.5, "y":1},
- {"label":"K1B", "x":10.5, "y":1},
- {"label":"K1C", "x":11.5, "y":1},
- {"label":"K1D", "x":12.5, "y":1},
- {"label":"K1E", "x":13.5, "y":1, "w":1.5},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 1},
+ {"matrix": [1, 3], "x": 2.5, "y": 1},
+ {"matrix": [1, 4], "x": 3.5, "y": 1},
+ {"matrix": [1, 5], "x": 4.5, "y": 1},
+ {"matrix": [1, 6], "x": 5.5, "y": 1},
+ {"matrix": [1, 7], "x": 6.5, "y": 1},
+ {"matrix": [1, 8], "x": 7.5, "y": 1},
+ {"matrix": [1, 9], "x": 8.5, "y": 1},
+ {"matrix": [1, 10], "x": 9.5, "y": 1},
+ {"matrix": [1, 11], "x": 10.5, "y": 1},
+ {"matrix": [1, 12], "x": 11.5, "y": 1},
+ {"matrix": [1, 13], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
- {"label":"K20", "x":0, "y":2, "w":1.75},
- {"label":"K22", "x":1.75, "y":2},
- {"label":"K23", "x":2.75, "y":2},
- {"label":"K24", "x":3.75, "y":2},
- {"label":"K25", "x":4.75, "y":2},
- {"label":"K26", "x":5.75, "y":2},
- {"label":"K27", "x":6.75, "y":2},
- {"label":"K28", "x":7.75, "y":2},
- {"label":"K29", "x":8.75, "y":2},
- {"label":"K2A", "x":9.75, "y":2},
- {"label":"K2B", "x":10.75, "y":2},
- {"label":"K2C", "x":11.75, "y":2},
- {"label":"K2D", "x":12.75, "y":2, "w":2.25},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2},
+ {"matrix": [2, 12], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.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":"K3E", "x":14, "y":3},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
- {"label":"K40", "x":0, "y":4, "w":1.25},
- {"label":"K41", "x":1.25, "y":4, "w":1.25},
- {"label":"K43", "x":2.5, "y":4, "w":1.25},
- {"label":"K44", "x":3.75, "y":4, "w":2.25},
- {"label":"K46", "x":6, "y":4, "w":1.25},
- {"label":"K48", "x":7.25, "y":4, "w":2.75},
- {"label":"K4A", "x":10, "y":4},
- {"label":"K4B", "x":11, "y":4},
- {"label":"K4C", "x":12, "y":4},
- {"label":"K4D", "x":13, "y":4},
- {"label":"K4E", "x":14, "y":4}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 10, "y": 4},
+ {"matrix": [4, 11], "x": 11, "y": 4},
+ {"matrix": [4, 12], "x": 12, "y": 4},
+ {"matrix": [4, 13], "x": 13, "y": 4},
+ {"matrix": [4, 14], "x": 14, "y": 4}
]
},
"LAYOUT_hhkb": {
"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":"K0E", "x":14, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
- {"label":"K10", "x":0, "y":1, "w":1.5},
- {"label":"K12", "x":1.5, "y":1},
- {"label":"K13", "x":2.5, "y":1},
- {"label":"K14", "x":3.5, "y":1},
- {"label":"K15", "x":4.5, "y":1},
- {"label":"K16", "x":5.5, "y":1},
- {"label":"K17", "x":6.5, "y":1},
- {"label":"K18", "x":7.5, "y":1},
- {"label":"K19", "x":8.5, "y":1},
- {"label":"K1A", "x":9.5, "y":1},
- {"label":"K1B", "x":10.5, "y":1},
- {"label":"K1C", "x":11.5, "y":1},
- {"label":"K1D", "x":12.5, "y":1},
- {"label":"K1E", "x":13.5, "y":1, "w":1.5},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 1},
+ {"matrix": [1, 3], "x": 2.5, "y": 1},
+ {"matrix": [1, 4], "x": 3.5, "y": 1},
+ {"matrix": [1, 5], "x": 4.5, "y": 1},
+ {"matrix": [1, 6], "x": 5.5, "y": 1},
+ {"matrix": [1, 7], "x": 6.5, "y": 1},
+ {"matrix": [1, 8], "x": 7.5, "y": 1},
+ {"matrix": [1, 9], "x": 8.5, "y": 1},
+ {"matrix": [1, 10], "x": 9.5, "y": 1},
+ {"matrix": [1, 11], "x": 10.5, "y": 1},
+ {"matrix": [1, 12], "x": 11.5, "y": 1},
+ {"matrix": [1, 13], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
- {"label":"K20", "x":0, "y":2, "w":1.75},
- {"label":"K22", "x":1.75, "y":2},
- {"label":"K23", "x":2.75, "y":2},
- {"label":"K24", "x":3.75, "y":2},
- {"label":"K25", "x":4.75, "y":2},
- {"label":"K26", "x":5.75, "y":2},
- {"label":"K27", "x":6.75, "y":2},
- {"label":"K28", "x":7.75, "y":2},
- {"label":"K29", "x":8.75, "y":2},
- {"label":"K2A", "x":9.75, "y":2},
- {"label":"K2B", "x":10.75, "y":2},
- {"label":"K2C", "x":11.75, "y":2},
- {"label":"K2D", "x":12.75, "y":2, "w":2.25},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2},
+ {"matrix": [2, 12], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.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":"K3E", "x":14, "y":3},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
- {"label":"K41", "x":1.5, "y":4},
- {"label":"K43", "x":2.5, "y":4, "w":1.5},
- {"label":"K46", "x":4, "y":4, "w":7},
- {"label":"K4B", "x":11, "y":4, "w":1.5},
- {"label":"K4D", "x":12.5, "y":4}
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 12.5, "y": 4}
]
},
"LAYOUT_true_hhkb": {
"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":"K0E", "x":14, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
- {"label":"K10", "x":0, "y":1, "w":1.5},
- {"label":"K12", "x":1.5, "y":1},
- {"label":"K13", "x":2.5, "y":1},
- {"label":"K14", "x":3.5, "y":1},
- {"label":"K15", "x":4.5, "y":1},
- {"label":"K16", "x":5.5, "y":1},
- {"label":"K17", "x":6.5, "y":1},
- {"label":"K18", "x":7.5, "y":1},
- {"label":"K19", "x":8.5, "y":1},
- {"label":"K1A", "x":9.5, "y":1},
- {"label":"K1B", "x":10.5, "y":1},
- {"label":"K1C", "x":11.5, "y":1},
- {"label":"K1D", "x":12.5, "y":1},
- {"label":"K1E", "x":13.5, "y":1, "w":1.5},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 1},
+ {"matrix": [1, 3], "x": 2.5, "y": 1},
+ {"matrix": [1, 4], "x": 3.5, "y": 1},
+ {"matrix": [1, 5], "x": 4.5, "y": 1},
+ {"matrix": [1, 6], "x": 5.5, "y": 1},
+ {"matrix": [1, 7], "x": 6.5, "y": 1},
+ {"matrix": [1, 8], "x": 7.5, "y": 1},
+ {"matrix": [1, 9], "x": 8.5, "y": 1},
+ {"matrix": [1, 10], "x": 9.5, "y": 1},
+ {"matrix": [1, 11], "x": 10.5, "y": 1},
+ {"matrix": [1, 12], "x": 11.5, "y": 1},
+ {"matrix": [1, 13], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
- {"label":"K20", "x":0, "y":2, "w":1.75},
- {"label":"K22", "x":1.75, "y":2},
- {"label":"K23", "x":2.75, "y":2},
- {"label":"K24", "x":3.75, "y":2},
- {"label":"K25", "x":4.75, "y":2},
- {"label":"K26", "x":5.75, "y":2},
- {"label":"K27", "x":6.75, "y":2},
- {"label":"K28", "x":7.75, "y":2},
- {"label":"K29", "x":8.75, "y":2},
- {"label":"K2A", "x":9.75, "y":2},
- {"label":"K2B", "x":10.75, "y":2},
- {"label":"K2C", "x":11.75, "y":2},
- {"label":"K2D", "x":12.75, "y":2, "w":2.25},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2},
+ {"matrix": [2, 12], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.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":"K3E", "x":14, "y":3},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
- {"label":"K41", "x":1.5, "y":4},
- {"label":"K43", "x":2.5, "y":4, "w":1.5},
- {"label":"K46", "x":4, "y":4, "w":6},
- {"label":"K4A", "x":10, "y":4, "w":1.5},
- {"label":"K4B", "x":11.5, "y":4}
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 4, "y": 4, "w": 6},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 11.5, "y": 4}
]
},
"LAYOUT_directional": {
"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":"K0E", "x":14, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
- {"label":"K10", "x":0, "y":1, "w":1.5},
- {"label":"K12", "x":1.5, "y":1},
- {"label":"K13", "x":2.5, "y":1},
- {"label":"K14", "x":3.5, "y":1},
- {"label":"K15", "x":4.5, "y":1},
- {"label":"K16", "x":5.5, "y":1},
- {"label":"K17", "x":6.5, "y":1},
- {"label":"K18", "x":7.5, "y":1},
- {"label":"K19", "x":8.5, "y":1},
- {"label":"K1A", "x":9.5, "y":1},
- {"label":"K1B", "x":10.5, "y":1},
- {"label":"K1C", "x":11.5, "y":1},
- {"label":"K1D", "x":12.5, "y":1},
- {"label":"K1E", "x":13.5, "y":1, "w":1.5},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 1},
+ {"matrix": [1, 3], "x": 2.5, "y": 1},
+ {"matrix": [1, 4], "x": 3.5, "y": 1},
+ {"matrix": [1, 5], "x": 4.5, "y": 1},
+ {"matrix": [1, 6], "x": 5.5, "y": 1},
+ {"matrix": [1, 7], "x": 6.5, "y": 1},
+ {"matrix": [1, 8], "x": 7.5, "y": 1},
+ {"matrix": [1, 9], "x": 8.5, "y": 1},
+ {"matrix": [1, 10], "x": 9.5, "y": 1},
+ {"matrix": [1, 11], "x": 10.5, "y": 1},
+ {"matrix": [1, 12], "x": 11.5, "y": 1},
+ {"matrix": [1, 13], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
- {"label":"K20", "x":0, "y":2, "w":1.75},
- {"label":"K22", "x":1.75, "y":2},
- {"label":"K23", "x":2.75, "y":2},
- {"label":"K24", "x":3.75, "y":2},
- {"label":"K25", "x":4.75, "y":2},
- {"label":"K26", "x":5.75, "y":2},
- {"label":"K27", "x":6.75, "y":2},
- {"label":"K28", "x":7.75, "y":2},
- {"label":"K29", "x":8.75, "y":2},
- {"label":"K2A", "x":9.75, "y":2},
- {"label":"K2B", "x":10.75, "y":2},
- {"label":"K2C", "x":11.75, "y":2},
- {"label":"K2D", "x":12.75, "y":2, "w":2.25},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2},
+ {"matrix": [2, 12], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.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":"K3C", "x":11.25, "y":3, "w":1.75},
- {"label":"K3D", "x":13, "y":3},
- {"label":"K3E", "x":14, "y":3},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 12], "x": 11.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 13, "y": 3},
+ {"matrix": [3, 14], "x": 14, "y": 3},
- {"label":"K40", "x":0, "y":4, "w":1.25},
- {"label":"K41", "x":1.25, "y":4, "w":1.25},
- {"label":"K43", "x":2.5, "y":4, "w":1.25},
- {"label":"K44", "x":3.75, "y":4, "w":2.25},
- {"label":"K46", "x":6, "y":4, "w":1.25},
- {"label":"K48", "x":7.25, "y":4, "w":2.75},
- {"label":"K4A", "x":10, "y":4},
- {"label":"K4B", "x":11, "y":4},
- {"label":"K4C", "x":12, "y":4},
- {"label":"K4D", "x":13, "y":4},
- {"label":"K4E", "x":14, "y":4}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 10, "y": 4},
+ {"matrix": [4, 11], "x": 11, "y": 4},
+ {"matrix": [4, 12], "x": 12, "y": 4},
+ {"matrix": [4, 13], "x": 13, "y": 4},
+ {"matrix": [4, 14], "x": 14, "y": 4}
]
},
"LAYOUT_mitchsplit": {
"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":"K0E", "x":13, "y":0, "w":2},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
- {"label":"K10", "x":0, "y":1, "w":1.5},
- {"label":"K12", "x":1.5, "y":1},
- {"label":"K13", "x":2.5, "y":1},
- {"label":"K14", "x":3.5, "y":1},
- {"label":"K15", "x":4.5, "y":1},
- {"label":"K16", "x":5.5, "y":1},
- {"label":"K17", "x":6.5, "y":1},
- {"label":"K18", "x":7.5, "y":1},
- {"label":"K19", "x":8.5, "y":1},
- {"label":"K1A", "x":9.5, "y":1},
- {"label":"K1B", "x":10.5, "y":1},
- {"label":"K1C", "x":11.5, "y":1},
- {"label":"K1D", "x":12.5, "y":1},
- {"label":"K1E", "x":13.5, "y":1, "w":1.5},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 1},
+ {"matrix": [1, 3], "x": 2.5, "y": 1},
+ {"matrix": [1, 4], "x": 3.5, "y": 1},
+ {"matrix": [1, 5], "x": 4.5, "y": 1},
+ {"matrix": [1, 6], "x": 5.5, "y": 1},
+ {"matrix": [1, 7], "x": 6.5, "y": 1},
+ {"matrix": [1, 8], "x": 7.5, "y": 1},
+ {"matrix": [1, 9], "x": 8.5, "y": 1},
+ {"matrix": [1, 10], "x": 9.5, "y": 1},
+ {"matrix": [1, 11], "x": 10.5, "y": 1},
+ {"matrix": [1, 12], "x": 11.5, "y": 1},
+ {"matrix": [1, 13], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
- {"label":"K20", "x":0, "y":2, "w":1.75},
- {"label":"K22", "x":1.75, "y":2},
- {"label":"K23", "x":2.75, "y":2},
- {"label":"K24", "x":3.75, "y":2},
- {"label":"K25", "x":4.75, "y":2},
- {"label":"K26", "x":5.75, "y":2},
- {"label":"K27", "x":6.75, "y":2},
- {"label":"K28", "x":7.75, "y":2},
- {"label":"K29", "x":8.75, "y":2},
- {"label":"K2A", "x":9.75, "y":2},
- {"label":"K2B", "x":10.75, "y":2},
- {"label":"K2C", "x":11.75, "y":2},
- {"label":"K2D", "x":12.75, "y":2, "w":2.25},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2},
+ {"matrix": [2, 12], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
- {"label":"K30", "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":"K3E", "x":14, "y":3},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
- {"label":"K40", "x":0, "y":4, "w":1.25},
- {"label":"K41", "x":1.25, "y":4, "w":1.25},
- {"label":"K43", "x":2.5, "y":4, "w":1.25},
- {"label":"K44", "x":3.75, "y":4, "w":2.75},
- {"label":"K46", "x":6.5, "y":4, "w":1.25},
- {"label":"K48", "x":7.75, "y":4, "w":2.25},
- {"label":"K4A", "x":10, "y":4, "w":1.25},
- {"label":"K4B", "x":11.25, "y":4, "w":1.25},
- {"label":"K4D", "x":12.5, "y":4, "w":1.25},
- {"label":"K4E", "x":13.75, "y":4, "w":1.25}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 7.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
]
}
}
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 @@
"layouts": {
"LAYOUT": {
"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},
+ {"matrix": [3, 0], "x": 0, "y": 0},
+ {"matrix": [3, 1], "x": 1, "y": 0},
+ {"matrix": [3, 2], "x": 2, "y": 0},
+ {"matrix": [3, 3], "x": 3, "y": 0},
+ {"matrix": [3, 4], "x": 4, "y": 0},
+ {"matrix": [3, 5], "x": 5, "y": 0},
+ {"matrix": [3, 6], "x": 6, "y": 0},
+ {"matrix": [3, 7], "x": 7, "y": 0},
+ {"matrix": [3, 8], "x": 8, "y": 0},
+ {"matrix": [3, 9], "x": 9, "y": 0},
+ {"matrix": [3, 10], "x": 10, "y": 0},
+ {"matrix": [3, 11], "x": 11, "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, "w":1.75},
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [2, 1], "x": 1.25, "y": 1},
+ {"matrix": [2, 2], "x": 2.25, "y": 1},
+ {"matrix": [2, 3], "x": 3.25, "y": 1},
+ {"matrix": [2, 4], "x": 4.25, "y": 1},
+ {"matrix": [2, 5], "x": 5.25, "y": 1},
+ {"matrix": [2, 6], "x": 6.25, "y": 1},
+ {"matrix": [2, 7], "x": 7.25, "y": 1},
+ {"matrix": [2, 8], "x": 8.25, "y": 1},
+ {"matrix": [2, 9], "x": 9.25, "y": 1},
+ {"matrix": [2, 10], "x": 10.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, "w":1.25},
- {"x":11, "y":2},
+ {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [1, 1], "x": 1.75, "y": 2},
+ {"matrix": [1, 2], "x": 2.75, "y": 2},
+ {"matrix": [1, 3], "x": 3.75, "y": 2},
+ {"matrix": [1, 4], "x": 4.75, "y": 2},
+ {"matrix": [1, 5], "x": 5.75, "y": 2},
+ {"matrix": [1, 6], "x": 6.75, "y": 2},
+ {"matrix": [1, 7], "x": 7.75, "y": 2},
+ {"matrix": [1, 8], "x": 8.75, "y": 2},
+ {"matrix": [1, 9], "x": 9.75, "y": 2, "w": 1.25},
+ {"matrix": [1, 10], "x": 11, "y": 2},
- {"x":0, "y":3, "w":1.25},
- {"x":1.25, "y":3},
- {"x":2.25, "y":3},
- {"x":3.25, "y":3, "w":6.25},
- {"x":9.5, "y":3, "w":1.25},
- {"x":10.75, "y":3, "w":1.25}
+ {"matrix": [0, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [0, 1], "x": 1.25, "y": 3},
+ {"matrix": [0, 2], "x": 2.25, "y": 3},
+ {"matrix": [0, 5], "x": 3.25, "y": 3, "w": 6.25},
+ {"matrix": [0, 9], "x": 9.5, "y": 3, "w": 1.25},
+ {"matrix": [0, 10], "x": 10.75, "y": 3, "w": 1.25}
]
},
"LAYOUT_split_space": {
"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},
+ {"matrix": [3, 0], "x": 0, "y": 0},
+ {"matrix": [3, 1], "x": 1, "y": 0},
+ {"matrix": [3, 2], "x": 2, "y": 0},
+ {"matrix": [3, 3], "x": 3, "y": 0},
+ {"matrix": [3, 4], "x": 4, "y": 0},
+ {"matrix": [3, 5], "x": 5, "y": 0},
+ {"matrix": [3, 6], "x": 6, "y": 0},
+ {"matrix": [3, 7], "x": 7, "y": 0},
+ {"matrix": [3, 8], "x": 8, "y": 0},
+ {"matrix": [3, 9], "x": 9, "y": 0},
+ {"matrix": [3, 10], "x": 10, "y": 0},
+ {"matrix": [3, 11], "x": 11, "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, "w":1.75},
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [2, 1], "x": 1.25, "y": 1},
+ {"matrix": [2, 2], "x": 2.25, "y": 1},
+ {"matrix": [2, 3], "x": 3.25, "y": 1},
+ {"matrix": [2, 4], "x": 4.25, "y": 1},
+ {"matrix": [2, 5], "x": 5.25, "y": 1},
+ {"matrix": [2, 6], "x": 6.25, "y": 1},
+ {"matrix": [2, 7], "x": 7.25, "y": 1},
+ {"matrix": [2, 8], "x": 8.25, "y": 1},
+ {"matrix": [2, 9], "x": 9.25, "y": 1},
+ {"matrix": [2, 10], "x": 10.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, "w":1.25},
- {"x":11, "y":2},
+ {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [1, 1], "x": 1.75, "y": 2},
+ {"matrix": [1, 2], "x": 2.75, "y": 2},
+ {"matrix": [1, 3], "x": 3.75, "y": 2},
+ {"matrix": [1, 4], "x": 4.75, "y": 2},
+ {"matrix": [1, 5], "x": 5.75, "y": 2},
+ {"matrix": [1, 6], "x": 6.75, "y": 2},
+ {"matrix": [1, 7], "x": 7.75, "y": 2},
+ {"matrix": [1, 8], "x": 8.75, "y": 2},
+ {"matrix": [1, 9], "x": 9.75, "y": 2, "w": 1.25},
+ {"matrix": [1, 10], "x": 11, "y": 2},
- {"x":0, "y":3, "w":1.25},
- {"x":1.25, "y":3},
- {"x":2.25, "y":3, "w":1.25},
- {"x":3.5, "y":3, "w":2.75},
- {"x":6.25, "y":3, "w":2.25},
- {"x":8.5, "y":3, "w":1.25},
- {"x":9.75, "y":3},
- {"x":10.75, "y":3, "w":1.25}
+ {"matrix": [0, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [0, 1], "x": 1.25, "y": 3},
+ {"matrix": [0, 2], "x": 2.25, "y": 3, "w": 1.25},
+ {"matrix": [0, 3], "x": 3.5, "y": 3, "w": 2.75},
+ {"matrix": [0, 6], "x": 6.25, "y": 3, "w": 2.25},
+ {"matrix": [0, 8], "x": 8.5, "y": 3, "w": 1.25},
+ {"matrix": [0, 9], "x": 9.75, "y": 3},
+ {"matrix": [0, 10], "x": 10.75, "y": 3, "w": 1.25}
]
}
}
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 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT( \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
- K00, K01, K02, K05, K09, K0A \
-) \
-{ \
- { K00, K01, K02, ___, ___, K05, ___, ___, ___, K09, K0A, ___ }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, ___ }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, ___ }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B } \
-}
-
-#define LAYOUT_split_space( \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
- K00, K01, K02, K03, K06, K08, K09, K0A \
-) \
-{ \
- { K00, K01, K02, K03, ___, ___, K06, ___, K08, K09, K0A, ___ }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, ___ }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, ___ }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B } \
-}
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 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- {"label":"K00 (B0,E6)", "x":0, "y":0},
- {"label":"K01 (B0,B1)", "x":1, "y":0},
- {"label":"K02 (B0,B3)", "x":2, "y":0},
- {"label":"K03 (B0,D0)", "x":3, "y":0},
- {"label":"K04 (B0,D1)", "x":4, "y":0},
- {"label":"K05 (B0,D2)", "x":5, "y":0},
- {"label":"K06 (B0,D3)", "x":6, "y":0},
- {"label":"K07 (B0,D5)", "x":7, "y":0},
- {"label":"K08 (B0,F4)", "x":8, "y":0},
- {"label":"K09 (B0,F1)", "x":9, "y":0},
- {"label":"K0A (B0,D4)", "x":10, "y":0},
- {"label":"K0B (B0,D6)", "x":11, "y":0},
- {"label":"K0C (B0,D7)", "x":12, "y":0},
- {"label":"K0D (B0,B4)", "x":13, "y":0},
- {"label":"K0E (B0,B5)", "x":14, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
- {"label":"K10 (F0,E6)", "x":0, "y":1, "w":1.5},
- {"label":"K11 (F0,B1)", "x":1.5, "y":1},
- {"label":"K12 (F0,B3)", "x":2.5, "y":1},
- {"label":"K13 (F0,D0)", "x":3.5, "y":1},
- {"label":"K14 (F0,D1)", "x":4.5, "y":1},
- {"label":"K15 (F0,D2)", "x":5.5, "y":1},
- {"label":"K16 (F0,D3)", "x":6.5, "y":1},
- {"label":"K17 (F0,D5)", "x":7.5, "y":1},
- {"label":"K18 (F0,F4)", "x":8.5, "y":1},
- {"label":"K19 (F0,F1)", "x":9.5, "y":1},
- {"label":"K1A (F0,D4)", "x":10.5, "y":1},
- {"label":"K1B (F0,D6)", "x":11.5, "y":1},
- {"label":"K1C (F0,D7)", "x":12.5, "y":1},
- {"label":"K1D (F0,B4)", "x":13.5, "y":1, "w":1.5},
- {"label":"K1E (F0,B5)", "x":15, "y":1},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
- {"label":"K20 (F5,E6)", "x":0, "y":2, "w":1.75},
- {"label":"K21 (F5,B1)", "x":1.75, "y":2},
- {"label":"K22 (F5,B3)", "x":2.75, "y":2},
- {"label":"K23 (F5,D0)", "x":3.75, "y":2},
- {"label":"K24 (F5,D1)", "x":4.75, "y":2},
- {"label":"K25 (F5,D2)", "x":5.75, "y":2},
- {"label":"K26 (F5,D3)", "x":6.75, "y":2},
- {"label":"K27 (F5,D5)", "x":7.75, "y":2},
- {"label":"K28 (F5,F4)", "x":8.75, "y":2},
- {"label":"K29 (F5,F1)", "x":9.75, "y":2},
- {"label":"K2A (F5,D4)", "x":10.75, "y":2},
- {"label":"K2B (F5,D6)", "x":11.75, "y":2},
- {"label":"K2C (F5,D7)", "x":12.75, "y":2},
- {"label":"K2D (F5,B4)", "x":13.75, "y":2, "w":1.25},
- {"label":"K2E (F5,B5)", "x":15, "y":2},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
- {"label":"K30 (F6,E6)", "x":0, "y":3, "w":1.25},
- {"label":"K31 (F6,B1)", "x":1.25, "y":3},
- {"label":"K32 (F6,B3)", "x":2.25, "y":3},
- {"label":"K33 (F6,D0)", "x":3.25, "y":3},
- {"label":"K34 (F6,D1)", "x":4.25, "y":3},
- {"label":"K35 (F6,D2)", "x":5.25, "y":3},
- {"label":"K36 (F6,D3)", "x":6.25, "y":3},
- {"label":"K37 (F6,D5)", "x":7.25, "y":3},
- {"label":"K38 (F6,F4)", "x":8.25, "y":3},
- {"label":"K39 (F6,F1)", "x":9.25, "y":3},
- {"label":"K3A (F6,D4)", "x":10.25, "y":3},
- {"label":"K3B (F6,D6)", "x":11.25, "y":3},
- {"label":"K3C (F6,D7)", "x":12.25, "y":3, "w":1.75},
- {"label":"K3D (F6,B4)", "x":14, "y":3},
- {"label":"K3E (F6,B5)", "x":15, "y":3},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
- {"label":"K40 (F7,E6)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (F7,B1)", "x":1.25, "y":4, "w":1.25},
- {"label":"K42 (F7,B3)", "x":2.5, "y":4, "w":1.25},
- {"label":"K46 (F7,D3)", "x":3.75, "y":4, "w":6.25},
- {"label":"K4A (F7,D4)", "x":10, "y":4, "w":1.25},
- {"label":"K4B (F7,D6)", "x":11.25, "y":4, "w":1.25},
- {"label":"K4C (F7,D7)", "x":13, "y":4},
- {"label":"K4D (F7,B4)", "x":14, "y":4},
- {"label":"K4E (F7,B5)", "x":15, "y":4}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
},
"LAYOUT": {
"layout": [
- {"label":"K00 (B0,E6)", "x":0, "y":0},
- {"label":"K01 (B0,B1)", "x":1, "y":0},
- {"label":"K02 (B0,B3)", "x":2, "y":0},
- {"label":"K03 (B0,D0)", "x":3, "y":0},
- {"label":"K04 (B0,D1)", "x":4, "y":0},
- {"label":"K05 (B0,D2)", "x":5, "y":0},
- {"label":"K06 (B0,D3)", "x":6, "y":0},
- {"label":"K07 (B0,D5)", "x":7, "y":0},
- {"label":"K08 (B0,F4)", "x":8, "y":0},
- {"label":"K09 (B0,F1)", "x":9, "y":0},
- {"label":"K0A (B0,D4)", "x":10, "y":0},
- {"label":"K0B (B0,D6)", "x":11, "y":0},
- {"label":"K0C (B0,D7)", "x":12, "y":0},
- {"label":"K0D (B0,B4)", "x":13, "y":0, "w":2},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
- {"label":"K10 (F0,E6)", "x":0, "y":1, "w":1.5},
- {"label":"K11 (F0,B1)", "x":1.5, "y":1},
- {"label":"K12 (F0,B3)", "x":2.5, "y":1},
- {"label":"K13 (F0,D0)", "x":3.5, "y":1},
- {"label":"K14 (F0,D1)", "x":4.5, "y":1},
- {"label":"K15 (F0,D2)", "x":5.5, "y":1},
- {"label":"K16 (F0,D3)", "x":6.5, "y":1},
- {"label":"K17 (F0,D5)", "x":7.5, "y":1},
- {"label":"K18 (F0,F4)", "x":8.5, "y":1},
- {"label":"K19 (F0,F1)", "x":9.5, "y":1},
- {"label":"K1A (F0,D4)", "x":10.5, "y":1},
- {"label":"K1B (F0,D6)", "x":11.5, "y":1},
- {"label":"K1C (F0,D7)", "x":12.5, "y":1},
- {"label":"K1D (F0,B4)", "x":13.5, "y":1, "w":1.5},
- {"label":"K1E (F0,B5)", "x":15, "y":1},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
- {"label":"K20 (F5,E6)", "x":0, "y":2, "w":1.75},
- {"label":"K21 (F5,B1)", "x":1.75, "y":2},
- {"label":"K22 (F5,B3)", "x":2.75, "y":2},
- {"label":"K23 (F5,D0)", "x":3.75, "y":2},
- {"label":"K24 (F5,D1)", "x":4.75, "y":2},
- {"label":"K25 (F5,D2)", "x":5.75, "y":2},
- {"label":"K26 (F5,D3)", "x":6.75, "y":2},
- {"label":"K27 (F5,D5)", "x":7.75, "y":2},
- {"label":"K28 (F5,F4)", "x":8.75, "y":2},
- {"label":"K29 (F5,F1)", "x":9.75, "y":2},
- {"label":"K2A (F5,D4)", "x":10.75, "y":2},
- {"label":"K2B (F5,D6)", "x":11.75, "y":2},
- {"label":"K2D (F5,B4)", "x":12.75, "y":2, "w":2.25},
- {"label":"K2E (F5,B5)", "x":15, "y":2},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
- {"label":"K30 (F6,E6)", "x":0, "y":3, "w":2.25},
- {"label":"K32 (F6,B3)", "x":2.25, "y":3},
- {"label":"K33 (F6,D0)", "x":3.25, "y":3},
- {"label":"K34 (F6,D1)", "x":4.25, "y":3},
- {"label":"K35 (F6,D2)", "x":5.25, "y":3},
- {"label":"K36 (F6,D3)", "x":6.25, "y":3},
- {"label":"K37 (F6,D5)", "x":7.25, "y":3},
- {"label":"K38 (F6,F4)", "x":8.25, "y":3},
- {"label":"K39 (F6,F1)", "x":9.25, "y":3},
- {"label":"K3A (F6,D4)", "x":10.25, "y":3},
- {"label":"K3B (F6,D6)", "x":11.25, "y":3},
- {"label":"K3C (F6,D7)", "x":12.25, "y":3, "w":1.75},
- {"label":"K3D (F6,B4)", "x":14, "y":3},
- {"label":"K3E (F6,B5)", "x":15, "y":3},
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"label":"K40 (F7,E6)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (F7,B1)", "x":1.25, "y":4, "w":1.25},
- {"label":"K42 (F7,B3)", "x":2.5, "y":4, "w":1.25},
- {"label":"K46 (F7,D3)", "x":3.75, "y":4, "w":6.25},
- {"label":"K4A (F7,D4)", "x":10, "y":4, "w":1.25},
- {"label":"K4B (F7,D6)", "x":11.25, "y":4, "w":1.25},
- {"label":"K4C (F7,D7)", "x":13, "y":4},
- {"label":"K4D (F7,B4)", "x":14, "y":4},
- {"label":"K4E (F7,B5)", "x":15, "y":4}
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
}
}
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 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───────┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │ │0D │ 2u Backspace
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┐ └─┬─────┤
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │ │ │
- * 2.25u ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ ┌──┴┐2D │ ISO Enter
- * LShift │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D │2E │ │2C │ │
- * ┌────────┐ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ └───┴────┘
- * │30 │ │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │
- * └────────┘ ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40 │41 │42 │46 │4A │4B │││4C │4D │4E │
- * └────┴────┴────┴────────────────────────┴────┴────┘│└───┴───┴───┘
- * ──────┴─────
- * ┌──────────┐
- * │3C │ 2.75u RShift
- * └──────────┘
- */
-
-#define LAYOUT_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
- K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E }, \
-}
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
- K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E }, \
- { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E }, \
-}
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 @@
"layouts": {
"LAYOUT": {
"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": 8.5, "y": 0},
- {"label": "", "x": 9.5, "y": 0},
- {"label": "", "x": 10.5, "y": 0},
- {"label": "", "x": 11.5, "y": 0},
- {"label": "", "x": 12.5, "y": 0},
- {"label": "", "x": 13.5, "y": 0},
- {"label": "", "x": 14.5, "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": 8.5, "y": 1},
- {"label": "", "x": 9.5, "y": 1},
- {"label": "", "x": 10.5, "y": 1},
- {"label": "", "x": 11.5, "y": 1},
- {"label": "", "x": 12.5, "y": 1},
- {"label": "", "x": 13.5, "y": 1},
- {"label": "", "x": 14.5, "y": 1},
- {"label": "", "x": 0, "y": 2},
- {"label": "", "x": 1, "y": 2},
- {"label": "", "x": 2, "y": 2},
- {"label": "", "x": 3, "y": 2},
- {"label": "", "x": 4, "y": 2},
- {"label": "", "x": 5, "y": 2},
- {"label": "", "x": 6, "y": 2},
- {"label": "", "x": 8.5, "y": 2},
- {"label": "", "x": 9.5, "y": 2},
- {"label": "", "x": 10.5, "y": 2},
- {"label": "", "x": 11.5, "y": 2},
- {"label": "", "x": 12.5, "y": 2},
- {"label": "", "x": 13.5, "y": 2},
- {"label": "", "x": 14.5, "y": 2},
- {"label": "", "x": 4, "y": 3},
- {"label": "", "x": 5, "y": 3},
- {"label": "", "x": 9.5, "y": 3},
- {"label": "", "x": 10.5, "y": 3}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+
+ {"matrix": [4, 6], "x": 8.5, "y": 0},
+ {"matrix": [4, 5], "x": 9.5, "y": 0},
+ {"matrix": [4, 4], "x": 10.5, "y": 0},
+ {"matrix": [4, 3], "x": 11.5, "y": 0},
+ {"matrix": [4, 2], "x": 12.5, "y": 0},
+ {"matrix": [4, 1], "x": 13.5, "y": 0},
+ {"matrix": [4, 0], "x": 14.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+
+ {"matrix": [5, 6], "x": 8.5, "y": 1},
+ {"matrix": [5, 5], "x": 9.5, "y": 1},
+ {"matrix": [5, 4], "x": 10.5, "y": 1},
+ {"matrix": [5, 3], "x": 11.5, "y": 1},
+ {"matrix": [5, 2], "x": 12.5, "y": 1},
+ {"matrix": [5, 1], "x": 13.5, "y": 1},
+ {"matrix": [5, 0], "x": 14.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+
+ {"matrix": [6, 6], "x": 8.5, "y": 2},
+ {"matrix": [6, 5], "x": 9.5, "y": 2},
+ {"matrix": [6, 4], "x": 10.5, "y": 2},
+ {"matrix": [6, 3], "x": 11.5, "y": 2},
+ {"matrix": [6, 2], "x": 12.5, "y": 2},
+ {"matrix": [6, 1], "x": 13.5, "y": 2},
+ {"matrix": [6, 0], "x": 14.5, "y": 2},
+
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [7, 5], "x": 9.5, "y": 3},
+ {"matrix": [7, 4], "x": 10.5, "y": 3}
]
- },
- "LAYOUT_2u": {
+ },
+ "LAYOUT_2u": {
"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": 8.5, "y": 0},
- {"label": "", "x": 9.5, "y": 0},
- {"label": "", "x": 10.5, "y": 0},
- {"label": "", "x": 11.5, "y": 0},
- {"label": "", "x": 12.5, "y": 0},
- {"label": "", "x": 13.5, "y": 0},
- {"label": "", "x": 14.5, "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": 8.5, "y": 1},
- {"label": "", "x": 9.5, "y": 1},
- {"label": "", "x": 10.5, "y": 1},
- {"label": "", "x": 11.5, "y": 1},
- {"label": "", "x": 12.5, "y": 1},
- {"label": "", "x": 13.5, "y": 1},
- {"label": "", "x": 14.5, "y": 1},
- {"label": "", "x": 0, "y": 2},
- {"label": "", "x": 1, "y": 2},
- {"label": "", "x": 2, "y": 2},
- {"label": "", "x": 3, "y": 2},
- {"label": "", "x": 4, "y": 2},
- {"label": "", "x": 5, "y": 2},
- {"label": "", "x": 6, "y": 2},
- {"label": "", "x": 8.5, "y": 2},
- {"label": "", "x": 9.5, "y": 2},
- {"label": "", "x": 10.5, "y": 2},
- {"label": "", "x": 11.5, "y": 2},
- {"label": "", "x": 12.5, "y": 2},
- {"label": "", "x": 13.5, "y": 2},
- {"label": "", "x": 14.5, "y": 2},
- {"label": "", "x": 4, "y": 3, "w": 2},
- {"label": "", "x": 9.5, "y": 3, "w": 2}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+
+ {"matrix": [4, 6], "x": 8.5, "y": 0},
+ {"matrix": [4, 5], "x": 9.5, "y": 0},
+ {"matrix": [4, 4], "x": 10.5, "y": 0},
+ {"matrix": [4, 3], "x": 11.5, "y": 0},
+ {"matrix": [4, 2], "x": 12.5, "y": 0},
+ {"matrix": [4, 1], "x": 13.5, "y": 0},
+ {"matrix": [4, 0], "x": 14.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+
+ {"matrix": [5, 6], "x": 8.5, "y": 1},
+ {"matrix": [5, 5], "x": 9.5, "y": 1},
+ {"matrix": [5, 4], "x": 10.5, "y": 1},
+ {"matrix": [5, 3], "x": 11.5, "y": 1},
+ {"matrix": [5, 2], "x": 12.5, "y": 1},
+ {"matrix": [5, 1], "x": 13.5, "y": 1},
+ {"matrix": [5, 0], "x": 14.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+
+ {"matrix": [6, 6], "x": 8.5, "y": 2},
+ {"matrix": [6, 5], "x": 9.5, "y": 2},
+ {"matrix": [6, 4], "x": 10.5, "y": 2},
+ {"matrix": [6, 3], "x": 11.5, "y": 2},
+ {"matrix": [6, 2], "x": 12.5, "y": 2},
+ {"matrix": [6, 1], "x": 13.5, "y": 2},
+ {"matrix": [6, 0], "x": 14.5, "y": 2},
+
+ {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
+
+ {"matrix": [7, 4], "x": 9.5, "y": 3, "w": 2}
]
}
}
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 @@
-/* Copyright 2019 Luciano M
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \
- L10, L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, R10, \
- L20, L21, L22, L23, L24, L25, L26, R26, R25, R24, R23, R22, R21, R20, \
- L30, L31, R31, R30 \
-) \
-{ \
- { L00, L01, L02, L03, L04, L05, L06}, \
- { L10, L11, L12, L13, L14, L15, L16}, \
- { L20, L21, L22, L23, L24, L25, L26}, \
- { ___, ___, ___, ___, L30, L31, ___}, \
- { R00, R01, R02, R03, R04, R05, R06}, \
- { R10, R11, R12, R13, R14, R15, R16}, \
- { R20, R21, R22, R23, R24, R25, R26}, \
- { ___, ___, ___, ___, R30, R31, ___}, \
-}
-
-// 2u SPACEBAR LAYOUT, DON'T FORGET TO CHANGE NAME OF LAYOUTS IN KEYMAP.C
-
-#define LAYOUT_2u( \
- L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \
- L10, L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, R10, \
- L20, L21, L22, L23, L24, L25, L26, R26, R25, R24, R23, R22, R21, R20, \
- L30, R30 \
-) \
-{ \
- { L00, L01, L02, L03, L04, L05, L06}, \
- { L10, L11, L12, L13, L14, L15, L16}, \
- { L20, L21, L22, L23, L24, L25, L26}, \
- { ___, ___, ___, ___, L30, ___, ___},\
- { R00, R01, R02, R03, R04, R05, R06}, \
- { R10, R11, R12, R13, R14, R15, R16}, \
- { R20, R21, R22, R23, R24, R25, R26}, \
- { ___, ___, ___, ___, R30, ___, ___},\
-}
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 @@
"layouts": {
"LAYOUT": {
"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":"k0e", "x":13, "y":0, "w":2},
-
- {"label":"k10", "x":0, "y":1, "w":1.5},
- {"label":"k12", "x":1.5, "y":1},
- {"label":"k13", "x":2.5, "y":1},
- {"label":"k14", "x":3.5, "y":1},
- {"label":"k15", "x":4.5, "y":1},
- {"label":"k16", "x":5.5, "y":1},
- {"label":"k17", "x":6.5, "y":1},
- {"label":"k18", "x":7.5, "y":1},
- {"label":"k19", "x":8.5, "y":1},
- {"label":"k1a", "x":9.5, "y":1},
- {"label":"k1b", "x":10.5, "y":1},
- {"label":"k1c", "x":11.5, "y":1},
- {"label":"k1d", "x":12.5, "y":1},
- {"label":"k1e", "x":13.5, "y":1, "w":1.5},
-
- {"label":"k20", "x":0, "y":2, "w":1.75},
- {"label":"k22", "x":1.75, "y":2},
- {"label":"k23", "x":2.75, "y":2},
- {"label":"k24", "x":3.75, "y":2},
- {"label":"k25", "x":4.75, "y":2},
- {"label":"k26", "x":5.75, "y":2},
- {"label":"k27", "x":6.75, "y":2},
- {"label":"k28", "x":7.75, "y":2},
- {"label":"k29", "x":8.75, "y":2},
- {"label":"k2a", "x":9.75, "y":2},
- {"label":"k2b", "x":10.75, "y":2},
- {"label":"k2c", "x":11.75, "y":2},
- {"label":"k2d", "x":12.75, "y":2, "w":2.25},
-
- {"label":"k30", "x":0, "y":3, "w":2.25},
- {"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":"k3c", "x":11, "y":3, "w":1.75},
- {"label":"k3d", "x":12, "y":3},
- {"label":"k3e", "x":13, "y":3},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
- {"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":"k46", "x":3.75, "y":4, "w":6.25},
- {"label":"k4a", "x":10, "y":4},
- {"label":"k4b", "x":11, "y":4},
- {"label":"k4c", "x":12, "y":4},
- {"label":"k4d", "x":13, "y":4},
- {"label":"k4e", "x":14, "y":4}
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 1},
+ {"matrix": [1, 3], "x": 2.5, "y": 1},
+ {"matrix": [1, 4], "x": 3.5, "y": 1},
+ {"matrix": [1, 5], "x": 4.5, "y": 1},
+ {"matrix": [1, 6], "x": 5.5, "y": 1},
+ {"matrix": [1, 7], "x": 6.5, "y": 1},
+ {"matrix": [1, 8], "x": 7.5, "y": 1},
+ {"matrix": [1, 9], "x": 8.5, "y": 1},
+ {"matrix": [1, 10], "x": 9.5, "y": 1},
+ {"matrix": [1, 11], "x": 10.5, "y": 1},
+ {"matrix": [1, 12], "x": 11.5, "y": 1},
+ {"matrix": [1, 13], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2},
+ {"matrix": [2, 12], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 12], "x": 11, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 12, "y": 3},
+ {"matrix": [3, 14], "x": 13, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4},
+ {"matrix": [4, 11], "x": 11, "y": 4},
+ {"matrix": [4, 12], "x": 12, "y": 4},
+ {"matrix": [4, 13], "x": 13, "y": 4},
+ {"matrix": [4, 14], "x": 14, "y": 4}
]
},
- "LAYOUT_division":{
+ "LAYOUT_division": {
"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":"k0e", "x":14, "y":0},
-
- {"label":"k10", "x":0, "y":1, "w":1.5},
- {"label":"k12", "x":1.5, "y":1},
- {"label":"k13", "x":2.5, "y":1},
- {"label":"k14", "x":3.5, "y":1},
- {"label":"k15", "x":4.5, "y":1},
- {"label":"k16", "x":5.5, "y":1},
- {"label":"k17", "x":6.5, "y":1},
- {"label":"k18", "x":7.5, "y":1},
- {"label":"k19", "x":8.5, "y":1},
- {"label":"k1a", "x":9.5, "y":1},
- {"label":"k1b", "x":10.5, "y":1},
- {"label":"k1c", "x":11.5, "y":1},
- {"label":"k1d", "x":12.5, "y":1},
-
- {"label":"k20", "x":0, "y":2, "w":1.75},
- {"label":"k22", "x":1.75, "y":2},
- {"label":"k23", "x":2.75, "y":2},
- {"label":"k24", "x":3.75, "y":2},
- {"label":"k25", "x":4.75, "y":2},
- {"label":"k26", "x":5.75, "y":2},
- {"label":"k27", "x":6.75, "y":2},
- {"label":"k28", "x":7.75, "y":2},
- {"label":"k29", "x":8.75, "y":2},
- {"label":"k2a", "x":9.75, "y":2},
- {"label":"k2b", "x":10.75, "y":2},
- {"label":"k2c", "x":11.75, "y":2},
- {"label":"k1e", "x":12.75, "y":2},
- {"label":"k2d", "x":13.75, "y":1, "w": 1.25, "h": 2},
-
- {"label":"k30", "x":0, "y":3, "w":2.25},
- {"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":"k3c", "x":11, "y":3, "w":1.75},
- {"label":"k3d", "x":12, "y":3},
- {"label":"k3e", "x":13, "y":3},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 1},
+ {"matrix": [1, 3], "x": 2.5, "y": 1},
+ {"matrix": [1, 4], "x": 3.5, "y": 1},
+ {"matrix": [1, 5], "x": 4.5, "y": 1},
+ {"matrix": [1, 6], "x": 5.5, "y": 1},
+ {"matrix": [1, 7], "x": 6.5, "y": 1},
+ {"matrix": [1, 8], "x": 7.5, "y": 1},
+ {"matrix": [1, 9], "x": 8.5, "y": 1},
+ {"matrix": [1, 10], "x": 9.5, "y": 1},
+ {"matrix": [1, 11], "x": 10.5, "y": 1},
+ {"matrix": [1, 12], "x": 11.5, "y": 1},
+ {"matrix": [1, 13], "x": 12.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2},
+ {"matrix": [2, 12], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2},
+ {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 12], "x": 11, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 12, "y": 3},
+ {"matrix": [3, 14], "x": 13, "y": 3},
- {"label":"k40", "x":0, "y":4, "w":1.25},
- {"label":"k41", "x":1.25, "y":4, "w":1.25},
- {"label":"k43", "x":2.5, "y":4, "w":1.25},
- {"label":"k44", "x":3.75, "y":4, "w":2.25},
- {"label":"k46", "x":6, "y":4, "w":1.25},
- {"label":"k48", "x":7.25, "y":4, "w":2.75},
- {"label":"k4a", "x":10, "y":4},
- {"label":"k4b", "x":11, "y":4},
- {"label":"k4c", "x":12, "y":4},
- {"label":"k4d", "x":13, "y":4},
- {"label":"k4e", "x":14, "y":4}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 10, "y": 4},
+ {"matrix": [4, 11], "x": 11, "y": 4},
+ {"matrix": [4, 12], "x": 12, "y": 4},
+ {"matrix": [4, 13], "x": 13, "y": 4},
+ {"matrix": [4, 14], "x": 14, "y": 4}
]
}
}
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 @@
-/* Copyright 2021 Ocean
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┬───┤
- * │30 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3c │3d │3e │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬───┼───┼───┤
- * │40 │41 │43 │46 │4a │4b │4c │4d │4e │
- * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
- */
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, \
- k10, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
- k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3c, k3d, k3e, \
- k40, k41, k43, k46, k4a, k4b, k4c, k4d, k4e \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, KC_NO, k0e }, \
- { k10, KC_NO, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \
- { k20, KC_NO, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, KC_NO }, \
- { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, KC_NO, k3c, k3d, k3e }, \
- { k40, k41, KC_NO, k43, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4a, k4b, k4c, k4d, k4e } \
-}
-
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │ │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ 2d │
- * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │1e │ │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬──┴┬───┤
- * │30 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3c │3d │3e │
- * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┴───┼───┴──┬┴──┬┴──┬───┼───┼───┤
- * │40 │41 │43 │44 │46 │48 │4a │4b │4c │4d │4e │
- * └────┴────┴────┴────────┴────────┴──────┴───┴───┴───┴───┴───┘
-*/
-#define LAYOUT_division( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
- k10, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
- k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k1e, k2d, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3c, k3d, k3e, \
- k40, k41, k43, k44, k46, k48, k4a, k4b, k4c, k4d, k4e \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
- { k10, KC_NO, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, KC_NO }, \
- { k20, KC_NO, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k1e, k2d }, \
- { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, KC_NO, k3c, k3d, k3e }, \
- { k40, k41, KC_NO, k43, k44, KC_NO, k46, KC_NO, k48, KC_NO, k4a, k4b, k4c, k4d, k4e } \
-}
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 @@
"bootloader": "bootloadhid",
"layouts": {
"LAYOUT": {
- "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}]
+ "layout": [
+ {"matrix": [5, 0], "x": 2.25, "y": 0},
+ {"matrix": [5, 1], "x": 3.25, "y": 0},
+ {"matrix": [5, 2], "x": 4.25, "y": 0},
+ {"matrix": [5, 3], "x": 5.25, "y": 0},
+ {"matrix": [5, 4], "x": 6.25, "y": 0},
+ {"matrix": [5, 5], "x": 7.25, "y": 0},
+ {"matrix": [5, 6], "x": 8.25, "y": 0},
+
+ {"matrix": [5, 7], "x": 10.25, "y": 0},
+ {"matrix": [5, 8], "x": 11.25, "y": 0},
+ {"matrix": [5, 9], "x": 12.25, "y": 0},
+ {"matrix": [5, 10], "x": 13.25, "y": 0},
+ {"matrix": [5, 11], "x": 14.25, "y": 0},
+ {"matrix": [5, 12], "x": 15.25, "y": 0},
+ {"matrix": [5, 13], "x": 16.25, "y": 0},
+ {"matrix": [6, 8], "x": 17.25, "y": 0},
+ {"matrix": [7, 8], "x": 18.25, "y": 0},
+
+ {"matrix": [7, 4], "x": 0, "y": 1},
+ {"matrix": [6, 4], "x": 1, "y": 1},
+
+ {"matrix": [4, 0], "x": 2.25, "y": 1},
+ {"matrix": [4, 1], "x": 3.25, "y": 1},
+ {"matrix": [4, 2], "x": 4.25, "y": 1},
+ {"matrix": [4, 3], "x": 5.25, "y": 1},
+ {"matrix": [4, 4], "x": 6.25, "y": 1},
+ {"matrix": [4, 5], "x": 7.25, "y": 1},
+ {"matrix": [4, 6], "x": 8.25, "y": 1},
+
+ {"matrix": [4, 7], "x": 10.25, "y": 1},
+ {"matrix": [4, 8], "x": 11.25, "y": 1},
+ {"matrix": [4, 9], "x": 12.25, "y": 1},
+ {"matrix": [4, 10], "x": 13.25, "y": 1},
+ {"matrix": [4, 11], "x": 14.25, "y": 1},
+ {"matrix": [4, 12], "x": 15.25, "y": 1},
+ {"matrix": [6, 9], "x": 16.25, "y": 1, "w": 2},
+ {"matrix": [7, 9], "x": 18.25, "y": 1},
+
+ {"matrix": [7, 3], "x": 0, "y": 2},
+ {"matrix": [6, 3], "x": 1, "y": 2},
+
+ {"matrix": [3, 0], "x": 2.25, "y": 2, "w": 1.5},
+ {"matrix": [3, 1], "x": 3.75, "y": 2},
+ {"matrix": [3, 2], "x": 4.75, "y": 2},
+ {"matrix": [3, 3], "x": 5.75, "y": 2},
+ {"matrix": [3, 4], "x": 6.75, "y": 2},
+ {"matrix": [3, 5], "x": 7.75, "y": 2},
+
+ {"matrix": [3, 7], "x": 9.75, "y": 2},
+ {"matrix": [3, 8], "x": 10.75, "y": 2},
+ {"matrix": [3, 9], "x": 11.75, "y": 2},
+ {"matrix": [3, 10], "x": 12.75, "y": 2},
+ {"matrix": [3, 11], "x": 13.75, "y": 2},
+ {"matrix": [3, 12], "x": 14.75, "y": 2},
+ {"matrix": [3, 13], "x": 15.75, "y": 2},
+ {"matrix": [6, 10], "x": 16.75, "y": 2, "w": 1.5},
+ {"matrix": [7, 10], "x": 18.25, "y": 2},
+
+ {"matrix": [7, 2], "x": 0, "y": 3},
+ {"matrix": [6, 2], "x": 1, "y": 3},
+
+ {"matrix": [2, 0], "x": 2.25, "y": 3, "w": 1.75},
+ {"matrix": [2, 1], "x": 4, "y": 3},
+ {"matrix": [2, 2], "x": 5, "y": 3},
+ {"matrix": [2, 3], "x": 6, "y": 3},
+ {"matrix": [2, 4], "x": 7, "y": 3},
+ {"matrix": [2, 5], "x": 8, "y": 3},
+
+ {"matrix": [2, 7], "x": 10, "y": 3},
+ {"matrix": [2, 8], "x": 11, "y": 3},
+ {"matrix": [2, 9], "x": 12, "y": 3},
+ {"matrix": [2, 10], "x": 13, "y": 3},
+ {"matrix": [2, 11], "x": 14, "y": 3},
+ {"matrix": [2, 12], "x": 15, "y": 3},
+ {"matrix": [6, 11], "x": 16, "y": 3, "w": 2.25},
+ {"matrix": [7, 11], "x": 18.25, "y": 3},
+
+ {"matrix": [7, 1], "x": 0, "y": 4},
+ {"matrix": [6, 1], "x": 1, "y": 4},
+
+ {"matrix": [1, 0], "x": 2.25, "y": 4, "w": 2.25},
+ {"matrix": [1, 2], "x": 4.5, "y": 4},
+ {"matrix": [1, 3], "x": 5.5, "y": 4},
+ {"matrix": [1, 4], "x": 6.5, "y": 4},
+ {"matrix": [1, 5], "x": 7.5, "y": 4},
+ {"matrix": [1, 6], "x": 8.5, "y": 4},
+
+ {"matrix": [1, 7], "x": 10.5, "y": 4},
+ {"matrix": [1, 8], "x": 11.5, "y": 4},
+ {"matrix": [1, 9], "x": 12.5, "y": 4},
+ {"matrix": [1, 10], "x": 13.5, "y": 4},
+ {"matrix": [1, 11], "x": 14.5, "y": 4},
+ {"matrix": [1, 13], "x": 15.5, "y": 4, "w": 1.75},
+ {"matrix": [6, 12], "x": 17.25, "y": 4},
+ {"matrix": [7, 12], "x": 18.25, "y": 4},
+
+ {"matrix": [7, 0], "x": 0, "y": 5},
+ {"matrix": [6, 0], "x": 1, "y": 5},
+
+ {"matrix": [0, 0], "x": 2.25, "y": 5, "w": 1.25},
+ {"matrix": [0, 1], "x": 3.5, "y": 5, "w": 1.25},
+ {"matrix": [0, 2], "x": 4.75, "y": 5, "w": 1.25},
+ {"matrix": [0, 3], "x": 6, "y": 5, "w": 2},
+ {"matrix": [0, 4], "x": 8, "y": 5},
+
+ {"matrix": [0, 7], "x": 10, "y": 5, "w": 2.75},
+ {"matrix": [0, 10], "x": 12.75, "y": 5, "w": 1.25},
+ {"matrix": [0, 11], "x": 14, "y": 5},
+ {"matrix": [0, 12], "x": 15, "y": 5, "w": 1.25},
+ {"matrix": [0, 13], "x": 16.25, "y": 5},
+ {"matrix": [6, 13], "x": 17.25, "y": 5},
+ {"matrix": [7, 13], "x": 18.25, "y": 5}
+ ]
},
"LAYOUT_iso": {
- "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}]
+ "layout": [
+ {"matrix": [5, 0], "x": 2.25, "y": 0},
+ {"matrix": [5, 1], "x": 3.25, "y": 0},
+ {"matrix": [5, 2], "x": 4.25, "y": 0},
+ {"matrix": [5, 3], "x": 5.25, "y": 0},
+ {"matrix": [5, 4], "x": 6.25, "y": 0},
+ {"matrix": [5, 5], "x": 7.25, "y": 0},
+ {"matrix": [5, 6], "x": 8.25, "y": 0},
+
+ {"matrix": [5, 7], "x": 10.25, "y": 0},
+ {"matrix": [5, 8], "x": 11.25, "y": 0},
+ {"matrix": [5, 9], "x": 12.25, "y": 0},
+ {"matrix": [5, 10], "x": 13.25, "y": 0},
+ {"matrix": [5, 11], "x": 14.25, "y": 0},
+ {"matrix": [5, 12], "x": 15.25, "y": 0},
+ {"matrix": [5, 13], "x": 16.25, "y": 0},
+ {"matrix": [6, 8], "x": 17.25, "y": 0},
+ {"matrix": [7, 8], "x": 18.25, "y": 0},
+
+ {"matrix": [7, 4], "x": 0, "y": 1},
+ {"matrix": [6, 4], "x": 1, "y": 1},
+
+ {"matrix": [4, 0], "x": 2.25, "y": 1},
+ {"matrix": [4, 1], "x": 3.25, "y": 1},
+ {"matrix": [4, 2], "x": 4.25, "y": 1},
+ {"matrix": [4, 3], "x": 5.25, "y": 1},
+ {"matrix": [4, 4], "x": 6.25, "y": 1},
+ {"matrix": [4, 5], "x": 7.25, "y": 1},
+ {"matrix": [4, 6], "x": 8.25, "y": 1},
+
+ {"matrix": [4, 7], "x": 10.25, "y": 1},
+ {"matrix": [4, 8], "x": 11.25, "y": 1},
+ {"matrix": [4, 9], "x": 12.25, "y": 1},
+ {"matrix": [4, 10], "x": 13.25, "y": 1},
+ {"matrix": [4, 11], "x": 14.25, "y": 1},
+ {"matrix": [4, 12], "x": 15.25, "y": 1},
+ {"matrix": [6, 9], "x": 16.25, "y": 1, "w": 2},
+ {"matrix": [7, 9], "x": 18.25, "y": 1},
+
+ {"matrix": [7, 3], "x": 0, "y": 2},
+ {"matrix": [6, 3], "x": 1, "y": 2},
+
+ {"matrix": [3, 0], "x": 2.25, "y": 2, "w": 1.5},
+ {"matrix": [3, 1], "x": 3.75, "y": 2},
+ {"matrix": [3, 2], "x": 4.75, "y": 2},
+ {"matrix": [3, 3], "x": 5.75, "y": 2},
+ {"matrix": [3, 4], "x": 6.75, "y": 2},
+ {"matrix": [3, 5], "x": 7.75, "y": 2},
+
+ {"matrix": [3, 7], "x": 9.75, "y": 2},
+ {"matrix": [3, 8], "x": 10.75, "y": 2},
+ {"matrix": [3, 9], "x": 11.75, "y": 2},
+ {"matrix": [3, 10], "x": 12.75, "y": 2},
+ {"matrix": [3, 11], "x": 13.75, "y": 2},
+ {"matrix": [3, 12], "x": 14.75, "y": 2},
+ {"matrix": [3, 13], "x": 15.75, "y": 2},
+ {"matrix": [7, 10], "x": 18.25, "y": 2},
+
+ {"matrix": [7, 2], "x": 0, "y": 3},
+ {"matrix": [6, 2], "x": 1, "y": 3},
+
+ {"matrix": [2, 0], "x": 2.25, "y": 3, "w": 1.75},
+ {"matrix": [2, 1], "x": 4, "y": 3},
+ {"matrix": [2, 2], "x": 5, "y": 3},
+ {"matrix": [2, 3], "x": 6, "y": 3},
+ {"matrix": [2, 4], "x": 7, "y": 3},
+ {"matrix": [2, 5], "x": 8, "y": 3},
+
+ {"matrix": [2, 7], "x": 10, "y": 3},
+ {"matrix": [2, 8], "x": 11, "y": 3},
+ {"matrix": [2, 9], "x": 12, "y": 3},
+ {"matrix": [2, 10], "x": 13, "y": 3},
+ {"matrix": [2, 11], "x": 14, "y": 3},
+ {"matrix": [2, 12], "x": 15, "y": 3},
+ {"matrix": [2, 13], "x": 16, "y": 3},
+ {"matrix": [6, 11], "x": 17, "y": 2, "w": 1.25, "h": 2},
+ {"matrix": [7, 11], "x": 18.25, "y": 3},
+
+ {"matrix": [7, 1], "x": 0, "y": 4},
+ {"matrix": [6, 1], "x": 1, "y": 4},
+
+ {"matrix": [1, 0], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [1, 1], "x": 3.5, "y": 4},
+ {"matrix": [1, 2], "x": 4.5, "y": 4},
+ {"matrix": [1, 3], "x": 5.5, "y": 4},
+ {"matrix": [1, 4], "x": 6.5, "y": 4},
+ {"matrix": [1, 5], "x": 7.5, "y": 4},
+ {"matrix": [1, 6], "x": 8.5, "y": 4},
+
+ {"matrix": [1, 7], "x": 10.5, "y": 4},
+ {"matrix": [1, 8], "x": 11.5, "y": 4},
+ {"matrix": [1, 9], "x": 12.5, "y": 4},
+ {"matrix": [1, 10], "x": 13.5, "y": 4},
+ {"matrix": [1, 11], "x": 14.5, "y": 4},
+ {"matrix": [1, 13], "x": 15.5, "y": 4, "w": 1.75},
+ {"matrix": [6, 12], "x": 17.25, "y": 4},
+ {"matrix": [7, 12], "x": 18.25, "y": 4},
+
+ {"matrix": [7, 0], "x": 0, "y": 5},
+ {"matrix": [6, 0], "x": 1, "y": 5},
+
+ {"matrix": [0, 0], "x": 2.25, "y": 5, "w": 1.25},
+ {"matrix": [0, 1], "x": 3.5, "y": 5, "w": 1.25},
+ {"matrix": [0, 2], "x": 4.75, "y": 5, "w": 1.25},
+ {"matrix": [0, 3], "x": 6, "y": 5, "w": 2},
+ {"matrix": [0, 4], "x": 8, "y": 5},
+
+ {"matrix": [0, 7], "x": 10, "y": 5, "w": 2.75},
+ {"matrix": [0, 10], "x": 12.75, "y": 5, "w": 1.25},
+ {"matrix": [0, 11], "x": 14, "y": 5},
+ {"matrix": [0, 12], "x": 15, "y": 5, "w": 1.25},
+ {"matrix": [0, 13], "x": 16.25, "y": 5},
+ {"matrix": [6, 13], "x": 17.25, "y": 5},
+ {"matrix": [7, 13], "x": 18.25, "y": 5}
+ ]
}
}
}
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/>.
#include <stdio.h>
#include "quantum.h"
#include "i2c_master.h"
-#include "split75.h"
#define RIGHT_HALF
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 @@
-// Copyright 2022 Artjoms Rizihs (@artjomsR)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-// Number of keys in rows
-// 0 + 7 / 9
-// 2 + 7 / 8
-// 2 + 6 / 9
-// 2 + 6 / 8
-// 2 + 6 / 8
-// 2 + 5 / 7
-
-#define LAYOUT( \
- K05, K15, K25, K35, K45, K55, K65, K75, K85, K95, K105, K115, K125, K135, K86, K87, \
- K47, K46, K04, K14, K24, K34, K44, K54, K64, K74, K84, K94, K104, K114, K124, K96, K97, \
- K37, K36, K03, K13, K23, K33, K43, K53, K73, K83, K93, K103, K113, K123, K133, K106, K107, \
- K27, K26, K02, K12, K22, K32, K42, K52, K72, K82, K92, K102, K112, K122, K116, K117, \
- K17, K16, K01, K21, K31, K41, K51, K61, K71, K81, K91, K101, K111, K131, K126, K127, \
- K07, K06, K00, K10, K20, K30, K40, K70, K100, K110, K120, K130, K136, K137 \
-){ \
- { K00, K10, K20, K30, K40, KC_NO, KC_NO, K70, KC_NO, KC_NO, K100, K110, K120, K130 }, \
- { K01, KC_NO, K21, K31, K41, K51, K61, K71, K81, K91, K101, K111, KC_NO, K131 }, \
- { K02, K12, K22, K32, K42, K52, KC_NO, K72, K82, K92, K102, K112, K122, }, \
- { K03, K13, K23, K33, K43, K53, KC_NO, K73, K83, K93, K103, K113, K123, K133 }, \
- { K04, K14, K24, K34, K44, K54, K64, K74, K84, K94, K104, K114, K124, }, \
- { K05, K15, K25, K35, K45, K55, K65, K75, K85, K95, K105, K115, K125, K135 }, \
- { K06, K16, K26, K36, K46, KC_NO, KC_NO, KC_NO, K86, K96, K106, K116, K126, K136 }, \
- { K07, K17, K27, K37, K47, KC_NO, KC_NO, KC_NO, K87, K97, K107, K117, K127, K137 } \
-}
-
-#define LAYOUT_iso( \
- K05, K15, K25, K35, K45, K55, K65, K75, K85, K95, K105, K115, K125, K135, K86, K87, \
- K47, K46, K04, K14, K24, K34, K44, K54, K64, K74, K84, K94, K104, K114, K124, K96, K97, \
- K37, K36, K03, K13, K23, K33, K43, K53, K73, K83, K93, K103, K113, K123, K133, K107, \
- K27, K26, K02, K12, K22, K32, K42, K52, K72, K82, K92, K102, K112, K122, K132, K116, K117, \
- K17, K16, K01, K11, K21, K31, K41, K51, K61, K71, K81, K91, K101, K111, K131, K126, K127, \
- K07, K06, K00, K10, K20, K30, K40, K70, K100, K110, K120, K130, K136, K137 \
-){ \
- { K00, K10, K20, K30, K40, KC_NO, KC_NO, K70, KC_NO, KC_NO, K100, K110, K120, K130 }, \
- { K01, K11, K21, K31, K41, K51, K61, K71, K81, K91, K101, K111, KC_NO, K131 }, \
- { K02, K12, K22, K32, K42, K52, KC_NO, K72, K82, K92, K102, K112, K122, K132 }, \
- { K03, K13, K23, K33, K43, K53, KC_NO, K73, K83, K93, K103, K113, K123, K133 }, \
- { K04, K14, K24, K34, K44, K54, K64, K74, K84, K94, K104, K114, K124, }, \
- { K05, K15, K25, K35, K45, K55, K65, K75, K85, K95, K105, K115, K125, K135 }, \
- { K06, K16, K26, K36, K46, KC_NO, KC_NO, KC_NO, K86, K96, KC_NO, K116, K126, K136 }, \
- { K07, K17, K27, K37, K47, KC_NO, KC_NO, KC_NO, K87, K97, K107, K117, K127, K137 } \
-}
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 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
},
"LAYOUT_7u": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
},
"LAYOUT_splitspace": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
},
"LAYOUT_splitbs": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
},
"LAYOUT_splitbs_7u": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
},
"LAYOUT_splitbs_splitspace": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
},
"LAYOUT_iso": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
},
"LAYOUT_iso_7u": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
},
"LAYOUT_iso_splitspace": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
},
"LAYOUT_iso_splitbs": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
},
"LAYOUT_iso_splitbs_7u": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
},
"LAYOUT_iso_splitbs_splitspace": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [1, 0], "x": 15, "y": 0},
+ {"matrix": [1, 1], "x": 16, "y": 0},
+ {"matrix": [1, 2], "x": 17, "y": 0},
+ {"matrix": [1, 3], "x": 18, "y": 0},
+ {"matrix": [1, 4], "x": 19, "y": 0},
+ {"matrix": [1, 5], "x": 20, "y": 0},
+ {"matrix": [1, 6], "x": 21, "y": 0},
+ {"matrix": [1, 7], "x": 22, "y": 0},
+ {"matrix": [1, 8], "x": 23, "y": 0},
+ {"matrix": [1, 9], "x": 24, "y": 0},
+ {"matrix": [1, 10], "x": 25, "y": 0},
+ {"matrix": [1, 11], "x": 26, "y": 0},
+ {"matrix": [1, 12], "x": 27, "y": 0},
+ {"matrix": [1, 13], "x": 28, "y": 0},
+ {"matrix": [1, 14], "x": 29, "y": 0},
+ {"matrix": [2, 0], "x": 30, "y": 0},
+ {"matrix": [2, 1], "x": 31, "y": 0},
+ {"matrix": [2, 2], "x": 32, "y": 0},
+ {"matrix": [2, 3], "x": 33, "y": 0},
+ {"matrix": [2, 4], "x": 34, "y": 0},
+ {"matrix": [2, 5], "x": 35, "y": 0},
+ {"matrix": [2, 6], "x": 36, "y": 0},
+ {"matrix": [2, 7], "x": 37, "y": 0},
+ {"matrix": [2, 8], "x": 38, "y": 0},
+ {"matrix": [2, 9], "x": 39, "y": 0},
+ {"matrix": [2, 10], "x": 40, "y": 0},
+ {"matrix": [2, 11], "x": 41, "y": 0},
+ {"matrix": [2, 12], "x": 42, "y": 0},
+ {"matrix": [2, 13], "x": 43, "y": 0},
+ {"matrix": [2, 14], "x": 44, "y": 0},
+ {"matrix": [3, 0], "x": 45, "y": 0},
+ {"matrix": [3, 1], "x": 46, "y": 0},
+ {"matrix": [3, 2], "x": 47, "y": 0},
+ {"matrix": [3, 3], "x": 48, "y": 0},
+ {"matrix": [3, 4], "x": 49, "y": 0},
+ {"matrix": [3, 5], "x": 50, "y": 0},
+ {"matrix": [3, 6], "x": 51, "y": 0},
+ {"matrix": [3, 7], "x": 52, "y": 0},
+ {"matrix": [3, 8], "x": 53, "y": 0},
+ {"matrix": [3, 9], "x": 54, "y": 0},
+ {"matrix": [3, 10], "x": 55, "y": 0},
+ {"matrix": [3, 11], "x": 56, "y": 0},
+ {"matrix": [3, 12], "x": 57, "y": 0},
+ {"matrix": [3, 13], "x": 58, "y": 0},
+ {"matrix": [3, 14], "x": 59, "y": 0},
+ {"matrix": [4, 0], "x": 60, "y": 0},
+ {"matrix": [4, 1], "x": 61, "y": 0},
+ {"matrix": [4, 2], "x": 62, "y": 0},
+ {"matrix": [4, 3], "x": 63, "y": 0},
+ {"matrix": [4, 6], "x": 64, "y": 0},
+ {"matrix": [4, 8], "x": 65, "y": 0},
+ {"matrix": [4, 10], "x": 66, "y": 0},
+ {"matrix": [4, 11], "x": 67, "y": 0},
+ {"matrix": [4, 12], "x": 68, "y": 0},
+ {"matrix": [4, 13], "x": 69, "y": 0},
+ {"matrix": [4, 14], "x": 70, "y": 0}
+ ]
}
}
}
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 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
+#include "mxss_frontled.h"
hs_set caps_color = { .hue = 0, .sat = 255 };
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 @@
* EEPROM management code from ../cannonkeys/stm32f072/keyboard.c
*/
-#include "mxss.h"
+#include "quantum.h"
#include "eeprom.h"
-#include "action_layer.h"
-#include "rgblight.h"
-#include "via.h"
+#include "mxss_frontled.h"
#include "version.h" // for QMK_BUILDDATE used in EEPROM magic
void 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 @@
-/* Copyright 2018 Jumail Mundekkat / MxBlue
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-#include "mxss_frontled.h"
-
-// This a shortcut to help you visually see your layout.
-// The following is an example using the Planck MIT layout
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k2E, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
- k40, k41, k42, k46, k4A, k4B, k4C, k4D, k4E \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, KC_NO, k0E }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, KC_NO, k2D, k2E }, \
- { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
- { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, k4C, k4D, k4E }, \
-}
-//ANSI, normalBS, 7u
-#define LAYOUT_7u( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k2E, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
- k40, k41, k42, k46, k4B, k4C, k4D, k4E \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, KC_NO, k0E }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, KC_NO, k2D, k2E }, \
- { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
- { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, KC_NO, k4B, k4C, k4D, k4E }, \
-}
-//ANSI, normalBS, split space
-#define LAYOUT_splitspace( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k2E, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
- k40, k41, k42, k43, k46, k48, k4A, k4B, k4C, k4D, k4E \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, KC_NO, k0E }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, KC_NO, k2D, k2E }, \
- { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
- { k40, k41, k42, k43, KC_NO, KC_NO, k46, KC_NO, k48, KC_NO, k4A, k4B, k4C, k4D, k4E }, \
-}
-//ANSI, splitBS, 6.25u
-#define LAYOUT_splitbs( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k2E, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
- k40, k41, k42, k46, k4A, k4B, k4C, k4D, k4E \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, KC_NO, k2D, k2E }, \
- { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
- { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, k4C, k4D, k4E }, \
-}
-//ANSI, splitBS, 7u
-#define LAYOUT_splitbs_7u( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k2E, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
- k40, k41, k42, k46, k4B, k4C, k4D, k4E \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, KC_NO, k2D, k2E }, \
- { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
- { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, KC_NO, k4B, k4C, k4D, k4E }, \
-}
-//ANSI, normalBS, split space
-#define LAYOUT_splitbs_splitspace( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k2E, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
- k40, k41, k42, k43, k46, k48, k4A, k4B, k4C, k4D, k4E \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, KC_NO, k2D, k2E }, \
- { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
- { k40, k41, k42, k43, KC_NO, KC_NO, k46, KC_NO, k48, KC_NO, k4A, k4B, k4C, k4D, k4E }, \
-}
-//ISO, normalBS, 6.25u
-#define LAYOUT_iso( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1E, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
- k40, k41, k42, k46, k4A, k4B, k4C, k4D, k4E \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, KC_NO, k0E }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, KC_NO, k1E }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
- { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, k4C, k4D, k4E }, \
-}
-//ISO, normalBS, 7u
-#define LAYOUT_iso_7u( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1E, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
- k40, k41, k42, k46, k4B, k4C, k4D, k4E \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, KC_NO, k0E }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, KC_NO, k1E }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
- { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, KC_NO, k4B, k4C, k4D, k4E }, \
-}
-//ISO, normalBS, split space
-#define LAYOUT_iso_splitspace( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1E, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
- k40, k41, k42, k43, k46, k48, k4A, k4B, k4C, k4D, k4E \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, KC_NO, k0E }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, KC_NO, k1E }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
- { k40, k41, k42, k43, KC_NO, KC_NO, k46, KC_NO, k48, KC_NO, k4A, k4B, k4C, k4D, k4E }, \
-}
-//ISO, splitBS, 6.25u
-#define LAYOUT_iso_splitbs( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1E, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
- k40, k41, k42, k46, k4A, k4B, k4C, k4D, k4E \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, KC_NO, k1E }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
- { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, k4C, k4D, k4E }, \
-}
-//ISO, splitBS, 7u
-#define LAYOUT_iso_splitbs_7u( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1E, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
- k40, k41, k42, k46, k4B, k4C, k4D, k4E \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, KC_NO, k1E }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
- { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, KC_NO, k4B, k4C, k4D, k4E }, \
-}
-//ISO, splitBS, split space
-#define LAYOUT_iso_splitbs_splitspace( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1E, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
- k40, k41, k42, k43, k46, k48, k4A, k4B, k4C, k4D, k4E \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, KC_NO, k1E }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
- { k40, k41, k42, k43, KC_NO, KC_NO, k46, KC_NO, k48, KC_NO, k4A, k4B, k4C, k4D, k4E }, \
-}
-
-// All the gubs
-#define LAYOUT_all( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
- k40, k41, k42, k43, k46, k48, k4A, k4B, k4C, k4D, k4E \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
- { k40, k41, k42, k43, KC_NO, KC_NO, k46, KC_NO, k48, KC_NO, k4A, k4B, k4C, k4D, k4E }, \
-}
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 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
+#include "mxss_frontled.h"
hs_set caps_color = { .hue = 0, .sat = 255 };
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 @@
"community_layouts": ["60_ansi"],
"layouts": {
"LAYOUT": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [4, 9], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3},
+ {"matrix": [4, 7], "x": 12, "y": 3},
+ {"matrix": [3, 13], "x": 13, "y": 3},
+ {"matrix": [3, 12], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4},
+ {"matrix": [4, 11], "x": 11, "y": 4},
+ {"matrix": [4, 8], "x": 12, "y": 4},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4}
+ ]
},
"LAYOUT_60_ansi": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
}
}
}
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); }
inline void org60_caps_led_off(void) { DDRB &= ~(1<<2); PORTB &= ~(1<<2); }
inline void org60_bl_led_off(void) { DDRF &= ~(1<<5); PORTF &= ~(1<<5); }
-
-#define XXX KC_NO
-
-/* Org60 Keymap Definition Macro */
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k49, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k47, k3D, k3C, \
- k40, k41, k42, k45, k4A, k4B, k48, k4C, k4D \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \
- { k40, k41, k42, XXX, XXX, k45, XXX, k47, k48, k49, k4A, k4B, k4C, k4D } \
-}
-
-#define LAYOUT_60_ansi( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, \
- k40, k41, k42, k45, k4A, k4B, k4C, k4D \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D }, \
- { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D }, \
- { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4A, k4B, k4C, k4D } \
-}
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 @@
"bootloader": "stm32-dfu",
"layouts": {
"LAYOUT": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 2], "x": 1.5, "y": 0},
+ {"matrix": [0, 3], "x": 2.5, "y": 0},
+ {"matrix": [0, 4], "x": 3.5, "y": 0},
+ {"matrix": [0, 5], "x": 4.5, "y": 0},
+
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+
+ {"matrix": [0, 11], "x": 10.5, "y": 0},
+ {"matrix": [0, 12], "x": 11.5, "y": 0},
+ {"matrix": [0, 13], "x": 12.5, "y": 0},
+ {"matrix": [0, 14], "x": 13.5, "y": 0},
+
+ {"matrix": [0, 15], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+ {"matrix": [1, 15], "x": 15, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 15], "x": 15, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+ {"matrix": [3, 15], "x": 15, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"matrix": [4, 12], "x": 14, "y": 4.25},
+ {"matrix": [4, 15], "x": 15, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 1], "x": 2.25, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 7},
+ {"matrix": [5, 9], "x": 10.75, "y": 5.25, "w": 1.5},
+
+ {"matrix": [5, 11], "x": 13, "y": 5.25},
+ {"matrix": [5, 12], "x": 14, "y": 5.25},
+ {"matrix": [5, 15], "x": 15, "y": 5.25}
+ ]
},
"LAYOUT_split_bs": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 2], "x": 1.5, "y": 0},
+ {"matrix": [0, 3], "x": 2.5, "y": 0},
+ {"matrix": [0, 4], "x": 3.5, "y": 0},
+ {"matrix": [0, 5], "x": 4.5, "y": 0},
+
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+
+ {"matrix": [0, 11], "x": 10.5, "y": 0},
+ {"matrix": [0, 12], "x": 11.5, "y": 0},
+ {"matrix": [0, 13], "x": 12.5, "y": 0},
+ {"matrix": [0, 14], "x": 13.5, "y": 0},
+
+ {"matrix": [0, 15], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25},
+ {"matrix": [1, 14], "x": 14, "y": 1.25},
+ {"matrix": [1, 15], "x": 15, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 15], "x": 15, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+ {"matrix": [3, 15], "x": 15, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"matrix": [4, 12], "x": 14, "y": 4.25},
+ {"matrix": [4, 15], "x": 15, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 1], "x": 2.25, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 7},
+ {"matrix": [5, 9], "x": 10.75, "y": 5.25, "w": 1.5},
+
+ {"matrix": [5, 11], "x": 13, "y": 5.25},
+ {"matrix": [5, 12], "x": 14, "y": 5.25},
+ {"matrix": [5, 15], "x": 15, "y": 5.25}
+ ]
}
}
}
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 @@
-/* Copyright 2019 zvecr<git@zvecr.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-#define ____ KC_NO
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- K000, K002, K003, K004, K005, K006, K007, K008, K009, K011, K012, K013, K014, K015, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K115, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K215, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K315, \
- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K415, \
- K500, K501, K505, K509, K511, K512, K515 \
-) \
-{ \
- { K000, ____, K002, K003, K004, K005, K006, K007, K008, K009, ____, K011, K012, K013, K014, K015}, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, ____, K115}, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, ____, K215}, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, ____, ____, K315}, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, ____, ____, K415}, \
- { K500, K501, ____, ____, ____, K505, ____, ____, ____, K509, ____, K511, K512, ____, ____, K515}, \
-}
-
-#define LAYOUT_split_bs( \
- K000, K002, K003, K004, K005, K006, K007, K008, K009, K011, K012, K013, K014, K015, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K215, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K315, \
- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K415, \
- K500, K501, K505, K509, K511, K512, K515 \
-) \
-{ \
- { K000, ____, K002, K003, K004, K005, K006, K007, K008, K009, ____, K011, K012, K013, K014, K015}, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115}, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, ____, K215}, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, ____, ____, K315}, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, ____, ____, K415}, \
- { K500, K501, ____, ____, ____, K505, ____, ____, ____, K509, ____, K511, K512, ____, ____, K515}, \
-}
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 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [0, 8], "x": 8.25, "y": 0},
+ {"matrix": [0, 9], "x": 9.25, "y": 0},
+ {"matrix": [0, 10], "x": 10.25, "y": 0},
+ {"matrix": [0, 11], "x": 11.25, "y": 0},
+ {"matrix": [0, 12], "x": 12.25, "y": 0},
+ {"matrix": [0, 13], "x": 13.25, "y": 0},
+ {"matrix": [0, 14], "x": 14.25, "y": 0},
+ {"matrix": [0, 16], "x": 15.25, "y": 0, "w": 2},
+ {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+
+ {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [1, 8], "x": 8.75, "y": 1},
+ {"matrix": [1, 9], "x": 9.75, "y": 1},
+ {"matrix": [1, 10], "x": 10.75, "y": 1},
+ {"matrix": [1, 11], "x": 11.75, "y": 1},
+ {"matrix": [1, 12], "x": 12.75, "y": 1},
+ {"matrix": [1, 13], "x": 13.75, "y": 1},
+ {"matrix": [1, 14], "x": 14.75, "y": 1},
+ {"matrix": [1, 16], "x": 15.75, "y": 1, "w": 1.5},
+ {"matrix": [1, 17], "x": 17.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+
+ {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 9], "x": 10, "y": 2},
+ {"matrix": [2, 10], "x": 11, "y": 2},
+ {"matrix": [2, 11], "x": 12, "y": 2},
+ {"matrix": [2, 12], "x": 13, "y": 2},
+ {"matrix": [2, 13], "x": 14, "y": 2},
+ {"matrix": [2, 16], "x": 15, "y": 2, "w": 2.25},
+ {"matrix": [2, 17], "x": 17.25, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+
+ {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.5, "y": 3},
+ {"matrix": [3, 7], "x": 7.5, "y": 3},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [3, 9], "x": 9.5, "y": 3},
+ {"matrix": [3, 10], "x": 10.5, "y": 3},
+ {"matrix": [3, 11], "x": 11.5, "y": 3},
+ {"matrix": [3, 12], "x": 12.5, "y": 3},
+ {"matrix": [3, 13], "x": 13.5, "y": 3},
+ {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
+ {"matrix": [3, 16], "x": 16.25, "y": 3},
+ {"matrix": [3, 17], "x": 17.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 3], "x": 3.75, "y": 4},
+ {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+ {"matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+ {"matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 14], "x": 15.25, "y": 4},
+ {"matrix": [4, 16], "x": 16.25, "y": 4},
+ {"matrix": [4, 17], "x": 17.25, "y": 4}
+ ]
+ },
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 15], "x": 15, "y": 0},
+ {"matrix": [0, 16], "x": 16, "y": 0},
+ {"matrix": [0, 17], "x": 17, "y": 0},
+ {"matrix": [1, 0], "x": 18, "y": 0},
+ {"matrix": [1, 1], "x": 19, "y": 0},
+ {"matrix": [1, 2], "x": 20, "y": 0},
+ {"matrix": [1, 3], "x": 21, "y": 0},
+ {"matrix": [1, 4], "x": 22, "y": 0},
+ {"matrix": [1, 5], "x": 23, "y": 0},
+ {"matrix": [1, 6], "x": 24, "y": 0},
+ {"matrix": [1, 7], "x": 25, "y": 0},
+ {"matrix": [1, 8], "x": 26, "y": 0},
+ {"matrix": [1, 9], "x": 27, "y": 0},
+ {"matrix": [1, 10], "x": 28, "y": 0},
+ {"matrix": [1, 11], "x": 29, "y": 0},
+ {"matrix": [1, 12], "x": 30, "y": 0},
+ {"matrix": [1, 13], "x": 31, "y": 0},
+ {"matrix": [1, 14], "x": 32, "y": 0},
+ {"matrix": [1, 16], "x": 33, "y": 0},
+ {"matrix": [1, 17], "x": 34, "y": 0},
+ {"matrix": [2, 0], "x": 35, "y": 0},
+ {"matrix": [2, 1], "x": 36, "y": 0},
+ {"matrix": [2, 2], "x": 37, "y": 0},
+ {"matrix": [2, 3], "x": 38, "y": 0},
+ {"matrix": [2, 4], "x": 39, "y": 0},
+ {"matrix": [2, 5], "x": 40, "y": 0},
+ {"matrix": [2, 6], "x": 41, "y": 0},
+ {"matrix": [2, 7], "x": 42, "y": 0},
+ {"matrix": [2, 8], "x": 43, "y": 0},
+ {"matrix": [2, 9], "x": 44, "y": 0},
+ {"matrix": [2, 10], "x": 45, "y": 0},
+ {"matrix": [2, 11], "x": 46, "y": 0},
+ {"matrix": [2, 12], "x": 47, "y": 0},
+ {"matrix": [2, 13], "x": 48, "y": 0},
+ {"matrix": [2, 14], "x": 49, "y": 0},
+ {"matrix": [2, 16], "x": 50, "y": 0},
+ {"matrix": [2, 17], "x": 51, "y": 0},
+ {"matrix": [3, 0], "x": 52, "y": 0},
+ {"matrix": [3, 1], "x": 53, "y": 0},
+ {"matrix": [3, 2], "x": 54, "y": 0},
+ {"matrix": [3, 3], "x": 55, "y": 0},
+ {"matrix": [3, 4], "x": 56, "y": 0},
+ {"matrix": [3, 5], "x": 57, "y": 0},
+ {"matrix": [3, 6], "x": 58, "y": 0},
+ {"matrix": [3, 7], "x": 59, "y": 0},
+ {"matrix": [3, 8], "x": 60, "y": 0},
+ {"matrix": [3, 9], "x": 61, "y": 0},
+ {"matrix": [3, 10], "x": 62, "y": 0},
+ {"matrix": [3, 11], "x": 63, "y": 0},
+ {"matrix": [3, 12], "x": 64, "y": 0},
+ {"matrix": [3, 13], "x": 65, "y": 0},
+ {"matrix": [3, 14], "x": 66, "y": 0},
+ {"matrix": [3, 16], "x": 67, "y": 0},
+ {"matrix": [3, 17], "x": 68, "y": 0},
+ {"matrix": [4, 0], "x": 69, "y": 0},
+ {"matrix": [4, 1], "x": 70, "y": 0},
+ {"matrix": [4, 2], "x": 71, "y": 0},
+ {"matrix": [4, 3], "x": 72, "y": 0},
+ {"matrix": [4, 4], "x": 73, "y": 0},
+ {"matrix": [4, 6], "x": 74, "y": 0},
+ {"matrix": [4, 8], "x": 75, "y": 0},
+ {"matrix": [4, 10], "x": 76, "y": 0},
+ {"matrix": [4, 12], "x": 77, "y": 0},
+ {"matrix": [4, 13], "x": 78, "y": 0},
+ {"matrix": [4, 14], "x": 79, "y": 0},
+ {"matrix": [4, 16], "x": 80, "y": 0},
+ {"matrix": [4, 17], "x": 81, "y": 0}
+ ]
}
}
} \ 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 @@
-/* Copyright 2021 Densus Design and Basekeys.jp
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO//readabilty
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0G, k0H, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1G, k1H, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2G, k2H, \
- k30, k31, k32, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3G, k3H, \
- k40, k41, k42, k43, k44, k48, k4D, k4E, k4G, k4H \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, XXX, k0G, k0H}, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, XXX, k1G, k1H}, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, k2G, k2H}, \
- { k30, k31, k32, XXX, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, XXX, k3G, k3H}, \
- { k40, k41, k42, k43, k44, XXX, XXX, XXX, k48, XXX, XXX, XXX, XXX, k4D, k4E, XXX, k4G, k4H} \
-}
-
-#define LAYOUT_all( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1G, k1H, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2G, k2H, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3G, k3H, \
- k40, k41, k42, k43, k44, k46, k48, k4A, k4C, k4D, k4E, k4G, k4H \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H}, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, XXX, k1G, k1H}, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, XXX, k2G, k2H}, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, XXX, k3G, k3H}, \
- { k40, k41, k42, k43, k44, XXX, k46, XXX, k48, XXX, k4A, XXX, k4C, k4D, k4E, XXX, k4G, k4H} \
-}
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 @@
"layouts": {
"LAYOUT": {
"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},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "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},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "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},
- {"x": 13.75, "y": 2, "w": 1.25},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
- {"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},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "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}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 7], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+ {"matrix": [4, 9], "x": 10, "y": 4},
+ {"matrix": [4, 10], "x": 11, "y": 4},
+ {"matrix": [4, 11], "x": 12, "y": 4},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4}
]
},
"LAYOUT_60_ansi": {
"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},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 14], "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},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "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},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "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},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
- {"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": 13.75, "y": 4, "w": 1.25}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
]
},
"LAYOUT_60_hhkb": {
"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},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "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},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "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},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "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},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "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}
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4}
]
}
}
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 @@
-/*
-Copyright 2020 newtonapple
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#pragma once
-
-#include "quantum.h"
-
-
-/* Standard arrangement / LAYOUT
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
- * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │3e │
- * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┼───┤
- * │40 │41 │42 │43 │47 │48 │49 │4a │4b │4c │4d │
- * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┘
-*/
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \
- k40, k41, k42, k43, k47, k48, k49, k4a, k4b, k4c, k4d \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, KC_NO }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, KC_NO }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, KC_NO, k3d, k3e }, \
- { k40, k41, k42, k43, KC_NO, KC_NO, KC_NO, k47, k48, k49, k4a, k4b, k4c, k4d, KC_NO } \
-}
-
-/* LAYOUT_60_ansi
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2d │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
- * │30 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
- * │40 │41 │42 │47 │49 │4a │4c │4d │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
-*/
-#define LAYOUT_60_ansi( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \
- k40, k41, k42, k47, k49, k4a, k4c, k4d \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, KC_NO, k0e }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, KC_NO }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, KC_NO, k2d, KC_NO }, \
- { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, KC_NO, k3d, KC_NO }, \
- { k40, k41, k42, KC_NO, KC_NO, KC_NO, KC_NO, k47, KC_NO, k49, k4a, KC_NO, k4c, k4d, KC_NO } \
-}
-
-/* LAYOUT_60_hhkb
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2d │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
- * │30 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │3e │
- * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
- * │▓▓▓▓▓│41 │42 │47 (7u) │4a │4c │▓▓▓▓▓│
- * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
-*/
-#define LAYOUT_60_hhkb( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \
- k41, k42, k47, k4a, k4c \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, KC_NO }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, KC_NO, k2d, KC_NO }, \
- { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, KC_NO, k3d, k3e }, \
- { 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 } \
-}
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 @@
"layouts": {
"LAYOUT": {
"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":8,
- "y":0
- },
- {
- "label":"U",
- "x":9,
- "y":0
- },
- {
- "label":"I",
- "x":10,
- "y":0
- },
- {
- "label":"O",
- "x":11,
- "y":0
- },
- {
- "label":"P",
- "x":12,
- "y":0
- },
- {
- "label":"Back Space",
- "x":13,
- "y":0
- },
- {
- "label":"Esc",
- "x":0,
- "y":1
- },
- {
- "label":"A",
- "x":1,
- "y":1
- },
- {
- "label":"S",
- "x":2,
- "y":1
- },
- {
- "label":"D",
- "x":3,
- "y":1
- },
- {
- "label":"F",
- "x":4,
- "y":1
- },
- {
- "label":"G",
- "x":5,
- "y":1
- },
- {
- "label":"H",
- "x":8,
- "y":1
- },
- {
- "label":"J",
- "x":9,
- "y":1
- },
- {
- "label":"K",
- "x":10,
- "y":1
- },
- {
- "label":"L",
- "x":11,
- "y":1
- },
- {
- "label":";",
- "x":12,
- "y":1
- },
- {
- "label":"'",
- "x":13,
- "y":1
- },
- {
- "label":"Shift",
- "x":0,
- "y":2
- },
- {
- "label":"Z",
- "x":1,
- "y":2
- },
- {
- "label":"X",
- "x":2,
- "y":2
- },
- {
- "label":"C",
- "x":3,
- "y":2
- },
- {
- "label":"V",
- "x":4,
- "y":2
- },
- {
- "label":"B",
- "x":5,
- "y":2
- },
- {
- "label":"N",
- "x":8,
- "y":2
- },
- {
- "label":"M",
- "x":9,
- "y":2
- },
- {
- "label":",",
- "x":10,
- "y":2
- },
- {
- "label":".",
- "x":11,
- "y":2
- },
- {
- "label":"/",
- "x":12,
- "y":2
- },
- {
- "label":"Enter",
- "x":13,
- "y":2
- },
- {
- "label":"Adjust",
- "x":1,
- "y":3
- },
- {
- "label":"Ctrl",
- "x":2,
- "y":3
- },
- {
- "label":"Alt",
- "x":3,
- "y":3
- },
- {
- "label":"GUI",
- "x":4,
- "y":3
- },
- {
- "label":"&dArr;",
- "x":5,
- "y":3
- },
- {
- "x":6,
- "y":3
- },
- {
- "x":7,
- "y":3
- },
- {
- "label":"&uArr;",
- "x":8,
- "y":3
- },
- {
- "label":"&larr;",
- "x":9,
- "y":3
- },
- {
- "label":"&darr;",
- "x":10,
- "y":3
- },
- {
- "label":"&uarr;",
- "x":11,
- "y":3
- },
- {
- "label":"&rarr;",
- "x":12,
- "y":3
- }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [0, 6], "x": 8, "y": 0},
+ {"matrix": [0, 7], "x": 9, "y": 0},
+ {"matrix": [0, 8], "x": 10, "y": 0},
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+
+ {"matrix": [1, 6], "x": 8, "y": 1},
+ {"matrix": [1, 7], "x": 9, "y": 1},
+ {"matrix": [1, 8], "x": 10, "y": 1},
+ {"matrix": [1, 9], "x": 11, "y": 1},
+ {"matrix": [1, 10], "x": 12, "y": 1},
+ {"matrix": [1, 11], "x": 13, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+
+ {"matrix": [2, 6], "x": 8, "y": 2},
+ {"matrix": [2, 7], "x": 9, "y": 2},
+ {"matrix": [2, 8], "x": 10, "y": 2},
+ {"matrix": [2, 9], "x": 11, "y": 2},
+ {"matrix": [2, 10], "x": 12, "y": 2},
+ {"matrix": [2, 11], "x": 13, "y": 2},
+
+ {"matrix": [3, 0], "x": 1, "y": 3},
+ {"matrix": [3, 1], "x": 2, "y": 3},
+ {"matrix": [3, 2], "x": 3, "y": 3},
+ {"matrix": [3, 3], "x": 4, "y": 3},
+ {"matrix": [3, 4], "x": 5, "y": 3},
+ {"matrix": [3, 5], "x": 6, "y": 3},
+ {"matrix": [3, 6], "x": 7, "y": 3},
+ {"matrix": [3, 7], "x": 8, "y": 3},
+ {"matrix": [3, 8], "x": 9, "y": 3},
+ {"matrix": [3, 9], "x": 10, "y": 3},
+ {"matrix": [3, 10], "x": 11, "y": 3},
+ {"matrix": [3, 11], "x": 12, "y": 3}
+ ]
+ },
+ "LAYOUT_with_nafuda": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [4, 1], "x": 12, "y": 0},
+ {"matrix": [1, 0], "x": 13, "y": 0},
+ {"matrix": [1, 1], "x": 14, "y": 0},
+ {"matrix": [1, 2], "x": 15, "y": 0},
+ {"matrix": [1, 3], "x": 16, "y": 0},
+ {"matrix": [1, 4], "x": 17, "y": 0},
+ {"matrix": [1, 5], "x": 18, "y": 0},
+ {"matrix": [1, 6], "x": 19, "y": 0},
+ {"matrix": [1, 7], "x": 20, "y": 0},
+ {"matrix": [1, 8], "x": 21, "y": 0},
+ {"matrix": [1, 9], "x": 22, "y": 0},
+ {"matrix": [1, 10], "x": 23, "y": 0},
+ {"matrix": [1, 11], "x": 24, "y": 0},
+ {"matrix": [5, 0], "x": 25, "y": 0},
+ {"matrix": [5, 1], "x": 26, "y": 0},
+ {"matrix": [5, 2], "x": 27, "y": 0},
+ {"matrix": [2, 0], "x": 28, "y": 0},
+ {"matrix": [2, 1], "x": 29, "y": 0},
+ {"matrix": [2, 2], "x": 30, "y": 0},
+ {"matrix": [2, 3], "x": 31, "y": 0},
+ {"matrix": [2, 4], "x": 32, "y": 0},
+ {"matrix": [2, 5], "x": 33, "y": 0},
+ {"matrix": [2, 6], "x": 34, "y": 0},
+ {"matrix": [2, 7], "x": 35, "y": 0},
+ {"matrix": [2, 8], "x": 36, "y": 0},
+ {"matrix": [2, 9], "x": 37, "y": 0},
+ {"matrix": [2, 10], "x": 38, "y": 0},
+ {"matrix": [2, 11], "x": 39, "y": 0},
+ {"matrix": [6, 0], "x": 40, "y": 0},
+ {"matrix": [6, 1], "x": 41, "y": 0},
+ {"matrix": [6, 2], "x": 42, "y": 0},
+ {"matrix": [3, 0], "x": 43, "y": 0},
+ {"matrix": [3, 1], "x": 44, "y": 0},
+ {"matrix": [3, 2], "x": 45, "y": 0},
+ {"matrix": [3, 3], "x": 46, "y": 0},
+ {"matrix": [3, 4], "x": 47, "y": 0},
+ {"matrix": [3, 5], "x": 48, "y": 0},
+ {"matrix": [3, 6], "x": 49, "y": 0},
+ {"matrix": [3, 7], "x": 50, "y": 0},
+ {"matrix": [3, 8], "x": 51, "y": 0},
+ {"matrix": [3, 9], "x": 52, "y": 0},
+ {"matrix": [3, 10], "x": 53, "y": 0},
+ {"matrix": [3, 11], "x": 54, "y": 0}
+ ]
+ },
+ "LAYOUT_with_setta21": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [4, 0], "x": 12, "y": 0},
+ {"matrix": [4, 1], "x": 13, "y": 0},
+ {"matrix": [4, 2], "x": 14, "y": 0},
+ {"matrix": [4, 3], "x": 15, "y": 0},
+ {"matrix": [4, 4], "x": 16, "y": 0},
+ {"matrix": [4, 5], "x": 17, "y": 0},
+ {"matrix": [1, 0], "x": 18, "y": 0},
+ {"matrix": [1, 1], "x": 19, "y": 0},
+ {"matrix": [1, 2], "x": 20, "y": 0},
+ {"matrix": [1, 3], "x": 21, "y": 0},
+ {"matrix": [1, 4], "x": 22, "y": 0},
+ {"matrix": [1, 5], "x": 23, "y": 0},
+ {"matrix": [1, 6], "x": 24, "y": 0},
+ {"matrix": [1, 7], "x": 25, "y": 0},
+ {"matrix": [1, 8], "x": 26, "y": 0},
+ {"matrix": [1, 9], "x": 27, "y": 0},
+ {"matrix": [1, 10], "x": 28, "y": 0},
+ {"matrix": [1, 11], "x": 29, "y": 0},
+ {"matrix": [5, 1], "x": 30, "y": 0},
+ {"matrix": [5, 2], "x": 31, "y": 0},
+ {"matrix": [5, 3], "x": 32, "y": 0},
+ {"matrix": [5, 4], "x": 33, "y": 0},
+ {"matrix": [5, 5], "x": 34, "y": 0},
+ {"matrix": [2, 0], "x": 35, "y": 0},
+ {"matrix": [2, 1], "x": 36, "y": 0},
+ {"matrix": [2, 2], "x": 37, "y": 0},
+ {"matrix": [2, 3], "x": 38, "y": 0},
+ {"matrix": [2, 4], "x": 39, "y": 0},
+ {"matrix": [2, 5], "x": 40, "y": 0},
+ {"matrix": [2, 6], "x": 41, "y": 0},
+ {"matrix": [2, 7], "x": 42, "y": 0},
+ {"matrix": [2, 8], "x": 43, "y": 0},
+ {"matrix": [2, 9], "x": 44, "y": 0},
+ {"matrix": [2, 10], "x": 45, "y": 0},
+ {"matrix": [2, 11], "x": 46, "y": 0},
+ {"matrix": [6, 0], "x": 47, "y": 0},
+ {"matrix": [6, 1], "x": 48, "y": 0},
+ {"matrix": [6, 2], "x": 49, "y": 0},
+ {"matrix": [6, 3], "x": 50, "y": 0},
+ {"matrix": [6, 4], "x": 51, "y": 0},
+ {"matrix": [6, 5], "x": 52, "y": 0},
+ {"matrix": [3, 0], "x": 53, "y": 0},
+ {"matrix": [3, 1], "x": 54, "y": 0},
+ {"matrix": [3, 2], "x": 55, "y": 0},
+ {"matrix": [3, 3], "x": 56, "y": 0},
+ {"matrix": [3, 4], "x": 57, "y": 0},
+ {"matrix": [3, 5], "x": 58, "y": 0},
+ {"matrix": [3, 6], "x": 59, "y": 0},
+ {"matrix": [3, 7], "x": 60, "y": 0},
+ {"matrix": [3, 8], "x": 61, "y": 0},
+ {"matrix": [3, 9], "x": 62, "y": 0},
+ {"matrix": [3, 10], "x": 63, "y": 0},
+ {"matrix": [3, 11], "x": 64, "y": 0},
+ {"matrix": [7, 0], "x": 65, "y": 0},
+ {"matrix": [7, 2], "x": 66, "y": 0},
+ {"matrix": [7, 4], "x": 67, "y": 0},
+ {"matrix": [7, 5], "x": 68, "y": 0}
]
}
}
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
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "rev1.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
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 @@
-/*
-Copyright 2021 Salicylic_Acid
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-#ifdef RGBLIGHT_ENABLE
-//rgb led driver
-#include "ws2812.h"
-#endif
-
-//////////////////////////////////////////////////////////////////////////////
-// When only use Naked48.
-//////////////////////////////////////////////////////////////////////////////
-/*
- * ,------------------------------------ ------------------------------------.
- * | L00 | L01 | L02 | L03 | L04 | L05 | | L06 | L07 | L08 | L09 | L0A | L0B |
- * |------------------------------------ ------------------------------------+
- * | L10 | L11 | L12 | L13 | L14 | L15 | | L16 | L17 | L18 | L19 | L1A | L1B |
- * |------------------------------------ ------------------------------------+
- * | L20 | L21 | L22 | L23 | L24 | L25 | | L26 | L17 | L28 | L29 | L2A | L2B |
- * |-----------------------------------------------------------------------------------+
- * | L30 | L32 | L33 | L34 | L35 | L36 | L37 | L38 | L39 | L3A | L3B | L3D |
- * |-----------------------------------------------------------------------'
- */
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B, \
- L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B, \
- L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B, \
- L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B }, \
- { L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B }, \
- { L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B }, \
- { L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B }, \
- {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,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,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,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO } \
- }
-
-//////////////////////////////////////////////////////////////////////////////
-// When connecting Setta21 to Naked48.
-//////////////////////////////////////////////////////////////////////////////
-
-#define LAYOUT_with_setta21( \
- L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B, R30, R32, R34, R35 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B }, \
- { L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B }, \
- { L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B }, \
- { L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B }, \
- { R00, R01, R02, R03, R04, R05,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
- {KC_NO, R11, R12, R13, R14, R15,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
- { R20, R21, R22, R23, R24, R25,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
- { R30,KC_NO, R32,KC_NO, R34, R35,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO } \
- }
-
-//////////////////////////////////////////////////////////////////////////////
-// When connecting Nafuda to Naked48.
-//////////////////////////////////////////////////////////////////////////////
-
-#define LAYOUT_with_nafuda( \
- L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B, R01, \
- L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B, R10, R11, R12, \
- L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B, R20, R21, R22, \
- L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B }, \
- { L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B }, \
- { L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B }, \
- { L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B }, \
- {KC_NO, R01,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
- { R10, R11, R12,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
- { R20, R21, R22,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,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO } \
- }
-
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 @@
"layouts": {
"LAYOUT": {
"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":8, "y":0},
- {"label":"7", "x":9, "y":0},
- {"label":"8", "x":10, "y":0},
- {"label":"9", "x":11, "y":0},
- {"label":"0", "x":12, "y":0},
- {"label":"Back Space", "x":13, "y":0},
- {"label":"Tab", "x":0, "y":1},
- {"label":"Q", "x":1, "y":1},
- {"label":"W", "x":2, "y":1},
- {"label":"E", "x":3, "y":1},
- {"label":"R", "x":4, "y":1},
- {"label":"T", "x":5, "y":1},
- {"label":"Y", "x":8, "y":1},
- {"label":"U", "x":9, "y":1},
- {"label":"I", "x":10, "y":1},
- {"label":"O", "x":11, "y":1},
- {"label":"P", "x":12, "y":1},
- {"label":"\\", "x":13, "y":1},
- {"label":"Esc", "x":0, "y":2},
- {"label":"A", "x":1, "y":2},
- {"label":"S", "x":2, "y":2},
- {"label":"D", "x":3, "y":2},
- {"label":"F", "x":4, "y":2},
- {"label":"G", "x":5, "y":2},
- {"label":"H", "x":8, "y":2},
- {"label":"J", "x":9, "y":2},
- {"label":"K", "x":10, "y":2},
- {"label":"L", "x":11, "y":2},
- {"label":";", "x":12, "y":2},
- {"label":"'", "x":13, "y":2},
- {"label":"Shift", "x":0, "y":3},
- {"label":"Z", "x":1, "y":3},
- {"label":"X", "x":2, "y":3},
- {"label":"C", "x":3, "y":3},
- {"label":"V", "x":4, "y":3},
- {"label":"B", "x":5, "y":3},
- {"label":"N", "x":8, "y":3},
- {"label":"M", "x":9, "y":3},
- {"label":",", "x":10, "y":3},
- {"label":".", "x":11, "y":3},
- {"label":"/", "x":12, "y":3},
- {"label":"Enter", "x":13, "y":3},
- {"label":"Adjust", "x":1, "y":4},
- {"label":"Ctrl", "x":2, "y":4},
- {"label":"Alt", "x":3, "y":4},
- {"label":"GUI", "x":4, "y":4},
- {"label":"&dArr;", "x":5, "y":4},
- {"x":6, "y":4},
- {"x":7, "y":4},
- {"label":"&uArr;", "x":8, "y":4},
- {"label":"&larr;", "x":9, "y":4},
- {"label":"&darr;", "x":10, "y":4},
- {"label":"&uarr;", "x":11, "y":4},
- {"label":"&rarr;", "x":12, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [0, 6], "x": 8, "y": 0},
+ {"matrix": [0, 7], "x": 9, "y": 0},
+ {"matrix": [0, 8], "x": 10, "y": 0},
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+
+ {"matrix": [1, 6], "x": 8, "y": 1},
+ {"matrix": [1, 7], "x": 9, "y": 1},
+ {"matrix": [1, 8], "x": 10, "y": 1},
+ {"matrix": [1, 9], "x": 11, "y": 1},
+ {"matrix": [1, 10], "x": 12, "y": 1},
+ {"matrix": [1, 11], "x": 13, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+
+ {"matrix": [2, 6], "x": 8, "y": 2},
+ {"matrix": [2, 7], "x": 9, "y": 2},
+ {"matrix": [2, 8], "x": 10, "y": 2},
+ {"matrix": [2, 9], "x": 11, "y": 2},
+ {"matrix": [2, 10], "x": 12, "y": 2},
+ {"matrix": [2, 11], "x": 13, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+
+ {"matrix": [3, 6], "x": 8, "y": 3},
+ {"matrix": [3, 7], "x": 9, "y": 3},
+ {"matrix": [3, 8], "x": 10, "y": 3},
+ {"matrix": [3, 9], "x": 11, "y": 3},
+ {"matrix": [3, 10], "x": 12, "y": 3},
+ {"matrix": [3, 11], "x": 13, "y": 3},
+
+ {"matrix": [4, 0], "x": 1, "y": 4},
+ {"matrix": [4, 1], "x": 2, "y": 4},
+ {"matrix": [4, 2], "x": 3, "y": 4},
+ {"matrix": [4, 3], "x": 4, "y": 4},
+ {"matrix": [4, 4], "x": 5, "y": 4},
+ {"matrix": [4, 5], "x": 6, "y": 4},
+ {"matrix": [4, 6], "x": 7, "y": 4},
+ {"matrix": [4, 7], "x": 8, "y": 4},
+ {"matrix": [4, 8], "x": 9, "y": 4},
+ {"matrix": [4, 9], "x": 10, "y": 4},
+ {"matrix": [4, 10], "x": 11, "y": 4},
+ {"matrix": [4, 11], "x": 12, "y": 4}
+ ]
+ },
+ "LAYOUT_with_nafuda": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [5, 1], "x": 12, "y": 0},
+ {"matrix": [1, 0], "x": 13, "y": 0},
+ {"matrix": [1, 1], "x": 14, "y": 0},
+ {"matrix": [1, 2], "x": 15, "y": 0},
+ {"matrix": [1, 3], "x": 16, "y": 0},
+ {"matrix": [1, 4], "x": 17, "y": 0},
+ {"matrix": [1, 5], "x": 18, "y": 0},
+ {"matrix": [1, 6], "x": 19, "y": 0},
+ {"matrix": [1, 7], "x": 20, "y": 0},
+ {"matrix": [1, 8], "x": 21, "y": 0},
+ {"matrix": [1, 9], "x": 22, "y": 0},
+ {"matrix": [1, 10], "x": 23, "y": 0},
+ {"matrix": [1, 11], "x": 24, "y": 0},
+ {"matrix": [6, 0], "x": 25, "y": 0},
+ {"matrix": [6, 1], "x": 26, "y": 0},
+ {"matrix": [6, 2], "x": 27, "y": 0},
+ {"matrix": [2, 0], "x": 28, "y": 0},
+ {"matrix": [2, 1], "x": 29, "y": 0},
+ {"matrix": [2, 2], "x": 30, "y": 0},
+ {"matrix": [2, 3], "x": 31, "y": 0},
+ {"matrix": [2, 4], "x": 32, "y": 0},
+ {"matrix": [2, 5], "x": 33, "y": 0},
+ {"matrix": [2, 6], "x": 34, "y": 0},
+ {"matrix": [2, 7], "x": 35, "y": 0},
+ {"matrix": [2, 8], "x": 36, "y": 0},
+ {"matrix": [2, 9], "x": 37, "y": 0},
+ {"matrix": [2, 10], "x": 38, "y": 0},
+ {"matrix": [2, 11], "x": 39, "y": 0},
+ {"matrix": [7, 0], "x": 40, "y": 0},
+ {"matrix": [7, 1], "x": 41, "y": 0},
+ {"matrix": [7, 2], "x": 42, "y": 0},
+ {"matrix": [3, 0], "x": 43, "y": 0},
+ {"matrix": [3, 1], "x": 44, "y": 0},
+ {"matrix": [3, 2], "x": 45, "y": 0},
+ {"matrix": [3, 3], "x": 46, "y": 0},
+ {"matrix": [3, 4], "x": 47, "y": 0},
+ {"matrix": [3, 5], "x": 48, "y": 0},
+ {"matrix": [3, 6], "x": 49, "y": 0},
+ {"matrix": [3, 7], "x": 50, "y": 0},
+ {"matrix": [3, 8], "x": 51, "y": 0},
+ {"matrix": [3, 9], "x": 52, "y": 0},
+ {"matrix": [3, 10], "x": 53, "y": 0},
+ {"matrix": [3, 11], "x": 54, "y": 0},
+ {"matrix": [4, 0], "x": 55, "y": 0},
+ {"matrix": [4, 1], "x": 56, "y": 0},
+ {"matrix": [4, 2], "x": 57, "y": 0},
+ {"matrix": [4, 3], "x": 58, "y": 0},
+ {"matrix": [4, 4], "x": 59, "y": 0},
+ {"matrix": [4, 5], "x": 60, "y": 0},
+ {"matrix": [4, 6], "x": 61, "y": 0},
+ {"matrix": [4, 7], "x": 62, "y": 0},
+ {"matrix": [4, 8], "x": 63, "y": 0},
+ {"matrix": [4, 9], "x": 64, "y": 0},
+ {"matrix": [4, 10], "x": 65, "y": 0},
+ {"matrix": [4, 11], "x": 66, "y": 0}
+ ]
+ },
+ "LAYOUT_with_setta21": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [5, 0], "x": 12, "y": 0},
+ {"matrix": [5, 1], "x": 13, "y": 0},
+ {"matrix": [5, 2], "x": 14, "y": 0},
+ {"matrix": [5, 3], "x": 15, "y": 0},
+ {"matrix": [5, 4], "x": 16, "y": 0},
+ {"matrix": [5, 5], "x": 17, "y": 0},
+ {"matrix": [1, 0], "x": 18, "y": 0},
+ {"matrix": [1, 1], "x": 19, "y": 0},
+ {"matrix": [1, 2], "x": 20, "y": 0},
+ {"matrix": [1, 3], "x": 21, "y": 0},
+ {"matrix": [1, 4], "x": 22, "y": 0},
+ {"matrix": [1, 5], "x": 23, "y": 0},
+ {"matrix": [1, 6], "x": 24, "y": 0},
+ {"matrix": [1, 7], "x": 25, "y": 0},
+ {"matrix": [1, 8], "x": 26, "y": 0},
+ {"matrix": [1, 9], "x": 27, "y": 0},
+ {"matrix": [1, 10], "x": 28, "y": 0},
+ {"matrix": [1, 11], "x": 29, "y": 0},
+ {"matrix": [6, 1], "x": 30, "y": 0},
+ {"matrix": [6, 2], "x": 31, "y": 0},
+ {"matrix": [6, 3], "x": 32, "y": 0},
+ {"matrix": [6, 4], "x": 33, "y": 0},
+ {"matrix": [6, 5], "x": 34, "y": 0},
+ {"matrix": [2, 0], "x": 35, "y": 0},
+ {"matrix": [2, 1], "x": 36, "y": 0},
+ {"matrix": [2, 2], "x": 37, "y": 0},
+ {"matrix": [2, 3], "x": 38, "y": 0},
+ {"matrix": [2, 4], "x": 39, "y": 0},
+ {"matrix": [2, 5], "x": 40, "y": 0},
+ {"matrix": [2, 6], "x": 41, "y": 0},
+ {"matrix": [2, 7], "x": 42, "y": 0},
+ {"matrix": [2, 8], "x": 43, "y": 0},
+ {"matrix": [2, 9], "x": 44, "y": 0},
+ {"matrix": [2, 10], "x": 45, "y": 0},
+ {"matrix": [2, 11], "x": 46, "y": 0},
+ {"matrix": [7, 0], "x": 47, "y": 0},
+ {"matrix": [7, 1], "x": 48, "y": 0},
+ {"matrix": [7, 2], "x": 49, "y": 0},
+ {"matrix": [7, 3], "x": 50, "y": 0},
+ {"matrix": [7, 4], "x": 51, "y": 0},
+ {"matrix": [7, 5], "x": 52, "y": 0},
+ {"matrix": [3, 0], "x": 53, "y": 0},
+ {"matrix": [3, 1], "x": 54, "y": 0},
+ {"matrix": [3, 2], "x": 55, "y": 0},
+ {"matrix": [3, 3], "x": 56, "y": 0},
+ {"matrix": [3, 4], "x": 57, "y": 0},
+ {"matrix": [3, 5], "x": 58, "y": 0},
+ {"matrix": [3, 6], "x": 59, "y": 0},
+ {"matrix": [3, 7], "x": 60, "y": 0},
+ {"matrix": [3, 8], "x": 61, "y": 0},
+ {"matrix": [3, 9], "x": 62, "y": 0},
+ {"matrix": [3, 10], "x": 63, "y": 0},
+ {"matrix": [3, 11], "x": 64, "y": 0},
+ {"matrix": [8, 0], "x": 65, "y": 0},
+ {"matrix": [8, 2], "x": 66, "y": 0},
+ {"matrix": [8, 4], "x": 67, "y": 0},
+ {"matrix": [8, 5], "x": 68, "y": 0},
+ {"matrix": [4, 0], "x": 69, "y": 0},
+ {"matrix": [4, 1], "x": 70, "y": 0},
+ {"matrix": [4, 2], "x": 71, "y": 0},
+ {"matrix": [4, 3], "x": 72, "y": 0},
+ {"matrix": [4, 4], "x": 73, "y": 0},
+ {"matrix": [4, 5], "x": 74, "y": 0},
+ {"matrix": [4, 6], "x": 75, "y": 0},
+ {"matrix": [4, 7], "x": 76, "y": 0},
+ {"matrix": [4, 8], "x": 77, "y": 0},
+ {"matrix": [4, 9], "x": 78, "y": 0},
+ {"matrix": [4, 10], "x": 79, "y": 0},
+ {"matrix": [4, 11], "x": 80, "y": 0}
]
}
}
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 @@
-/*
-Copyright 2021 Salicylic_Acid
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-
-//////////////////////////////////////////////////////////////////////////////
-// When only use naked60.
-//////////////////////////////////////////////////////////////////////////////
-/*
- * ,------------------------------------ ------------------------------------.
- * | L00 | L01 | L02 | L03 | L04 | L05 | | L06 | L07 | L08 | L09 | L0A | L0B |
- * |------------------------------------ ------------------------------------+
- * | L10 | L11 | L12 | L13 | L14 | L15 | | L16 | L17 | L18 | L19 | L1A | L1B |
- * |------------------------------------ ------------------------------------+
- * | L20 | L21 | L22 | L23 | L24 | L25 | | L26 | L17 | L28 | L29 | L2A | L2B |
- * |------------------------------------ ------------------------------------+
- * | L30 | L31 | L32 | L33 | L34 | L35 | | L36 | L37 | L38 | L39 | L3A | L3B |
- * |-----------------------------------------------------------------------'
- * | L40 | L41 | L42 | L43 | L44 | L45 | L46 | L47 | L48 | L49 | L4A | L4B |
- * |-----------------------------------------------------------------------'
- */
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B, \
- L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B, \
- L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B, \
- L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B, \
- L40, L41, L42, L43, L44, L45, L46, L47, L48, L49, L4A, L4B \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B }, \
- { L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B }, \
- { L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B }, \
- { L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B }, \
- { L40, L41, L42, L43, L44, L45, L46, L47, L48, L49, L4A, L4B }, \
- {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,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,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,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,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO } \
- }
-
-//////////////////////////////////////////////////////////////////////////////
-// When connecting Setta21 to naked60.
-//////////////////////////////////////////////////////////////////////////////
-
-#define LAYOUT_with_setta21( \
- L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B, R30, R32, R34, R35, \
- L40, L41, L42, L43, L44, L45, L46, L47, L48, L49, L4A, L4B \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B }, \
- { L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B }, \
- { L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B }, \
- { L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B }, \
- { L40, L41, L42, L43, L44, L45, L46, L47, L48, L49, L4A, L4B }, \
- { R00, R01, R02, R03, R04, R05,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
- {KC_NO, R11, R12, R13, R14, R15,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
- { R20, R21, R22, R23, R24, R25,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
- { R30,KC_NO, R32,KC_NO, R34, R35,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,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO } \
- }
-
-//////////////////////////////////////////////////////////////////////////////
-// When connecting Nafuda to naked60.
-//////////////////////////////////////////////////////////////////////////////
-
-#define LAYOUT_with_nafuda( \
- L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B, R01, \
- L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B, R10, R11, R12, \
- L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B, R20, R21, R22, \
- L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B, \
- L40, L41, L42, L43, L44, L45, L46, L47, L48, L49, L4A, L4B \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B }, \
- { L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B }, \
- { L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B }, \
- { L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B }, \
- { L40, L41, L42, L43, L44, L45, L46, L47, L48, L49, L4A, L4B }, \
- {KC_NO, R01,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
- { R10, R11, R12,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
- { R20, R21, R22,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,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,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO } \
- }
-
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 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"pgup", "x":0.25, "y":0},
- {"label":"ESC", "x":1.75, "y":0},
- {"label":"1", "x":2.75, "y":0},
- {"label":"2", "x":4, "y":0},
- {"label":"3", "x":5, "y":0},
- {"label":"4", "x":6, "y":0},
- {"label":"5", "x":7, "y":0},
- {"label":"6", "x":9.25, "y":0},
- {"label":"7", "x":10.25, "y":0},
- {"label":"8", "x":11.25, "y":0},
- {"label":"9", "x":12.25, "y":0},
- {"label":"0", "x":13.5, "y":0},
- {"label":"-", "x":14.5, "y":0},
- {"label":"Back Space", "x":15.5, "y":0},
- {"label":"pgdn", "x":0, "y":1},
- {"label":"Tab", "x":1.25, "y":1, "w":1.5},
- {"label":"Q", "x":2.75, "y":1},
- {"label":"W", "x":4, "y":1},
- {"label":"E", "x":5, "y":1},
- {"label":"R", "x":6, "y":1},
- {"label":"T", "x":7, "y":1},
- {"label":"Y", "x":9.25, "y":1},
- {"label":"U", "x":10.25, "y":1},
- {"label":"I", "x":11.25, "y":1},
- {"label":"O", "x":12.25, "y":1},
- {"label":"P", "x":13.5, "y":1},
- {"label":"[", "x":14.5, "y":1},
- {"label":"]", "x":15.5, "y":1},
- {"label":"Control", "x":1, "y":2, "w":1.75},
- {"label":"A", "x":2.75, "y":2},
- {"label":"S", "x":4, "y":2},
- {"label":"D", "x":5, "y":2},
- {"label":"F", "x":6, "y":2},
- {"label":"G", "x":7, "y":2},
- {"label":"H", "x":9.25, "y":2},
- {"label":"J", "x":10.25, "y":2},
- {"label":"K", "x":11.25, "y":2},
- {"label":"L", "x":12.25, "y":2},
- {"label":";", "x":13.5, "y":2},
- {"label":"'", "x":14.5, "y":2},
- {"label":"Return", "x":15.5, "y":2},
- {"label":"Shift", "x":0.5, "y":3, "w":2.25},
- {"label":"Z", "x":2.75, "y":3},
- {"label":"X", "x":4, "y":3},
- {"label":"C", "x":5, "y":3},
- {"label":"V", "x":6, "y":3},
- {"label":"B", "x":7, "y":3},
- {"label":"N", "x":9.25, "y":3},
- {"label":"M", "x":10.25, "y":3},
- {"label":",", "x":11.25, "y":3},
- {"label":".", "x":12.25, "y":3},
- {"label":"/", "x":13.5, "y":3},
- {"label":"&uarr;", "x":14.5, "y":3},
- {"label":"Shift", "x":15.5, "y":3},
- {"label":"Adjust", "x":1.25, "y":4, "w":1.75},
- {"label":"Alt", "x":3.75, "y":4.25},
- {"x":4.75, "y":4.25, "w":2.25},
- {"label":"&dArr;", "x":7, "y":4.25},
- {"label":"&uArr;", "x":9.25, "y":4.25},
- {"x":10.25, "y":4.25, "w":2},
- {"label":"GUI", "x":12.25, "y":4.25},
- {"label":"&larr;", "x":13.5, "y":4},
- {"label":"&darr;", "x":14.5, "y":4},
- {"label":"&rarr;", "x":15.5, "y":4}
+ {"matrix": [0, 0], "x": 0.25, "y": 0},
+
+ {"matrix": [2, 0], "x": 1.75, "y": 0},
+ {"matrix": [7, 0], "x": 2.75, "y": 0},
+ {"matrix": [3, 1], "x": 4, "y": 0},
+ {"matrix": [0, 2], "x": 5, "y": 0},
+ {"matrix": [5, 2], "x": 6, "y": 0},
+ {"matrix": [1, 3], "x": 7, "y": 0},
+
+ {"matrix": [6, 3], "x": 9.25, "y": 0},
+ {"matrix": [3, 4], "x": 10.25, "y": 0},
+ {"matrix": [0, 5], "x": 11.25, "y": 0},
+ {"matrix": [4, 5], "x": 12.25, "y": 0},
+ {"matrix": [1, 6], "x": 13.5, "y": 0},
+ {"matrix": [6, 6], "x": 14.5, "y": 0},
+ {"matrix": [3, 7], "x": 15.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [3, 0], "x": 1.25, "y": 1, "w": 1.5},
+ {"matrix": [0, 1], "x": 2.75, "y": 1},
+ {"matrix": [4, 1], "x": 4, "y": 1},
+ {"matrix": [1, 2], "x": 5, "y": 1},
+ {"matrix": [6, 2], "x": 6, "y": 1},
+ {"matrix": [2, 3], "x": 7, "y": 1},
+
+ {"matrix": [7, 3], "x": 9.25, "y": 1},
+ {"matrix": [4, 4], "x": 10.25, "y": 1},
+ {"matrix": [1, 5], "x": 11.25, "y": 1},
+ {"matrix": [5, 5], "x": 12.25, "y": 1},
+ {"matrix": [2, 6], "x": 13.5, "y": 1},
+ {"matrix": [7, 6], "x": 14.5, "y": 1},
+ {"matrix": [4, 7], "x": 15.5, "y": 1},
+
+ {"matrix": [4, 0], "x": 1, "y": 2, "w": 1.75},
+ {"matrix": [1, 1], "x": 2.75, "y": 2},
+ {"matrix": [5, 1], "x": 4, "y": 2},
+ {"matrix": [2, 2], "x": 5, "y": 2},
+ {"matrix": [7, 2], "x": 6, "y": 2},
+ {"matrix": [3, 3], "x": 7, "y": 2},
+
+ {"matrix": [0, 4], "x": 9.25, "y": 2},
+ {"matrix": [5, 4], "x": 10.25, "y": 2},
+ {"matrix": [2, 5], "x": 11.25, "y": 2},
+ {"matrix": [6, 5], "x": 12.25, "y": 2},
+ {"matrix": [3, 6], "x": 13.5, "y": 2},
+ {"matrix": [0, 7], "x": 14.5, "y": 2},
+ {"matrix": [5, 7], "x": 15.5, "y": 2},
+
+ {"matrix": [5, 0], "x": 0.5, "y": 3, "w": 2.25},
+ {"matrix": [2, 1], "x": 2.75, "y": 3},
+ {"matrix": [6, 1], "x": 4, "y": 3},
+ {"matrix": [3, 2], "x": 5, "y": 3},
+ {"matrix": [0, 3], "x": 6, "y": 3},
+ {"matrix": [4, 3], "x": 7, "y": 3},
+
+ {"matrix": [1, 4], "x": 9.25, "y": 3},
+ {"matrix": [6, 4], "x": 10.25, "y": 3},
+ {"matrix": [3, 5], "x": 11.25, "y": 3},
+ {"matrix": [7, 5], "x": 12.25, "y": 3},
+ {"matrix": [4, 6], "x": 13.5, "y": 3},
+ {"matrix": [1, 7], "x": 14.5, "y": 3},
+ {"matrix": [6, 7], "x": 15.5, "y": 3},
+
+ {"matrix": [6, 0], "x": 1.25, "y": 4, "w": 1.75},
+ {"matrix": [7, 1], "x": 3.75, "y": 4.25},
+ {"matrix": [4, 2], "x": 4.75, "y": 4.25, "w": 2.25},
+ {"matrix": [5, 3], "x": 7, "y": 4.25},
+
+ {"matrix": [2, 4], "x": 9.25, "y": 4.25},
+ {"matrix": [7, 4], "x": 10.25, "y": 4.25, "w": 2},
+ {"matrix": [0, 6], "x": 12.25, "y": 4.25},
+ {"matrix": [5, 6], "x": 13.5, "y": 4},
+ {"matrix": [2, 7], "x": 14.5, "y": 4},
+ {"matrix": [7, 7], "x": 15.5, "y": 4}
]
},
"LAYOUT_with_setta21": {
"layout": [
- {"label":"pgup", "x":0.25, "y":0},
- {"label":"ESC", "x":1.75, "y":0},
- {"label":"1", "x":2.75, "y":0},
- {"label":"2", "x":4, "y":0},
- {"label":"3", "x":5, "y":0},
- {"label":"4", "x":6, "y":0},
- {"label":"5", "x":7, "y":0},
- {"label":"6", "x":9.25, "y":0},
- {"label":"7", "x":10.25, "y":0},
- {"label":"8", "x":11.25, "y":0},
- {"label":"9", "x":12.25, "y":0},
- {"label":"0", "x":13.5, "y":0},
- {"label":"-", "x":14.5, "y":0},
- {"label":"Back Space", "x":15.5, "y":0},
-
- {"label":"Esc", "x": 17.5, "y":0},
- {"label":"F2", "x": 18.5, "y":0},
- {"label":"=", "x": 19.5, "y":0},
- {"label":"Delete", "x": 20.5, "y":0},
-
- {"label":"pgdn", "x":0, "y":1},
- {"label":"Tab", "x":1.25, "y":1, "w":1.5},
- {"label":"Q", "x":2.75, "y":1},
- {"label":"W", "x":4, "y":1},
- {"label":"E", "x":5, "y":1},
- {"label":"R", "x":6, "y":1},
- {"label":"T", "x":7, "y":1},
- {"label":"Y", "x":9.25, "y":1},
- {"label":"U", "x":10.25, "y":1},
- {"label":"I", "x":11.25, "y":1},
- {"label":"O", "x":12.25, "y":1},
- {"label":"P", "x":13.5, "y":1},
- {"label":"[", "x":14.5, "y":1},
- {"label":"]", "x":15.5, "y":1},
-
- {"label":"Num Lock", "x": 17.5, "y":1.25},
- {"label":"/", "x": 18.5, "y":1.25},
- {"label":"*", "x": 19.5, "y":1.25},
- {"label":"-", "x": 20.5, "y":1.25},
-
- {"label":"Control", "x":1, "y":2, "w":1.75},
- {"label":"A", "x":2.75, "y":2},
- {"label":"S", "x":4, "y":2},
- {"label":"D", "x":5, "y":2},
- {"label":"F", "x":6, "y":2},
- {"label":"G", "x":7, "y":2},
- {"label":"H", "x":9.25, "y":2},
- {"label":"J", "x":10.25, "y":2},
- {"label":"K", "x":11.25, "y":2},
- {"label":"L", "x":12.25, "y":2},
- {"label":";", "x":13.5, "y":2},
- {"label":"'", "x":14.5, "y":2},
- {"label":"Return", "x":15.5, "y":2},
-
- {"label":"7", "x": 17.5, "y":2.25},
- {"label":"8", "x": 18.5, "y":2.25},
- {"label":"9", "x": 19.5, "y":2.25},
-
- {"label":"Shift", "x":0.5, "y":3, "w":2.25},
- {"label":"Z", "x":2.75, "y":3},
- {"label":"X", "x":4, "y":3},
- {"label":"C", "x":5, "y":3},
- {"label":"V", "x":6, "y":3},
- {"label":"B", "x":7, "y":3},
- {"label":"N", "x":9.25, "y":3},
- {"label":"M", "x":10.25, "y":3},
- {"label":",", "x":11.25, "y":3},
- {"label":".", "x":12.25, "y":3},
- {"label":"/", "x":13.5, "y":3},
- {"label":"&uarr;", "x":14.5, "y":3},
- {"label":"Shift", "x":15.5, "y":3},
-
- {"label":"4", "x": 17.5, "y":3.25},
- {"label":"5", "x": 18.5, "y":3.25},
- {"label":"6", "x": 19.5, "y":3.25},
- {"label":"+", "x": 20.5, "y":2.25, "h":2},
-
- {"label":"Adjust", "x":1.25, "y":4, "w":1.75},
- {"label":"Alt", "x":3.75, "y":4.25},
- {"x":4.75, "y":4.25, "w":2.25},
- {"label":"&dArr;", "x":7, "y":4.25},
- {"label":"&uArr;", "x":9.25, "y":4.25},
- {"x":10.25, "y":4.25, "w":2},
- {"label":"GUI", "x":12.25, "y":4.25},
- {"label":"&larr;", "x":13.5, "y":4},
- {"label":"&darr;", "x":14.5, "y":4},
- {"label":"&rarr;", "x":15.5, "y":4},
-
- {"label":"1", "x": 17.5, "y":4.25},
- {"label":"2", "x": 18.5, "y":4.25},
- {"label":"3", "x": 19.5, "y":4.25},
-
- {"label":"Lower / 0", "x": 17.5, "y":5.25, "w":2},
- {"label":"Raise / .", "x": 19.5, "y":5.25},
- {"label":"Enter", "x": 20.5, "y":4.25, "h":2}
+ {"matrix": [0, 0], "x": 0.25, "y": 0},
+
+ {"matrix": [2, 0], "x": 1.75, "y": 0},
+ {"matrix": [7, 0], "x": 2.75, "y": 0},
+ {"matrix": [3, 1], "x": 4, "y": 0},
+ {"matrix": [0, 2], "x": 5, "y": 0},
+ {"matrix": [5, 2], "x": 6, "y": 0},
+ {"matrix": [1, 3], "x": 7, "y": 0},
+
+ {"matrix": [6, 3], "x": 9.25, "y": 0},
+ {"matrix": [3, 4], "x": 10.25, "y": 0},
+ {"matrix": [0, 5], "x": 11.25, "y": 0},
+ {"matrix": [4, 5], "x": 12.25, "y": 0},
+ {"matrix": [1, 6], "x": 13.5, "y": 0},
+ {"matrix": [6, 6], "x": 14.5, "y": 0},
+ {"matrix": [3, 7], "x": 15.5, "y": 0},
+
+ {"matrix": [8, 5], "x": 17.5, "y": 0},
+ {"matrix": [9, 5], "x": 18.5, "y": 0},
+ {"matrix": [10, 5], "x": 19.5, "y": 0},
+ {"matrix": [11, 5], "x": 20.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [3, 0], "x": 1.25, "y": 1, "w": 1.5},
+ {"matrix": [0, 1], "x": 2.75, "y": 1},
+ {"matrix": [4, 1], "x": 4, "y": 1},
+ {"matrix": [1, 2], "x": 5, "y": 1},
+ {"matrix": [6, 2], "x": 6, "y": 1},
+ {"matrix": [2, 3], "x": 7, "y": 1},
+
+ {"matrix": [7, 3], "x": 9.25, "y": 1},
+ {"matrix": [4, 4], "x": 10.25, "y": 1},
+ {"matrix": [1, 5], "x": 11.25, "y": 1},
+ {"matrix": [5, 5], "x": 12.25, "y": 1},
+ {"matrix": [2, 6], "x": 13.5, "y": 1},
+ {"matrix": [7, 6], "x": 14.5, "y": 1},
+ {"matrix": [4, 7], "x": 15.5, "y": 1},
+
+ {"matrix": [8, 4], "x": 17.5, "y": 1.25},
+ {"matrix": [9, 4], "x": 18.5, "y": 1.25},
+ {"matrix": [10, 4], "x": 19.5, "y": 1.25},
+ {"matrix": [11, 4], "x": 20.5, "y": 1.25},
+
+ {"matrix": [4, 0], "x": 1, "y": 2, "w": 1.75},
+ {"matrix": [1, 1], "x": 2.75, "y": 2},
+ {"matrix": [5, 1], "x": 4, "y": 2},
+ {"matrix": [2, 2], "x": 5, "y": 2},
+ {"matrix": [7, 2], "x": 6, "y": 2},
+ {"matrix": [3, 3], "x": 7, "y": 2},
+
+ {"matrix": [0, 4], "x": 9.25, "y": 2},
+ {"matrix": [5, 4], "x": 10.25, "y": 2},
+ {"matrix": [2, 5], "x": 11.25, "y": 2},
+ {"matrix": [6, 5], "x": 12.25, "y": 2},
+ {"matrix": [3, 6], "x": 13.5, "y": 2},
+ {"matrix": [0, 7], "x": 14.5, "y": 2},
+ {"matrix": [5, 7], "x": 15.5, "y": 2},
+
+ {"matrix": [8, 3], "x": 17.5, "y": 2.25},
+ {"matrix": [9, 3], "x": 18.5, "y": 2.25},
+ {"matrix": [10, 3], "x": 19.5, "y": 2.25},
+
+ {"matrix": [5, 0], "x": 0.5, "y": 3, "w": 2.25},
+ {"matrix": [2, 1], "x": 2.75, "y": 3},
+ {"matrix": [6, 1], "x": 4, "y": 3},
+ {"matrix": [3, 2], "x": 5, "y": 3},
+ {"matrix": [0, 3], "x": 6, "y": 3},
+ {"matrix": [4, 3], "x": 7, "y": 3},
+
+ {"matrix": [1, 4], "x": 9.25, "y": 3},
+ {"matrix": [6, 4], "x": 10.25, "y": 3},
+ {"matrix": [3, 5], "x": 11.25, "y": 3},
+ {"matrix": [7, 5], "x": 12.25, "y": 3},
+ {"matrix": [4, 6], "x": 13.5, "y": 3},
+ {"matrix": [1, 7], "x": 14.5, "y": 3},
+ {"matrix": [6, 7], "x": 15.5, "y": 3},
+
+ {"matrix": [8, 2], "x": 17.5, "y": 3.25},
+ {"matrix": [9, 2], "x": 18.5, "y": 3.25},
+ {"matrix": [10, 2], "x": 19.5, "y": 3.25},
+ {"matrix": [11, 2], "x": 20.5, "y": 2.25, "h": 2},
+
+ {"matrix": [6, 0], "x": 1.25, "y": 4, "w": 1.75},
+ {"matrix": [7, 1], "x": 3.75, "y": 4.25},
+ {"matrix": [4, 2], "x": 4.75, "y": 4.25, "w": 2.25},
+ {"matrix": [5, 3], "x": 7, "y": 4.25},
+
+ {"matrix": [2, 4], "x": 9.25, "y": 4.25},
+ {"matrix": [7, 4], "x": 10.25, "y": 4.25, "w": 2},
+ {"matrix": [0, 6], "x": 12.25, "y": 4.25},
+ {"matrix": [5, 6], "x": 13.5, "y": 4},
+ {"matrix": [2, 7], "x": 14.5, "y": 4},
+ {"matrix": [7, 7], "x": 15.5, "y": 4},
+
+ {"matrix": [8, 1], "x": 17.5, "y": 4.25},
+ {"matrix": [9, 1], "x": 18.5, "y": 4.25},
+ {"matrix": [10, 1], "x": 19.5, "y": 4.25},
+
+ {"matrix": [8, 0], "x": 17.5, "y": 5.25, "w": 2},
+ {"matrix": [10, 0], "x": 19.5, "y": 5.25},
+ {"matrix": [11, 0], "x": 20.5, "y": 4.25, "h": 2}
]
}
}
+
}
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 @@
-#pragma once
-
-#include "quantum.h"
-
-
-//////////////////////////////////////////////////////////////////////////////
-// When only use Naked64.
-//////////////////////////////////////////////////////////////////////////////
-/*
- * ,------------------------------------------ -----------------------------------------.
- * | L00 | L20 | L70 | L31 | L02 | L52 | L13 | | L63 | L34 | L05 | L45 | L16 | L66 | L37 |
- * |------------------------------------------ ------------------------------------------+
- * | L10 | L30 | L01 | L41 | L12 | L62 | L23 | | L73 | L44 | L15 | L55 | L26 | L76 | L47 |
- * |------------------------------------------ ------------------------------------------+
- * | L40 | L11 | L51 | L22 | L72 | L33 | | L04 | L54 | L25 | L65 | L36 | L07 | L57 |
- * |------------------------------------ ------------------------------------------+
- * | L50 | L21 | L61 | L32 | L03 | L43 | | L14 | L64 | L35 | L75 | L46 | L17 | L67 |
- * |------------------------------------ ------------------------------------------+
- * | L60 | | L71 | L42 | | L53 | | L24 | L74 | | L06 | L56 | L27 | L77 |
- * |------------------------------------ ------------------------------------------'
- */
-
-#define LAYOUT( \
- L00, L20, L70, L31, L02, L52, L13, L63, L34, L05, L45, L16, L66, L37, \
- L10, L30, L01, L41, L12, L62, L23, L73, L44, L15, L55, L26, L76, L47, \
- L40, L11, L51, L22, L72, L33, L04, L54, L25, L65, L36, L07, L57, \
- L50, L21, L61, L32, L03, L43, L14, L64, L35, L75, L46, L17, L67, \
- L60, L71, L42, L53, L24, L74, L06, L56, L27, L77 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06, L07 }, \
- { L10, L11, L12, L13, L14, L15, L16, L17 }, \
- { L20, L21, L22, L23, L24, L25, L26, L27 }, \
- { L30, L31, L32, L33, L34, L35, L36, L37 }, \
- { L40, L41, L42, L43, L44, L45, L46, L47 }, \
- { L50, L51, L52, L53, L54, L55, L56, L57 }, \
- { L60, L61, L62, L63, L64, L65, L66, L67 }, \
- { L70, L71, L72, L73, L74, L75, L76, L77 }, \
- {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,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,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,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,KC_NO,KC_NO,KC_NO,KC_NO }, \
- {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO } \
- }
-
-//////////////////////////////////////////////////////////////////////////////
-// When connecting Setta21 to Naked64.
-//////////////////////////////////////////////////////////////////////////////
-
-#define LAYOUT_with_setta21( \
- L00, L20, L70, L31, L02, L52, L13, L63, L34, L05, L45, L16, L66, L37, R05, R15, R25, R35, \
- L10, L30, L01, L41, L12, L62, L23, L73, L44, L15, L55, L26, L76, L47, R04, R14, R24, R34, \
- L40, L11, L51, L22, L72, L33, L04, L54, L25, L65, L36, L07, L57, R03, R13, R23, \
- L50, L21, L61, L32, L03, L43, L14, L64, L35, L75, L46, L17, L67, R02, R12, R22, R32, \
- L60, L71, L42, L53, L24, L74, L06, L56, L27, L77, R01, R11, R21, \
- R00, R20, R30 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06, L07 }, \
- { L10, L11, L12, L13, L14, L15, L16, L17 }, \
- { L20, L21, L22, L23, L24, L25, L26, L27 }, \
- { L30, L31, L32, L33, L34, L35, L36, L37 }, \
- { L40, L41, L42, L43, L44, L45, L46, L47 }, \
- { L50, L51, L52, L53, L54, L55, L56, L57 }, \
- { L60, L61, L62, L63, L64, L65, L66, L67 }, \
- { L70, L71, L72, L73, L74, L75, L76, L77 }, \
- { R00, R01, R02, R03, R04, R05,KC_NO,KC_NO }, \
- {KC_NO, R11, R12, R13, R14, R15,KC_NO,KC_NO }, \
- { R20, R21, R22, R23, R24, R25,KC_NO,KC_NO }, \
- { R30,KC_NO, R32,KC_NO, R34, R35,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,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 }, \
- {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO } \
- }
-
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 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_7u_space"
+ },
"layouts": {
"LAYOUT_7u_space": {
"layout": [
- {"label":"K00 (F0,B7)", "x":0, "y":0},
- {"label":"K01 (F0,B6)", "x":1, "y":0},
- {"label":"K02 (F0,B5)", "x":2, "y":0},
- {"label":"K03 (F0,B4)", "x":3, "y":0},
- {"label":"K04 (F0,C7)", "x":4, "y":0},
- {"label":"K05 (F0,C6)", "x":5, "y":0},
- {"label":"K06 (F0,D0)", "x":6, "y":0},
- {"label":"K07 (F0,D1)", "x":7, "y":0},
- {"label":"K08 (F0,D2)", "x":8, "y":0},
- {"label":"K09 (F0,D3)", "x":9, "y":0},
- {"label":"K0A (F0,D4)", "x":10, "y":0},
- {"label":"K0B (F0,D5)", "x":11, "y":0},
- {"label":"K0C (F0,D6)", "x":12, "y":0},
- {"label":"K0D (F0,D7)", "x":13, "y":0, "w":2},
- {"label":"K2D (F4,D7)", "x":15.5, "y":0},
- {"label":"K3D (F5,D7)", "x":16.5, "y":0},
- {"label":"K4D (F6,D7)", "x":17.5, "y":0},
-
- {"label":"K10 (F1,B7)", "x":0, "y":1.25, "w":1.5},
- {"label":"K11 (F1,B6)", "x":1.5, "y":1.25},
- {"label":"K12 (F1,B5)", "x":2.5, "y":1.25},
- {"label":"K13 (F1,B4)", "x":3.5, "y":1.25},
- {"label":"K14 (F1,C7)", "x":4.5, "y":1.25},
- {"label":"K15 (F1,C6)", "x":5.5, "y":1.25},
- {"label":"K16 (F1,D0)", "x":6.5, "y":1.25},
- {"label":"K17 (F1,D1)", "x":7.5, "y":1.25},
- {"label":"K18 (F1,D2)", "x":8.5, "y":1.25},
- {"label":"K19 (F1,D3)", "x":9.5, "y":1.25},
- {"label":"K1A (F1,D4)", "x":10.5, "y":1.25},
- {"label":"K1B (F1,D5)", "x":11.5, "y":1.25},
- {"label":"K1C (F1,D6)", "x":12.5, "y":1.25},
- {"label":"K1D (F1,D7)", "x":13.5, "y":1.25, "w":1.5},
- {"label":"K56 (F7,D0)", "x":15.5, "y":1.25},
- {"label":"K57 (F7,D1)", "x":16.5, "y":1.25},
- {"label":"K58 (F7,D2)", "x":17.5, "y":1.25},
-
- {"label":"K20 (F4,B7)", "x":0, "y":2.25, "w":1.75},
- {"label":"K21 (F4,B6)", "x":1.75, "y":2.25},
- {"label":"K22 (F4,B5)", "x":2.75, "y":2.25},
- {"label":"K23 (F4,B4)", "x":3.75, "y":2.25},
- {"label":"K24 (F4,C7)", "x":4.75, "y":2.25},
- {"label":"K25 (F4,C6)", "x":5.75, "y":2.25},
- {"label":"K26 (F4,D0)", "x":6.75, "y":2.25},
- {"label":"K27 (F4,D1)", "x":7.75, "y":2.25},
- {"label":"K28 (F4,D2)", "x":8.75, "y":2.25},
- {"label":"K29 (F4,D3)", "x":9.75, "y":2.25},
- {"label":"K2A (F4,D4)", "x":10.75, "y":2.25},
- {"label":"K2B (F4,D5)", "x":11.75, "y":2.25},
- {"label":"K2C (F4,D6)", "x":12.75, "y":2.25, "w":2.25},
- {"label":"K53 (F7,B4)", "x":15.5, "y":2.25},
- {"label":"K54 (F7,C7)", "x":16.5, "y":2.25},
- {"label":"K55 (F7,C6)", "x":17.5, "y":2.25},
-
- {"label":"K30 (F5,B7)", "x":0, "y":3.25, "w":2.25},
- {"label":"K31 (F5,B6)", "x":2.25, "y":3.25},
- {"label":"K32 (F5,B5)", "x":3.25, "y":3.25},
- {"label":"K33 (F5,B4)", "x":4.25, "y":3.25},
- {"label":"K34 (F5,C7)", "x":5.25, "y":3.25},
- {"label":"K35 (F5,C6)", "x":6.25, "y":3.25},
- {"label":"K36 (F5,D0)", "x":7.25, "y":3.25},
- {"label":"K37 (F5,D1)", "x":8.25, "y":3.25},
- {"label":"K38 (F5,D2)", "x":9.25, "y":3.25},
- {"label":"K39 (F5,D3)", "x":10.25, "y":3.25},
- {"label":"K3A (F5,D4)", "x":11.25, "y":3.25},
- {"label":"K3B (F5,D5)", "x":12.25, "y":3.25, "w":1.75},
- {"label":"K3C (F5,D6)", "x":14.25, "y":3.5},
- {"label":"K50 (F7,B7)", "x":15.5, "y":3.25},
- {"label":"K51 (F7,B6)", "x":16.5, "y":3.25},
- {"label":"K52 (F7,B5)", "x":17.5, "y":3.25},
-
- {"label":"K40 (F6,B7)", "x":0, "y":4.25, "w":1.5},
- {"label":"K41 (F6,B6)", "x":1.5, "y":4.25},
- {"label":"K42 (F6,B5)", "x":2.5, "y":4.25, "w":1.5},
- {"label":"K45 (F6,C6)", "x":4, "y":4.25, "w":7},
- {"label":"K48 (F6,D2)", "x":11, "y":4.25},
- {"label":"K49 (F6,D3)", "x":12, "y":4.25},
- {"label":"K4A (F6,D4)", "x":13.25, "y":4.5},
- {"label":"K4B (F6,D5)", "x":14.25, "y":4.5},
- {"label":"K4C (F6,D6)", "x":15.25, "y":4.5},
- {"label":"K59 (F7,D3)", "x":16.5, "y":4.25},
- {"label":"K5A (F7,D4)", "x":17.5, "y":4.25}
- ]
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [2, 13], "x": 15.5, "y": 0},
+ {"matrix": [3, 13], "x": 16.5, "y": 0},
+ {"matrix": [4, 13], "x": 17.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1.25},
+ {"matrix": [1, 2], "x": 2.5, "y": 1.25},
+ {"matrix": [1, 3], "x": 3.5, "y": 1.25},
+ {"matrix": [1, 4], "x": 4.5, "y": 1.25},
+ {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6.5, "y": 1.25},
+ {"matrix": [1, 7], "x": 7.5, "y": 1.25},
+ {"matrix": [1, 8], "x": 8.5, "y": 1.25},
+ {"matrix": [1, 9], "x": 9.5, "y": 1.25},
+ {"matrix": [1, 10], "x": 10.5, "y": 1.25},
+ {"matrix": [1, 11], "x": 11.5, "y": 1.25},
+ {"matrix": [1, 12], "x": 12.5, "y": 1.25},
+ {"matrix": [1, 13], "x": 13.5, "y": 1.25, "w": 1.5},
+
+ {"matrix": [5, 6], "x": 15.5, "y": 1.25},
+ {"matrix": [5, 7], "x": 16.5, "y": 1.25},
+ {"matrix": [5, 8], "x": 17.5, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.75, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.75, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.75, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.75, "y": 2.25, "w": 2.25},
+
+ {"matrix": [5, 3], "x": 15.5, "y": 2.25},
+ {"matrix": [5, 4], "x": 16.5, "y": 2.25},
+ {"matrix": [5, 5], "x": 17.5, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3.25},
+ {"matrix": [3, 2], "x": 3.25, "y": 3.25},
+ {"matrix": [3, 3], "x": 4.25, "y": 3.25},
+ {"matrix": [3, 4], "x": 5.25, "y": 3.25},
+ {"matrix": [3, 5], "x": 6.25, "y": 3.25},
+ {"matrix": [3, 6], "x": 7.25, "y": 3.25},
+ {"matrix": [3, 7], "x": 8.25, "y": 3.25},
+ {"matrix": [3, 8], "x": 9.25, "y": 3.25},
+ {"matrix": [3, 9], "x": 10.25, "y": 3.25},
+ {"matrix": [3, 10], "x": 11.25, "y": 3.25},
+ {"matrix": [3, 11], "x": 12.25, "y": 3.25, "w": 1.75},
+
+ {"matrix": [3, 12], "x": 14.25, "y": 3.5},
+
+ {"matrix": [5, 0], "x": 15.5, "y": 3.25},
+ {"matrix": [5, 1], "x": 16.5, "y": 3.25},
+ {"matrix": [5, 2], "x": 17.5, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.5},
+ {"matrix": [4, 5], "x": 4, "y": 4.25, "w": 7},
+ {"matrix": [4, 8], "x": 11, "y": 4.25},
+ {"matrix": [4, 9], "x": 12, "y": 4.25},
+
+ {"matrix": [4, 10], "x": 13.25, "y": 4.5},
+ {"matrix": [4, 11], "x": 14.25, "y": 4.5},
+ {"matrix": [4, 12], "x": 15.25, "y": 4.5},
+ {"matrix": [5, 9], "x": 16.5, "y": 4.25},
+ {"matrix": [5, 10], "x": 17.5, "y": 4.25}
+ ]
},
"LAYOUT_6_25u_space": {
"layout": [
- {"label":"K00 (F0,B7)", "x":0, "y":0},
- {"label":"K01 (F0,B6)", "x":1, "y":0},
- {"label":"K02 (F0,B5)", "x":2, "y":0},
- {"label":"K03 (F0,B4)", "x":3, "y":0},
- {"label":"K04 (F0,C7)", "x":4, "y":0},
- {"label":"K05 (F0,C6)", "x":5, "y":0},
- {"label":"K06 (F0,D0)", "x":6, "y":0},
- {"label":"K07 (F0,D1)", "x":7, "y":0},
- {"label":"K08 (F0,D2)", "x":8, "y":0},
- {"label":"K09 (F0,D3)", "x":9, "y":0},
- {"label":"K0A (F0,D4)", "x":10, "y":0},
- {"label":"K0B (F0,D5)", "x":11, "y":0},
- {"label":"K0C (F0,D6)", "x":12, "y":0},
- {"label":"K0D (F0,D7)", "x":13, "y":0, "w":2},
- {"label":"K2D (F4,D7)", "x":15.5, "y":0},
- {"label":"K3D (F5,D7)", "x":16.5, "y":0},
- {"label":"K4D (F6,D7)", "x":17.5, "y":0},
-
- {"label":"K10 (F1,B7)", "x":0, "y":1.25, "w":1.5},
- {"label":"K11 (F1,B6)", "x":1.5, "y":1.25},
- {"label":"K12 (F1,B5)", "x":2.5, "y":1.25},
- {"label":"K13 (F1,B4)", "x":3.5, "y":1.25},
- {"label":"K14 (F1,C7)", "x":4.5, "y":1.25},
- {"label":"K15 (F1,C6)", "x":5.5, "y":1.25},
- {"label":"K16 (F1,D0)", "x":6.5, "y":1.25},
- {"label":"K17 (F1,D1)", "x":7.5, "y":1.25},
- {"label":"K18 (F1,D2)", "x":8.5, "y":1.25},
- {"label":"K19 (F1,D3)", "x":9.5, "y":1.25},
- {"label":"K1A (F1,D4)", "x":10.5, "y":1.25},
- {"label":"K1B (F1,D5)", "x":11.5, "y":1.25},
- {"label":"K1C (F1,D6)", "x":12.5, "y":1.25},
- {"label":"K1D (F1,D7)", "x":13.5, "y":1.25, "w":1.5},
- {"label":"K56 (F7,D0)", "x":15.5, "y":1.25},
- {"label":"K57 (F7,D1)", "x":16.5, "y":1.25},
- {"label":"K58 (F7,D2)", "x":17.5, "y":1.25},
-
- {"label":"K20 (F4,B7)", "x":0, "y":2.25, "w":1.75},
- {"label":"K21 (F4,B6)", "x":1.75, "y":2.25},
- {"label":"K22 (F4,B5)", "x":2.75, "y":2.25},
- {"label":"K23 (F4,B4)", "x":3.75, "y":2.25},
- {"label":"K24 (F4,C7)", "x":4.75, "y":2.25},
- {"label":"K25 (F4,C6)", "x":5.75, "y":2.25},
- {"label":"K26 (F4,D0)", "x":6.75, "y":2.25},
- {"label":"K27 (F4,D1)", "x":7.75, "y":2.25},
- {"label":"K28 (F4,D2)", "x":8.75, "y":2.25},
- {"label":"K29 (F4,D3)", "x":9.75, "y":2.25},
- {"label":"K2A (F4,D4)", "x":10.75, "y":2.25},
- {"label":"K2B (F4,D5)", "x":11.75, "y":2.25},
- {"label":"K2C (F4,D6)", "x":12.75, "y":2.25, "w":2.25},
- {"label":"K53 (F7,B4)", "x":15.5, "y":2.25},
- {"label":"K54 (F7,C7)", "x":16.5, "y":2.25},
- {"label":"K55 (F7,C6)", "x":17.5, "y":2.25},
-
- {"label":"K30 (F5,B7)", "x":0, "y":3.25, "w":2.25},
- {"label":"K31 (F5,B6)", "x":2.25, "y":3.25},
- {"label":"K32 (F5,B5)", "x":3.25, "y":3.25},
- {"label":"K33 (F5,B4)", "x":4.25, "y":3.25},
- {"label":"K34 (F5,C7)", "x":5.25, "y":3.25},
- {"label":"K35 (F5,C6)", "x":6.25, "y":3.25},
- {"label":"K36 (F5,D0)", "x":7.25, "y":3.25},
- {"label":"K37 (F5,D1)", "x":8.25, "y":3.25},
- {"label":"K38 (F5,D2)", "x":9.25, "y":3.25},
- {"label":"K39 (F5,D3)", "x":10.25, "y":3.25},
- {"label":"K3A (F5,D4)", "x":11.25, "y":3.25},
- {"label":"K3B (F5,D5)", "x":12.25, "y":3.25, "w":1.75},
- {"label":"K3C (F5,D6)", "x":14.25, "y":3.5},
- {"label":"K50 (F7,B7)", "x":15.5, "y":3.25},
- {"label":"K51 (F7,B6)", "x":16.5, "y":3.25},
- {"label":"K52 (F7,B5)", "x":17.5, "y":3.25},
-
- {"label":"K40 (F6,B7)", "x":0, "y":4.25, "w":1.25},
- {"label":"K41 (F6,B6)", "x":1.25, "y":4.25, "w":1.25},
- {"label":"K42 (F6,B5)", "x":2.5, "y":4.25, "w":1.25},
- {"label":"K45 (F6,C6)", "x":3.75, "y":4.25, "w":6.25},
- {"label":"K47 (F6,D1)", "x":10, "y":4.25},
- {"label":"K48 (F6,D2)", "x":11, "y":4.25},
- {"label":"K49 (F6,D3)", "x":12, "y":4.25},
- {"label":"K4A (F6,D4)", "x":13.25, "y":4.5},
- {"label":"K4B (F6,D5)", "x":14.25, "y":4.5},
- {"label":"K4C (F6,D6)", "x":15.25, "y":4.5},
- {"label":"K59 (F7,D3)", "x":16.5, "y":4.25},
- {"label":"K5A (F7,D4)", "x":17.5, "y":4.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [2, 13], "x": 15.5, "y": 0},
+ {"matrix": [3, 13], "x": 16.5, "y": 0},
+ {"matrix": [4, 13], "x": 17.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1.25},
+ {"matrix": [1, 2], "x": 2.5, "y": 1.25},
+ {"matrix": [1, 3], "x": 3.5, "y": 1.25},
+ {"matrix": [1, 4], "x": 4.5, "y": 1.25},
+ {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6.5, "y": 1.25},
+ {"matrix": [1, 7], "x": 7.5, "y": 1.25},
+ {"matrix": [1, 8], "x": 8.5, "y": 1.25},
+ {"matrix": [1, 9], "x": 9.5, "y": 1.25},
+ {"matrix": [1, 10], "x": 10.5, "y": 1.25},
+ {"matrix": [1, 11], "x": 11.5, "y": 1.25},
+ {"matrix": [1, 12], "x": 12.5, "y": 1.25},
+ {"matrix": [1, 13], "x": 13.5, "y": 1.25, "w": 1.5},
+
+ {"matrix": [5, 6], "x": 15.5, "y": 1.25},
+ {"matrix": [5, 7], "x": 16.5, "y": 1.25},
+ {"matrix": [5, 8], "x": 17.5, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.75, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.75, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.75, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.75, "y": 2.25, "w": 2.25},
+
+ {"matrix": [5, 3], "x": 15.5, "y": 2.25},
+ {"matrix": [5, 4], "x": 16.5, "y": 2.25},
+ {"matrix": [5, 5], "x": 17.5, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3.25},
+ {"matrix": [3, 2], "x": 3.25, "y": 3.25},
+ {"matrix": [3, 3], "x": 4.25, "y": 3.25},
+ {"matrix": [3, 4], "x": 5.25, "y": 3.25},
+ {"matrix": [3, 5], "x": 6.25, "y": 3.25},
+ {"matrix": [3, 6], "x": 7.25, "y": 3.25},
+ {"matrix": [3, 7], "x": 8.25, "y": 3.25},
+ {"matrix": [3, 8], "x": 9.25, "y": 3.25},
+ {"matrix": [3, 9], "x": 10.25, "y": 3.25},
+ {"matrix": [3, 10], "x": 11.25, "y": 3.25},
+ {"matrix": [3, 11], "x": 12.25, "y": 3.25, "w": 1.75},
+
+ {"matrix": [3, 12], "x": 14.25, "y": 3.5},
+
+ {"matrix": [5, 0], "x": 15.5, "y": 3.25},
+ {"matrix": [5, 1], "x": 16.5, "y": 3.25},
+ {"matrix": [5, 2], "x": 17.5, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4.25, "w": 6.25},
+ {"matrix": [4, 7], "x": 10, "y": 4.25},
+ {"matrix": [4, 8], "x": 11, "y": 4.25},
+ {"matrix": [4, 9], "x": 12, "y": 4.25},
+
+ {"matrix": [4, 10], "x": 13.25, "y": 4.5},
+ {"matrix": [4, 11], "x": 14.25, "y": 4.5},
+ {"matrix": [4, 12], "x": 15.25, "y": 4.5},
+
+ {"matrix": [5, 9], "x": 16.5, "y": 4.25},
+ {"matrix": [5, 10], "x": 17.5, "y": 4.25}
]
-
}
}
}
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 @@
-/* Copyright 2021 CMM.Studio Freather
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_7u_space( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, K3D, K4D, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K56, K57, K58, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K53, K54, K55, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K50, K51, K52, \
- K40, K41, K42, K45, K48, K49, K4A, K4B, K4C, K59, K5A \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
- { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, K48, K49, K4A, K4B, K4C, K4D }, \
- { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, KC_NO, KC_NO, KC_NO }, \
-}
-
-#define LAYOUT_6_25u_space( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, K3D, K4D, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K56, K57, K58, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K53, K54, K55, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K50, K51, K52, \
- K40, K41, K42, K45, K47, K48, K49, K4A, K4B, K4C, K59, K5A \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
- { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, K47, K48, K49, K4A, K4B, K4C, K4D }, \
- { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, KC_NO, KC_NO, KC_NO }, \
-}
-
-#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 @@
-/*
-Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Vin�cius Nery Cordeiro <vinicius.nery.cordeiro@gmail.com>
-Copyright 2016 Felix Uhl <ifreilicht@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/* S60-X keymap definition macro
-* K31 is the extra key next to short left ISO shift
-* K2C is the moved key next to enter on ISO boards
-* K3C is the extra key next to short right JIS shift
-* K0D is extra key from split backspace
-* K3E is extra key from HHKB-style split right shift
-*/
-
-#define XXX KC_NO
-
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
- K40, K41, K42, K46, K4A, K4B, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E }, \
- { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, XXX } \
-}
-
-
-#define LAYOUT_60_ansi( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
- K40, K41, K42, K46, K4A, K4B, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, XXX, }, \
- { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, }, \
- { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, XXX, } \
-}
-
-#define LAYOUT_60_hhkb( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
- K41, K42, K46, K4B, K4C \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, XXX, }, \
- { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, }, \
- { XXX, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, K4C, XXX, XXX, } \
-}
-
-#define LAYOUT_60_ansi_split_bs_rshift( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
- K40, K41, K42, K46, K4A, K4B, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, XXX, }, \
- { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, }, \
- { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, XXX, } \
-}
-
-
-#define LAYOUT_60_iso( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
- K40, K41, K42, K46, K4A, K4B, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, XXX, }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, }, \
- { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, XXX, } \
-}
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 @@
"breathing": true
},
"processor": "atmega32u4",
- "bootloader": "atmel-dfu"
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_ansi": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_ansi_split_bs_rshift": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_hhkb": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4}
+ ]
+ },
+ "LAYOUT_60_iso": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ }
+ }
}
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 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
- "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_hhkb"],
- "layouts": {
- "LAYOUT": {
- "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}]
- },
- "LAYOUT_60_ansi": {
- "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}]
- },
- "LAYOUT_60_hhkb": {
- "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}]
- },
- "LAYOUT_60_ansi_split_bs_rshift": {
- "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}]
- },
- "LAYOUT_60_iso": {
- "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}]
- }
- }
+ "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_hhkb"]
}
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 @@
"pin": "F6"
},
"processor": "atmega32u4",
- "bootloader": "atmel-dfu"
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_ansi": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_ansi_split_bs_rshift": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_hhkb": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4}
+ ]
+ },
+ "LAYOUT_60_iso": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ }
+ }
}
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 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
- K40, K41, K42, K46, K4A, K4B, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E }, \
- { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, XXX } \
-}
-
-
-#define LAYOUT_60_ansi( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
- K40, K41, K42, K46, K4A, K4B, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, XXX, }, \
- { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, }, \
- { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, XXX, } \
-}
-
-#define LAYOUT_60_hhkb( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
- K41, K42, K46, K4B, K4C \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, XXX, }, \
- { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, }, \
- { XXX, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, K4C, XXX, XXX, } \
-}
-
-#define LAYOUT_60_ansi_split_bs_rshift( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
- K40, K41, K42, K46, K4A, K4B, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, XXX, }, \
- { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, }, \
- { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, XXX, } \
-}
-
-
-#define LAYOUT_60_iso( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
- K40, K41, K42, K46, K4A, K4B, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, XXX, }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, }, \
- { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, XXX, } \
-}
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 @@
"bootloader": "bootloadhid",
"layouts": {
"LAYOUT": {
- "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}]
- },
+ "layout": [
+ {"label": "K05", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "K25", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "K35", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "K45", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "K55", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "K06", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "KA6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "KA7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "K07", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "KB5", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "KC5", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "KD5", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "KE5", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "KD1", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "KE1", "matrix": [0, 14], "x": 14, "y": 0},
+ {"label": "KE2", "matrix": [6, 13], "x": 15, "y": 0},
- "LAYOUT_wkl": {
- "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}]
+ {"label": "K04", "matrix": [1, 0], "x": 0, "y": 1},
+ {"label": "K14", "matrix": [1, 1], "x": 1, "y": 1},
+ {"label": "K24", "matrix": [1, 2], "x": 2, "y": 1},
+ {"label": "K34", "matrix": [1, 3], "x": 3, "y": 1},
+ {"label": "K44", "matrix": [1, 4], "x": 4, "y": 1},
+ {"label": "K54", "matrix": [1, 5], "x": 5, "y": 1},
+ {"label": "K16", "matrix": [1, 6], "x": 6, "y": 1},
+ {"label": "KB6", "matrix": [1, 7], "x": 7, "y": 1},
+ {"label": "KB7", "matrix": [1, 8], "x": 8, "y": 1},
+ {"label": "K17", "matrix": [1, 9], "x": 9, "y": 1},
+ {"label": "KA4", "matrix": [1, 10], "x": 10, "y": 1},
+ {"label": "KB4", "matrix": [1, 11], "x": 11, "y": 1},
+ {"label": "KC4", "matrix": [1, 12], "x": 12, "y": 1},
+ {"label": "KE4", "matrix": [1, 13], "x": 13, "y": 1},
+ {"label": "KE4", "matrix": [1, 14], "x": 14, "y": 1},
+ {"label": "KD0", "matrix": [6, 14], "x": 15, "y": 1},
+
+ {"label": "K03", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"label": "K13", "matrix": [2, 1], "x": 1.5, "y": 2},
+ {"label": "K23", "matrix": [2, 2], "x": 2.5, "y": 2},
+ {"label": "K33", "matrix": [2, 3], "x": 3.5, "y": 2},
+ {"label": "K43", "matrix": [2, 4], "x": 4.5, "y": 2},
+ {"label": "K53", "matrix": [2, 5], "x": 5.5, "y": 2},
+ {"label": "K26", "matrix": [2, 6], "x": 6.5, "y": 2},
+ {"label": "KC6", "matrix": [2, 7], "x": 7.5, "y": 2},
+ {"label": "KC7", "matrix": [2, 8], "x": 8.5, "y": 2},
+ {"label": "K27", "matrix": [2, 9], "x": 9.5, "y": 2},
+ {"label": "KA3", "matrix": [2, 10], "x": 10.5, "y": 2},
+ {"label": "KB3", "matrix": [2, 11], "x": 11.5, "y": 2},
+ {"label": "KC3", "matrix": [2, 12], "x": 12.5, "y": 2},
+ {"label": "KD3", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+ {"label": "K67", "matrix": [2, 14], "x": 15, "y": 2},
+
+ {"label": "K02", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"label": "K12", "matrix": [3, 1], "x": 1.75, "y": 3},
+ {"label": "K22", "matrix": [3, 2], "x": 2.75, "y": 3},
+ {"label": "K32", "matrix": [3, 3], "x": 3.75, "y": 3},
+ {"label": "K42", "matrix": [3, 4], "x": 4.75, "y": 3},
+ {"label": "K52", "matrix": [3, 5], "x": 5.75, "y": 3},
+ {"label": "K36", "matrix": [3, 6], "x": 6.75, "y": 3},
+ {"label": "KD6", "matrix": [3, 7], "x": 7.75, "y": 3},
+ {"label": "KD7", "matrix": [3, 8], "x": 8.75, "y": 3},
+ {"label": "K37", "matrix": [3, 9], "x": 9.75, "y": 3},
+ {"label": "KA2", "matrix": [3, 10], "x": 10.75, "y": 3},
+ {"label": "KB2", "matrix": [3, 11], "x": 11.75, "y": 3},
+ {"label": "KD2", "matrix": [3, 12], "x": 12.75, "y": 3},
+ {"label": "KD2", "matrix": [3, 13], "x": 13.75, "y": 3, "w": 1.25},
+ {"label": "KE0", "matrix": [3, 14], "x": 15, "y": 3},
+
+ {"label": "K01", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "K01", "matrix": [4, 1], "x": 1.25, "y": 4},
+ {"label": "K11", "matrix": [4, 2], "x": 2.25, "y": 4},
+ {"label": "K21", "matrix": [4, 3], "x": 3.25, "y": 4},
+ {"label": "K31", "matrix": [4, 4], "x": 4.25, "y": 4},
+ {"label": "K41", "matrix": [4, 5], "x": 5.25, "y": 4},
+ {"label": "K51", "matrix": [4, 6], "x": 6.25, "y": 4},
+ {"label": "K46", "matrix": [4, 7], "x": 7.25, "y": 4},
+ {"label": "KE6", "matrix": [4, 8], "x": 8.25, "y": 4},
+ {"label": "KE7", "matrix": [4, 9], "x": 9.25, "y": 4},
+ {"label": "K47", "matrix": [4, 10], "x": 10.25, "y": 4},
+ {"label": "KA1", "matrix": [4, 11], "x": 11.25, "y": 4},
+ {"label": "KB1", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"label": "K86", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "K77", "matrix": [4, 14], "x": 15, "y": 4},
+
+ {"label": "K00", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"label": "K00", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"label": "K20", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"label": "K56", "matrix": [5, 3], "x": 3.75, "y": 5},
+ {"label": "K56", "matrix": [5, 4], "x": 4.75, "y": 5, "w": 1.25},
+ {"label": "K20", "matrix": [5, 5], "x": 6, "y": 5, "w": 1.75},
+ {"label": "K56", "matrix": [5, 7], "x": 7.75, "y": 5, "w": 1.25},
+ {"label": "K56", "matrix": [5, 8], "x": 9, "y": 5},
+ {"label": "K57", "matrix": [5, 9], "x": 10, "y": 5},
+ {"label": "K57", "matrix": [5, 10], "x": 11, "y": 5},
+ {"label": "K57", "matrix": [5, 11], "x": 12, "y": 5},
+ {"label": "K66", "matrix": [5, 12], "x": 13, "y": 5},
+ {"label": "K76", "matrix": [5, 13], "x": 14, "y": 5},
+ {"label": "K96", "matrix": [5, 14], "x": 15, "y": 5}
+ ]
},
+ "LAYOUT_wkl": {
+ "layout": [
+ {"label": "K05", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "K25", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "K35", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "K45", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "K55", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "K06", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "KA6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "KA7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "K07", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "KB5", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "KC5", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "KD5", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "KE5", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "KD1", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "KE1", "matrix": [0, 14], "x": 14, "y": 0},
+ {"label": "KE2", "matrix": [6, 13], "x": 15, "y": 0},
- "LAYOUT_wkl_split_bs": {
- "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}]
+ {"label": "K04", "matrix": [1, 0], "x": 0, "y": 1},
+ {"label": "K14", "matrix": [1, 1], "x": 1, "y": 1},
+ {"label": "K24", "matrix": [1, 2], "x": 2, "y": 1},
+ {"label": "K34", "matrix": [1, 3], "x": 3, "y": 1},
+ {"label": "K44", "matrix": [1, 4], "x": 4, "y": 1},
+ {"label": "K54", "matrix": [1, 5], "x": 5, "y": 1},
+ {"label": "K16", "matrix": [1, 6], "x": 6, "y": 1},
+ {"label": "KB6", "matrix": [1, 7], "x": 7, "y": 1},
+ {"label": "KB7", "matrix": [1, 8], "x": 8, "y": 1},
+ {"label": "K17", "matrix": [1, 9], "x": 9, "y": 1},
+ {"label": "KA4", "matrix": [1, 10], "x": 10, "y": 1},
+ {"label": "KB4", "matrix": [1, 11], "x": 11, "y": 1},
+ {"label": "KC4", "matrix": [1, 12], "x": 12, "y": 1},
+ {"label": "KE4", "matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+ {"label": "KD0", "matrix": [6, 14], "x": 15, "y": 1},
+
+ {"label": "K03", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"label": "K13", "matrix": [2, 1], "x": 1.5, "y": 2},
+ {"label": "K23", "matrix": [2, 2], "x": 2.5, "y": 2},
+ {"label": "K33", "matrix": [2, 3], "x": 3.5, "y": 2},
+ {"label": "K43", "matrix": [2, 4], "x": 4.5, "y": 2},
+ {"label": "K53", "matrix": [2, 5], "x": 5.5, "y": 2},
+ {"label": "K26", "matrix": [2, 6], "x": 6.5, "y": 2},
+ {"label": "KC6", "matrix": [2, 7], "x": 7.5, "y": 2},
+ {"label": "KC7", "matrix": [2, 8], "x": 8.5, "y": 2},
+ {"label": "K27", "matrix": [2, 9], "x": 9.5, "y": 2},
+ {"label": "KA3", "matrix": [2, 10], "x": 10.5, "y": 2},
+ {"label": "KB3", "matrix": [2, 11], "x": 11.5, "y": 2},
+ {"label": "KC3", "matrix": [2, 12], "x": 12.5, "y": 2},
+ {"label": "KD3", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+ {"label": "K67", "matrix": [2, 14], "x": 15, "y": 2},
+
+ {"label": "K02", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"label": "K12", "matrix": [3, 1], "x": 1.75, "y": 3},
+ {"label": "K22", "matrix": [3, 2], "x": 2.75, "y": 3},
+ {"label": "K32", "matrix": [3, 3], "x": 3.75, "y": 3},
+ {"label": "K42", "matrix": [3, 4], "x": 4.75, "y": 3},
+ {"label": "K52", "matrix": [3, 5], "x": 5.75, "y": 3},
+ {"label": "K36", "matrix": [3, 6], "x": 6.75, "y": 3},
+ {"label": "KD6", "matrix": [3, 7], "x": 7.75, "y": 3},
+ {"label": "KD7", "matrix": [3, 8], "x": 8.75, "y": 3},
+ {"label": "K37", "matrix": [3, 9], "x": 9.75, "y": 3},
+ {"label": "KA2", "matrix": [3, 10], "x": 10.75, "y": 3},
+ {"label": "KB2", "matrix": [3, 11], "x": 11.75, "y": 3},
+ {"label": "KD2", "matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+ {"label": "KE0", "matrix": [3, 14], "x": 15, "y": 3},
+
+ {"label": "K01", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"label": "K11", "matrix": [4, 2], "x": 2.25, "y": 4},
+ {"label": "K21", "matrix": [4, 3], "x": 3.25, "y": 4},
+ {"label": "K31", "matrix": [4, 4], "x": 4.25, "y": 4},
+ {"label": "K41", "matrix": [4, 5], "x": 5.25, "y": 4},
+ {"label": "K51", "matrix": [4, 6], "x": 6.25, "y": 4},
+ {"label": "K46", "matrix": [4, 7], "x": 7.25, "y": 4},
+ {"label": "KE6", "matrix": [4, 8], "x": 8.25, "y": 4},
+ {"label": "KE7", "matrix": [4, 9], "x": 9.25, "y": 4},
+ {"label": "K47", "matrix": [4, 10], "x": 10.25, "y": 4},
+ {"label": "KA1", "matrix": [4, 11], "x": 11.25, "y": 4},
+ {"label": "KB1", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"label": "K86", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "K77", "matrix": [4, 14], "x": 15, "y": 4},
+
+ {"label": "K00", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+ {"label": "K20", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.5},
+ {"label": "K56", "matrix": [5, 5], "x": 4, "y": 5, "w": 7},
+ {"label": "K57", "matrix": [5, 8], "x": 11, "y": 5, "w": 1.5},
+
+ {"label": "K66", "matrix": [5, 12], "x": 13, "y": 5},
+ {"label": "K76", "matrix": [5, 13], "x": 14, "y": 5},
+ {"label": "K96", "matrix": [5, 14], "x": 15, "y": 5}
+ ]
},
+ "LAYOUT_wkl_split_bs": {
+ "layout": [
+ {"label": "K05", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "K25", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "K35", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "K45", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "K55", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "K06", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "KA6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "KA7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "K07", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "KB5", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "KC5", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "KD5", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "KE5", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "KD1", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "KE1", "matrix": [0, 14], "x": 14, "y": 0},
+ {"label": "KE2", "matrix": [6, 13], "x": 15, "y": 0},
- "LAYOUT_tsangan": {
- "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}]
+ {"label": "K04", "matrix": [1, 0], "x": 0, "y": 1},
+ {"label": "K14", "matrix": [1, 1], "x": 1, "y": 1},
+ {"label": "K24", "matrix": [1, 2], "x": 2, "y": 1},
+ {"label": "K34", "matrix": [1, 3], "x": 3, "y": 1},
+ {"label": "K44", "matrix": [1, 4], "x": 4, "y": 1},
+ {"label": "K54", "matrix": [1, 5], "x": 5, "y": 1},
+ {"label": "K16", "matrix": [1, 6], "x": 6, "y": 1},
+ {"label": "KB6", "matrix": [1, 7], "x": 7, "y": 1},
+ {"label": "KB7", "matrix": [1, 8], "x": 8, "y": 1},
+ {"label": "K17", "matrix": [1, 9], "x": 9, "y": 1},
+ {"label": "KA4", "matrix": [1, 10], "x": 10, "y": 1},
+ {"label": "KB4", "matrix": [1, 11], "x": 11, "y": 1},
+ {"label": "KC4", "matrix": [1, 12], "x": 12, "y": 1},
+ {"label": "KE4", "matrix": [1, 13], "x": 13, "y": 1},
+ {"label": "KE4", "matrix": [1, 14], "x": 14, "y": 1},
+ {"label": "KD0", "matrix": [6, 14], "x": 15, "y": 1},
+
+ {"label": "K03", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"label": "K13", "matrix": [2, 1], "x": 1.5, "y": 2},
+ {"label": "K23", "matrix": [2, 2], "x": 2.5, "y": 2},
+ {"label": "K33", "matrix": [2, 3], "x": 3.5, "y": 2},
+ {"label": "K43", "matrix": [2, 4], "x": 4.5, "y": 2},
+ {"label": "K53", "matrix": [2, 5], "x": 5.5, "y": 2},
+ {"label": "K26", "matrix": [2, 6], "x": 6.5, "y": 2},
+ {"label": "KC6", "matrix": [2, 7], "x": 7.5, "y": 2},
+ {"label": "KC7", "matrix": [2, 8], "x": 8.5, "y": 2},
+ {"label": "K27", "matrix": [2, 9], "x": 9.5, "y": 2},
+ {"label": "KA3", "matrix": [2, 10], "x": 10.5, "y": 2},
+ {"label": "KB3", "matrix": [2, 11], "x": 11.5, "y": 2},
+ {"label": "KC3", "matrix": [2, 12], "x": 12.5, "y": 2},
+ {"label": "KD3", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+ {"label": "K67", "matrix": [2, 14], "x": 15, "y": 2},
+
+ {"label": "K02", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"label": "K12", "matrix": [3, 1], "x": 1.75, "y": 3},
+ {"label": "K22", "matrix": [3, 2], "x": 2.75, "y": 3},
+ {"label": "K32", "matrix": [3, 3], "x": 3.75, "y": 3},
+ {"label": "K42", "matrix": [3, 4], "x": 4.75, "y": 3},
+ {"label": "K52", "matrix": [3, 5], "x": 5.75, "y": 3},
+ {"label": "K36", "matrix": [3, 6], "x": 6.75, "y": 3},
+ {"label": "KD6", "matrix": [3, 7], "x": 7.75, "y": 3},
+ {"label": "KD7", "matrix": [3, 8], "x": 8.75, "y": 3},
+ {"label": "K37", "matrix": [3, 9], "x": 9.75, "y": 3},
+ {"label": "KA2", "matrix": [3, 10], "x": 10.75, "y": 3},
+ {"label": "KB2", "matrix": [3, 11], "x": 11.75, "y": 3},
+ {"label": "KD2", "matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+ {"label": "KE0", "matrix": [3, 14], "x": 15, "y": 3},
+
+ {"label": "K01", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"label": "K11", "matrix": [4, 2], "x": 2.25, "y": 4},
+ {"label": "K21", "matrix": [4, 3], "x": 3.25, "y": 4},
+ {"label": "K31", "matrix": [4, 4], "x": 4.25, "y": 4},
+ {"label": "K41", "matrix": [4, 5], "x": 5.25, "y": 4},
+ {"label": "K51", "matrix": [4, 6], "x": 6.25, "y": 4},
+ {"label": "K46", "matrix": [4, 7], "x": 7.25, "y": 4},
+ {"label": "KE6", "matrix": [4, 8], "x": 8.25, "y": 4},
+ {"label": "KE7", "matrix": [4, 9], "x": 9.25, "y": 4},
+ {"label": "K47", "matrix": [4, 10], "x": 10.25, "y": 4},
+ {"label": "KA1", "matrix": [4, 11], "x": 11.25, "y": 4},
+ {"label": "KB1", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"label": "K86", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "K77", "matrix": [4, 14], "x": 15, "y": 4},
+
+ {"label": "K00", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+ {"label": "K20", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.5},
+ {"label": "K56", "matrix": [5, 5], "x": 4, "y": 5, "w": 7},
+ {"label": "K57", "matrix": [5, 8], "x": 11, "y": 5, "w": 1.5},
+
+ {"label": "K66", "matrix": [5, 12], "x": 13, "y": 5},
+ {"label": "K76", "matrix": [5, 13], "x": 14, "y": 5},
+ {"label": "K96", "matrix": [5, 14], "x": 15, "y": 5}
+ ]
},
+ "LAYOUT_tsangan": {
+ "layout": [
+ {"label": "K05", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "K25", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "K35", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "K45", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "K55", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "K06", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "KA6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "KA7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "K07", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "KB5", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "KC5", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "KD5", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "KE5", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "KD1", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "KE1", "matrix": [0, 14], "x": 14, "y": 0},
+ {"label": "KE2", "matrix": [6, 13], "x": 15, "y": 0},
- "LAYOUT_tsangan_split_bs": {
- "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}]
+ {"label": "K04", "matrix": [1, 0], "x": 0, "y": 1},
+ {"label": "K14", "matrix": [1, 1], "x": 1, "y": 1},
+ {"label": "K24", "matrix": [1, 2], "x": 2, "y": 1},
+ {"label": "K34", "matrix": [1, 3], "x": 3, "y": 1},
+ {"label": "K44", "matrix": [1, 4], "x": 4, "y": 1},
+ {"label": "K54", "matrix": [1, 5], "x": 5, "y": 1},
+ {"label": "K16", "matrix": [1, 6], "x": 6, "y": 1},
+ {"label": "KB6", "matrix": [1, 7], "x": 7, "y": 1},
+ {"label": "KB7", "matrix": [1, 8], "x": 8, "y": 1},
+ {"label": "K17", "matrix": [1, 9], "x": 9, "y": 1},
+ {"label": "KA4", "matrix": [1, 10], "x": 10, "y": 1},
+ {"label": "KB4", "matrix": [1, 11], "x": 11, "y": 1},
+ {"label": "KC4", "matrix": [1, 12], "x": 12, "y": 1},
+ {"label": "KE4", "matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+ {"label": "KD0", "matrix": [6, 14], "x": 15, "y": 1},
+
+ {"label": "K03", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"label": "K13", "matrix": [2, 1], "x": 1.5, "y": 2},
+ {"label": "K23", "matrix": [2, 2], "x": 2.5, "y": 2},
+ {"label": "K33", "matrix": [2, 3], "x": 3.5, "y": 2},
+ {"label": "K43", "matrix": [2, 4], "x": 4.5, "y": 2},
+ {"label": "K53", "matrix": [2, 5], "x": 5.5, "y": 2},
+ {"label": "K26", "matrix": [2, 6], "x": 6.5, "y": 2},
+ {"label": "KC6", "matrix": [2, 7], "x": 7.5, "y": 2},
+ {"label": "KC7", "matrix": [2, 8], "x": 8.5, "y": 2},
+ {"label": "K27", "matrix": [2, 9], "x": 9.5, "y": 2},
+ {"label": "KA3", "matrix": [2, 10], "x": 10.5, "y": 2},
+ {"label": "KB3", "matrix": [2, 11], "x": 11.5, "y": 2},
+ {"label": "KC3", "matrix": [2, 12], "x": 12.5, "y": 2},
+ {"label": "KD3", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+ {"label": "K67", "matrix": [2, 14], "x": 15, "y": 2},
+
+ {"label": "K02", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"label": "K12", "matrix": [3, 1], "x": 1.75, "y": 3},
+ {"label": "K22", "matrix": [3, 2], "x": 2.75, "y": 3},
+ {"label": "K32", "matrix": [3, 3], "x": 3.75, "y": 3},
+ {"label": "K42", "matrix": [3, 4], "x": 4.75, "y": 3},
+ {"label": "K52", "matrix": [3, 5], "x": 5.75, "y": 3},
+ {"label": "K36", "matrix": [3, 6], "x": 6.75, "y": 3},
+ {"label": "KD6", "matrix": [3, 7], "x": 7.75, "y": 3},
+ {"label": "KD7", "matrix": [3, 8], "x": 8.75, "y": 3},
+ {"label": "K37", "matrix": [3, 9], "x": 9.75, "y": 3},
+ {"label": "KA2", "matrix": [3, 10], "x": 10.75, "y": 3},
+ {"label": "KB2", "matrix": [3, 11], "x": 11.75, "y": 3},
+ {"label": "KD2", "matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+ {"label": "KE0", "matrix": [3, 14], "x": 15, "y": 3},
+
+ {"label": "K01", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"label": "K11", "matrix": [4, 2], "x": 2.25, "y": 4},
+ {"label": "K21", "matrix": [4, 3], "x": 3.25, "y": 4},
+ {"label": "K31", "matrix": [4, 4], "x": 4.25, "y": 4},
+ {"label": "K41", "matrix": [4, 5], "x": 5.25, "y": 4},
+ {"label": "K51", "matrix": [4, 6], "x": 6.25, "y": 4},
+ {"label": "K46", "matrix": [4, 7], "x": 7.25, "y": 4},
+ {"label": "KE6", "matrix": [4, 8], "x": 8.25, "y": 4},
+ {"label": "KE7", "matrix": [4, 9], "x": 9.25, "y": 4},
+ {"label": "K47", "matrix": [4, 10], "x": 10.25, "y": 4},
+ {"label": "KA1", "matrix": [4, 11], "x": 11.25, "y": 4},
+ {"label": "KB1", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"label": "K86", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "K77", "matrix": [4, 14], "x": 15, "y": 4},
+
+ {"label": "K00", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+ {"label": "K00", "matrix": [5, 1], "x": 1.5, "y": 5},
+ {"label": "K20", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.5},
+ {"label": "K56", "matrix": [5, 5], "x": 4, "y": 5, "w": 7},
+ {"label": "K57", "matrix": [5, 8], "x": 11, "y": 5, "w": 1.5},
+
+ {"label": "K66", "matrix": [5, 12], "x": 13, "y": 5},
+ {"label": "K76", "matrix": [5, 13], "x": 14, "y": 5},
+ {"label": "K96", "matrix": [5, 14], "x": 15, "y": 5}
+ ]
},
+ "LAYOUT_tsangan_split_bs": {
+ "layout": [
+ {"label": "K05", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "K25", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "K35", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "K45", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "K55", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "K06", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "KA6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "KA7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "K07", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "KB5", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "KC5", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "KD5", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "KE5", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "KD1", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "KE1", "matrix": [0, 14], "x": 14, "y": 0},
+ {"label": "KE2", "matrix": [6, 13], "x": 15, "y": 0},
- "LAYOUT_wk": {
- "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}]
+ {"label": "K04", "matrix": [1, 0], "x": 0, "y": 1},
+ {"label": "K14", "matrix": [1, 1], "x": 1, "y": 1},
+ {"label": "K24", "matrix": [1, 2], "x": 2, "y": 1},
+ {"label": "K34", "matrix": [1, 3], "x": 3, "y": 1},
+ {"label": "K44", "matrix": [1, 4], "x": 4, "y": 1},
+ {"label": "K54", "matrix": [1, 5], "x": 5, "y": 1},
+ {"label": "K16", "matrix": [1, 6], "x": 6, "y": 1},
+ {"label": "KB6", "matrix": [1, 7], "x": 7, "y": 1},
+ {"label": "KB7", "matrix": [1, 8], "x": 8, "y": 1},
+ {"label": "K17", "matrix": [1, 9], "x": 9, "y": 1},
+ {"label": "KA4", "matrix": [1, 10], "x": 10, "y": 1},
+ {"label": "KB4", "matrix": [1, 11], "x": 11, "y": 1},
+ {"label": "KC4", "matrix": [1, 12], "x": 12, "y": 1},
+ {"label": "KE4", "matrix": [1, 13], "x": 13, "y": 1},
+ {"label": "KE4", "matrix": [1, 14], "x": 14, "y": 1},
+ {"label": "KD0", "matrix": [6, 14], "x": 15, "y": 1},
+
+ {"label": "K03", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"label": "K13", "matrix": [2, 1], "x": 1.5, "y": 2},
+ {"label": "K23", "matrix": [2, 2], "x": 2.5, "y": 2},
+ {"label": "K33", "matrix": [2, 3], "x": 3.5, "y": 2},
+ {"label": "K43", "matrix": [2, 4], "x": 4.5, "y": 2},
+ {"label": "K53", "matrix": [2, 5], "x": 5.5, "y": 2},
+ {"label": "K26", "matrix": [2, 6], "x": 6.5, "y": 2},
+ {"label": "KC6", "matrix": [2, 7], "x": 7.5, "y": 2},
+ {"label": "KC7", "matrix": [2, 8], "x": 8.5, "y": 2},
+ {"label": "K27", "matrix": [2, 9], "x": 9.5, "y": 2},
+ {"label": "KA3", "matrix": [2, 10], "x": 10.5, "y": 2},
+ {"label": "KB3", "matrix": [2, 11], "x": 11.5, "y": 2},
+ {"label": "KC3", "matrix": [2, 12], "x": 12.5, "y": 2},
+ {"label": "KD3", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+ {"label": "K67", "matrix": [2, 14], "x": 15, "y": 2},
+
+ {"label": "K02", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"label": "K12", "matrix": [3, 1], "x": 1.75, "y": 3},
+ {"label": "K22", "matrix": [3, 2], "x": 2.75, "y": 3},
+ {"label": "K32", "matrix": [3, 3], "x": 3.75, "y": 3},
+ {"label": "K42", "matrix": [3, 4], "x": 4.75, "y": 3},
+ {"label": "K52", "matrix": [3, 5], "x": 5.75, "y": 3},
+ {"label": "K36", "matrix": [3, 6], "x": 6.75, "y": 3},
+ {"label": "KD6", "matrix": [3, 7], "x": 7.75, "y": 3},
+ {"label": "KD7", "matrix": [3, 8], "x": 8.75, "y": 3},
+ {"label": "K37", "matrix": [3, 9], "x": 9.75, "y": 3},
+ {"label": "KA2", "matrix": [3, 10], "x": 10.75, "y": 3},
+ {"label": "KB2", "matrix": [3, 11], "x": 11.75, "y": 3},
+ {"label": "KD2", "matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+ {"label": "KE0", "matrix": [3, 14], "x": 15, "y": 3},
+
+ {"label": "K01", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"label": "K11", "matrix": [4, 2], "x": 2.25, "y": 4},
+ {"label": "K21", "matrix": [4, 3], "x": 3.25, "y": 4},
+ {"label": "K31", "matrix": [4, 4], "x": 4.25, "y": 4},
+ {"label": "K41", "matrix": [4, 5], "x": 5.25, "y": 4},
+ {"label": "K51", "matrix": [4, 6], "x": 6.25, "y": 4},
+ {"label": "K46", "matrix": [4, 7], "x": 7.25, "y": 4},
+ {"label": "KE6", "matrix": [4, 8], "x": 8.25, "y": 4},
+ {"label": "KE7", "matrix": [4, 9], "x": 9.25, "y": 4},
+ {"label": "K47", "matrix": [4, 10], "x": 10.25, "y": 4},
+ {"label": "KA1", "matrix": [4, 11], "x": 11.25, "y": 4},
+ {"label": "KB1", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"label": "K86", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "K77", "matrix": [4, 14], "x": 15, "y": 4},
+
+ {"label": "K00", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+ {"label": "K00", "matrix": [5, 1], "x": 1.5, "y": 5},
+ {"label": "K20", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.5},
+ {"label": "K56", "matrix": [5, 5], "x": 4, "y": 5, "w": 7},
+ {"label": "K57", "matrix": [5, 8], "x": 11, "y": 5, "w": 1.5},
+
+ {"label": "K66", "matrix": [5, 12], "x": 13, "y": 5},
+ {"label": "K76", "matrix": [5, 13], "x": 14, "y": 5},
+ {"label": "K96", "matrix": [5, 14], "x": 15, "y": 5}
+ ]
},
+ "LAYOUT_wk": {
+ "layout": [
+ {"label": "K05", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "K25", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "K35", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "K45", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "K55", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "K06", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "KA6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "KA7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "K07", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "KB5", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "KC5", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "KD5", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "KE5", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "KD1", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "KE1", "matrix": [0, 14], "x": 14, "y": 0},
+ {"label": "KE2", "matrix": [6, 13], "x": 15, "y": 0},
+
+ {"label": "K04", "matrix": [1, 0], "x": 0, "y": 1},
+ {"label": "K14", "matrix": [1, 1], "x": 1, "y": 1},
+ {"label": "K24", "matrix": [1, 2], "x": 2, "y": 1},
+ {"label": "K34", "matrix": [1, 3], "x": 3, "y": 1},
+ {"label": "K44", "matrix": [1, 4], "x": 4, "y": 1},
+ {"label": "K54", "matrix": [1, 5], "x": 5, "y": 1},
+ {"label": "K16", "matrix": [1, 6], "x": 6, "y": 1},
+ {"label": "KB6", "matrix": [1, 7], "x": 7, "y": 1},
+ {"label": "KB7", "matrix": [1, 8], "x": 8, "y": 1},
+ {"label": "K17", "matrix": [1, 9], "x": 9, "y": 1},
+ {"label": "KA4", "matrix": [1, 10], "x": 10, "y": 1},
+ {"label": "KB4", "matrix": [1, 11], "x": 11, "y": 1},
+ {"label": "KC4", "matrix": [1, 12], "x": 12, "y": 1},
+ {"label": "KE4", "matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+ {"label": "KD0", "matrix": [6, 14], "x": 15, "y": 1},
+
+ {"label": "K03", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"label": "K13", "matrix": [2, 1], "x": 1.5, "y": 2},
+ {"label": "K23", "matrix": [2, 2], "x": 2.5, "y": 2},
+ {"label": "K33", "matrix": [2, 3], "x": 3.5, "y": 2},
+ {"label": "K43", "matrix": [2, 4], "x": 4.5, "y": 2},
+ {"label": "K53", "matrix": [2, 5], "x": 5.5, "y": 2},
+ {"label": "K26", "matrix": [2, 6], "x": 6.5, "y": 2},
+ {"label": "KC6", "matrix": [2, 7], "x": 7.5, "y": 2},
+ {"label": "KC7", "matrix": [2, 8], "x": 8.5, "y": 2},
+ {"label": "K27", "matrix": [2, 9], "x": 9.5, "y": 2},
+ {"label": "KA3", "matrix": [2, 10], "x": 10.5, "y": 2},
+ {"label": "KB3", "matrix": [2, 11], "x": 11.5, "y": 2},
+ {"label": "KC3", "matrix": [2, 12], "x": 12.5, "y": 2},
+ {"label": "KD3", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+ {"label": "K67", "matrix": [2, 14], "x": 15, "y": 2},
+ {"label": "K02", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"label": "K12", "matrix": [3, 1], "x": 1.75, "y": 3},
+ {"label": "K22", "matrix": [3, 2], "x": 2.75, "y": 3},
+ {"label": "K32", "matrix": [3, 3], "x": 3.75, "y": 3},
+ {"label": "K42", "matrix": [3, 4], "x": 4.75, "y": 3},
+ {"label": "K52", "matrix": [3, 5], "x": 5.75, "y": 3},
+ {"label": "K36", "matrix": [3, 6], "x": 6.75, "y": 3},
+ {"label": "KD6", "matrix": [3, 7], "x": 7.75, "y": 3},
+ {"label": "KD7", "matrix": [3, 8], "x": 8.75, "y": 3},
+ {"label": "K37", "matrix": [3, 9], "x": 9.75, "y": 3},
+ {"label": "KA2", "matrix": [3, 10], "x": 10.75, "y": 3},
+ {"label": "KB2", "matrix": [3, 11], "x": 11.75, "y": 3},
+ {"label": "KD2", "matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+ {"label": "KE0", "matrix": [3, 14], "x": 15, "y": 3},
+
+ {"label": "K01", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"label": "K11", "matrix": [4, 2], "x": 2.25, "y": 4},
+ {"label": "K21", "matrix": [4, 3], "x": 3.25, "y": 4},
+ {"label": "K31", "matrix": [4, 4], "x": 4.25, "y": 4},
+ {"label": "K41", "matrix": [4, 5], "x": 5.25, "y": 4},
+ {"label": "K51", "matrix": [4, 6], "x": 6.25, "y": 4},
+ {"label": "K46", "matrix": [4, 7], "x": 7.25, "y": 4},
+ {"label": "KE6", "matrix": [4, 8], "x": 8.25, "y": 4},
+ {"label": "KE7", "matrix": [4, 9], "x": 9.25, "y": 4},
+ {"label": "K47", "matrix": [4, 10], "x": 10.25, "y": 4},
+ {"label": "KA1", "matrix": [4, 11], "x": 11.25, "y": 4},
+ {"label": "KB1", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"label": "K86", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "K77", "matrix": [4, 14], "x": 15, "y": 4},
+
+ {"label": "K00", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"label": "K00", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"label": "K20", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"label": "K56", "matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+ {"label": "K57", "matrix": [5, 8], "x": 10, "y": 5, "w": 1.5},
+ {"label": "K57", "matrix": [5, 10], "x": 11.5, "y": 5, "w": 1.5},
+ {"label": "K66", "matrix": [5, 12], "x": 13, "y": 5},
+ {"label": "K76", "matrix": [5, 13], "x": 14, "y": 5},
+ {"label": "K96", "matrix": [5, 14], "x": 15, "y": 5}
+ ]
+ },
"LAYOUT_wk_split_bs": {
- "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}]
+ "layout": [
+ {"label": "K05", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "K25", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "K35", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "K45", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "K55", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "K06", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "KA6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "KA7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "K07", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "KB5", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "KC5", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "KD5", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "KE5", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "KD1", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "KE1", "matrix": [0, 14], "x": 14, "y": 0},
+ {"label": "KE2", "matrix": [6, 13], "x": 15, "y": 0},
+
+ {"label": "K04", "matrix": [1, 0], "x": 0, "y": 1},
+ {"label": "K14", "matrix": [1, 1], "x": 1, "y": 1},
+ {"label": "K24", "matrix": [1, 2], "x": 2, "y": 1},
+ {"label": "K34", "matrix": [1, 3], "x": 3, "y": 1},
+ {"label": "K44", "matrix": [1, 4], "x": 4, "y": 1},
+ {"label": "K54", "matrix": [1, 5], "x": 5, "y": 1},
+ {"label": "K16", "matrix": [1, 6], "x": 6, "y": 1},
+ {"label": "KB6", "matrix": [1, 7], "x": 7, "y": 1},
+ {"label": "KB7", "matrix": [1, 8], "x": 8, "y": 1},
+ {"label": "K17", "matrix": [1, 9], "x": 9, "y": 1},
+ {"label": "KA4", "matrix": [1, 10], "x": 10, "y": 1},
+ {"label": "KB4", "matrix": [1, 11], "x": 11, "y": 1},
+ {"label": "KC4", "matrix": [1, 12], "x": 12, "y": 1},
+ {"label": "KE4", "matrix": [1, 13], "x": 13, "y": 1},
+ {"label": "KE4", "matrix": [1, 14], "x": 14, "y": 1},
+ {"label": "KD0", "matrix": [6, 14], "x": 15, "y": 1},
+
+ {"label": "K03", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"label": "K13", "matrix": [2, 1], "x": 1.5, "y": 2},
+ {"label": "K23", "matrix": [2, 2], "x": 2.5, "y": 2},
+ {"label": "K33", "matrix": [2, 3], "x": 3.5, "y": 2},
+ {"label": "K43", "matrix": [2, 4], "x": 4.5, "y": 2},
+ {"label": "K53", "matrix": [2, 5], "x": 5.5, "y": 2},
+ {"label": "K26", "matrix": [2, 6], "x": 6.5, "y": 2},
+ {"label": "KC6", "matrix": [2, 7], "x": 7.5, "y": 2},
+ {"label": "KC7", "matrix": [2, 8], "x": 8.5, "y": 2},
+ {"label": "K27", "matrix": [2, 9], "x": 9.5, "y": 2},
+ {"label": "KA3", "matrix": [2, 10], "x": 10.5, "y": 2},
+ {"label": "KB3", "matrix": [2, 11], "x": 11.5, "y": 2},
+ {"label": "KC3", "matrix": [2, 12], "x": 12.5, "y": 2},
+ {"label": "KD3", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+ {"label": "K67", "matrix": [2, 14], "x": 15, "y": 2},
+
+ {"label": "K02", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"label": "K12", "matrix": [3, 1], "x": 1.75, "y": 3},
+ {"label": "K22", "matrix": [3, 2], "x": 2.75, "y": 3},
+ {"label": "K32", "matrix": [3, 3], "x": 3.75, "y": 3},
+ {"label": "K42", "matrix": [3, 4], "x": 4.75, "y": 3},
+ {"label": "K52", "matrix": [3, 5], "x": 5.75, "y": 3},
+ {"label": "K36", "matrix": [3, 6], "x": 6.75, "y": 3},
+ {"label": "KD6", "matrix": [3, 7], "x": 7.75, "y": 3},
+ {"label": "KD7", "matrix": [3, 8], "x": 8.75, "y": 3},
+ {"label": "K37", "matrix": [3, 9], "x": 9.75, "y": 3},
+ {"label": "KA2", "matrix": [3, 10], "x": 10.75, "y": 3},
+ {"label": "KB2", "matrix": [3, 11], "x": 11.75, "y": 3},
+ {"label": "KD2", "matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+ {"label": "KE0", "matrix": [3, 14], "x": 15, "y": 3},
+
+ {"label": "K01", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"label": "K11", "matrix": [4, 2], "x": 2.25, "y": 4},
+ {"label": "K21", "matrix": [4, 3], "x": 3.25, "y": 4},
+ {"label": "K31", "matrix": [4, 4], "x": 4.25, "y": 4},
+ {"label": "K41", "matrix": [4, 5], "x": 5.25, "y": 4},
+ {"label": "K51", "matrix": [4, 6], "x": 6.25, "y": 4},
+ {"label": "K46", "matrix": [4, 7], "x": 7.25, "y": 4},
+ {"label": "KE6", "matrix": [4, 8], "x": 8.25, "y": 4},
+ {"label": "KE7", "matrix": [4, 9], "x": 9.25, "y": 4},
+ {"label": "K47", "matrix": [4, 10], "x": 10.25, "y": 4},
+ {"label": "KA1", "matrix": [4, 11], "x": 11.25, "y": 4},
+ {"label": "KB1", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"label": "K86", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "K77", "matrix": [4, 14], "x": 15, "y": 4},
+
+ {"label": "K00", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"label": "K00", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"label": "K20", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"label": "K56", "matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+ {"label": "K57", "matrix": [5, 8], "x": 10, "y": 5, "w": 1.5},
+ {"label": "K57", "matrix": [5, 10], "x": 11.5, "y": 5, "w": 1.5},
+ {"label": "K66", "matrix": [5, 12], "x": 13, "y": 5},
+ {"label": "K76", "matrix": [5, 13], "x": 14, "y": 5},
+ {"label": "K96", "matrix": [5, 14], "x": 15, "y": 5}
+ ]
}
}
}
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 @@
-/* Copyright 2018 amnesia0287
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, \
- k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, k31, \
- k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, \
- k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60, k61, \
- k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, k72, k73, k74, k75, k76, \
- k77, k78, k79, k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k90 \
-){ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14 }, \
- { k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30 }, \
- { k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, k46 }, \
- { k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60, k61 }, \
- { k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, k72, k73, k74, k75, k76 }, \
- { k77, k78, k79, k80, k81, k82, KC_NO, k83, k84, k85, k86, k87, k88, k89, k90 }, \
- { 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 } \
-}
-
-#define LAYOUT_wkl( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, \
- k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, \
- k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, \
- k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, \
- k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, k72, k73, \
- k74, k75, k76, k77, k78, k79, k80 \
-){ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14 }, \
- { k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, KC_NO }, \
- { k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45 }, \
- { k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, KC_NO, k58, k59 }, \
- { k60, KC_NO, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, k72, k73 }, \
- { k74, KC_NO, k75, KC_NO, KC_NO, k76, KC_NO, KC_NO, k77, KC_NO, KC_NO, KC_NO, k78, k79, k80 }, \
- { 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 } \
-}
-
-#define LAYOUT_wkl_split_bs( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, \
- k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k81, k30, \
- k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, \
- k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, \
- k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, k72, k73, \
- k74, k75, k76, k77, k78, k79, k80 \
-){ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14 }, \
- { k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k81 }, \
- { k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45 }, \
- { k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, KC_NO, k58, k59 }, \
- { k60, KC_NO, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, k72, k73 }, \
- { k74, KC_NO, k75, KC_NO, KC_NO, k76, KC_NO, KC_NO, k77, KC_NO, KC_NO, KC_NO, k78, k79, k80 }, \
- { 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 } \
-}
-
-#define LAYOUT_tsangan( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, \
- k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, \
- k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, \
- k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, \
- k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, k72, k73, \
- k74, k81, k75, k76, k77, k78, k79, k80 \
-){ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14 }, \
- { k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, KC_NO }, \
- { k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45 }, \
- { k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, KC_NO, k58, k59 }, \
- { k60, KC_NO, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, k72, k73 }, \
- { k74, k81, k75, KC_NO, KC_NO, k76, KC_NO, KC_NO, k77, KC_NO, KC_NO, KC_NO, k78, k79, k80 }, \
- { 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 } \
-}
-
-#define LAYOUT_tsangan_split_bs( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, \
- k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k82, k30, \
- k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, \
- k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, \
- k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, k72, k73, \
- k74, k81, k75, k76, k77, k78, k79, k80 \
-){ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14 }, \
- { k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k82 }, \
- { k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45 }, \
- { k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, KC_NO, k58, k59 }, \
- { k60, KC_NO, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, k72, k73 }, \
- { k74, k81, k75, KC_NO, KC_NO, k76, KC_NO, KC_NO, k77, KC_NO, KC_NO, KC_NO, k78, k79, k80 }, \
- { 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 } \
-}
-
-#define LAYOUT_wk( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, \
- k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, \
- k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, \
- k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, \
- k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, k72, k73, \
- k74, k81, k75, k76, k77, k82, k78, k79, k80 \
-){ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14 }, \
- { k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, KC_NO }, \
- { k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45 }, \
- { k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, KC_NO, k58, k59 }, \
- { k60, KC_NO, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, k72, k73 }, \
- { k74, k81 , k75, KC_NO, KC_NO, k76, KC_NO, KC_NO, k77, KC_NO, k82, KC_NO, k78, k79, k80 }, \
- { 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 } \
-}
-
-#define LAYOUT_wk_split_bs( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, \
- k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k83, k30, \
- k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, \
- k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, \
- k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, k72, k73, \
- k74, k81, k75, k76, k77, k82, k78, k79, k80 \
-){ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14 }, \
- { k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k83 }, \
- { k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45 }, \
- { k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, KC_NO, k58, k59 }, \
- { k60, KC_NO, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, k72, k73 }, \
- { k74, k81, k75, KC_NO, KC_NO, k76, KC_NO, KC_NO, k77, KC_NO, k82, KC_NO, k78, k79, k80 }, \
- { 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 } \
-}
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 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Esc", "x":0, "y":0, "w":1.5},
- {"label":"1", "x":1.5, "y":0},
- {"label":"2", "x":2.5, "y":0},
- {"label":"3", "x":3.5, "y":0},
- {"label":"4", "x":4.5, "y":0},
- {"label":"5", "x":5.5, "y":0},
- {"label":"-", "x":6.5, "y":0},
- {"label":"=", "x":9.5, "y":0},
- {"label":"6", "x":10.5, "y":0},
- {"label":"7", "x":11.5, "y":0},
- {"label":"8", "x":12.5, "y":0},
- {"label":"9", "x":13.5, "y":0},
- {"label":"0", "x":14.5, "y":0},
- {"label":"Bspc", "x":15.5, "y":0, "w":1.5},
- {"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":"PgUp", "x":6.5, "y":1, "h":1.5},
- {"label":"[", "x":9.5, "y":1, "h":1.5},
- {"label":"Y", "x":10.5, "y":1},
- {"label":"U", "x":11.5, "y":1},
- {"label":"I", "x":12.5, "y":1},
- {"label":"O", "x":13.5, "y":1},
- {"label":"P", "x":14.5, "y":1},
- {"label":"\\", "x":15.5, "y":1, "w":1.5},
- {"label":"Caps", "x":0, "y":2, "w":1.5},
- {"label":"A", "x":1.5, "y":2},
- {"label":"S", "x":2.5, "y":2},
- {"label":"D", "x":3.5, "y":2},
- {"label":"F", "x":4.5, "y":2},
- {"label":"G", "x":5.5, "y":2},
- {"label":"H", "x":10.5, "y":2},
- {"label":"J", "x":11.5, "y":2},
- {"label":"K", "x":12.5, "y":2},
- {"label":"L", "x":13.5, "y":2},
- {"label":";", "x":14.5, "y":2},
- {"label":"Enter", "x":15.5, "y":2, "w":1.5},
- {"label":"Shift", "x":0, "y":3, "w":1.5},
- {"label":"Z", "x":1.5, "y":3},
- {"label":"X", "x":2.5, "y":3},
- {"label":"C", "x":3.5, "y":3},
- {"label":"V", "x":4.5, "y":3},
- {"label":"B", "x":5.5, "y":3},
- {"label":"PgDn", "x":6.5, "y":2.5, "h":1.5},
- {"label":"]", "x":9.5, "y":2.5, "h":1.5},
- {"label":"N", "x":10.5, "y":3},
- {"label":"M", "x":11.5, "y":3},
- {"label":",", "x":12.5, "y":3},
- {"label":".", "x":13.5, "y":3},
- {"label":"Up", "x":14.5, "y":3},
- {"label":"Shift", "x":15.5, "y":3, "w":1.5},
- {"label":"Ctrl", "x":0.5, "y":4},
- {"label":"Super", "x":1.5, "y":4},
- {"label":"Alt", "x":2.5, "y":4},
- {"label":"Left", "x":13.5, "y":4},
- {"label":"Down", "x":14.5, "y":4},
- {"label":"Right", "x":15.5, "y":4},
- {"label":"Space", "x":5.5, "y":5},
- {"label":"Ins", "x":6.5, "y":5},
- {"label":"Home", "x":9.5, "y":5},
- {"label":"Space", "x":10.5, "y":5},
- {"label":"Space", "x":5.5, "y":6},
- {"label":"Del", "x":6.5, "y":6},
- {"label":"End", "x":9.5, "y":6},
- {"label":"Space", "x":10.5, "y":6}
+ {"matrix": [2, 9], "x": 0, "y": 0, "w": 1.5},
+ {"matrix": [1, 14], "x": 1.5, "y": 0},
+ {"matrix": [1, 15], "x": 2.5, "y": 0},
+ {"matrix": [2, 0], "x": 3.5, "y": 0},
+ {"matrix": [2, 1], "x": 4.5, "y": 0},
+ {"matrix": [2, 2], "x": 5.5, "y": 0},
+ {"matrix": [2, 13], "x": 6.5, "y": 0},
+
+ {"matrix": [2, 14], "x": 9.5, "y": 0},
+ {"matrix": [2, 3], "x": 10.5, "y": 0},
+ {"matrix": [2, 4], "x": 11.5, "y": 0},
+ {"matrix": [2, 5], "x": 12.5, "y": 0},
+ {"matrix": [2, 6], "x": 13.5, "y": 0},
+ {"matrix": [2, 7], "x": 14.5, "y": 0},
+ {"matrix": [2, 10], "x": 15.5, "y": 0, "w": 1.5},
+
+ {"matrix": [2, 11], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 4], "x": 1.5, "y": 1},
+ {"matrix": [1, 10], "x": 2.5, "y": 1},
+ {"matrix": [0, 8], "x": 3.5, "y": 1},
+ {"matrix": [1, 5], "x": 4.5, "y": 1},
+ {"matrix": [1, 7], "x": 5.5, "y": 1},
+ {"matrix": [4, 11], "x": 6.5, "y": 1, "h": 1.5},
+
+ {"matrix": [2, 15], "x": 9.5, "y": 1, "h": 1.5},
+ {"matrix": [1, 12], "x": 10.5, "y": 1},
+ {"matrix": [1, 8], "x": 11.5, "y": 1},
+ {"matrix": [0, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 2], "x": 13.5, "y": 1},
+ {"matrix": [1, 3], "x": 14.5, "y": 1},
+ {"matrix": [3, 1], "x": 15.5, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 9], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [0, 4], "x": 1.5, "y": 2},
+ {"matrix": [1, 6], "x": 2.5, "y": 2},
+ {"matrix": [0, 7], "x": 3.5, "y": 2},
+ {"matrix": [0, 9], "x": 4.5, "y": 2},
+ {"matrix": [0, 10], "x": 5.5, "y": 2},
+
+ {"matrix": [0, 11], "x": 10.5, "y": 2},
+ {"matrix": [0, 13], "x": 11.5, "y": 2},
+ {"matrix": [0, 14], "x": 12.5, "y": 2},
+ {"matrix": [0, 15], "x": 13.5, "y": 2},
+ {"matrix": [3, 3], "x": 14.5, "y": 2},
+ {"matrix": [3, 4], "x": 15.5, "y": 2, "w": 1.5},
+
+ {"matrix": [14, 1], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [1, 13], "x": 1.5, "y": 3},
+ {"matrix": [1, 11], "x": 2.5, "y": 3},
+ {"matrix": [0, 6], "x": 3.5, "y": 3},
+ {"matrix": [1, 9], "x": 4.5, "y": 3},
+ {"matrix": [0, 5], "x": 5.5, "y": 3},
+ {"matrix": [4, 14], "x": 6.5, "y": 2.5, "h": 1.5},
+
+ {"matrix": [3, 0], "x": 9.5, "y": 2.5, "h": 1.5},
+ {"matrix": [1, 1], "x": 10.5, "y": 3},
+ {"matrix": [1, 0], "x": 11.5, "y": 3},
+ {"matrix": [3, 6], "x": 12.5, "y": 3},
+ {"matrix": [3, 7], "x": 13.5, "y": 3},
+ {"matrix": [5, 2], "x": 14.5, "y": 3},
+ {"matrix": [14, 5], "x": 15.5, "y": 3, "w": 1.5},
+
+ {"matrix": [14, 0], "x": 0.5, "y": 4},
+ {"matrix": [14, 3], "x": 1.5, "y": 4},
+ {"matrix": [14, 2], "x": 2.5, "y": 4},
+ {"matrix": [5, 0], "x": 13.5, "y": 4},
+ {"matrix": [5, 1], "x": 14.5, "y": 4},
+ {"matrix": [4, 15], "x": 15.5, "y": 4},
+
+ {"matrix": [2, 12], "x": 5.5, "y": 5},
+ {"matrix": [4, 9], "x": 6.5, "y": 5},
+
+ {"matrix": [4, 10], "x": 9.5, "y": 5},
+ {"matrix": [2, 8], "x": 10.5, "y": 5},
+
+ {"matrix": [14, 6], "x": 5.5, "y": 6},
+ {"matrix": [4, 12], "x": 6.5, "y": 6},
+
+ {"matrix": [4, 13], "x": 9.5, "y": 6},
+ {"matrix": [14, 4], "x": 10.5, "y": 6}
]
},
"LAYOUT_beta_pcb": {
"layout": [
- {"label":"Esc", "x":0, "y":0, "w":1.5},
- {"label":"1", "x":1.5, "y":0},
- {"label":"2", "x":2.5, "y":0},
- {"label":"3", "x":3.5, "y":0},
- {"label":"4", "x":4.5, "y":0},
- {"label":"5", "x":5.5, "y":0},
- {"label":"-", "x":6.5, "y":0},
- {"label":"=", "x":9.5, "y":0},
- {"label":"6", "x":10.5, "y":0},
- {"label":"7", "x":11.5, "y":0},
- {"label":"8", "x":12.5, "y":0},
- {"label":"9", "x":13.5, "y":0},
- {"label":"0", "x":14.5, "y":0},
- {"label":"Bspc", "x":15.5, "y":0, "w":1.5},
- {"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":"PgUp", "x":6.5, "y":1, "h":1.5},
- {"label":"[", "x":9.5, "y":1, "h":1.5},
- {"label":"Y", "x":10.5, "y":1},
- {"label":"U", "x":11.5, "y":1},
- {"label":"I", "x":12.5, "y":1},
- {"label":"O", "x":13.5, "y":1},
- {"label":"P", "x":14.5, "y":1},
- {"label":"\\", "x":15.5, "y":1, "w":1.5},
- {"label":"Caps", "x":0, "y":2, "w":1.5},
- {"label":"A", "x":1.5, "y":2},
- {"label":"S", "x":2.5, "y":2},
- {"label":"D", "x":3.5, "y":2},
- {"label":"F", "x":4.5, "y":2},
- {"label":"G", "x":5.5, "y":2},
- {"label":"H", "x":10.5, "y":2},
- {"label":"J", "x":11.5, "y":2},
- {"label":"K", "x":12.5, "y":2},
- {"label":"L", "x":13.5, "y":2},
- {"label":";", "x":14.5, "y":2},
- {"label":"Enter", "x":15.5, "y":2, "w":1.5},
- {"label":"Shift", "x":0, "y":3, "w":1.5},
- {"label":"Z", "x":1.5, "y":3},
- {"label":"X", "x":2.5, "y":3},
- {"label":"C", "x":3.5, "y":3},
- {"label":"V", "x":4.5, "y":3},
- {"label":"B", "x":5.5, "y":3},
- {"label":"PgDn", "x":6.5, "y":2.5, "h":1.5},
- {"label":"]", "x":9.5, "y":2.5, "h":1.5},
- {"label":"N", "x":10.5, "y":3},
- {"label":"M", "x":11.5, "y":3},
- {"label":",", "x":12.5, "y":3},
- {"label":".", "x":13.5, "y":3},
- {"label":"Up", "x":14.5, "y":3},
- {"label":"Shift", "x":15.5, "y":3, "w":1.5},
- {"label":"Ctrl", "x":0.5, "y":4},
- {"label":"Super", "x":1.5, "y":4},
- {"label":"Alt", "x":2.5, "y":4},
- {"label":"Left", "x":13.5, "y":4},
- {"label":"Down", "x":14.5, "y":4},
- {"label":"Right", "x":15.5, "y":4},
- {"label":"Space", "x":5.5, "y":5, "h":2},
- {"label":"Ins", "x":6.5, "y":5},
- {"label":"Home", "x":9.5, "y":5},
- {"label":"Space", "x":10.5, "y":5, "h":2},
- {"label":"Del", "x":6.5, "y":6},
- {"label":"End", "x":9.5, "y":6}
+ {"matrix": [1, 13], "x": 0, "y": 0, "w": 1.5},
+ {"matrix": [1, 14], "x": 1.5, "y": 0},
+ {"matrix": [3, 0], "x": 2.5, "y": 0},
+ {"matrix": [2, 15], "x": 3.5, "y": 0},
+ {"matrix": [4, 5], "x": 4.5, "y": 0},
+ {"matrix": [3, 11], "x": 5.5, "y": 0},
+ {"matrix": [14, 6], "x": 6.5, "y": 0},
+
+ {"matrix": [14, 2], "x": 9.5, "y": 0},
+ {"matrix": [3, 10], "x": 10.5, "y": 0},
+ {"matrix": [3, 9], "x": 11.5, "y": 0},
+ {"matrix": [1, 4], "x": 12.5, "y": 0},
+ {"matrix": [0, 4], "x": 13.5, "y": 0},
+ {"matrix": [0, 9], "x": 14.5, "y": 0},
+ {"matrix": [0, 7], "x": 15.5, "y": 0, "w": 1.5},
+
+ {"matrix": [2, 9], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 5], "x": 1.5, "y": 1},
+ {"matrix": [3, 12], "x": 2.5, "y": 1},
+ {"matrix": [3, 13], "x": 3.5, "y": 1},
+ {"matrix": [3, 14], "x": 4.5, "y": 1},
+ {"matrix": [3, 15], "x": 5.5, "y": 1},
+ {"matrix": [5, 8], "x": 6.5, "y": 1, "h": 1.5},
+
+ {"matrix": [5, 0], "x": 9.5, "y": 1, "h": 1.5},
+ {"matrix": [2, 12], "x": 10.5, "y": 1},
+ {"matrix": [1, 1], "x": 11.5, "y": 1},
+ {"matrix": [0, 5], "x": 12.5, "y": 1},
+ {"matrix": [5, 5], "x": 13.5, "y": 1},
+ {"matrix": [1, 0], "x": 14.5, "y": 1},
+ {"matrix": [0, 6], "x": 15.5, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 1], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [5, 15], "x": 1.5, "y": 2},
+ {"matrix": [5, 14], "x": 2.5, "y": 2},
+ {"matrix": [6, 1], "x": 3.5, "y": 2},
+ {"matrix": [2, 10], "x": 4.5, "y": 2},
+ {"matrix": [3, 8], "x": 5.5, "y": 2},
+
+ {"matrix": [4, 12], "x": 10.5, "y": 2},
+ {"matrix": [5, 7], "x": 11.5, "y": 2},
+ {"matrix": [5, 3], "x": 12.5, "y": 2},
+ {"matrix": [5, 11], "x": 13.5, "y": 2},
+ {"matrix": [5, 10], "x": 14.5, "y": 2},
+ {"matrix": [0, 8], "x": 15.5, "y": 2, "w": 1.5},
+
+ {"matrix": [3, 5], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [5, 13], "x": 1.5, "y": 3},
+ {"matrix": [1, 7], "x": 2.5, "y": 3},
+ {"matrix": [1, 11], "x": 3.5, "y": 3},
+ {"matrix": [1, 10], "x": 4.5, "y": 3},
+ {"matrix": [5, 2], "x": 5.5, "y": 3},
+ {"matrix": [5, 6], "x": 6.5, "y": 2.5, "h": 1.5},
+
+ {"matrix": [5, 1], "x": 9.5, "y": 2.5, "h": 1.5},
+ {"matrix": [4, 13], "x": 10.5, "y": 3},
+ {"matrix": [2, 3], "x": 11.5, "y": 3},
+ {"matrix": [1, 12], "x": 12.5, "y": 3},
+ {"matrix": [1, 3], "x": 13.5, "y": 3},
+ {"matrix": [2, 14], "x": 14.5, "y": 3},
+ {"matrix": [0, 12], "x": 15.5, "y": 3, "w": 1.5},
+
+ {"matrix": [5, 12], "x": 0.5, "y": 4},
+ {"matrix": [0, 10], "x": 1.5, "y": 4},
+ {"matrix": [0, 15], "x": 2.5, "y": 4},
+
+ {"matrix": [3, 6], "x": 13.5, "y": 4},
+ {"matrix": [0, 14], "x": 14.5, "y": 4},
+ {"matrix": [3, 7], "x": 15.5, "y": 4},
+
+ {"matrix": [14, 4], "x": 5.5, "y": 5, "h": 2},
+ {"matrix": [4, 9], "x": 6.5, "y": 5},
+
+ {"matrix": [4, 11], "x": 9.5, "y": 5},
+ {"matrix": [14, 0], "x": 10.5, "y": 5, "h": 2},
+
+ {"matrix": [14, 5], "x": 6.5, "y": 6},
+
+ {"matrix": [14, 1], "x": 9.5, "y": 6}
]
}
}
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 @@
-/*
-Copyright 2017 Balz Guenat <balz.guenat@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K29,K1E,K1F,K20,K21,K22,K2D, K2E,K23,K24,K25,K26,K27,K2A,\
- K2B,K14,K1A,K08,K15,K17,K4B, K2F,K1C,K18,K0C,K12,K13,K31,\
- K39,K04,K16,K07,K09,K0A, K0B,K0D,K0E,K0F,K33,K34,\
- KE1,K1D,K1B,K06,K19,K05,K4E, K30,K11,K10,K36,K37,K52,KE5,\
- KE0,KE3,KE2, K50,K51,K4F,\
- K2C,K49, K4A,K28, \
- KE6,K4C, K4D,KE4 \
-) { \
- { KC_NO, KC_NO, KC_NO, KC_NO, K04, K05, K06, K07, /* 00-07 */ \
- K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, /* 08-0F */ \
- { K10, K11, K12, K13, K14, K15, K16, K17, /* 10-17 */ \
- K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, /* 18-1F */ \
- { K20, K21, K22, K23, K24, K25, K26, K27, /* 20-27 */ \
- K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, /* 28-2F */ \
- { K30, K31, KC_NO, K33, K34, KC_NO, K36, K37, /* 30-37 */ \
- KC_NO, K39, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 38-3F */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 40-47 */ \
- KC_NO, K49, K4A, K4B, K4C, K4D, K4E, K4F }, /* 48-4F */ \
- { K50, K51, K52, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 50-57 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 58-5F */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 60-67 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 68-6F */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 70-77 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 78-7F */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 80-87 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 88-8F */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 90-97 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 98-9F */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* A0-A7 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* A8-AF */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* B0-B7 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* B8-BF */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* C0-C7 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* C8-CF */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* D0-D7 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* D8-DF */ \
- { KE0, KE1, KE2, KE3, KE4, KE5, KE6, KC_NO, /* E0-E7 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* E8-EF */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* F0-F7 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* F8-FF */ \
-}
-
-#define LAYOUT_beta_pcb( \
- K1E, K1F, K30, K2F, K45, K3B, KE6, KE2, K3A, K39, K14, K04, K09, K07, \
- K29, K15, K3C, K3D, K3E, K3F, K58, K50, K2C, K11, K05, K55, K10, K06, \
- K31, K5F, K5E, K61, K2A, K38, K4C, K57, K53, K5B, K5A, K08, \
- K35, K5D, K17, K1B, K1A, K52, K56, K51, K4D, K23, K1C, K13, K2E, K0C, \
- K5C, K0A, K0F, K36, K0E, K37, \
- KE4, K49, K4B, KE0, \
- KE5, KE1\
-) { \
- { KC_NO, KC_NO, KC_NO, KC_NO, K04, K05, K06, K07, /* 00-07 */ \
- K08, K09, K0A, KC_NO, K0C, KC_NO, K0E, K0F }, /* 08-0F */ \
- { K10, K11, KC_NO, K13, K14, K15, KC_NO, K17, /* 10-17 */ \
- KC_NO, KC_NO, K1A, K1B, K1C, K1E, K1F, KC_NO }, /* 18-1F */ \
- { KC_NO, KC_NO, KC_NO, K23, KC_NO, KC_NO, KC_NO, KC_NO, /* 20-27 */ \
- KC_NO, K29, K2A, KC_NO, K2C, KC_NO, K2E, K2F }, /* 28-2F */ \
- { K30, K31, KC_NO, KC_NO, KC_NO, K35, K36, K37, /* 30-37 */ \
- K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, /* 38-3F */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K45, KC_NO, KC_NO, /* 40-47 */ \
- KC_NO, K49, KC_NO, K4B, K4C, K4D, KC_NO, KC_NO }, /* 48-4F */ \
- { K50, K51, K52, K53, KC_NO, K55, K56, K57, /* 50-57 */ \
- K58, KC_NO, K5A, K5B, K5C, K5D, K5E, K5F }, /* 58-5F */ \
- { KC_NO, K61, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 60-67 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 68-6F */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 70-77 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 78-7F */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 80-87 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 88-8F */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 90-97 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 98-9F */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* A0-A7 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* A8-AF */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* B0-B7 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* B8-BF */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* C0-C7 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* C8-CF */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* D0-D7 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* D8-DF */ \
- { KE0, KE1, KE2, KC_NO, KE4, KE5, KE6, KC_NO, /* E0-E7 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* E8-EF */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* F0-F7 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* F8-FF */ \
-}
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 @@
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
- "LAYOUT": {
- "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}]
- },
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
- "LAYOUT_arrow": {
- "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}]
- },
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.25, "y": 1},
+ {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
- "LAYOUT_command": {
- "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}]
- },
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
- "LAYOUT_arrow_command": {
- "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}]
- }
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3, "w": 1.25},
+ {"matrix": [3, 3], "x": 4, "y": 3, "w": 2.25},
+ {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 2},
+ {"matrix": [3, 8], "x": 8.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.5},
+ {"matrix": [3, 11], "x": 11, "y": 3, "w": 1.75}
+ ]
+ },
+ "LAYOUT_arrow": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.25, "y": 1},
+ {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3, "w": 1.25},
+ {"matrix": [3, 3], "x": 4, "y": 3, "w": 2.25},
+ {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 2},
+ {"matrix": [3, 8], "x": 8.25, "y": 3, "w": 1.5},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3}
+ ]
+ },
+ "LAYOUT_command": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.25, "y": 1},
+ {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 4], "x": 3, "y": 3},
+ {"matrix": [3, 3], "x": 4, "y": 3, "w": 2.25},
+ {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 2},
+ {"matrix": [3, 8], "x": 8.25, "y": 3, "w": 1.5},
+ {"matrix": [3, 9], "x": 9.75, "y": 3, "w": 1.5},
+ {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.5}
+ ]
+ },
+ "LAYOUT_arrow_command": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.25, "y": 1},
+ {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 4], "x": 3, "y": 3},
+ {"matrix": [3, 3], "x": 4, "y": 3, "w": 2.25},
+ {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 2},
+ {"matrix": [3, 8], "x": 8.25, "y": 3, "w": 1.5},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3}
+ ]
+ }
}
}
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 @@
-#pragma once
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// There are a number of variations depending on the layout of your bottom row.
-// The arrow variant adds an additional key on the bottom-right, while the
-// command variant adds an additional key on the bottom-left. arrow-command is a
-// combination of both of those, having an additional key on both sides.
-//
-// Please note that the numbering of the macro arguments are based on the
-// numbers of the keys on the PCB.
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
- K30, K31, K32, K33, K37, K38, K39, K3B \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
- { K30, K31, K32, K33, KC_NO, KC_NO, KC_NO, K37, K38, K39, KC_NO, K3B } \
-}
-
-#define LAYOUT_arrow( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
- K30, K31, K32, K33, K37, K38, K39, K3A, K3B \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
- { K30, K31, K32, K33, KC_NO, KC_NO, KC_NO, K37, K38, K39, K3A, K3B } \
-}
-
-#define LAYOUT_command( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
- K30, K31, K32, K34, K33, K37, K38, K39, K3B \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
- { K30, K31, K32, K33, K34, KC_NO, KC_NO, K37, K38, K39, KC_NO, K3B } \
-}
-
-#define LAYOUT_arrow_command( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
- K30, K31, K32, K34, K33, K37, K38, K39, K3A, K3B \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
- { K30, K31, K32, K33, K34, KC_NO, KC_NO, K37, K38, K39, K3A, K3B } \
-}
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 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+
+ {"matrix": [4, 5], "x": 1.5, "y": 4, "w": 7}
+ ]
},
"LAYOUT_split": {
- "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}]
- }
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+
+ {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 4], "x": 3, "y": 4, "w": 2},
+ {"matrix": [4, 6], "x": 5, "y": 4, "w": 2},
+ {"matrix": [4, 7], "x": 7, "y": 4, "w": 1.5}
+ ]
+ }
}
}
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 @@
-/*
-Copyright 2022 tominabox1
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, \
- K45 \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39 }, \
- { XXX, XXX, XXX, XXX, XXX, K45, XXX, XXX, XXX, XXX } \
-}
-
-#define LAYOUT_split( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, \
- K42, K44, K46, K47 \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39 }, \
- { XXX, XXX, K42, XXX, K44, XXX, K46, K47, XXX, XXX } \
-}
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 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+
+ {"matrix": [4, 5], "x": 1.5, "y": 4, "w": 7}
+ ]
},
"LAYOUT_split": {
- "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}]
- }
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+
+ {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 4], "x": 3, "y": 4, "w": 2},
+ {"matrix": [4, 6], "x": 5, "y": 4, "w": 2},
+ {"matrix": [4, 7], "x": 7, "y": 4, "w": 1.5}
+ ]
+ }
}
}
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 @@
-/*
-Copyright 2022 tominabox1
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, \
- K45 \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39 }, \
- { XXX, XXX, XXX, XXX, XXX, K45, XXX, XXX, XXX, XXX } \
-}
-
-#define LAYOUT_split( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, \
- K42, K44, K46, K47 \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39 }, \
- { XXX, XXX, K42, XXX, K44, XXX, K46, K47, XXX, XXX } \
-}
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 @@
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
- "LAYOUT_split_space": {
- "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}]
- },
- "LAYOUT": {
- "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}]
- }
+ "LAYOUT_split_space": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [4, 0], "x": 7, "y": 0},
+ {"matrix": [4, 1], "x": 8, "y": 0},
+ {"matrix": [4, 2], "x": 9, "y": 0, "w": 1.25},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [5, 0], "x": 7.25, "y": 1},
+ {"matrix": [5, 1], "x": 8.25, "y": 1},
+ {"matrix": [5, 2], "x": 9.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [4, 3], "x": 7.75, "y": 2},
+ {"matrix": [5, 3], "x": 8.75, "y": 2, "w": 1.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3, "w": 2.25},
+ {"matrix": [3, 4], "x": 5.25, "y": 3, "w": 2},
+ {"matrix": [3, 5], "x": 7.25, "y": 3},
+ {"matrix": [3, 6], "x": 8.25, "y": 3},
+ {"matrix": [4, 4], "x": 9.25, "y": 3}
+ ]
+ },
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [4, 0], "x": 7, "y": 0},
+ {"matrix": [4, 1], "x": 8, "y": 0},
+ {"matrix": [4, 2], "x": 9, "y": 0, "w": 1.25},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [5, 0], "x": 7.25, "y": 1},
+ {"matrix": [5, 1], "x": 8.25, "y": 1},
+ {"matrix": [5, 2], "x": 9.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [4, 3], "x": 7.75, "y": 2},
+ {"matrix": [5, 3], "x": 8.75, "y": 2, "w": 1.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 4], "x": 2, "y": 3, "w": 6.25},
+ {"matrix": [3, 6], "x": 8.25, "y": 3},
+ {"matrix": [4, 4], "x": 9.25, "y": 3}
+ ]
+ }
}
}
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 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_split_space( \
- K00, K01, K02, K03, K04, K05, K06, K40, K41, K42, \
- K10, K11, K12, K13, K14, K15, K16, K50, K51, K52, \
- K20, K21, K22, K23, K24, K25, K26, K43, K53, \
- K30, K31, K32, K33, K34, K35, K36, K44 \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06 }, \
-{ K10, K11, K12, K13, K14, K15, K16 }, \
-{ K20, K21, K22, K23, K24, K25, K26 }, \
-{ K30, K31, K32, K33, K34, K35, K36 }, \
-{ K40, K41, K42, K43, K44, XXX, XXX }, \
-{ K50, K51, K52, K53, XXX, XXX, XXX } \
-}
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K40, K41, K42, \
- K10, K11, K12, K13, K14, K15, K16, K50, K51, K52, \
- K20, K21, K22, K23, K24, K25, K26, K43, K53, \
- K30, K31, K34, K36, K44 \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06 }, \
-{ K10, K11, K12, K13, K14, K15, K16 }, \
-{ K20, K21, K22, K23, K24, K25, K26 }, \
-{ K30, K31, XXX, XXX, K34, XXX, K36 }, \
-{ K40, K41, K42, K43, K44, XXX, XXX }, \
-{ K50, K51, K52, K53, XXX, XXX, XXX } \
-}
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 @@
"layouts": {
"LAYOUT": {
"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, "w":1.75},
- {"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},
- {"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":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}
+ {"matrix": [5, 0], "x": 0, "y": 0},
+ {"matrix": [5, 1], "x": 1, "y": 0},
+ {"matrix": [5, 2], "x": 2, "y": 0},
+ {"matrix": [5, 3], "x": 3, "y": 0},
+ {"matrix": [0, 0], "x": 4, "y": 0},
+ {"matrix": [0, 1], "x": 5, "y": 0},
+ {"matrix": [0, 2], "x": 6, "y": 0},
+ {"matrix": [0, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [0, 5], "x": 9, "y": 0},
+ {"matrix": [0, 6], "x": 10, "y": 0},
+ {"matrix": [0, 7], "x": 11, "y": 0, "w": 1.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 1},
+ {"matrix": [4, 2], "x": 2.25, "y": 1},
+ {"matrix": [4, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 0], "x": 4.25, "y": 1},
+ {"matrix": [1, 1], "x": 5.25, "y": 1},
+ {"matrix": [1, 2], "x": 6.25, "y": 1},
+ {"matrix": [1, 3], "x": 7.25, "y": 1},
+ {"matrix": [1, 4], "x": 8.25, "y": 1},
+ {"matrix": [1, 5], "x": 9.25, "y": 1},
+ {"matrix": [1, 6], "x": 10.25, "y": 1},
+ {"matrix": [1, 7], "x": 11.25, "y": 1, "w": 1.5},
+
+ {"matrix": [4, 6], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [5, 6], "x": 1.75, "y": 2},
+ {"matrix": [5, 5], "x": 2.75, "y": 2},
+ {"matrix": [4, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 0], "x": 4.75, "y": 2},
+ {"matrix": [2, 1], "x": 5.75, "y": 2},
+ {"matrix": [2, 2], "x": 6.75, "y": 2},
+ {"matrix": [2, 3], "x": 7.75, "y": 2},
+ {"matrix": [2, 4], "x": 8.75, "y": 2},
+ {"matrix": [2, 5], "x": 9.75, "y": 2},
+ {"matrix": [2, 6], "x": 10.75, "y": 2},
+ {"matrix": [2, 7], "x": 11.75, "y": 2},
+
+ {"matrix": [4, 5], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [5, 4], "x": 1.25, "y": 3, "w": 1.5},
+ {"matrix": [3, 1], "x": 2.75, "y": 3, "w": 1.25},
+ {"matrix": [3, 2], "x": 4, "y": 3, "w": 2.25},
+ {"matrix": [3, 3], "x": 6.25, "y": 3, "w": 2},
+ {"matrix": [3, 4], "x": 8.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 5], "x": 9.5, "y": 3, "w": 1.5},
+ {"matrix": [3, 7], "x": 11, "y": 3, "w": 1.75}
]
},
-
"LAYOUT_arrow": {
"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, "w":1.75},
- {"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},
- {"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":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}
+ {"matrix": [5, 0], "x": 0, "y": 0},
+ {"matrix": [5, 1], "x": 1, "y": 0},
+ {"matrix": [5, 2], "x": 2, "y": 0},
+ {"matrix": [5, 3], "x": 3, "y": 0},
+ {"matrix": [0, 0], "x": 4, "y": 0},
+ {"matrix": [0, 1], "x": 5, "y": 0},
+ {"matrix": [0, 2], "x": 6, "y": 0},
+ {"matrix": [0, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [0, 5], "x": 9, "y": 0},
+ {"matrix": [0, 6], "x": 10, "y": 0},
+ {"matrix": [0, 7], "x": 11, "y": 0, "w": 1.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 1},
+ {"matrix": [4, 2], "x": 2.25, "y": 1},
+ {"matrix": [4, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 0], "x": 4.25, "y": 1},
+ {"matrix": [1, 1], "x": 5.25, "y": 1},
+ {"matrix": [1, 2], "x": 6.25, "y": 1},
+ {"matrix": [1, 3], "x": 7.25, "y": 1},
+ {"matrix": [1, 4], "x": 8.25, "y": 1},
+ {"matrix": [1, 5], "x": 9.25, "y": 1},
+ {"matrix": [1, 6], "x": 10.25, "y": 1},
+ {"matrix": [1, 7], "x": 11.25, "y": 1, "w": 1.5},
+
+ {"matrix": [4, 6], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [5, 6], "x": 1.75, "y": 2},
+ {"matrix": [5, 5], "x": 2.75, "y": 2},
+ {"matrix": [4, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 0], "x": 4.75, "y": 2},
+ {"matrix": [2, 1], "x": 5.75, "y": 2},
+ {"matrix": [2, 2], "x": 6.75, "y": 2},
+ {"matrix": [2, 3], "x": 7.75, "y": 2},
+ {"matrix": [2, 4], "x": 8.75, "y": 2},
+ {"matrix": [2, 5], "x": 9.75, "y": 2},
+ {"matrix": [2, 6], "x": 10.75, "y": 2},
+ {"matrix": [2, 7], "x": 11.75, "y": 2},
+
+ {"matrix": [4, 5], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [5, 4], "x": 1.25, "y": 3, "w": 1.5},
+ {"matrix": [3, 0], "x": 2.75, "y": 3, "w": 1.25},
+ {"matrix": [3, 2], "x": 4, "y": 3, "w": 2.25},
+ {"matrix": [3, 3], "x": 6.25, "y": 3, "w": 2},
+ {"matrix": [3, 4], "x": 8.25, "y": 3, "w": 1.5},
+ {"matrix": [3, 5], "x": 9.75, "y": 3},
+ {"matrix": [3, 6], "x": 10.75, "y": 3},
+ {"matrix": [3, 7], "x": 11.75, "y": 3}
]
},
-
"LAYOUT_command": {
"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, "w":1.75},
- {"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},
- {"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":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}
+ {"matrix": [5, 0], "x": 0, "y": 0},
+ {"matrix": [5, 1], "x": 1, "y": 0},
+ {"matrix": [5, 2], "x": 2, "y": 0},
+ {"matrix": [5, 3], "x": 3, "y": 0},
+ {"matrix": [0, 0], "x": 4, "y": 0},
+ {"matrix": [0, 1], "x": 5, "y": 0},
+ {"matrix": [0, 2], "x": 6, "y": 0},
+ {"matrix": [0, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [0, 5], "x": 9, "y": 0},
+ {"matrix": [0, 6], "x": 10, "y": 0},
+ {"matrix": [0, 7], "x": 11, "y": 0, "w": 1.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 1},
+ {"matrix": [4, 2], "x": 2.25, "y": 1},
+ {"matrix": [4, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 0], "x": 4.25, "y": 1},
+ {"matrix": [1, 1], "x": 5.25, "y": 1},
+ {"matrix": [1, 2], "x": 6.25, "y": 1},
+ {"matrix": [1, 3], "x": 7.25, "y": 1},
+ {"matrix": [1, 4], "x": 8.25, "y": 1},
+ {"matrix": [1, 5], "x": 9.25, "y": 1},
+ {"matrix": [1, 6], "x": 10.25, "y": 1},
+ {"matrix": [1, 7], "x": 11.25, "y": 1, "w": 1.5},
+
+ {"matrix": [4, 6], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [5, 6], "x": 1.75, "y": 2},
+ {"matrix": [5, 5], "x": 2.75, "y": 2},
+ {"matrix": [4, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 0], "x": 4.75, "y": 2},
+ {"matrix": [2, 1], "x": 5.75, "y": 2},
+ {"matrix": [2, 2], "x": 6.75, "y": 2},
+ {"matrix": [2, 3], "x": 7.75, "y": 2},
+ {"matrix": [2, 4], "x": 8.75, "y": 2},
+ {"matrix": [2, 5], "x": 9.75, "y": 2},
+ {"matrix": [2, 6], "x": 10.75, "y": 2},
+ {"matrix": [2, 7], "x": 11.75, "y": 2},
+
+ {"matrix": [4, 5], "x": 0, "y": 3},
+ {"matrix": [5, 4], "x": 1, "y": 3},
+ {"matrix": [3, 0], "x": 2, "y": 3},
+ {"matrix": [3, 1], "x": 3, "y": 3},
+ {"matrix": [3, 2], "x": 4, "y": 3, "w": 2.25},
+ {"matrix": [3, 3], "x": 6.25, "y": 3, "w": 2},
+ {"matrix": [3, 4], "x": 8.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 5], "x": 9.5, "y": 3, "w": 1.5},
+ {"matrix": [3, 7], "x": 11, "y": 3, "w": 1.75}
]
},
-
"LAYOUT_all": {
"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, "w":1.75},
- {"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},
- {"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":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}
+ {"matrix": [5, 0], "x": 0, "y": 0},
+ {"matrix": [5, 1], "x": 1, "y": 0},
+ {"matrix": [5, 2], "x": 2, "y": 0},
+ {"matrix": [5, 3], "x": 3, "y": 0},
+ {"matrix": [0, 0], "x": 4, "y": 0},
+ {"matrix": [0, 1], "x": 5, "y": 0},
+ {"matrix": [0, 2], "x": 6, "y": 0},
+ {"matrix": [0, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [0, 5], "x": 9, "y": 0},
+ {"matrix": [0, 6], "x": 10, "y": 0},
+ {"matrix": [0, 7], "x": 11, "y": 0, "w": 1.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 1},
+ {"matrix": [4, 2], "x": 2.25, "y": 1},
+ {"matrix": [4, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 0], "x": 4.25, "y": 1},
+ {"matrix": [1, 1], "x": 5.25, "y": 1},
+ {"matrix": [1, 2], "x": 6.25, "y": 1},
+ {"matrix": [1, 3], "x": 7.25, "y": 1},
+ {"matrix": [1, 4], "x": 8.25, "y": 1},
+ {"matrix": [1, 5], "x": 9.25, "y": 1},
+ {"matrix": [1, 6], "x": 10.25, "y": 1},
+ {"matrix": [1, 7], "x": 11.25, "y": 1, "w": 1.5},
+
+ {"matrix": [4, 6], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [5, 6], "x": 1.75, "y": 2},
+ {"matrix": [5, 5], "x": 2.75, "y": 2},
+ {"matrix": [4, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 0], "x": 4.75, "y": 2},
+ {"matrix": [2, 1], "x": 5.75, "y": 2},
+ {"matrix": [2, 2], "x": 6.75, "y": 2},
+ {"matrix": [2, 3], "x": 7.75, "y": 2},
+ {"matrix": [2, 4], "x": 8.75, "y": 2},
+ {"matrix": [2, 5], "x": 9.75, "y": 2},
+ {"matrix": [2, 6], "x": 10.75, "y": 2},
+ {"matrix": [2, 7], "x": 11.75, "y": 2},
+
+ {"matrix": [4, 5], "x": 0, "y": 3},
+ {"matrix": [5, 4], "x": 1, "y": 3},
+ {"matrix": [3, 0], "x": 2, "y": 3},
+ {"matrix": [3, 1], "x": 3, "y": 3},
+ {"matrix": [3, 2], "x": 4, "y": 3, "w": 2.25},
+ {"matrix": [3, 3], "x": 6.25, "y": 3, "w": 2},
+ {"matrix": [3, 4], "x": 8.25, "y": 3, "w": 1.5},
+ {"matrix": [3, 5], "x": 9.75, "y": 3},
+ {"matrix": [3, 6], "x": 10.75, "y": 3},
+ {"matrix": [3, 7], "x": 11.75, "y": 3}
]
},
"LAYOUT_jetvan": {
"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, "w":1.75},
- {"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},
- {"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":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}
+ {"matrix": [5, 0], "x": 0, "y": 0},
+ {"matrix": [5, 1], "x": 1, "y": 0},
+ {"matrix": [5, 2], "x": 2, "y": 0},
+ {"matrix": [5, 3], "x": 3, "y": 0},
+ {"matrix": [0, 0], "x": 4, "y": 0},
+ {"matrix": [0, 1], "x": 5, "y": 0},
+ {"matrix": [0, 2], "x": 6, "y": 0},
+ {"matrix": [0, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [0, 5], "x": 9, "y": 0},
+ {"matrix": [0, 6], "x": 10, "y": 0},
+ {"matrix": [0, 7], "x": 11, "y": 0, "w": 1.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 1},
+ {"matrix": [4, 2], "x": 2.25, "y": 1},
+ {"matrix": [4, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 0], "x": 4.25, "y": 1},
+ {"matrix": [1, 1], "x": 5.25, "y": 1},
+ {"matrix": [1, 2], "x": 6.25, "y": 1},
+ {"matrix": [1, 3], "x": 7.25, "y": 1},
+ {"matrix": [1, 4], "x": 8.25, "y": 1},
+ {"matrix": [1, 5], "x": 9.25, "y": 1},
+ {"matrix": [1, 6], "x": 10.25, "y": 1},
+ {"matrix": [1, 7], "x": 11.25, "y": 1, "w": 1.5},
+
+ {"matrix": [4, 6], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [5, 6], "x": 1.75, "y": 2},
+ {"matrix": [5, 5], "x": 2.75, "y": 2},
+ {"matrix": [4, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 0], "x": 4.75, "y": 2},
+ {"matrix": [2, 1], "x": 5.75, "y": 2},
+ {"matrix": [2, 2], "x": 6.75, "y": 2},
+ {"matrix": [2, 3], "x": 7.75, "y": 2},
+ {"matrix": [2, 4], "x": 8.75, "y": 2},
+ {"matrix": [2, 5], "x": 9.75, "y": 2},
+ {"matrix": [2, 6], "x": 10.75, "y": 2},
+ {"matrix": [2, 7], "x": 11.75, "y": 2},
+
+ {"matrix": [4, 5], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [5, 4], "x": 1.25, "y": 3},
+ {"matrix": [3, 0], "x": 2.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 6.25},
+ {"matrix": [3, 5], "x": 9.75, "y": 3},
+ {"matrix": [3, 6], "x": 10.75, "y": 3},
+ {"matrix": [3, 7], "x": 11.75, "y": 3}
]
}
}
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 @@
-/*
-Copyright 2021 Evan Sailer, Jetpacktuxedo, & QMK Firmware
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#pragma once
-#include "quantum.h"
-
-#define LAYOUT(\
- K39, K40, K41, K42, K0, K1, K2, K3, K4, K5, K6, K7,\
- K32, K33, K34, K35, K8, K9, K10, K11, K12, K13, K14, K15,\
- K38, K45, K44, K36, K16, K17, K18, K19, K20, K21, K22, K23,\
- K37, K43, K24, K26, K27, K28, K29, K31\
-) {\
- { K0, K1, K2, K3, K4, K5, K6, K7 },\
- { K8, K9, K10, K11, K12, K13, K14, K15 },\
- { K16, K17, K18, K19, K20, K21, K22, K23 },\
- { KC_NO, K24, K26, K27, K28, K29, KC_NO, K31 },\
- { K32, K33, K34, K35, K36, K37, K38, KC_NO },\
- { K39, K40, K41, K42, K43, K44, K45, KC_NO }\
-}
-
-#define LAYOUT_arrow(\
- K39, K40, K41, K42, K0, K1, K2, K3, K4, K5, K6, K7,\
- K32, K33, K34, K35, K8, K9, K10, K11, K12, K13, K14, K15,\
- K38, K45, K44, K36, K16, K17, K18, K19, K20, K21, K22, K23,\
- K37, K43, K24, K26, K27, K28, K29, K30, K31\
-) {\
- { K0, K1, K2, K3, K4, K5, K6, K7 }, \
- { K8, K9, K10, K11, K12, K13, K14, K15 }, \
- { K16, K17, K18, K19, K20, K21, K22, K23 }, \
- { K24, KC_NO, K26, K27, K28, K29, K30, K31 }, \
- { K32, K33, K34, K35, K36, K37, K38, KC_NO }, \
- { K39, K40, K41, K42, K43, K44, K45, KC_NO } \
-}
-
-#define LAYOUT_command(\
- K39, K40, K41, K42, K0, K1, K2, K3, K4, K5, K6, K7,\
- K32, K33, K34, K35, K8, K9, K10, K11, K12, K13, K14, K15,\
- K38, K45, K44, K36, K16, K17, K18, K19, K20, K21, K22, K23,\
- K37, K43, K24, K25, K26, K27, K28, K29, K31\
-) {\
- { K0, K1, K2, K3, K4, K5, K6, K7 }, \
- { K8, K9, K10, K11, K12, K13, K14, K15 }, \
- { K16, K17, K18, K19, K20, K21, K22, K23 }, \
- { K24, K25, K26, K27, K28, K29, KC_NO, K31 }, \
- { K32, K33, K34, K35, K36, K37, K38, KC_NO }, \
- { K39, K40, K41, K42, K43, K44, K45, KC_NO } \
-}
-
-// This layout is typically called "southpaw_arrow" or "southpaw + arrow", but
-// using "all" here to match typical qmk conventions
-#define LAYOUT_all(\
- K39, K40, K41, K42, K0, K1, K2, K3, K4, K5, K6, K7,\
- K32, K33, K34, K35, K8, K9, K10, K11, K12, K13, K14, K15,\
- K38, K45, K44, K36, K16, K17, K18, K19, K20, K21, K22, K23,\
- K37, K43, K24, K25, K26, K27, K28, K29, K30, K31\
-) {\
- { K0, K1, K2, K3, K4, K5, K6, K7 }, \
- { K8, K9, K10, K11, K12, K13, K14, K15 }, \
- { K16, K17, K18, K19, K20, K21, K22, K23 }, \
- { K24, K25, K26, K27, K28, K29, K30, K31 }, \
- { K32, K33, K34, K35, K36, K37, K38, KC_NO }, \
- { K39, K40, K41, K42, K43, K44, K45, KC_NO } \
-}
-
-#define LAYOUT_jetvan(\
- K39, K40, K41, K42, K0, K1, K2, K3, K4, K5, K6, K7,\
- K32, K33, K34, K35, K8, K9, K10, K11, K12, K13, K14, K15,\
- K38, K45, K44, K36, K16, K17, K18, K19, K20, K21, K22, K23,\
- K37, K43, K24, K27, K29, K30, K31\
-) {\
- { K0, K1, K2, K3, K4, K5, K6, K7 }, \
- { K8, K9, K10, K11, K12, K13, K14, K15 }, \
- { K16, K17, K18, K19, K20, K21, K22, K23 }, \
- { K24, KC_NO, KC_NO, K27, KC_NO, K29, K30, K31 }, \
- { K32, K33, K34, K35, K36, K37, K38, KC_NO }, \
- { K39, K40, K41, K42, K43, K44, K45, KC_NO } \
-}
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 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"F2", "x":1, "y":0},
- {"label":"Esc", "x":2.5, "y":0},
- {"label":"!", "x":3.5, "y":0},
- {"label":"@", "x":4.5, "y":0},
- {"label":"#", "x":5.5, "y":0},
- {"label":"$", "x":6.5, "y":0},
- {"label":"%", "x":7.5, "y":0},
- {"label":"^", "x":8.5, "y":0},
- {"label":"&", "x":9.5, "y":0},
- {"label":"*", "x":10.5, "y":0},
- {"label":"(", "x":11.5, "y":0},
- {"label":")", "x":12.5, "y":0},
- {"label":"_", "x":13.5, "y":0},
- {"label":"+", "x":14.5, "y":0},
- {"label":"Backspace", "x":15.5, "y":0, "w":1.75},
- {"label":"Num Lock", "x":17.25, "y":0},
- {"label":"Scroll Lock", "x":18.25, "y":0, "w":1.5},
- {"label":"Sys Req", "x":19.75, "y":0, "w":1.5},
- {"label":"F3", "x":0, "y":1},
- {"label":"F4", "x":1, "y":1},
- {"label":"Tab", "x":2.5, "y":1, "w":1.5},
- {"label":"Q", "x":4, "y":1},
- {"label":"W", "x":5, "y":1},
- {"label":"E", "x":6, "y":1},
- {"label":"R", "x":7, "y":1},
- {"label":"T", "x":8, "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, "y":1, "w":1.25},
- {"label":"Enter", "x":15.25, "y":2, "w":2},
- {"label":"7", "x":17.25, "y":1},
- {"label":"8", "x":18.25, "y":1},
- {"label":"9", "x":19.25, "y":1},
- {"label":"PrtSc", "x":20.25, "y":1},
- {"label":"F5", "x":0, "y":2},
- {"label":"F6", "x":1, "y":2},
- {"label":"Ctrl", "x":2.5, "y":2, "w":1.75},
- {"label":"A", "x":4.25, "y":2},
- {"label":"S", "x":5.25, "y":2},
- {"label":"D", "x":6.25, "y":2},
- {"label":"F", "x":7.25, "y":2},
- {"label":"G", "x":8.25, "y":2},
- {"label":"H", "x":9.25, "y":2},
- {"label":"J", "x":10.25, "y":2},
- {"label":"K", "x":11.25, "y":2},
- {"label":"L", "x":12.25, "y":2},
- {"label":":", "x":13.25, "y":2},
- {"label":"\"", "x":14.25, "y":2},
- {"label":"4", "x":17.25, "y":2},
- {"label":"5", "x":18.25, "y":2},
- {"label":"6", "x":19.25, "y":2},
- {"label":"-", "x":20.25, "y":2},
- {"label":"F7", "x":0, "y":3},
- {"label":"F8", "x":1, "y":3},
- {"label":"Shift", "x":2.5, "y":3, "w":2.25},
- {"label":"Z", "x":4.75, "y":3},
- {"label":"X", "x":5.75, "y":3},
- {"label":"C", "x":6.75, "y":3},
- {"label":"V", "x":7.75, "y":3},
- {"label":"B", "x":8.75, "y":3},
- {"label":"N", "x":9.75, "y":3},
- {"label":"M", "x":10.75, "y":3},
- {"label":"<", "x":11.75, "y":3},
- {"label":">", "x":12.75, "y":3},
- {"label":"?", "x":13.75, "y":3},
- {"label":"Shift", "x":14.75, "y":3, "w":1.5},
- {"label":"|", "x":16.25, "y":3},
- {"label":"1", "x":17.25, "y":3},
- {"label":"2", "x":18.25, "y":3},
- {"label":"3", "x":19.25, "y":3},
- {"label":"+", "x":20.25, "y":3, "h":2},
- {"label":"F9", "x":0, "y":4},
- {"label":"F10", "x":1, "y":4},
- {"label":"Alt", "x":2.5, "y":4, "w":1.75},
- {"label":"~", "x":4.25, "y":4},
- {"label":"Space", "x":5.25, "y":4, "w":9},
- {"label":"Caps Lock", "x":14.25, "y":4, "w":2},
- {"label":"0", "x":16.25, "y":4, "w":2},
- {"label":".", "x":18.25, "y":4, "w":2}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [0, 9], "x": 9.5, "y": 0},
+ {"matrix": [0, 10], "x": 10.5, "y": 0},
+ {"matrix": [0, 11], "x": 11.5, "y": 0},
+ {"matrix": [0, 12], "x": 12.5, "y": 0},
+ {"matrix": [0, 13], "x": 13.5, "y": 0},
+ {"matrix": [0, 14], "x": 14.5, "y": 0},
+ {"matrix": [0, 15], "x": 15.5, "y": 0, "w": 1.75},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+ {"matrix": [0, 17], "x": 18.25, "y": 0, "w": 1.5},
+ {"matrix": [0, 19], "x": 19.75, "y": 0, "w": 1.5},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+
+ {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 3], "x": 4, "y": 1},
+ {"matrix": [1, 4], "x": 5, "y": 1},
+ {"matrix": [1, 5], "x": 6, "y": 1},
+ {"matrix": [1, 6], "x": 7, "y": 1},
+ {"matrix": [1, 7], "x": 8, "y": 1},
+ {"matrix": [1, 8], "x": 9, "y": 1},
+ {"matrix": [1, 9], "x": 10, "y": 1},
+ {"matrix": [1, 10], "x": 11, "y": 1},
+ {"matrix": [1, 11], "x": 12, "y": 1},
+ {"matrix": [1, 12], "x": 13, "y": 1},
+ {"matrix": [1, 13], "x": 14, "y": 1},
+ {"matrix": [1, 14], "x": 15, "y": 1, "w": 1.25},
+ {"matrix": [1, 15], "x": 15.25, "y": 2, "w": 2},
+ {"matrix": [1, 16], "x": 17.25, "y": 1},
+ {"matrix": [1, 17], "x": 18.25, "y": 1},
+ {"matrix": [1, 18], "x": 19.25, "y": 1},
+ {"matrix": [1, 19], "x": 20.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+
+ {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 3], "x": 4.25, "y": 2},
+ {"matrix": [2, 4], "x": 5.25, "y": 2},
+ {"matrix": [2, 5], "x": 6.25, "y": 2},
+ {"matrix": [2, 6], "x": 7.25, "y": 2},
+ {"matrix": [2, 7], "x": 8.25, "y": 2},
+ {"matrix": [2, 8], "x": 9.25, "y": 2},
+ {"matrix": [2, 9], "x": 10.25, "y": 2},
+ {"matrix": [2, 10], "x": 11.25, "y": 2},
+ {"matrix": [2, 11], "x": 12.25, "y": 2},
+ {"matrix": [2, 12], "x": 13.25, "y": 2},
+ {"matrix": [2, 13], "x": 14.25, "y": 2},
+ {"matrix": [2, 15], "x": 17.25, "y": 2},
+ {"matrix": [2, 16], "x": 18.25, "y": 2},
+ {"matrix": [2, 17], "x": 19.25, "y": 2},
+ {"matrix": [2, 18], "x": 20.25, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+
+ {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 3], "x": 4.75, "y": 3},
+ {"matrix": [3, 4], "x": 5.75, "y": 3},
+ {"matrix": [3, 5], "x": 6.75, "y": 3},
+ {"matrix": [3, 6], "x": 7.75, "y": 3},
+ {"matrix": [3, 7], "x": 8.75, "y": 3},
+ {"matrix": [3, 8], "x": 9.75, "y": 3},
+ {"matrix": [3, 9], "x": 10.75, "y": 3},
+ {"matrix": [3, 10], "x": 11.75, "y": 3},
+ {"matrix": [3, 11], "x": 12.75, "y": 3},
+ {"matrix": [3, 12], "x": 13.75, "y": 3},
+ {"matrix": [3, 13], "x": 14.75, "y": 3, "w": 1.5},
+ {"matrix": [3, 14], "x": 16.25, "y": 3},
+ {"matrix": [3, 15], "x": 17.25, "y": 3},
+ {"matrix": [3, 16], "x": 18.25, "y": 3},
+ {"matrix": [3, 17], "x": 19.25, "y": 3},
+ {"matrix": [3, 18], "x": 20.25, "y": 3, "h": 2},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.75},
+ {"matrix": [4, 3], "x": 4.25, "y": 4},
+ {"matrix": [4, 7], "x": 5.25, "y": 4, "w": 9},
+ {"matrix": [4, 14], "x": 14.25, "y": 4, "w": 2},
+ {"matrix": [4, 15], "x": 16.25, "y": 4, "w": 2},
+ {"matrix": [4, 17], "x": 18.25, "y": 4, "w": 2}
]
},
"LAYOUT_z150_tkl": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"F2", "x":1, "y":0},
- {"label":"Esc", "x":2.5, "y":0},
- {"label":"1", "x":3.5, "y":0},
- {"label":"2", "x":4.5, "y":0},
- {"label":"3", "x":5.5, "y":0},
- {"label":"4", "x":6.5, "y":0},
- {"label":"5", "x":7.5, "y":0},
- {"label":"6", "x":8.5, "y":0},
- {"label":"7", "x":9.5, "y":0},
- {"label":"8", "x":10.5, "y":0},
- {"label":"9", "x":11.5, "y":0},
- {"label":"0", "x":12.5, "y":0},
- {"label":"-", "x":13.5, "y":0},
- {"label":"=", "x":14.5, "y":0},
- {"label":"Backspace", "x":15.5, "y":0, "w":2},
- {"label":"Insert", "x":18.25, "y":0},
- {"label":"Home", "x":19.25, "y":0},
- {"label":"PgUp", "x":20.25, "y":0},
- {"label":"F3", "x":0, "y":1},
- {"label":"F4", "x":1, "y":1},
- {"label":"Tab", "x":2.5, "y":1, "w":1.5},
- {"label":"Q", "x":4, "y":1},
- {"label":"W", "x":5, "y":1},
- {"label":"E", "x":6, "y":1},
- {"label":"R", "x":7, "y":1},
- {"label":"T", "x":8, "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, "y":1},
- {"label":"\\", "x":16, "y":1, "w":1.5},
- {"label":"Delete", "x":18.25, "y":1},
- {"label":"End", "x":19.25, "y":1},
- {"label":"PgDn", "x":20.25, "y":1},
- {"label":"F5", "x":0, "y":2},
- {"label":"F6", "x":1, "y":2},
- {"label":"Caps Lock", "x":2.5, "y":2, "w":1.75},
- {"label":"A", "x":4.25, "y":2},
- {"label":"S", "x":5.25, "y":2},
- {"label":"D", "x":6.25, "y":2},
- {"label":"F", "x":7.25, "y":2},
- {"label":"G", "x":8.25, "y":2},
- {"label":"H", "x":9.25, "y":2},
- {"label":"J", "x":10.25, "y":2},
- {"label":"K", "x":11.25, "y":2},
- {"label":"L", "x":12.25, "y":2},
- {"label":";", "x":13.25, "y":2},
- {"label":"'", "x":14.25, "y":2},
- {"label":"Enter", "x":15.25, "y":2, "w":2.25},
- {"x":18.25, "y":2},
- {"x":19.25, "y":2},
- {"x":20.25, "y":2},
- {"label":"F7", "x":0, "y":3},
- {"label":"F8", "x":1, "y":3},
- {"label":"Shift", "x":2.5, "y":3, "w":1.25},
- {"label":"ISO \\", "x":3.75, "y":3},
- {"label":"Z", "x":4.75, "y":3},
- {"label":"X", "x":5.75, "y":3},
- {"label":"C", "x":6.75, "y":3},
- {"label":"V", "x":7.75, "y":3},
- {"label":"B", "x":8.75, "y":3},
- {"label":"N", "x":9.75, "y":3},
- {"label":"M", "x":10.75, "y":3},
- {"label":",", "x":11.75, "y":3},
- {"label":".", "x":12.75, "y":3},
- {"label":"/", "x":13.75, "y":3},
- {"label":"Shift", "x":14.75, "y":3, "w":1.75},
- {"label":"Fn", "x":16.5, "y":3},
- {"x":18.25, "y":3},
- {"label":"Up", "x":19.25, "y":3},
- {"x":20.25, "y":3},
- {"label":"F9", "x":0, "y":4},
- {"label":"F10", "x":1, "y":4},
- {"label":"Ctrl", "x":2.5, "y":4, "w":1.25},
- {"label":"Win", "x":3.75, "y":4, "w":1.25},
- {"label":"Alt", "x":5, "y":4, "w":1.25},
- {"label":"Space", "x":6.25, "y":4, "w":6.25},
- {"label":"Alt", "x":12.5, "y":4, "w":1.25},
- {"label":"Win", "x":13.75, "y":4, "w":1.25},
- {"label":"Menu", "x":15, "y":4, "w":1.25},
- {"label":"Ctrl", "x":16.25, "y":4, "w":1.25},
- {"label":"Left", "x":18.25, "y":4},
- {"label":"Down", "x":19.25, "y":4},
- {"label":"Right", "x":20.25, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [0, 9], "x": 9.5, "y": 0},
+ {"matrix": [0, 10], "x": 10.5, "y": 0},
+ {"matrix": [0, 11], "x": 11.5, "y": 0},
+ {"matrix": [0, 12], "x": 12.5, "y": 0},
+ {"matrix": [0, 13], "x": 13.5, "y": 0},
+ {"matrix": [0, 14], "x": 14.5, "y": 0},
+ {"matrix": [0, 15], "x": 15.5, "y": 0, "w": 2},
+
+ {"matrix": [0, 17], "x": 18.25, "y": 0},
+ {"matrix": [0, 18], "x": 19.25, "y": 0},
+ {"matrix": [0, 19], "x": 20.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+
+ {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 3], "x": 4, "y": 1},
+ {"matrix": [1, 4], "x": 5, "y": 1},
+ {"matrix": [1, 5], "x": 6, "y": 1},
+ {"matrix": [1, 6], "x": 7, "y": 1},
+ {"matrix": [1, 7], "x": 8, "y": 1},
+ {"matrix": [1, 8], "x": 9, "y": 1},
+ {"matrix": [1, 9], "x": 10, "y": 1},
+ {"matrix": [1, 10], "x": 11, "y": 1},
+ {"matrix": [1, 11], "x": 12, "y": 1},
+ {"matrix": [1, 12], "x": 13, "y": 1},
+ {"matrix": [1, 13], "x": 14, "y": 1},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+ {"matrix": [1, 15], "x": 16, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 17], "x": 18.25, "y": 1},
+ {"matrix": [1, 18], "x": 19.25, "y": 1},
+ {"matrix": [1, 19], "x": 20.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+
+ {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 3], "x": 4.25, "y": 2},
+ {"matrix": [2, 4], "x": 5.25, "y": 2},
+ {"matrix": [2, 5], "x": 6.25, "y": 2},
+ {"matrix": [2, 6], "x": 7.25, "y": 2},
+ {"matrix": [2, 7], "x": 8.25, "y": 2},
+ {"matrix": [2, 8], "x": 9.25, "y": 2},
+ {"matrix": [2, 9], "x": 10.25, "y": 2},
+ {"matrix": [2, 10], "x": 11.25, "y": 2},
+ {"matrix": [2, 11], "x": 12.25, "y": 2},
+ {"matrix": [2, 12], "x": 13.25, "y": 2},
+ {"matrix": [2, 13], "x": 14.25, "y": 2},
+ {"matrix": [2, 14], "x": 15.25, "y": 2, "w": 2.25},
+
+ {"matrix": [2, 16], "x": 18.25, "y": 2},
+ {"matrix": [2, 17], "x": 19.25, "y": 2},
+ {"matrix": [2, 18], "x": 20.25, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+
+ {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 3},
+ {"matrix": [3, 3], "x": 4.75, "y": 3},
+ {"matrix": [3, 4], "x": 5.75, "y": 3},
+ {"matrix": [3, 5], "x": 6.75, "y": 3},
+ {"matrix": [3, 6], "x": 7.75, "y": 3},
+ {"matrix": [3, 7], "x": 8.75, "y": 3},
+ {"matrix": [3, 8], "x": 9.75, "y": 3},
+ {"matrix": [3, 9], "x": 10.75, "y": 3},
+ {"matrix": [3, 10], "x": 11.75, "y": 3},
+ {"matrix": [3, 11], "x": 12.75, "y": 3},
+ {"matrix": [3, 12], "x": 13.75, "y": 3},
+ {"matrix": [3, 13], "x": 14.75, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16.5, "y": 3},
+
+ {"matrix": [3, 16], "x": 18.25, "y": 3},
+ {"matrix": [3, 17], "x": 19.25, "y": 3},
+ {"matrix": [3, 18], "x": 20.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 6.25, "y": 4, "w": 6.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25},
+ {"matrix": [4, 15], "x": 16.25, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 16], "x": 18.25, "y": 4},
+ {"matrix": [4, 17], "x": 19.25, "y": 4},
+ {"matrix": [4, 18], "x": 20.25, "y": 4}
]
}
}
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 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0J, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, K2G, K2H, K2I, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, \
- K40, K41, K42, K43, K47, K4E, K4F, K4H \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, KC_NO, K0J }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO, K2F, K2G, K2H, K2I, KC_NO }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, KC_NO }, \
- { 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 } \
-}
-
-#define LAYOUT_z150_tkl( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0H, K0I, K0J, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1H, K1I, K1J, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2G, K2H, K2I, \
- K30, K31, K32, K45, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3G, K3H, K3I, \
- K40, K41, K42, K43, K44, K47, K4C, K4D, K4E, K4F, K4G, K4H, K4I \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, KC_NO, K0H, K0I, K0J }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, KC_NO, K1H, K1I, K1J }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, KC_NO, K2G, K2H, K2I, KC_NO }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, KC_NO, K3G, K3H, K3I, KC_NO }, \
- { 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 } \
-}
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 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K05, K25, K35, K45, K55, K06, KA6, KA7, K07, KB5, KC5, KD5, KE5, KD1, KE1, KE2, \
- K04, K14, K24, K34, K44, K54, K16, KB6, KB7, K17, KA4, KB4, KC4, KE4, KD0, \
- K03, K13, K23, K33, K43, K53, K26, KC6, KC7, K27, KA3, KB3, KC3, KD3, K67, \
- K02, K12, K22, K32, K42, K52, K36, KD6, KD7, K37, KA2, KB2, KD2, KE0, \
- K01, K11, K21, K31, K41, K51, K46, KE6, KE7, K47, KA1, KB1, K86, K77, \
- K00, K10, K20, K56, K57, KB0, KC0, K66, K76, K96 \
-){ \
- { K00, K10, K20, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KB0, KC0, KD0, KE0 }, \
- { K01, K11, K21, K31, K41, K51, KC_NO, KC_NO, KC_NO, KC_NO, KA1, KB1, KC_NO, KD1, KE1 }, \
- { K02, K12, K22, K32, K42, K52, KC_NO, KC_NO, KC_NO, KC_NO, KA2, KB2, KC_NO, KD2, KE2 }, \
- { K03, K13, K23, K33, K43, K53, KC_NO, KC_NO, KC_NO, KC_NO, KA3, KB3, KC3, KD3, KC_NO }, \
- { K04, K14, K24, K34, K44, K54, KC_NO, KC_NO, KC_NO, KC_NO, KA4, KB4, KC4, KC_NO, KE4 }, \
- { K05, KC_NO, K25, K35, K45, K55, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KB5, KC5, KD5, KE5 }, \
- { K06, K16, K26, K36, K46, K56, K66, K76, K86, K96, KA6, KB6, KC6, KD6, KE6 }, \
- { K07, K17, K27, K37, K47, K57, K67, K77, KC_NO, KC_NO, KA7, KB7, KC7, KD7, KE7 } \
-}
-
-#define LAYOUT_splitbs( \
- K05, K25, K35, K45, K55, K06, KA6, KA7, K07, KB5, KC5, KD5, KE5, KD1, KE1, KE2, \
- K04, K14, K24, K34, K44, K54, K16, KB6, KB7, K17, KA4, KB4, KC4, KE4, KD4, KD0, \
- K03, K13, K23, K33, K43, K53, K26, KC6, KC7, K27, KA3, KB3, KC3, KD3, K67, \
- K02, K12, K22, K32, K42, K52, K36, KD6, KD7, K37, KA2, KB2, KD2, KE0, \
- K01, K11, K21, K31, K41, K51, K46, KE6, KE7, K47, KA1, KB1, K86, K77, \
- K00, K10, K20, K56, K57, KB0, KC0, K66, K76, K96 \
-){ \
- { K00, K10, K20, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KB0, KC0, KD0, KE0 }, \
- { K01, K11, K21, K31, K41, K51, KC_NO, KC_NO, KC_NO, KC_NO, KA1, KB1, KC_NO, KD1, KE1 }, \
- { K02, K12, K22, K32, K42, K52, KC_NO, KC_NO, KC_NO, KC_NO, KA2, KB2, KC_NO, KD2, KE2 }, \
- { K03, K13, K23, K33, K43, K53, KC_NO, KC_NO, KC_NO, KC_NO, KA3, KB3, KC3, KD3, KC_NO }, \
- { K04, K14, K24, K34, K44, K54, KC_NO, KC_NO, KC_NO, KC_NO, KA4, KB4, KC4, KD4, KE4 }, \
- { K05, KC_NO, K25, K35, K45, K55, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KB5, KC5, KD5, KE5 }, \
- { K06, K16, K26, K36, K46, K56, K66, K76, K86, K96, KA6, KB6, KC6, KD6, KE6 }, \
- { K07, K17, K27, K37, K47, K57, K67, K77, KC_NO, KC_NO, KA7, KB7, KC7, KD7, KE7 } \
-}
-
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 @@
"bootloader": "bootloadhid",
"layouts": {
"LAYOUT": {
- "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}]
+ "layout": [
+ {"matrix": [5, 0], "x": 0, "y": 0},
+ {"matrix": [5, 2], "x": 1, "y": 0},
+ {"matrix": [5, 3], "x": 2, "y": 0},
+ {"matrix": [5, 4], "x": 3, "y": 0},
+ {"matrix": [5, 5], "x": 4, "y": 0},
+ {"matrix": [6, 0], "x": 5, "y": 0},
+ {"matrix": [6, 10], "x": 6, "y": 0},
+ {"matrix": [7, 10], "x": 7, "y": 0},
+ {"matrix": [7, 0], "x": 8, "y": 0},
+ {"matrix": [5, 11], "x": 9, "y": 0},
+ {"matrix": [5, 12], "x": 10, "y": 0},
+ {"matrix": [5, 13], "x": 11, "y": 0},
+ {"matrix": [5, 14], "x": 12, "y": 0},
+ {"matrix": [1, 13], "x": 13, "y": 0},
+ {"matrix": [1, 14], "x": 14, "y": 0},
+ {"matrix": [2, 14], "x": 15, "y": 0},
+
+ {"matrix": [4, 0], "x": 0, "y": 1},
+ {"matrix": [4, 1], "x": 1, "y": 1},
+ {"matrix": [4, 2], "x": 2, "y": 1},
+ {"matrix": [4, 3], "x": 3, "y": 1},
+ {"matrix": [4, 4], "x": 4, "y": 1},
+ {"matrix": [4, 5], "x": 5, "y": 1},
+ {"matrix": [6, 1], "x": 6, "y": 1},
+ {"matrix": [6, 11], "x": 7, "y": 1},
+ {"matrix": [7, 11], "x": 8, "y": 1},
+ {"matrix": [7, 1], "x": 9, "y": 1},
+ {"matrix": [4, 10], "x": 10, "y": 1},
+ {"matrix": [4, 11], "x": 11, "y": 1},
+ {"matrix": [4, 12], "x": 12, "y": 1},
+ {"matrix": [4, 14], "x": 13, "y": 1, "w": 2},
+ {"matrix": [0, 13], "x": 15, "y": 1},
+
+ {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [3, 1], "x": 1.5, "y": 2},
+ {"matrix": [3, 2], "x": 2.5, "y": 2},
+ {"matrix": [3, 3], "x": 3.5, "y": 2},
+ {"matrix": [3, 4], "x": 4.5, "y": 2},
+ {"matrix": [3, 5], "x": 5.5, "y": 2},
+ {"matrix": [6, 2], "x": 6.5, "y": 2},
+ {"matrix": [6, 12], "x": 7.5, "y": 2},
+ {"matrix": [7, 12], "x": 8.5, "y": 2},
+ {"matrix": [7, 2], "x": 9.5, "y": 2},
+ {"matrix": [3, 10], "x": 10.5, "y": 2},
+ {"matrix": [3, 11], "x": 11.5, "y": 2},
+ {"matrix": [3, 12], "x": 12.5, "y": 2},
+ {"matrix": [3, 13], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [7, 6], "x": 15, "y": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 3},
+ {"matrix": [2, 2], "x": 2.75, "y": 3},
+ {"matrix": [2, 3], "x": 3.75, "y": 3},
+ {"matrix": [2, 4], "x": 4.75, "y": 3},
+ {"matrix": [2, 5], "x": 5.75, "y": 3},
+ {"matrix": [6, 3], "x": 6.75, "y": 3},
+ {"matrix": [6, 13], "x": 7.75, "y": 3},
+ {"matrix": [7, 13], "x": 8.75, "y": 3},
+ {"matrix": [7, 3], "x": 9.75, "y": 3},
+ {"matrix": [2, 10], "x": 10.75, "y": 3},
+ {"matrix": [2, 11], "x": 11.75, "y": 3},
+ {"matrix": [2, 13], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [0, 14], "x": 15, "y": 3},
+
+ {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
+ {"matrix": [1, 1], "x": 2.25, "y": 4},
+ {"matrix": [1, 2], "x": 3.25, "y": 4},
+ {"matrix": [1, 3], "x": 4.25, "y": 4},
+ {"matrix": [1, 4], "x": 5.25, "y": 4},
+ {"matrix": [1, 5], "x": 6.25, "y": 4},
+ {"matrix": [6, 4], "x": 7.25, "y": 4},
+ {"matrix": [6, 14], "x": 8.25, "y": 4},
+ {"matrix": [7, 14], "x": 9.25, "y": 4},
+ {"matrix": [7, 4], "x": 10.25, "y": 4},
+ {"matrix": [1, 10], "x": 11.25, "y": 4},
+ {"matrix": [1, 11], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [6, 8], "x": 14, "y": 4},
+ {"matrix": [7, 7], "x": 15, "y": 4},
+
+ {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [6, 5], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [7, 5], "x": 10, "y": 5},
+ {"matrix": [0, 11], "x": 11, "y": 5},
+ {"matrix": [0, 12], "x": 12, "y": 5},
+ {"matrix": [6, 6], "x": 13, "y": 5},
+ {"matrix": [6, 7], "x": 14, "y": 5},
+ {"matrix": [6, 9], "x": 15, "y": 5}
+ ]
},
"LAYOUT_splitbs": {
- "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}]
+ "layout": [
+ {"matrix": [5, 0], "x": 0, "y": 0},
+ {"matrix": [5, 2], "x": 1, "y": 0},
+ {"matrix": [5, 3], "x": 2, "y": 0},
+ {"matrix": [5, 4], "x": 3, "y": 0},
+ {"matrix": [5, 5], "x": 4, "y": 0},
+ {"matrix": [6, 0], "x": 5, "y": 0},
+ {"matrix": [6, 10], "x": 6, "y": 0},
+ {"matrix": [7, 10], "x": 7, "y": 0},
+ {"matrix": [7, 0], "x": 8, "y": 0},
+ {"matrix": [5, 11], "x": 9, "y": 0},
+ {"matrix": [5, 12], "x": 10, "y": 0},
+ {"matrix": [5, 13], "x": 11, "y": 0},
+ {"matrix": [5, 14], "x": 12, "y": 0},
+ {"matrix": [1, 13], "x": 13, "y": 0},
+ {"matrix": [1, 14], "x": 14, "y": 0},
+ {"matrix": [2, 14], "x": 15, "y": 0},
+
+ {"matrix": [4, 0], "x": 0, "y": 1},
+ {"matrix": [4, 1], "x": 1, "y": 1},
+ {"matrix": [4, 2], "x": 2, "y": 1},
+ {"matrix": [4, 3], "x": 3, "y": 1},
+ {"matrix": [4, 4], "x": 4, "y": 1},
+ {"matrix": [4, 5], "x": 5, "y": 1},
+ {"matrix": [6, 1], "x": 6, "y": 1},
+ {"matrix": [6, 11], "x": 7, "y": 1},
+ {"matrix": [7, 11], "x": 8, "y": 1},
+ {"matrix": [7, 1], "x": 9, "y": 1},
+ {"matrix": [4, 10], "x": 10, "y": 1},
+ {"matrix": [4, 11], "x": 11, "y": 1},
+ {"matrix": [4, 12], "x": 12, "y": 1},
+ {"matrix": [4, 14], "x": 13, "y": 1},
+ {"matrix": [4, 13], "x": 14, "y": 1},
+ {"matrix": [0, 13], "x": 15, "y": 1},
+
+ {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [3, 1], "x": 1.5, "y": 2},
+ {"matrix": [3, 2], "x": 2.5, "y": 2},
+ {"matrix": [3, 3], "x": 3.5, "y": 2},
+ {"matrix": [3, 4], "x": 4.5, "y": 2},
+ {"matrix": [3, 5], "x": 5.5, "y": 2},
+ {"matrix": [6, 2], "x": 6.5, "y": 2},
+ {"matrix": [6, 12], "x": 7.5, "y": 2},
+ {"matrix": [7, 12], "x": 8.5, "y": 2},
+ {"matrix": [7, 2], "x": 9.5, "y": 2},
+ {"matrix": [3, 10], "x": 10.5, "y": 2},
+ {"matrix": [3, 11], "x": 11.5, "y": 2},
+ {"matrix": [3, 12], "x": 12.5, "y": 2},
+ {"matrix": [3, 13], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [7, 6], "x": 15, "y": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 3},
+ {"matrix": [2, 2], "x": 2.75, "y": 3},
+ {"matrix": [2, 3], "x": 3.75, "y": 3},
+ {"matrix": [2, 4], "x": 4.75, "y": 3},
+ {"matrix": [2, 5], "x": 5.75, "y": 3},
+ {"matrix": [6, 3], "x": 6.75, "y": 3},
+ {"matrix": [6, 13], "x": 7.75, "y": 3},
+ {"matrix": [7, 13], "x": 8.75, "y": 3},
+ {"matrix": [7, 3], "x": 9.75, "y": 3},
+ {"matrix": [2, 10], "x": 10.75, "y": 3},
+ {"matrix": [2, 11], "x": 11.75, "y": 3},
+ {"matrix": [2, 13], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [0, 14], "x": 15, "y": 3},
+
+ {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
+ {"matrix": [1, 1], "x": 2.25, "y": 4},
+ {"matrix": [1, 2], "x": 3.25, "y": 4},
+ {"matrix": [1, 3], "x": 4.25, "y": 4},
+ {"matrix": [1, 4], "x": 5.25, "y": 4},
+ {"matrix": [1, 5], "x": 6.25, "y": 4},
+ {"matrix": [6, 4], "x": 7.25, "y": 4},
+ {"matrix": [6, 14], "x": 8.25, "y": 4},
+ {"matrix": [7, 14], "x": 9.25, "y": 4},
+ {"matrix": [7, 4], "x": 10.25, "y": 4},
+ {"matrix": [1, 10], "x": 11.25, "y": 4},
+ {"matrix": [1, 11], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [6, 8], "x": 14, "y": 4},
+ {"matrix": [7, 7], "x": 15, "y": 4},
+
+ {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [6, 5], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [7, 5], "x": 10, "y": 5},
+ {"matrix": [0, 11], "x": 11, "y": 5},
+ {"matrix": [0, 12], "x": 12, "y": 5},
+ {"matrix": [6, 6], "x": 13, "y": 5},
+ {"matrix": [6, 7], "x": 14, "y": 5},
+ {"matrix": [6, 9], "x": 15, "y": 5}
+ ]
}
}
}
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 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K05, K25, K35, K45, K55, K06, KA6, KA7, K07, KB5, KC5, KD5, KE5, KD1, KE1, KE2, K65, K75, K85, K95, \
- K04, K14, K24, K34, K44, K54, K16, KB6, KB7, K17, KA4, KB4, KC4, KE4, KD0, K64, K74, K84, K94, \
- K03, K13, K23, K33, K43, K53, K26, KC6, KC7, K27, KA3, KB3, KC3, KD3, K67, K63, K73, K83, \
- K02, K12, K22, K32, K42, K52, K36, KD6, KD7, K37, KA2, KB2, KC2, KD2, KE0, K62, K72, K82, K92, \
- K01, K30, K11, K21, K31, K41, K51, K46, KE6, KE7, K47, KA1, KB1, K86, K77, K61, K71, K81, \
- K00, K10, K20, K56, K57, KB0, KC0, K66, K76, K96, K60, K80, K90 \
-){ \
- { K00, K10, K20, K30, KC_NO, KC_NO, K60, KC_NO, K80, K90, KC_NO, KB0, KC0, KD0, KE0 }, \
- { K01, K11, K21, K31, K41, K51, K61, K71, K81, KC_NO, KA1, KB1, KC_NO, KD1, KE1 }, \
- { K02, K12, K22, K32, K42, K52, K62, K72, K82, K92, KA2, KB2, KC2, KD2, KE2 }, \
- { K03, K13, K23, K33, K43, K53, K63, K73, K83, KC_NO, KA3, KB3, KC3, KD3, KC_NO }, \
- { K04, K14, K24, K34, K44, K54, K64, K74, K84, K94, KA4, KB4, KC4, KC_NO, KE4 }, \
- { K05, KC_NO, K25, K35, K45, K55, K65, K75, K85, K95, KC_NO, KB5, KC5, KD5, KE5 }, \
- { K06, K16, K26, K36, K46, K56, K66, K76, K86, K96, KA6, KB6, KC6, KD6, KE6 }, \
- { K07, K17, K27, K37, K47, K57, K67, K77, KC_NO, KC_NO, KA7, KB7, KC7, KD7, KE7 } \
-}
-
-#define LAYOUT_ansi( \
- K05, K25, K35, K45, K55, K06, KA6, KA7, K07, KB5, KC5, KD5, KE5, KD1, KE1, KE2, K65, K75, K85, K95, \
- K04, K14, K24, K34, K44, K54, K16, KB6, KB7, K17, KA4, KB4, KC4, KE4, KD0, K64, K74, K84, K94, \
- K03, K13, K23, K33, K43, K53, K26, KC6, KC7, K27, KA3, KB3, KC3, KD3, K67, K63, K73, K83, \
- K02, K12, K22, K32, K42, K52, K36, KD6, KD7, K37, KA2, KB2, KD2, KE0, K62, K72, K82, K92, \
- K01, K11, K21, K31, K41, K51, K46, KE6, KE7, K47, KA1, KB1, K86, K77, K61, K71, K81, \
- K00, K10, K20, K56, K57, KB0, KC0, K66, K76, K96, K60, K80, K90 \
-){ \
- { K00, K10, K20, KC_NO, KC_NO, KC_NO, K60, KC_NO, K80, K90, KC_NO, KB0, KC0, KD0, KE0 }, \
- { K01, K11, K21, K31, K41, K51, K61, K71, K81, KC_NO, KA1, KB1, KC_NO, KD1, KE1 }, \
- { K02, K12, K22, K32, K42, K52, K62, K72, K82, K92, KA2, KB2, KC_NO, KD2, KE2 }, \
- { K03, K13, K23, K33, K43, K53, K63, K73, K83, KC_NO, KA3, KB3, KC3, KD3, KC_NO }, \
- { K04, K14, K24, K34, K44, K54, K64, K74, K84, K94, KA4, KB4, KC4, KC_NO, KE4 }, \
- { K05, KC_NO, K25, K35, K45, K55, K65, K75, K85, K95, KC_NO, KB5, KC5, KD5, KE5 }, \
- { K06, K16, K26, K36, K46, K56, K66, K76, K86, K96, KA6, KB6, KC6, KD6, KE6 }, \
- { K07, K17, K27, K37, K47, K57, K67, K77, KC_NO, KC_NO, KA7, KB7, KC7, KD7, KE7 } \
-}
-
-#define LAYOUT_iso( \
- K05, K25, K35, K45, K55, K06, KA6, KA7, K07, KB5, KC5, KD5, KE5, KD1, KE1, KE2, K65, K75, K85, K95, \
- K04, K14, K24, K34, K44, K54, K16, KB6, KB7, K17, KA4, KB4, KC4, KE4, KD0, K64, K74, K84, K94, \
- K03, K13, K23, K33, K43, K53, K26, KC6, KC7, K27, KA3, KB3, KC3, K67, K63, K73, K83, \
- K02, K12, K22, K32, K42, K52, K36, KD6, KD7, K37, KA2, KB2, KC2, KD2, KE0, K62, K72, K82, K92, \
- K01, K30, K11, K21, K31, K41, K51, K46, KE6, KE7, K47, KA1, KB1, K86, K77, K61, K71, K81, \
- K00, K10, K20, K56, K57, KB0, KC0, K66, K76, K96, K60, K80, K90 \
-){ \
- { K00, K10, K20, K30, KC_NO, KC_NO, K60, KC_NO, K80, K90, KC_NO, KB0, KC0, KD0, KE0 }, \
- { K01, K11, K21, K31, K41, K51, K61, K71, K81, KC_NO, KA1, KB1, KC_NO, KD1, KE1 }, \
- { K02, K12, K22, K32, K42, K52, K62, K72, K82, K92, KA2, KB2, KC2, KD2, KE2 }, \
- { K03, K13, K23, K33, K43, K53, K63, K73, K83, KC_NO, KA3, KB3, KC3, KC_NO, KC_NO }, \
- { K04, K14, K24, K34, K44, K54, K64, K74, K84, K94, KA4, KB4, KC4, KC_NO, KE4 }, \
- { K05, KC_NO, K25, K35, K45, K55, K65, K75, K85, K95, KC_NO, KB5, KC5, KD5, KE5 }, \
- { K06, K16, K26, K36, K46, K56, K66, K76, K86, K96, KA6, KB6, KC6, KD6, KE6 }, \
- { K07, K17, K27, K37, K47, K57, K67, K77, KC_NO, KC_NO, KA7, KB7, KC7, KD7, KE7 } \
-}
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 @@
"layouts": {
"LAYOUT": {
"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":"PSCR", "x":13, "y":0},
- {"label":"HOME", "x":14, "y":0},
- {"label":"END", "x":15, "y":0},
- {"label":"NO", "x":16.25, "y":0},
- {"label":"NO", "x":17.25, "y":0},
- {"label":"NO", "x":18.25, "y":0},
- {"label":"NO", "x":19.25, "y":0},
- {"label":"GRV", "x":0, "y":1.25},
- {"label":"1", "x":1, "y":1.25},
- {"label":"2", "x":2, "y":1.25},
- {"label":"3", "x":3, "y":1.25},
- {"label":"4", "x":4, "y":1.25},
- {"label":"5", "x":5, "y":1.25},
- {"label":"6", "x":6, "y":1.25},
- {"label":"7", "x":7, "y":1.25},
- {"label":"8", "x":8, "y":1.25},
- {"label":"9", "x":9, "y":1.25},
- {"label":"0", "x":10, "y":1.25},
- {"label":"MINS", "x":11, "y":1.25},
- {"label":"EQL", "x":12, "y":1.25},
- {"label":"BSPC", "x":13, "y":1.25, "w":2},
- {"label":"DEL", "x":15, "y":1.25},
- {"label":"NLCK", "x":16.25, "y":1.25},
- {"label":"PSLS", "x":17.25, "y":1.25},
- {"label":"PAST", "x":18.25, "y":1.25},
- {"label":"PMNS", "x":19.25, "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":"LBRC", "x":11.5, "y":2.25},
- {"label":"RBRC", "x":12.5, "y":2.25},
- {"label":"NO", "x":13.5, "y":2.25, "w":1.5},
- {"label":"INS", "x":15, "y":2.25},
- {"label":"P7", "x":16.25, "y":2.25},
- {"label":"P8", "x":17.25, "y":2.25},
- {"label":"P9", "x":18.25, "y":2.25},
- {"label":"CAPS", "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":"SCLN", "x":10.75, "y":3.25},
- {"label":"QUOT", "x":11.75, "y":3.25},
- {"label":"NUHS", "x":12.75, "y":3.25},
- {"label":"ENT", "x":13.75, "y":3.25, "w":1.25},
- {"label":"PGUP", "x":15, "y":3.25},
- {"label":"P4", "x":16.25, "y":3.25},
- {"label":"P5", "x":17.25, "y":3.25},
- {"label":"P6", "x":18.25, "y":3.25},
- {"label":"PPLS", "x":19.25, "y":2.25, "h":2},
- {"label":"LSFT", "x":0, "y":4.25, "w":1.25},
- {"label":"NUBS", "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":"COMM", "x":9.25, "y":4.25},
- {"label":"DOT", "x":10.25, "y":4.25},
- {"label":"SLSH", "x":11.25, "y":4.25},
- {"label":"RSFT", "x":12.25, "y":4.25, "w":1.75},
- {"label":"UP", "x":14, "y":4.25},
- {"label":"PGDN", "x":15, "y":4.25},
- {"label":"P1", "x":16.25, "y":4.25},
- {"label":"P2", "x":17.25, "y":4.25},
- {"label":"P3", "x":18.25, "y":4.25},
- {"label":"LCTL", "x":0, "y":5.25, "w":1.25},
- {"label":"LGUI", "x":1.25, "y":5.25, "w":1.25},
- {"label":"LALT", "x":2.5, "y":5.25, "w":1.25},
- {"label":"SPC", "x":3.75, "y":5.25, "w":6.25},
- {"label":"RALT", "x":10, "y":5.25},
- {"label":"APP", "x":11, "y":5.25},
- {"label":"RCTL", "x":12, "y":5.25},
- {"label":"LEFT", "x":13, "y":5.25},
- {"label":"DOWN", "x":14, "y":5.25},
- {"label":"RGHT", "x":15, "y":5.25},
- {"label":"P0", "x":16.25, "y":5.25, "w":2},
- {"label":"PDOT", "x":18.25, "y":5.25},
- {"label":"PENT", "x":19.25, "y":4.25, "h":2}
+ {"matrix": [5, 0], "x": 0, "y": 0},
+ {"matrix": [5, 2], "x": 1, "y": 0},
+ {"matrix": [5, 3], "x": 2, "y": 0},
+ {"matrix": [5, 4], "x": 3, "y": 0},
+ {"matrix": [5, 5], "x": 4, "y": 0},
+ {"matrix": [6, 0], "x": 5, "y": 0},
+ {"matrix": [6, 10], "x": 6, "y": 0},
+ {"matrix": [7, 10], "x": 7, "y": 0},
+ {"matrix": [7, 0], "x": 8, "y": 0},
+ {"matrix": [5, 11], "x": 9, "y": 0},
+ {"matrix": [5, 12], "x": 10, "y": 0},
+ {"matrix": [5, 13], "x": 11, "y": 0},
+ {"matrix": [5, 14], "x": 12, "y": 0},
+ {"matrix": [1, 13], "x": 13, "y": 0},
+ {"matrix": [1, 14], "x": 14, "y": 0},
+ {"matrix": [2, 14], "x": 15, "y": 0},
+
+ {"matrix": [5, 6], "x": 16.25, "y": 0},
+ {"matrix": [5, 7], "x": 17.25, "y": 0},
+ {"matrix": [5, 8], "x": 18.25, "y": 0},
+ {"matrix": [5, 9], "x": 19.25, "y": 0},
+
+ {"matrix": [4, 0], "x": 0, "y": 1.25},
+ {"matrix": [4, 1], "x": 1, "y": 1.25},
+ {"matrix": [4, 2], "x": 2, "y": 1.25},
+ {"matrix": [4, 3], "x": 3, "y": 1.25},
+ {"matrix": [4, 4], "x": 4, "y": 1.25},
+ {"matrix": [4, 5], "x": 5, "y": 1.25},
+ {"matrix": [6, 1], "x": 6, "y": 1.25},
+ {"matrix": [6, 11], "x": 7, "y": 1.25},
+ {"matrix": [7, 11], "x": 8, "y": 1.25},
+ {"matrix": [7, 1], "x": 9, "y": 1.25},
+ {"matrix": [4, 10], "x": 10, "y": 1.25},
+ {"matrix": [4, 11], "x": 11, "y": 1.25},
+ {"matrix": [4, 12], "x": 12, "y": 1.25},
+ {"matrix": [4, 14], "x": 13, "y": 1.25, "w": 2},
+ {"matrix": [0, 13], "x": 15, "y": 1.25},
+
+ {"matrix": [4, 6], "x": 16.25, "y": 1.25},
+ {"matrix": [4, 7], "x": 17.25, "y": 1.25},
+ {"matrix": [4, 8], "x": 18.25, "y": 1.25},
+ {"matrix": [4, 9], "x": 19.25, "y": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [3, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [3, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [3, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [3, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [3, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [6, 2], "x": 6.5, "y": 2.25},
+ {"matrix": [6, 12], "x": 7.5, "y": 2.25},
+ {"matrix": [7, 12], "x": 8.5, "y": 2.25},
+ {"matrix": [7, 2], "x": 9.5, "y": 2.25},
+ {"matrix": [3, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [3, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [3, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+ {"matrix": [7, 6], "x": 15, "y": 2.25},
+
+ {"matrix": [3, 6], "x": 16.25, "y": 2.25},
+ {"matrix": [3, 7], "x": 17.25, "y": 2.25},
+ {"matrix": [3, 8], "x": 18.25, "y": 2.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [2, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [2, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [2, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [2, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+ {"matrix": [6, 13], "x": 7.75, "y": 3.25},
+ {"matrix": [7, 13], "x": 8.75, "y": 3.25},
+ {"matrix": [7, 3], "x": 9.75, "y": 3.25},
+ {"matrix": [2, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [2, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [2, 12], "x": 12.75, "y": 3.25},
+ {"matrix": [2, 13], "x": 13.75, "y": 3.25, "w": 1.25},
+ {"matrix": [0, 14], "x": 15, "y": 3.25},
+
+ {"matrix": [2, 6], "x": 16.25, "y": 3.25},
+ {"matrix": [2, 7], "x": 17.25, "y": 3.25},
+ {"matrix": [2, 8], "x": 18.25, "y": 3.25},
+ {"matrix": [2, 9], "x": 19.25, "y": 2.25, "h": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [0, 3], "x": 1.25, "y": 4.25},
+ {"matrix": [1, 1], "x": 2.25, "y": 4.25},
+ {"matrix": [1, 2], "x": 3.25, "y": 4.25},
+ {"matrix": [1, 3], "x": 4.25, "y": 4.25},
+ {"matrix": [1, 4], "x": 5.25, "y": 4.25},
+ {"matrix": [1, 5], "x": 6.25, "y": 4.25},
+ {"matrix": [6, 4], "x": 7.25, "y": 4.25},
+ {"matrix": [6, 14], "x": 8.25, "y": 4.25},
+ {"matrix": [7, 14], "x": 9.25, "y": 4.25},
+ {"matrix": [7, 4], "x": 10.25, "y": 4.25},
+ {"matrix": [1, 10], "x": 11.25, "y": 4.25},
+ {"matrix": [1, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"matrix": [6, 8], "x": 14, "y": 4.25},
+ {"matrix": [7, 7], "x": 15, "y": 4.25},
+
+ {"matrix": [1, 6], "x": 16.25, "y": 4.25},
+ {"matrix": [1, 7], "x": 17.25, "y": 4.25},
+ {"matrix": [1, 8], "x": 18.25, "y": 4.25},
+
+ {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [0, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [0, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [6, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [7, 5], "x": 10, "y": 5.25},
+ {"matrix": [0, 11], "x": 11, "y": 5.25},
+ {"matrix": [0, 12], "x": 12, "y": 5.25},
+ {"matrix": [6, 6], "x": 13, "y": 5.25},
+ {"matrix": [6, 7], "x": 14, "y": 5.25},
+ {"matrix": [6, 9], "x": 15, "y": 5.25},
+
+ {"matrix": [0, 6], "x": 16.25, "y": 5.25, "w": 2},
+ {"matrix": [0, 8], "x": 18.25, "y": 5.25},
+ {"matrix": [0, 9], "x": 19.25, "y": 4.25, "h": 2}
]
},
"LAYOUT_ansi": {
"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":"PSCR", "x":13, "y":0},
- {"label":"HOME", "x":14, "y":0},
- {"label":"END", "x":15, "y":0},
- {"label":"NO", "x":16.25, "y":0},
- {"label":"NO", "x":17.25, "y":0},
- {"label":"NO", "x":18.25, "y":0},
- {"label":"NO", "x":19.25, "y":0},
- {"label":"GRV", "x":0, "y":1.25},
- {"label":"1", "x":1, "y":1.25},
- {"label":"2", "x":2, "y":1.25},
- {"label":"3", "x":3, "y":1.25},
- {"label":"4", "x":4, "y":1.25},
- {"label":"5", "x":5, "y":1.25},
- {"label":"6", "x":6, "y":1.25},
- {"label":"7", "x":7, "y":1.25},
- {"label":"8", "x":8, "y":1.25},
- {"label":"9", "x":9, "y":1.25},
- {"label":"0", "x":10, "y":1.25},
- {"label":"MINS", "x":11, "y":1.25},
- {"label":"EQL", "x":12, "y":1.25},
- {"label":"BSPC", "x":13, "y":1.25, "w":2},
- {"label":"DEL", "x":15, "y":1.25},
- {"label":"NLCK", "x":16.25, "y":1.25},
- {"label":"PSLS", "x":17.25, "y":1.25},
- {"label":"PAST", "x":18.25, "y":1.25},
- {"label":"PMNS", "x":19.25, "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":"LBRC", "x":11.5, "y":2.25},
- {"label":"RBRC", "x":12.5, "y":2.25},
- {"label":"BSLS", "x":13.5, "y":2.25, "w":1.5},
- {"label":"INS", "x":15, "y":2.25},
- {"label":"P7", "x":16.25, "y":2.25},
- {"label":"P8", "x":17.25, "y":2.25},
- {"label":"P9", "x":18.25, "y":2.25},
- {"label":"CAPS", "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":"SCLN", "x":10.75, "y":3.25},
- {"label":"QUOT", "x":11.75, "y":3.25},
- {"label":"ENT", "x":12.75, "y":3.25, "w":2.25},
- {"label":"PGUP", "x":15, "y":3.25},
- {"label":"P4", "x":16.25, "y":3.25},
- {"label":"P5", "x":17.25, "y":3.25},
- {"label":"P6", "x":18.25, "y":3.25},
- {"label":"PPLS", "x":19.25, "y":2.25, "h":2},
- {"label":"LSFT", "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":"COMM", "x":9.25, "y":4.25},
- {"label":"DOT", "x":10.25, "y":4.25},
- {"label":"SLSH", "x":11.25, "y":4.25},
- {"label":"RSFT", "x":12.25, "y":4.25, "w":1.75},
- {"label":"UP", "x":14, "y":4.25},
- {"label":"PGDN", "x":15, "y":4.25},
- {"label":"P1", "x":16.25, "y":4.25},
- {"label":"P2", "x":17.25, "y":4.25},
- {"label":"P3", "x":18.25, "y":4.25},
- {"label":"LCTL", "x":0, "y":5.25, "w":1.25},
- {"label":"LGUI", "x":1.25, "y":5.25, "w":1.25},
- {"label":"LALT", "x":2.5, "y":5.25, "w":1.25},
- {"label":"SPC", "x":3.75, "y":5.25, "w":6.25},
- {"label":"RALT", "x":10, "y":5.25},
- {"label":"APP", "x":11, "y":5.25},
- {"label":"RCTL", "x":12, "y":5.25},
- {"label":"LEFT", "x":13, "y":5.25},
- {"label":"DOWN", "x":14, "y":5.25},
- {"label":"RGHT", "x":15, "y":5.25},
- {"label":"P0", "x":16.25, "y":5.25, "w":2},
- {"label":"PDOT", "x":18.25, "y":5.25},
- {"label":"PENT", "x":19.25, "y":4.25, "h":2}
+ {"matrix": [5, 0], "x": 0, "y": 0},
+ {"matrix": [5, 2], "x": 1, "y": 0},
+ {"matrix": [5, 3], "x": 2, "y": 0},
+ {"matrix": [5, 4], "x": 3, "y": 0},
+ {"matrix": [5, 5], "x": 4, "y": 0},
+ {"matrix": [6, 0], "x": 5, "y": 0},
+ {"matrix": [6, 10], "x": 6, "y": 0},
+ {"matrix": [7, 10], "x": 7, "y": 0},
+ {"matrix": [7, 0], "x": 8, "y": 0},
+ {"matrix": [5, 11], "x": 9, "y": 0},
+ {"matrix": [5, 12], "x": 10, "y": 0},
+ {"matrix": [5, 13], "x": 11, "y": 0},
+ {"matrix": [5, 14], "x": 12, "y": 0},
+ {"matrix": [1, 13], "x": 13, "y": 0},
+ {"matrix": [1, 14], "x": 14, "y": 0},
+ {"matrix": [2, 14], "x": 15, "y": 0},
+
+ {"matrix": [5, 6], "x": 16.25, "y": 0},
+ {"matrix": [5, 7], "x": 17.25, "y": 0},
+ {"matrix": [5, 8], "x": 18.25, "y": 0},
+ {"matrix": [5, 9], "x": 19.25, "y": 0},
+
+ {"matrix": [4, 0], "x": 0, "y": 1.25},
+ {"matrix": [4, 1], "x": 1, "y": 1.25},
+ {"matrix": [4, 2], "x": 2, "y": 1.25},
+ {"matrix": [4, 3], "x": 3, "y": 1.25},
+ {"matrix": [4, 4], "x": 4, "y": 1.25},
+ {"matrix": [4, 5], "x": 5, "y": 1.25},
+ {"matrix": [6, 1], "x": 6, "y": 1.25},
+ {"matrix": [6, 11], "x": 7, "y": 1.25},
+ {"matrix": [7, 11], "x": 8, "y": 1.25},
+ {"matrix": [7, 1], "x": 9, "y": 1.25},
+ {"matrix": [4, 10], "x": 10, "y": 1.25},
+ {"matrix": [4, 11], "x": 11, "y": 1.25},
+ {"matrix": [4, 12], "x": 12, "y": 1.25},
+ {"matrix": [4, 14], "x": 13, "y": 1.25, "w": 2},
+ {"matrix": [0, 13], "x": 15, "y": 1.25},
+
+ {"matrix": [4, 6], "x": 16.25, "y": 1.25},
+ {"matrix": [4, 7], "x": 17.25, "y": 1.25},
+ {"matrix": [4, 8], "x": 18.25, "y": 1.25},
+ {"matrix": [4, 9], "x": 19.25, "y": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [3, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [3, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [3, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [3, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [3, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [6, 2], "x": 6.5, "y": 2.25},
+ {"matrix": [6, 12], "x": 7.5, "y": 2.25},
+ {"matrix": [7, 12], "x": 8.5, "y": 2.25},
+ {"matrix": [7, 2], "x": 9.5, "y": 2.25},
+ {"matrix": [3, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [3, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [3, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+ {"matrix": [7, 6], "x": 15, "y": 2.25},
+
+ {"matrix": [3, 6], "x": 16.25, "y": 2.25},
+ {"matrix": [3, 7], "x": 17.25, "y": 2.25},
+ {"matrix": [3, 8], "x": 18.25, "y": 2.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [2, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [2, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [2, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [2, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+ {"matrix": [6, 13], "x": 7.75, "y": 3.25},
+ {"matrix": [7, 13], "x": 8.75, "y": 3.25},
+ {"matrix": [7, 3], "x": 9.75, "y": 3.25},
+ {"matrix": [2, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [2, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [2, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+ {"matrix": [0, 14], "x": 15, "y": 3.25},
+
+ {"matrix": [2, 6], "x": 16.25, "y": 3.25},
+ {"matrix": [2, 7], "x": 17.25, "y": 3.25},
+ {"matrix": [2, 8], "x": 18.25, "y": 3.25},
+ {"matrix": [2, 9], "x": 19.25, "y": 2.25, "h": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [1, 1], "x": 2.25, "y": 4.25},
+ {"matrix": [1, 2], "x": 3.25, "y": 4.25},
+ {"matrix": [1, 3], "x": 4.25, "y": 4.25},
+ {"matrix": [1, 4], "x": 5.25, "y": 4.25},
+ {"matrix": [1, 5], "x": 6.25, "y": 4.25},
+ {"matrix": [6, 4], "x": 7.25, "y": 4.25},
+ {"matrix": [6, 14], "x": 8.25, "y": 4.25},
+ {"matrix": [7, 14], "x": 9.25, "y": 4.25},
+ {"matrix": [7, 4], "x": 10.25, "y": 4.25},
+ {"matrix": [1, 10], "x": 11.25, "y": 4.25},
+ {"matrix": [1, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"matrix": [6, 8], "x": 14, "y": 4.25},
+ {"matrix": [7, 7], "x": 15, "y": 4.25},
+
+ {"matrix": [1, 6], "x": 16.25, "y": 4.25},
+ {"matrix": [1, 7], "x": 17.25, "y": 4.25},
+ {"matrix": [1, 8], "x": 18.25, "y": 4.25},
+
+ {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [0, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [0, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [6, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [7, 5], "x": 10, "y": 5.25},
+ {"matrix": [0, 11], "x": 11, "y": 5.25},
+ {"matrix": [0, 12], "x": 12, "y": 5.25},
+ {"matrix": [6, 6], "x": 13, "y": 5.25},
+ {"matrix": [6, 7], "x": 14, "y": 5.25},
+ {"matrix": [6, 9], "x": 15, "y": 5.25},
+
+ {"matrix": [0, 6], "x": 16.25, "y": 5.25, "w": 2},
+ {"matrix": [0, 8], "x": 18.25, "y": 5.25},
+ {"matrix": [0, 9], "x": 19.25, "y": 4.25, "h": 2}
]
},
"LAYOUT_iso": {
"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":"PSCR", "x":13, "y":0},
- {"label":"HOME", "x":14, "y":0},
- {"label":"END", "x":15, "y":0},
- {"label":"NO", "x":16.25, "y":0},
- {"label":"NO", "x":17.25, "y":0},
- {"label":"NO", "x":18.25, "y":0},
- {"label":"NO", "x":19.25, "y":0},
- {"label":"GRV", "x":0, "y":1.25},
- {"label":"1", "x":1, "y":1.25},
- {"label":"2", "x":2, "y":1.25},
- {"label":"3", "x":3, "y":1.25},
- {"label":"4", "x":4, "y":1.25},
- {"label":"5", "x":5, "y":1.25},
- {"label":"6", "x":6, "y":1.25},
- {"label":"7", "x":7, "y":1.25},
- {"label":"8", "x":8, "y":1.25},
- {"label":"9", "x":9, "y":1.25},
- {"label":"0", "x":10, "y":1.25},
- {"label":"MINS", "x":11, "y":1.25},
- {"label":"EQL", "x":12, "y":1.25},
- {"label":"BSPC", "x":13, "y":1.25, "w":2},
- {"label":"DEL", "x":15, "y":1.25},
- {"label":"NLCK", "x":16.25, "y":1.25},
- {"label":"PSLS", "x":17.25, "y":1.25},
- {"label":"PAST", "x":18.25, "y":1.25},
- {"label":"PMNS", "x":19.25, "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":"LBRC", "x":11.5, "y":2.25},
- {"label":"RBRC", "x":12.5, "y":2.25},
- {"label":"INS", "x":15, "y":2.25},
- {"label":"P7", "x":16.25, "y":2.25},
- {"label":"P8", "x":17.25, "y":2.25},
- {"label":"P9", "x":18.25, "y":2.25},
- {"label":"CAPS", "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":"SCLN", "x":10.75, "y":3.25},
- {"label":"QUOT", "x":11.75, "y":3.25},
- {"label":"NUHS", "x":12.75, "y":3.25},
- {"label":"ENT", "x":13.75, "y":2.25, "w":1.25, "h":2},
- {"label":"PGUP", "x":15, "y":3.25},
- {"label":"P4", "x":16.25, "y":3.25},
- {"label":"P5", "x":17.25, "y":3.25},
- {"label":"P6", "x":18.25, "y":3.25},
- {"label":"PPLS", "x":19.25, "y":2.25, "h":2},
- {"label":"LSFT", "x":0, "y":4.25, "w":1.25},
- {"label":"NUBS", "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":"COMM", "x":9.25, "y":4.25},
- {"label":"DOT", "x":10.25, "y":4.25},
- {"label":"SLSH", "x":11.25, "y":4.25},
- {"label":"RSFT", "x":12.25, "y":4.25, "w":1.75},
- {"label":"UP", "x":14, "y":4.25},
- {"label":"PGDN", "x":15, "y":4.25},
- {"label":"P1", "x":16.25, "y":4.25},
- {"label":"P2", "x":17.25, "y":4.25},
- {"label":"P3", "x":18.25, "y":4.25},
- {"label":"LCTL", "x":0, "y":5.25, "w":1.25},
- {"label":"LGUI", "x":1.25, "y":5.25, "w":1.25},
- {"label":"LALT", "x":2.5, "y":5.25, "w":1.25},
- {"label":"SPC", "x":3.75, "y":5.25, "w":6.25},
- {"label":"RALT", "x":10, "y":5.25},
- {"label":"APP", "x":11, "y":5.25},
- {"label":"RCTL", "x":12, "y":5.25},
- {"label":"LEFT", "x":13, "y":5.25},
- {"label":"DOWN", "x":14, "y":5.25},
- {"label":"RGHT", "x":15, "y":5.25},
- {"label":"P0", "x":16.25, "y":5.25, "w":2},
- {"label":"PDOT", "x":18.25, "y":5.25},
- {"label":"PENT", "x":19.25, "y":4.25, "h":2}
+ {"matrix": [5, 0], "x": 0, "y": 0},
+ {"matrix": [5, 2], "x": 1, "y": 0},
+ {"matrix": [5, 3], "x": 2, "y": 0},
+ {"matrix": [5, 4], "x": 3, "y": 0},
+ {"matrix": [5, 5], "x": 4, "y": 0},
+ {"matrix": [6, 0], "x": 5, "y": 0},
+ {"matrix": [6, 10], "x": 6, "y": 0},
+ {"matrix": [7, 10], "x": 7, "y": 0},
+ {"matrix": [7, 0], "x": 8, "y": 0},
+ {"matrix": [5, 11], "x": 9, "y": 0},
+ {"matrix": [5, 12], "x": 10, "y": 0},
+ {"matrix": [5, 13], "x": 11, "y": 0},
+ {"matrix": [5, 14], "x": 12, "y": 0},
+ {"matrix": [1, 13], "x": 13, "y": 0},
+ {"matrix": [1, 14], "x": 14, "y": 0},
+ {"matrix": [2, 14], "x": 15, "y": 0},
+
+ {"matrix": [5, 6], "x": 16.25, "y": 0},
+ {"matrix": [5, 7], "x": 17.25, "y": 0},
+ {"matrix": [5, 8], "x": 18.25, "y": 0},
+ {"matrix": [5, 9], "x": 19.25, "y": 0},
+
+ {"matrix": [4, 0], "x": 0, "y": 1.25},
+ {"matrix": [4, 1], "x": 1, "y": 1.25},
+ {"matrix": [4, 2], "x": 2, "y": 1.25},
+ {"matrix": [4, 3], "x": 3, "y": 1.25},
+ {"matrix": [4, 4], "x": 4, "y": 1.25},
+ {"matrix": [4, 5], "x": 5, "y": 1.25},
+ {"matrix": [6, 1], "x": 6, "y": 1.25},
+ {"matrix": [6, 11], "x": 7, "y": 1.25},
+ {"matrix": [7, 11], "x": 8, "y": 1.25},
+ {"matrix": [7, 1], "x": 9, "y": 1.25},
+ {"matrix": [4, 10], "x": 10, "y": 1.25},
+ {"matrix": [4, 11], "x": 11, "y": 1.25},
+ {"matrix": [4, 12], "x": 12, "y": 1.25},
+ {"matrix": [4, 14], "x": 13, "y": 1.25, "w": 2},
+ {"matrix": [0, 13], "x": 15, "y": 1.25},
+
+ {"matrix": [4, 6], "x": 16.25, "y": 1.25},
+ {"matrix": [4, 7], "x": 17.25, "y": 1.25},
+ {"matrix": [4, 8], "x": 18.25, "y": 1.25},
+ {"matrix": [4, 9], "x": 19.25, "y": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [3, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [3, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [3, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [3, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [3, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [6, 2], "x": 6.5, "y": 2.25},
+ {"matrix": [6, 12], "x": 7.5, "y": 2.25},
+ {"matrix": [7, 12], "x": 8.5, "y": 2.25},
+ {"matrix": [7, 2], "x": 9.5, "y": 2.25},
+ {"matrix": [3, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [3, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [3, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [7, 6], "x": 15, "y": 2.25},
+
+ {"matrix": [3, 6], "x": 16.25, "y": 2.25},
+ {"matrix": [3, 7], "x": 17.25, "y": 2.25},
+ {"matrix": [3, 8], "x": 18.25, "y": 2.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [2, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [2, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [2, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [2, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+ {"matrix": [6, 13], "x": 7.75, "y": 3.25},
+ {"matrix": [7, 13], "x": 8.75, "y": 3.25},
+ {"matrix": [7, 3], "x": 9.75, "y": 3.25},
+ {"matrix": [2, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [2, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [2, 12], "x": 12.75, "y": 3.25},
+ {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+ {"matrix": [0, 14], "x": 15, "y": 3.25},
+
+ {"matrix": [2, 6], "x": 16.25, "y": 3.25},
+ {"matrix": [2, 7], "x": 17.25, "y": 3.25},
+ {"matrix": [2, 8], "x": 18.25, "y": 3.25},
+ {"matrix": [2, 9], "x": 19.25, "y": 2.25, "h": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [0, 3], "x": 1.25, "y": 4.25},
+ {"matrix": [1, 1], "x": 2.25, "y": 4.25},
+ {"matrix": [1, 2], "x": 3.25, "y": 4.25},
+ {"matrix": [1, 3], "x": 4.25, "y": 4.25},
+ {"matrix": [1, 4], "x": 5.25, "y": 4.25},
+ {"matrix": [1, 5], "x": 6.25, "y": 4.25},
+ {"matrix": [6, 4], "x": 7.25, "y": 4.25},
+ {"matrix": [6, 14], "x": 8.25, "y": 4.25},
+ {"matrix": [7, 14], "x": 9.25, "y": 4.25},
+ {"matrix": [7, 4], "x": 10.25, "y": 4.25},
+ {"matrix": [1, 10], "x": 11.25, "y": 4.25},
+ {"matrix": [1, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"matrix": [6, 8], "x": 14, "y": 4.25},
+ {"matrix": [7, 7], "x": 15, "y": 4.25},
+
+ {"matrix": [1, 6], "x": 16.25, "y": 4.25},
+ {"matrix": [1, 7], "x": 17.25, "y": 4.25},
+ {"matrix": [1, 8], "x": 18.25, "y": 4.25},
+
+ {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [0, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [0, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [6, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [7, 5], "x": 10, "y": 5.25},
+ {"matrix": [0, 11], "x": 11, "y": 5.25},
+ {"matrix": [0, 12], "x": 12, "y": 5.25},
+ {"matrix": [6, 6], "x": 13, "y": 5.25},
+ {"matrix": [6, 7], "x": 14, "y": 5.25},
+ {"matrix": [6, 9], "x": 15, "y": 5.25},
+
+ {"matrix": [0, 6], "x": 16.25, "y": 5.25, "w": 2},
+ {"matrix": [0, 8], "x": 18.25, "y": 5.25},
+ {"matrix": [0, 9], "x": 19.25, "y": 4.25, "h": 2}
]
}
}
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 @@
"community_layouts": ["60_ansi"],
"layouts": {
"LAYOUT": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+ {"matrix": [0, 3], "x": 6, "y": 0},
+ {"matrix": [1, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [0, 7], "x": 13, "y": 0},
+ {"matrix": [1, 7], "x": 14, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 1},
+ {"matrix": [3, 1], "x": 2.5, "y": 1},
+ {"matrix": [2, 2], "x": 3.5, "y": 1},
+ {"matrix": [3, 2], "x": 4.5, "y": 1},
+ {"matrix": [2, 3], "x": 5.5, "y": 1},
+ {"matrix": [3, 3], "x": 6.5, "y": 1},
+ {"matrix": [2, 4], "x": 7.5, "y": 1},
+ {"matrix": [3, 4], "x": 8.5, "y": 1},
+ {"matrix": [2, 5], "x": 9.5, "y": 1},
+ {"matrix": [3, 5], "x": 10.5, "y": 1},
+ {"matrix": [2, 6], "x": 11.5, "y": 1},
+ {"matrix": [2, 7], "x": 12.5, "y": 1},
+ {"matrix": [3, 7], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [4, 1], "x": 1.75, "y": 2},
+ {"matrix": [5, 1], "x": 2.75, "y": 2},
+ {"matrix": [4, 2], "x": 3.75, "y": 2},
+ {"matrix": [5, 2], "x": 4.75, "y": 2},
+ {"matrix": [4, 3], "x": 5.75, "y": 2},
+ {"matrix": [5, 3], "x": 6.75, "y": 2},
+ {"matrix": [4, 4], "x": 7.75, "y": 2},
+ {"matrix": [5, 4], "x": 8.75, "y": 2},
+ {"matrix": [4, 5], "x": 9.75, "y": 2},
+ {"matrix": [5, 5], "x": 10.75, "y": 2},
+ {"matrix": [4, 6], "x": 11.75, "y": 2},
+ {"matrix": [4, 7], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [6, 0], "x": 0, "y": 3},
+ {"matrix": [7, 0], "x": 1, "y": 3},
+ {"matrix": [6, 1], "x": 2, "y": 3},
+ {"matrix": [7, 1], "x": 3, "y": 3},
+ {"matrix": [6, 2], "x": 4, "y": 3},
+ {"matrix": [7, 2], "x": 5, "y": 3},
+ {"matrix": [6, 3], "x": 6, "y": 3},
+ {"matrix": [7, 3], "x": 7, "y": 3},
+ {"matrix": [6, 4], "x": 8, "y": 3},
+ {"matrix": [7, 4], "x": 9, "y": 3},
+ {"matrix": [6, 5], "x": 10, "y": 3},
+ {"matrix": [7, 5], "x": 11, "y": 3},
+ {"matrix": [6, 6], "x": 12, "y": 3},
+ {"matrix": [6, 7], "x": 13, "y": 3},
+ {"matrix": [7, 7], "x": 14, "y": 3},
+
+ {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 2], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [8, 3], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [8, 4], "x": 7.25, "y": 4, "w": 2.75},
+ {"matrix": [8, 5], "x": 10, "y": 4},
+ {"matrix": [9, 5], "x": 11, "y": 4},
+ {"matrix": [8, 6], "x": 12, "y": 4},
+ {"matrix": [8, 7], "x": 13, "y": 4},
+ {"matrix": [9, 7], "x": 14, "y": 4}
+ ]
},
"LAYOUT_60_ansi": {
"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": 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": 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": 13.75,
- "y": 4,
- "w": 1.25
- }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+ {"matrix": [0, 3], "x": 6, "y": 0},
+ {"matrix": [1, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [0, 7], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 1},
+ {"matrix": [3, 1], "x": 2.5, "y": 1},
+ {"matrix": [2, 2], "x": 3.5, "y": 1},
+ {"matrix": [3, 2], "x": 4.5, "y": 1},
+ {"matrix": [2, 3], "x": 5.5, "y": 1},
+ {"matrix": [3, 3], "x": 6.5, "y": 1},
+ {"matrix": [2, 4], "x": 7.5, "y": 1},
+ {"matrix": [3, 4], "x": 8.5, "y": 1},
+ {"matrix": [2, 5], "x": 9.5, "y": 1},
+ {"matrix": [3, 5], "x": 10.5, "y": 1},
+ {"matrix": [2, 6], "x": 11.5, "y": 1},
+ {"matrix": [2, 7], "x": 12.5, "y": 1},
+ {"matrix": [3, 7], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [4, 1], "x": 1.75, "y": 2},
+ {"matrix": [5, 1], "x": 2.75, "y": 2},
+ {"matrix": [4, 2], "x": 3.75, "y": 2},
+ {"matrix": [5, 2], "x": 4.75, "y": 2},
+ {"matrix": [4, 3], "x": 5.75, "y": 2},
+ {"matrix": [5, 3], "x": 6.75, "y": 2},
+ {"matrix": [4, 4], "x": 7.75, "y": 2},
+ {"matrix": [5, 4], "x": 8.75, "y": 2},
+ {"matrix": [4, 5], "x": 9.75, "y": 2},
+ {"matrix": [5, 5], "x": 10.75, "y": 2},
+ {"matrix": [4, 6], "x": 11.75, "y": 2},
+ {"matrix": [5, 7], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [6, 1], "x": 2.25, "y": 3},
+ {"matrix": [7, 1], "x": 3.25, "y": 3},
+ {"matrix": [6, 2], "x": 4.25, "y": 3},
+ {"matrix": [7, 2], "x": 5.25, "y": 3},
+ {"matrix": [6, 3], "x": 6.25, "y": 3},
+ {"matrix": [7, 3], "x": 7.25, "y": 3},
+ {"matrix": [6, 4], "x": 8.25, "y": 3},
+ {"matrix": [7, 4], "x": 9.25, "y": 3},
+ {"matrix": [6, 5], "x": 10.25, "y": 3},
+ {"matrix": [7, 5], "x": 11.25, "y": 3},
+ {"matrix": [6, 7], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [8, 5], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [9, 5], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [8, 7], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [9, 7], "x": 13.75, "y": 4, "w": 1.25}
]
}
}
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 @@
-/*
-Copyright 2020 <contact@vwolf.be>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/* LAYOUT
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │
- * ├───┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┬───┤
- * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │3d │3e │
- * ├───┴┬──┴─┬─┴──┬┴───┴───┼───┴┬──┴───┴───┼───┼───┼───┼───┼───┤
- * │40 │41 │42 │44 │46 │48 │4a │4b │4c │4d │4e │
- * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┘
-*/
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, K0e, \
- K10, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d, K1e, \
- K20, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e, \
- K40, K41, K42, K44, K46, K48, K4a, K4b, K4c, K4d, K4e \
-) { \
- { K00, K02, K04, K06, K08, K0a, K0c, K0d }, \
- { K01, K03, K05, K07, K09, K0b, KC_NO, K0e }, \
- { K10, K12, K14, K16, K18, K1a, K1c, K1d }, \
- { KC_NO, K13, K15, K17, K19, K1b, KC_NO, K1e }, \
- { K20, K22, K24, K26, K28, K2a, K2c, K2d }, \
- { KC_NO, K23, K25, K27, K29, K2b, KC_NO, K2e }, \
- { K30, K32, K34, K36, K38, K3a, K3c, K3d }, \
- { K31, K33, K35, K37, K39, K3b, KC_NO, K3e }, \
- { K40, K42, K44, K46, K48, K4a, K4c, K4d }, \
- { K41, KC_NO, KC_NO, KC_NO, KC_NO, K4b, KC_NO, K4e } \
-}
-
-/* LAYOUT_60_ansi
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
- * │30 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
- * │40 │41 │42 │46 │4a │4b │4d │4e │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
- */
- #define LAYOUT_60_ansi( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0e, \
- K10, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d, K1e, \
- K20, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3d, \
- K40, K41, K42, K46, K4a, K4b, K4d, K4e \
- ) { \
- { K00, K02, K04, K06, K08, K0a, K0c, K0e }, \
- { K01, K03, K05, K07, K09, K0b, KC_NO, KC_NO }, \
- { K10, K12, K14, K16, K18, K1a, K1c, K1d }, \
- { KC_NO, K13, K15, K17, K19, K1b, KC_NO, K1e }, \
- { K20, K22, K24, K26, K28, K2a, K2c, KC_NO }, \
- { KC_NO, K23, K25, K27, K29, K2b, KC_NO, K2d }, \
- { K30, K32, K34, K36, K38, K3a, KC_NO, K3d }, \
- { KC_NO, K33, K35, K37, K39, K3b, KC_NO, KC_NO }, \
- { K40, K42, KC_NO, K46, KC_NO, K4a, KC_NO, K4d }, \
- { K41, KC_NO, KC_NO, KC_NO, KC_NO, K4b, KC_NO, K4e } \
-}
-
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 @@
"layouts": {
"LAYOUT_2u_space": {
"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": 0, "y": 1 },
- { "x": 1, "y": 1 },
- { "x": 2, "y": 1 },
- { "x": 3, "y": 1 },
- { "x": 4, "y": 1 },
- { "x": 5, "y": 1 },
- { "x": 6, "y": 1 },
- { "x": 7, "y": 1 },
- { "x": 8, "y": 1 },
- { "x": 9, "y": 1 },
- { "x": 10, "y": 1 },
- { "x": 11, "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": 6, "y": 2 },
- { "x": 7, "y": 2 },
- { "x": 8, "y": 2 },
- { "x": 9, "y": 2 },
- { "x": 10, "y": 2 },
- { "x": 11, "y": 2 },
- { "x": 0, "y": 3 },
- { "x": 1, "y": 3 },
- { "x": 2, "y": 3 },
- { "x": 3, "y": 3 },
- { "x": 4, "y": 3 },
- { "x": 5, "y": 3, "w": 2 },
- { "x": 7, "y": 3 },
- { "x": 8, "y": 3 },
- { "x": 9, "y": 3 },
- { "x": 10, "y": 3 },
- { "x": 11, "y": 3 }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3}
]
- },
- "LAYOUT": {
+ },
+ "LAYOUT": {
"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": 0, "y": 1 },
- { "x": 1, "y": 1 },
- { "x": 2, "y": 1 },
- { "x": 3, "y": 1 },
- { "x": 4, "y": 1 },
- { "x": 5, "y": 1 },
- { "x": 6, "y": 1 },
- { "x": 7, "y": 1 },
- { "x": 8, "y": 1 },
- { "x": 9, "y": 1 },
- { "x": 10, "y": 1 },
- { "x": 11, "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": 6, "y": 2 },
- { "x": 7, "y": 2 },
- { "x": 8, "y": 2 },
- { "x": 9, "y": 2 },
- { "x": 10, "y": 2 },
- { "x": 11, "y": 2 },
- { "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 }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3}
]
}
}
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 @@
#include "quantum.h"
#include "rgb_functions.h"
-
-#define ___ KC_NO
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_2u_space( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
- k30, k31, k32, k33, k34, k35, k37, k38, k39, k3a, k3b \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, ___ }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, ___ }, \
- { k30, k31, k32, k33, k34, k35, ___, k37, k38, k39, k3a, k3b, ___ } \
-}
-
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, ___ }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, ___ }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, ___ } \
-}
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 @@
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.25, "y": 1},
+ {"matrix": [1, 11], "x": 11.25, "y": 1},
+ {"matrix": [1, 13], "x": 12.25, "y": 1, "w": 1.75},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 1.25},
+ {"matrix": [2, 12], "x": 12, "y": 2},
+ {"matrix": [2, 13], "x": 13, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 6], "x": 3.75, "y": 3, "w": 6.25},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3},
+ {"matrix": [3, 12], "x": 12, "y": 3},
+ {"matrix": [3, 13], "x": 13, "y": 3}
+ ]
},
"LAYOUT_all": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.25, "y": 1},
+ {"matrix": [1, 11], "x": 11.25, "y": 1},
+ {"matrix": [1, 13], "x": 12.25, "y": 1, "w": 1.75},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2},
+ {"matrix": [2, 12], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 4], "x": 3.75, "y": 3},
+ {"matrix": [3, 6], "x": 4.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 8], "x": 7, "y": 3, "w": 2},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3},
+ {"matrix": [3, 12], "x": 12, "y": 3},
+ {"matrix": [3, 13], "x": 13, "y": 3}
+ ]
}
}
}
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 @@
-/* Copyright 2020 Worldspawn <mcmancuso@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1d, \
- K20, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, \
- K30, K31, K32, K36, K3a, K3b, K3c, K3d \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, KC_NO, K1d }, \
- { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d }, \
- { K30, K31, K32, KC_NO, KC_NO, KC_NO, K36, KC_NO, KC_NO, KC_NO, K3a, K3b, K3c, K3d } \
-}
-
-#define LAYOUT_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1d, \
- K20, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, \
- K30, K31, K32, K34, K36, K38, K39, K3a, K3b, K3c, K3d \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, KC_NO, K1d }, \
- { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d }, \
- { K30, K31, K32, KC_NO, K34, KC_NO, K36, KC_NO, K38, K39, K3a, K3b, K3c, K3d } \
-}
-
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 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [4, 9], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 12], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2},
+ {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 2},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
},
"LAYOUT_pingjunior": {
- "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}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [4, 9], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 12], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
}
}
}
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 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*
- * ,-----------------------------------------------------------------------------------------.
- * | K00 | K01 | K02 | K03 | K04 | K05 | K06 | K07 | K08 | K09 | K0A | K0B | K0C | K0D | K49 |
- * |-----------------------------------------------------------------------------------------+
- * | K10 | K11 | K12 | K13 | K14 | K15 | K16 | K17 | K18 | K19 | K1A | K1B | K1C | K1D |
- * |-----------------------------------------------------------------------------------------+
- * | K20 | K21 | K22 | K23 | K24 | K25 | K26 | K17 | K28 | K29 | K2A | K2B | K2C | K2D |
- * |-----------------------------------------------------------------------------------------+
- * | K30 | K31 | K32 | K33 | K34 | K35 | K36 | K37 | K38 | K39 | K3A | K3B | K3D | K3C |
- * |-----------------------------------------------------------------------------------------+
- * | K40 | K41 | K42 | | K44 | K45 | K46 | | K4A | K4B | K4C | K4D |
- * `-----------------------------------------------------------------------------------------'
- */
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K49, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \
- K40, K41, K42, K44, K45, K46, K4A, K4B, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
- { K40, K41, K42, XXX, K44, K45, K46, XXX, XXX, K49, K4A, K4B, K4C, K4D } \
-}
-
-/*
- * ,-----------------------------------------------------------------------------------------.
- * | K00 | K01 | K02 | K03 | K04 | K05 | K06 | K07 | K08 | K09 | K0A | K0B | K0C | K0D | K49 |
- * |-----------------------------------------------------------------------------------------+
- * | K10 | K11 | K12 | K13 | K14 | K15 | K16 | K17 | K18 | K19 | K1A | K1B | K1C | K1D |
- * |-----------------------------------------------------------------------------------------+
- * | K20 | K21 | K22 | K23 | K24 | K25 | K26 | K17 | K28 | K29 | K2A | K2B | K2C | K2D |
- * |-----------------------------------------------------------------------------------------+
- * | K31 | K32 | K33 | K34 | K35 | K36 | K37 | K38 | K39 | K3A | K3B | K3D | K3C |
- * |-----------------------------------------------------------------------------------------+
- * | K40 | K41 | K42 | K45 | K4B | K4C | K4D |
- * `-----------------------------------------------------------------------------------------'
- */
-#define LAYOUT_pingjunior( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K49, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
- K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \
- K40, K41, K42, K45, K4B, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
- { XXX, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
- { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, XXX, K4B, K4C, K4D } \
-}
-
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 @@
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_hhkb", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan"],
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_all"
+ },
"layouts": {
"LAYOUT_all": {
"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":"\\", "x":13.5, "y":1, "w":1.5},
- {"label":"Caps", "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":"ISO Hash", "x":12.75, "y":2},
- {"label":"Enter", "x":13.75, "y":2, "w":1.25},
- {"label":"Shift", "x":0, "y":3},
- {"label":"ISO \\", "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},
- {"label":"Shift", "x":12, "y":3},
- {"label":"Up", "x":13, "y":3},
- {"label":"Del", "x":14, "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":"MO(1)", "x":3.75, "y":4, "w":2.25},
- {"label":"Space", "x":6, "y":4, "w":1.25},
- {"label":"MO(1)", "x":7.25, "y":4, "w":2.75},
- {"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}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3},
+ {"matrix": [3, 12], "x": 12, "y": 3},
+ {"matrix": [3, 13], "x": 13, "y": 3},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 7], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+ {"matrix": [4, 9], "x": 10, "y": 4},
+ {"matrix": [4, 10], "x": 11, "y": 4},
+ {"matrix": [4, 11], "x": 12, "y": 4},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4}
]
},
"LAYOUT_60_ansi": {
"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":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":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":13.75, "y":4, "w":1.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
]
- },
+ },
"LAYOUT_60_ansi_split_bs": {
"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":2.75},
-
- {"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":13.75, "y":4, "w":1.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
]
},
"LAYOUT_60_ansi_split_bs_rshift": {
"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":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":13.75, "y":4, "w":1.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
]
},
"LAYOUT_60_ansi_split_rshift": {
"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":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":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":13.75, "y":4, "w":1.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
]
},
"LAYOUT_60_ansi_tsangan": {
"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":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":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":12.5, "y":4},
- {"x":13.5, "y":4, "w":1.5}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
]
},
"LAYOUT_60_hhkb": {
"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}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4}
]
},
"LAYOUT_60_iso": {
"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":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":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":2.75},
-
- {"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":13.75, "y":4, "w":1.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
]
},
"LAYOUT_60_iso_split_bs": {
"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":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":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":2.75},
-
- {"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":13.75, "y":4, "w":1.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
]
},
"LAYOUT_60_iso_split_bs_rshift": {
"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":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":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":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":13.75, "y":4, "w":1.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
]
},
"LAYOUT_60_iso_split_rshift": {
"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":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":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":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":13.75, "y":4, "w":1.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
]
},
"LAYOUT_60_iso_tsangan": {
"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":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":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":2.75},
-
- {"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":12.5, "y":4},
- {"x":13.5, "y":4, "w":1.5}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
]
}
}
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 @@
-#include "yd60mq.h"
+#include "quantum.h"
__attribute__((weak))
void 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 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
- K40, K41, K42, K43, K47, K48, K49, K4A, K4B, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, K42, K43, KC_NO, KC_NO, KC_NO, K47, K48, K49, K4A, K4B, K4C, K4D, KC_NO } \
-}
-
-#define LAYOUT_60_ansi( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
- K40, K41, K42, K47, K49, K4A, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, KC_NO }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, KC_NO, K47, KC_NO, K49, K4A, KC_NO, K4C, K4D, KC_NO } \
-}
-
-#define LAYOUT_60_ansi_split_bs( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
- K40, K41, K42, K47, K49, K4A, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, KC_NO }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, KC_NO, K47, KC_NO, K49, K4A, KC_NO, K4C, K4D, KC_NO } \
-}
-
-#define LAYOUT_60_ansi_split_bs_rshift( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
- K40, K41, K42, K47, K49, K4A, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, KC_NO, K47, KC_NO, K49, K4A, KC_NO, K4C, K4D, KC_NO } \
-}
-
-#define LAYOUT_60_ansi_split_rshift( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
- K40, K41, K42, K47, K49, K4A, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, KC_NO, K47, KC_NO, K49, K4A, KC_NO, K4C, K4D, KC_NO } \
-}
-
-#define LAYOUT_60_ansi_tsangan( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
- K40, K41, K42, K47, K4A, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, KC_NO }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, KC_NO, K47, KC_NO, KC_NO, K4A, KC_NO, K4C, K4D, KC_NO } \
-}
-
-#define LAYOUT_60_hhkb( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
- K41, K42, K47, K4A, K4C \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E }, \
- { 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 } \
-}
-
-#define LAYOUT_60_iso( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
- K40, K41, K42, K47, K49, K4A, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, KC_NO }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, KC_NO, K47, KC_NO, K49, K4A, KC_NO, K4C, K4D, KC_NO } \
-}
-
-#define LAYOUT_60_iso_split_bs( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
- K40, K41, K42, K47, K49, K4A, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, KC_NO }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, KC_NO, K47, KC_NO, K49, K4A, KC_NO, K4C, K4D, KC_NO } \
-}
-
-#define LAYOUT_60_iso_split_bs_rshift( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
- K40, K41, K42, K47, K49, K4A, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, KC_NO, K47, KC_NO, K49, K4A, KC_NO, K4C, K4D, KC_NO } \
-}
-
-#define LAYOUT_60_iso_split_rshift( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
- K40, K41, K42, K47, K49, K4A, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, KC_NO, K47, KC_NO, K49, K4A, KC_NO, K4C, K4D, KC_NO } \
-}
-
-#define LAYOUT_60_iso_tsangan( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
- K40, K41, K42, K47, K4A, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, KC_NO }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, KC_NO, K47, KC_NO, KC_NO, K4A, KC_NO, K4C, K4D, KC_NO } \
-}
-
-#define LAYOUT LAYOUT_all