summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/aeboards/aegis/aegis.h43
-rw-r--r--keyboards/aeboards/aegis/info.json234
-rw-r--r--keyboards/aeboards/ext65/rev1/info.json177
-rw-r--r--keyboards/aeboards/ext65/rev1/rev1.c2
-rw-r--r--keyboards/aeboards/ext65/rev1/rev1.h40
-rw-r--r--keyboards/aeboards/ext65/rev2/info.json177
-rw-r--r--keyboards/aeboards/ext65/rev2/rev2.c2
-rw-r--r--keyboards/aeboards/ext65/rev2/rev2.h40
-rw-r--r--keyboards/aeboards/ext65/rev3/info.json512
-rw-r--r--keyboards/aeboards/ext65/rev3/rev3.c2
-rw-r--r--keyboards/aeboards/ext65/rev3/rev3.h40
-rw-r--r--keyboards/alfredslab/swift65/hotswap/hotswap.h35
-rw-r--r--keyboards/alfredslab/swift65/hotswap/info.json138
-rw-r--r--keyboards/alfredslab/swift65/solder/info.json576
-rw-r--r--keyboards/alfredslab/swift65/solder/solder.h77
-rw-r--r--keyboards/baguette/baguette.c2
-rw-r--r--keyboards/baguette/baguette.h57
-rw-r--r--keyboards/baguette/info.json283
-rw-r--r--keyboards/bajjak/bajjak.h27
-rw-r--r--keyboards/bajjak/info.json116
-rw-r--r--keyboards/bbrfkr/dynamis/dynamis.c2
-rw-r--r--keyboards/bbrfkr/dynamis/dynamis.h78
-rw-r--r--keyboards/bbrfkr/dynamis/info.json280
-rw-r--r--keyboards/bear_face/v1/info.json166
-rw-r--r--keyboards/bear_face/v1/v1.c2
-rw-r--r--keyboards/bear_face/v1/v1.h36
-rw-r--r--keyboards/bear_face/v2/info.json335
-rw-r--r--keyboards/bear_face/v2/v2.c2
-rw-r--r--keyboards/bear_face/v2/v2.h52
-rw-r--r--keyboards/boardrun/classic/classic.h33
-rw-r--r--keyboards/boardrun/classic/info.json152
-rw-r--r--keyboards/bolsa/damapad/damapad.c2
-rw-r--r--keyboards/bolsa/damapad/damapad.h42
-rw-r--r--keyboards/bolsa/damapad/info.json143
-rw-r--r--keyboards/capsunlocked/cu24/cu24.h57
-rw-r--r--keyboards/capsunlocked/cu24/info.json62
-rw-r--r--keyboards/chavdai40/info.json94
-rw-r--r--keyboards/chavdai40/rev1/info.json104
-rw-r--r--keyboards/chavdai40/rev1/rev1.h49
-rw-r--r--keyboards/chavdai40/rev2/info.json104
-rw-r--r--keyboards/chavdai40/rev2/rev2.h49
-rw-r--r--keyboards/checkerboards/candybar_ortho/candybar_ortho.h67
-rw-r--r--keyboards/checkerboards/candybar_ortho/info.json218
-rw-r--r--keyboards/checkerboards/plexus75/info.json236
-rw-r--r--keyboards/checkerboards/plexus75/plexus75.h65
-rw-r--r--keyboards/checkerboards/plexus75_he/info.json238
-rw-r--r--keyboards/checkerboards/plexus75_he/plexus75_he.h76
-rw-r--r--keyboards/checkerboards/quark_plus/info.json231
-rw-r--r--keyboards/checkerboards/quark_plus/quark_plus.c2
-rw-r--r--keyboards/checkerboards/quark_plus/quark_plus.h82
-rw-r--r--keyboards/checkerboards/quark_squared/info.json228
-rw-r--r--keyboards/checkerboards/quark_squared/quark_squared.c17
-rw-r--r--keyboards/checkerboards/quark_squared/quark_squared.h76
-rw-r--r--keyboards/coarse/ixora/info.json38
-rw-r--r--keyboards/coarse/ixora/ixora.h40
-rw-r--r--keyboards/converter/adb_usb/adb_usb.h108
-rw-r--r--keyboards/converter/adb_usb/info.json399
-rw-r--r--keyboards/converter/m0110_usb/info.json325
-rw-r--r--keyboards/converter/m0110_usb/m0110_usb.h131
-rw-r--r--keyboards/converter/sun_usb/type5/info.json793
-rw-r--r--keyboards/converter/sun_usb/type5/type5.h148
-rw-r--r--keyboards/crimsonkeyboards/resume1800/info.json253
-rw-r--r--keyboards/crimsonkeyboards/resume1800/resume1800.h53
-rw-r--r--keyboards/delikeeb/vaneelaex/info.json381
-rw-r--r--keyboards/delikeeb/vaneelaex/vaneelaex.h42
-rw-r--r--keyboards/deltasplit75/v2/info.json208
-rw-r--r--keyboards/deltasplit75/v2/v2.h55
-rw-r--r--keyboards/dinofizz/fnrow/v1/info.json81
-rw-r--r--keyboards/dinofizz/fnrow/v1/v1.c2
-rw-r--r--keyboards/dinofizz/fnrow/v1/v1.h25
-rw-r--r--keyboards/drhigsby/bkf/bkf.h53
-rw-r--r--keyboards/drhigsby/bkf/info.json109
-rw-r--r--keyboards/drhigsby/packrat/info.json247
-rw-r--r--keyboards/drhigsby/packrat/packrat.c16
-rw-r--r--keyboards/drhigsby/packrat/packrat.h79
-rw-r--r--keyboards/ebastler/isometria_75/rev1/info.json187
-rw-r--r--keyboards/ebastler/isometria_75/rev1/rev1.h35
-rw-r--r--keyboards/ergoslab/rev1/info.json113
-rw-r--r--keyboards/ergoslab/rev1/rev1.c2
-rw-r--r--keyboards/ergoslab/rev1/rev1.h22
-rw-r--r--keyboards/eu_isolation/eu_isolation.h59
-rw-r--r--keyboards/eu_isolation/info.json298
-rw-r--r--keyboards/evolv/evolv.c18
-rw-r--r--keyboards/evolv/evolv.h54
-rw-r--r--keyboards/evolv/info.json421
-rw-r--r--keyboards/exclusive/e85/hotswap/hotswap.c2
-rw-r--r--keyboards/exclusive/e85/hotswap/hotswap.h63
-rw-r--r--keyboards/exclusive/e85/hotswap/info.json379
-rw-r--r--keyboards/eyeohdesigns/babyv/babyv.h71
-rw-r--r--keyboards/eyeohdesigns/babyv/info.json221
-rw-r--r--keyboards/eyeohdesigns/sprh/info.json1128
-rw-r--r--keyboards/eyeohdesigns/sprh/sprh.c16
-rw-r--r--keyboards/eyeohdesigns/sprh/sprh.h139
-rw-r--r--keyboards/eyeohdesigns/theboulevard/info.json651
-rw-r--r--keyboards/eyeohdesigns/theboulevard/theboulevard.c17
-rw-r--r--keyboards/eyeohdesigns/theboulevard/theboulevard.h169
-rw-r--r--keyboards/flehrad/numbrero/info.json98
-rw-r--r--keyboards/flehrad/numbrero/numbrero.h30
-rw-r--r--keyboards/gboards/butterstick/butterstick.c2
-rw-r--r--keyboards/gboards/butterstick/butterstick.h11
-rw-r--r--keyboards/gboards/butterstick/info.json40
-rw-r--r--keyboards/gboards/butterstick/sten.h2
-rw-r--r--keyboards/gorthage_truck/gorthage_truck.c17
-rw-r--r--keyboards/gorthage_truck/gorthage_truck.h77
-rw-r--r--keyboards/gorthage_truck/info.json399
-rw-r--r--keyboards/handwired/aranck/aranck.h39
-rw-r--r--keyboards/handwired/aranck/info.json97
-rw-r--r--keyboards/handwired/concertina/64key/64key.h56
-rw-r--r--keyboards/handwired/concertina/64key/info.json88
-rw-r--r--keyboards/handwired/curiosity/curiosity.h41
-rw-r--r--keyboards/handwired/curiosity/info.json110
-rw-r--r--keyboards/handwired/dactyl/dactyl.h29
-rw-r--r--keyboards/handwired/dactyl/info.json89
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6/5x6.h30
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6/info.json128
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_2_5/5x6_2_5.h44
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_2_5/info.json134
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h28
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_5/info.json126
-rw-r--r--keyboards/handwired/dactyl_manuform/5x7/5x7.h37
-rw-r--r--keyboards/handwired/dactyl_manuform/5x7/info.json148
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6/6x6.h62
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6/info.json368
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.h37
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6_4/info.json194
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.h37
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json194
-rw-r--r--keyboards/handwired/dactyl_manuform/6x7/6x7.h35
-rw-r--r--keyboards/handwired/dactyl_manuform/6x7/info.json206
-rw-r--r--keyboards/handwired/dactyl_manuform/dmote/62key/62key.h44
-rw-r--r--keyboards/handwired/dactyl_manuform/dmote/62key/info.json126
-rw-r--r--keyboards/handwired/dactyl_promicro/dactyl_promicro.h29
-rw-r--r--keyboards/handwired/dactyl_promicro/info.json153
-rw-r--r--keyboards/handwired/dactyl_rah/dactyl_rah.h44
-rw-r--r--keyboards/handwired/dactyl_rah/info.json163
-rw-r--r--keyboards/handwired/heisenberg/heisenberg.h39
-rw-r--r--keyboards/handwired/heisenberg/info.json107
-rw-r--r--keyboards/handwired/pterodactyl/info.json141
-rw-r--r--keyboards/handwired/pterodactyl/matrix.c1
-rw-r--r--keyboards/handwired/pterodactyl/pterodactyl.c2
-rw-r--r--keyboards/handwired/pterodactyl/pterodactyl.h38
-rw-r--r--keyboards/handwired/skakunm_dactyl/info.json88
-rw-r--r--keyboards/handwired/skakunm_dactyl/skakunm_dactyl.h25
-rw-r--r--keyboards/handwired/steamvan/rev1/info.json217
-rw-r--r--keyboards/handwired/steamvan/rev1/rev1.h80
-rw-r--r--keyboards/handwired/tractyl_manuform/4x6_right/4x6_right.c2
-rw-r--r--keyboards/handwired/tractyl_manuform/4x6_right/4x6_right.h46
-rw-r--r--keyboards/handwired/tractyl_manuform/4x6_right/info.json113
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.c2
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.h49
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c2
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/info.json139
-rw-r--r--keyboards/handwired/tractyl_manuform/tractyl_manuform.h6
-rw-r--r--keyboards/handwired/twig/twig50/info.json66
-rw-r--r--keyboards/handwired/twig/twig50/twig50.h20
-rw-r--r--keyboards/hhkb/jp/info.json144
-rw-r--r--keyboards/hhkb/jp/jp.h28
-rw-r--r--keyboards/io_mini1800/info.json376
-rw-r--r--keyboards/io_mini1800/io_mini1800.c4
-rw-r--r--keyboards/io_mini1800/io_mini1800.h52
-rw-r--r--keyboards/jacky_studio/bear_65/rev2/info.json631
-rw-r--r--keyboards/jacky_studio/bear_65/rev2/rev2.h76
-rw-r--r--keyboards/jacky_studio/s7_elephant/rev1/info.json4660
-rw-r--r--keyboards/jacky_studio/s7_elephant/rev1/rev1.h869
-rw-r--r--keyboards/jae/j01/info.json188
-rw-r--r--keyboards/jae/j01/j01.c2
-rw-r--r--keyboards/jae/j01/j01.h61
-rw-r--r--keyboards/jagdpietr/drakon/drakon.c2
-rw-r--r--keyboards/jagdpietr/drakon/drakon.h91
-rw-r--r--keyboards/jagdpietr/drakon/info.json161
-rw-r--r--keyboards/kb_elmo/vertex/info.json376
-rw-r--r--keyboards/kb_elmo/vertex/vertex.h69
-rw-r--r--keyboards/keybage/radpad/info.json114
-rw-r--r--keyboards/keybage/radpad/radpad.h87
-rw-r--r--keyboards/kingly_keys/ave/staggered/info.json234
-rw-r--r--keyboards/kingly_keys/ave/staggered/staggered.h52
-rw-r--r--keyboards/knobgoblin/info.json47
-rw-r--r--keyboards/knobgoblin/knobgoblin.c2
-rw-r--r--keyboards/knobgoblin/knobgoblin.h32
-rwxr-xr-xkeyboards/kprepublic/bm40hsrgb/bm40hsrgb.c2
-rwxr-xr-xkeyboards/kprepublic/bm40hsrgb/bm40hsrgb.h30
-rw-r--r--keyboards/kprepublic/bm40hsrgb/info.json97
-rw-r--r--keyboards/kwub/bloop/bloop.h76
-rw-r--r--keyboards/kwub/bloop/info.json304
-rw-r--r--keyboards/labbe/labbeminiv1/info.json8
-rw-r--r--keyboards/labbe/labbeminiv1/labbeminiv1.c2
-rw-r--r--keyboards/labbe/labbeminiv1/labbeminiv1.h20
-rw-r--r--keyboards/latincompass/latin47ble/info.json95
-rw-r--r--keyboards/latincompass/latin47ble/latin47ble.h30
-rw-r--r--keyboards/latincompass/latinpadble/info.json34
-rw-r--r--keyboards/latincompass/latinpadble/latinpadble.c16
-rw-r--r--keyboards/latincompass/latinpadble/latinpadble.h33
-rw-r--r--keyboards/lm_keyboard/lm60n/info.json1043
-rw-r--r--keyboards/lm_keyboard/lm60n/lm60n.h204
-rw-r--r--keyboards/lw67/info.json335
-rw-r--r--keyboards/lw67/lw67.c17
-rw-r--r--keyboards/lw67/lw67.h131
-rw-r--r--keyboards/lw75/info.json423
-rw-r--r--keyboards/lw75/lw75.c4
-rw-r--r--keyboards/lw75/lw75.h138
-rw-r--r--keyboards/machkeyboards/mach3/info.json47
-rw-r--r--keyboards/machkeyboards/mach3/mach3.c2
-rw-r--r--keyboards/machkeyboards/mach3/mach3.h29
-rw-r--r--keyboards/macro1/info.json174
-rw-r--r--keyboards/macro1/macro1.c16
-rw-r--r--keyboards/macro1/macro1.h115
-rw-r--r--keyboards/marksard/treadstone48/rev2/info.json304
-rw-r--r--keyboards/marksard/treadstone48/rev2/rev2.h48
-rw-r--r--keyboards/meme/info.json313
-rw-r--r--keyboards/meme/meme.h97
-rw-r--r--keyboards/merge/um70/info.json366
-rw-r--r--keyboards/merge/um70/um70.c2
-rw-r--r--keyboards/merge/um70/um70.h97
-rw-r--r--keyboards/merge/um80/info.json116
-rw-r--r--keyboards/merge/um80/um80.c2
-rw-r--r--keyboards/merge/um80/um80.h43
-rw-r--r--keyboards/mode/m80v1/m80s/info.json193
-rw-r--r--keyboards/mode/m80v1/m80s/m80s.h32
-rw-r--r--keyboards/mode/m80v2/m80v2s/info.json197
-rw-r--r--keyboards/mode/m80v2/m80v2s/m80v2s.h39
-rw-r--r--keyboards/moonlander/info.json89
-rw-r--r--keyboards/moonlander/moonlander.c2
-rw-r--r--keyboards/moonlander/moonlander.h24
-rw-r--r--keyboards/ms_sculpt/info.json178
-rw-r--r--keyboards/ms_sculpt/ms_sculpt.h25
-rw-r--r--keyboards/nightly_boards/adellein/adellein.h35
-rw-r--r--keyboards/nightly_boards/adellein/info.json214
-rw-r--r--keyboards/nopunin10did/jabberwocky/v1/info.json366
-rw-r--r--keyboards/nopunin10did/jabberwocky/v1/v1.h65
-rw-r--r--keyboards/nopunin10did/jabberwocky/v2/info.json498
-rw-r--r--keyboards/nopunin10did/jabberwocky/v2/v2.h65
-rw-r--r--keyboards/nyhxis/nfr_70/info.json318
-rw-r--r--keyboards/nyhxis/nfr_70/nfr_70.h63
-rw-r--r--keyboards/owlab/suit80/ansi/ansi.h36
-rw-r--r--keyboards/owlab/suit80/ansi/info.json188
-rw-r--r--keyboards/quad_h/lb75/info.json356
-rw-r--r--keyboards/quad_h/lb75/lb75.c2
-rw-r--r--keyboards/quad_h/lb75/lb75.h73
-rw-r--r--keyboards/rart/rartlite/info.json242
-rw-r--r--keyboards/rart/rartlite/rartlite.c2
-rw-r--r--keyboards/rart/rartlite/rartlite.h50
-rw-r--r--keyboards/redscarf_iiplus/verb/info.json184
-rwxr-xr-xkeyboards/redscarf_iiplus/verb/verb.h59
-rwxr-xr-xkeyboards/reviung/reviung34/info.json148
-rwxr-xr-xkeyboards/reviung/reviung34/reviung34.h52
-rw-r--r--keyboards/rominronin/katana60/rev2/info.json1108
-rw-r--r--keyboards/rominronin/katana60/rev2/rev2.h238
-rw-r--r--keyboards/sck/m0116b/info.json347
-rw-r--r--keyboards/sck/m0116b/m0116b.h58
-rw-r--r--keyboards/sentraq/s65_plus/info.json322
-rw-r--r--keyboards/sentraq/s65_plus/s65_plus.h34
-rw-r--r--keyboards/sirius/uni660/rev2/ansi/ansi.h25
-rw-r--r--keyboards/sirius/uni660/rev2/ansi/info.json182
-rw-r--r--keyboards/sirius/uni660/rev2/iso/info.json184
-rw-r--r--keyboards/sirius/uni660/rev2/iso/iso.h25
-rw-r--r--keyboards/sirius/uni660/rev2/rev2.h6
-rw-r--r--keyboards/tetris/info.json61
-rwxr-xr-xkeyboards/tetris/tetris.h19
-rw-r--r--keyboards/the_royal/liminal/info.json107
-rw-r--r--keyboards/the_royal/liminal/liminal.h19
-rw-r--r--keyboards/the_royal/schwann/info.json277
-rw-r--r--keyboards/the_royal/schwann/schwann.h44
-rw-r--r--keyboards/tokyokeyboard/alix40/alix40.h29
-rw-r--r--keyboards/tokyokeyboard/alix40/info.json284
-rw-r--r--keyboards/tominabox1/underscore33/rev1/info.json87
-rw-r--r--keyboards/tominabox1/underscore33/rev1/rev1.h46
-rw-r--r--keyboards/tominabox1/underscore33/rev2/info.json88
-rw-r--r--keyboards/tominabox1/underscore33/rev2/rev2.h46
-rw-r--r--keyboards/walletburner/cajal/cajal.h43
-rw-r--r--keyboards/walletburner/cajal/info.json120
-rw-r--r--keyboards/wavtype/foundation/foundation.h85
-rw-r--r--keyboards/wavtype/foundation/info.json688
-rw-r--r--keyboards/westfoxtrot/aanzee/aanzee.h60
-rw-r--r--keyboards/westfoxtrot/aanzee/info.json152
-rw-r--r--keyboards/westfoxtrot/cypher/rev1/info.json383
-rw-r--r--keyboards/westfoxtrot/cypher/rev1/rev1.c2
-rw-r--r--keyboards/westfoxtrot/cypher/rev1/rev1.h68
-rw-r--r--keyboards/westm/westm9/info.json20
-rw-r--r--keyboards/westm/westm9/rev1/rev1.c2
-rw-r--r--keyboards/westm/westm9/rev2/rev2.c2
-rw-r--r--keyboards/westm/westm9/westm9.h30
-rw-r--r--keyboards/xelus/rs108/info.json235
-rw-r--r--keyboards/xelus/rs108/rs108.h42
-rw-r--r--keyboards/xelus/xs108/info.json245
-rw-r--r--keyboards/xelus/xs108/xs108.h56
-rw-r--r--keyboards/ydkb/yd68/info.json75
-rw-r--r--keyboards/ydkb/yd68/yd68.c2
-rw-r--r--keyboards/ydkb/yd68/yd68.h59
288 files changed, 19933 insertions, 21424 deletions
diff --git a/keyboards/aeboards/aegis/aegis.h b/keyboards/aeboards/aegis/aegis.h
deleted file mode 100644
index 95ffb73dde..0000000000
--- a/keyboards/aeboards/aegis/aegis.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- *
- * 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_aegis( \
- K0000, K0100, K0001, K0101, K0002, K0102, K0003, K0103, K0004, K0104, K0005, K0105, K0006, K0106, K0007, K0107, K0008, \
- K0200, K0300, K0201, K0301, K0202, K0302, K0203, K0303, K0204, K0304, K0205, K0305, K0206, K0306, K0207, K0307, K0208, K0308, K0108, \
- K0400, K0500, K0401, K0501, K0402, K0502, K0403, K0503, K0404, K0504, K0405, K0505, K0406, K0506, K0407, K0507, K0408, K0508, \
- K0600, K0700, K0601, K0701, K0602, K0702, K0603, K0703, K0604, K0704, K0605, K0705, K0606, K0706, K0607, K0707, K0608, \
- K0800, K0900, K0801, K0901, K0802, K0902, K0803, K0903, K0804, K0904, K0805, K0905, K0806, K0906, K0807, K0907, K0808, K0908, \
- K1000, K1100, K1001, K1101, K1002, K1102, K1003, K1103, K1105, K1107, K1008, K1108 \
-) { \
- { K0000, K0001, K0002, K0003, K0004, K0005, K0006, K0007, K0008 }, \
- { K0100, K0101, K0102, K0103, K0104, K0105, K0106, K0107, K0108 }, \
- { K0200, K0201, K0202, K0203, K0204, K0205, K0206, K0207, K0208 }, \
- { K0300, K0301, K0302, K0303, K0304, K0305, K0306, K0307, K0308 }, \
- { K0400, K0401, K0402, K0403, K0404, K0405, K0406, K0407, K0408 }, \
- { K0500, K0501, K0502, K0503, K0504, K0505, K0506, K0507, K0508 }, \
- { K0600, K0601, K0602, K0603, K0604, K0605, K0606, K0607, K0608 }, \
- { K0700, K0701, K0702, K0703, K0704, K0705, K0706, K0707, _____ }, \
- { K0800, K0801, K0802, K0803, K0804, K0805, K0806, K0807, K0808 }, \
- { K0900, K0901, K0902, K0903, K0904, K0905, K0906, K0907, K0908 }, \
- { K1000, K1001, K1002, K1003, _____, _____, _____, _____, K1008 }, \
- { K1100, K1101, K1102, K1103, _____, K1105, _____, K1107, K1108 } \
-}
diff --git a/keyboards/aeboards/aegis/info.json b/keyboards/aeboards/aegis/info.json
index 63b9ea551e..5fe143318f 100644
--- a/keyboards/aeboards/aegis/info.json
+++ b/keyboards/aeboards/aegis/info.json
@@ -18,123 +18,123 @@
"layouts": {
"LAYOUT_aegis": {
"layout": [
- {"x": 0, "y": 0},
- {"x": 1, "y": 0},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0},
-
- {"x": 4.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": 15.5, "y": 0},
- {"x": 16.5, "y": 0},
- {"x": 17.5, "y": 0},
- {"x": 18.5, "y": 0},
-
- {"x": 0, "y": 1.5},
- {"x": 1, "y": 1.5},
- {"x": 2, "y": 1.5},
- {"x": 3, "y": 1.5},
-
- {"x": 4.5, "y": 1.5},
- {"x": 5.5, "y": 1.5},
- {"x": 6.5, "y": 1.5},
- {"x": 7.5, "y": 1.5},
- {"x": 8.5, "y": 1.5},
- {"x": 9.5, "y": 1.5},
- {"x": 10.5, "y": 1.5},
- {"x": 11.5, "y": 1.5},
- {"x": 12.5, "y": 1.5},
- {"x": 13.5, "y": 1.5},
- {"x": 14.5, "y": 1.5},
- {"x": 15.5, "y": 1.5},
- {"x": 16.5, "y": 1.5},
- {"x": 17.5, "y": 1.5},
- {"x": 18.5, "y": 1.5},
-
- {"x": 0, "y": 2.5},
- {"x": 1, "y": 2.5},
- {"x": 2, "y": 2.5},
- {"x": 3, "y": 2.5},
-
- {"x": 4.5, "y": 2.5, "w": 1.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, "y": 2.5},
- {"x": 16, "y": 2.5},
- {"x": 17, "y": 2.5},
- {"x": 18, "y": 2.5, "w": 1.5},
-
- {"x": 0, "y": 3.5},
- {"x": 1, "y": 3.5},
- {"x": 2, "y": 3.5},
- {"x": 3, "y": 3.5},
-
- {"x": 4.5, "y": 3.5, "w": 1.75},
- {"x": 6.25, "y": 3.5},
- {"x": 7.25, "y": 3.5},
- {"x": 8.25, "y": 3.5},
- {"x": 9.25, "y": 3.5},
- {"x": 10.25, "y": 3.5},
- {"x": 11.25, "y": 3.5},
- {"x": 12.25, "y": 3.5},
- {"x": 13.25, "y": 3.5},
- {"x": 14.25, "y": 3.5},
- {"x": 15.25, "y": 3.5},
- {"x": 16.25, "y": 3.5},
- {"x": 17.25, "y": 3.5, "w": 2.25},
-
- {"x": 0, "y": 4.5},
- {"x": 1, "y": 4.5},
- {"x": 2, "y": 4.5},
- {"x": 3, "y": 4.5},
-
- {"x": 4.25, "y": 4.75},
-
- {"x": 5.5, "y": 4.5, "w": 1.25},
- {"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},
- {"x": 14.75, "y": 4.5},
- {"x": 15.75, "y": 4.5},
- {"x": 16.75, "y": 4.5, "w": 1.75},
- {"x": 18.5, "y": 4.5},
-
- {"x": 0, "y": 5.5},
- {"x": 1, "y": 5.5},
- {"x": 2, "y": 5.5},
-
- {"x": 3.25, "y": 5.75},
- {"x": 4.25, "y": 5.75},
- {"x": 5.25, "y": 5.75},
-
- {"x": 6.5, "y": 5.5, "w": 1.25},
- {"x": 7.75, "y": 5.5, "w": 1.25},
- {"x": 9, "y": 5.5, "w": 6.25},
- {"x": 15.25, "y": 5.5, "w": 1.5},
- {"x": 16.75, "y": 5.5, "w": 1.25},
- {"x": 18, "y": 5.5, "w": 1.5}
+ {"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.5, "y": 0},
+
+ {"matrix": [1, 2], "x": 6.5, "y": 0},
+ {"matrix": [0, 3], "x": 7.5, "y": 0},
+ {"matrix": [1, 3], "x": 8.5, "y": 0},
+ {"matrix": [0, 4], "x": 9.5, "y": 0},
+
+ {"matrix": [1, 4], "x": 11, "y": 0},
+ {"matrix": [0, 5], "x": 12, "y": 0},
+ {"matrix": [1, 5], "x": 13, "y": 0},
+ {"matrix": [0, 6], "x": 14, "y": 0},
+
+ {"matrix": [1, 6], "x": 15.5, "y": 0},
+ {"matrix": [0, 7], "x": 16.5, "y": 0},
+ {"matrix": [1, 7], "x": 17.5, "y": 0},
+ {"matrix": [0, 8], "x": 18.5, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1.5},
+ {"matrix": [3, 0], "x": 1, "y": 1.5},
+ {"matrix": [2, 1], "x": 2, "y": 1.5},
+ {"matrix": [3, 1], "x": 3, "y": 1.5},
+
+ {"matrix": [2, 2], "x": 4.5, "y": 1.5},
+ {"matrix": [3, 2], "x": 5.5, "y": 1.5},
+ {"matrix": [2, 3], "x": 6.5, "y": 1.5},
+ {"matrix": [3, 3], "x": 7.5, "y": 1.5},
+ {"matrix": [2, 4], "x": 8.5, "y": 1.5},
+ {"matrix": [3, 4], "x": 9.5, "y": 1.5},
+ {"matrix": [2, 5], "x": 10.5, "y": 1.5},
+ {"matrix": [3, 5], "x": 11.5, "y": 1.5},
+ {"matrix": [2, 6], "x": 12.5, "y": 1.5},
+ {"matrix": [3, 6], "x": 13.5, "y": 1.5},
+ {"matrix": [2, 7], "x": 14.5, "y": 1.5},
+ {"matrix": [3, 7], "x": 15.5, "y": 1.5},
+ {"matrix": [2, 8], "x": 16.5, "y": 1.5},
+ {"matrix": [3, 8], "x": 17.5, "y": 1.5},
+ {"matrix": [1, 8], "x": 18.5, "y": 1.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 2.5},
+ {"matrix": [5, 0], "x": 1, "y": 2.5},
+ {"matrix": [4, 1], "x": 2, "y": 2.5},
+ {"matrix": [5, 1], "x": 3, "y": 2.5},
+
+ {"matrix": [4, 2], "x": 4.5, "y": 2.5, "w": 1.5},
+ {"matrix": [5, 2], "x": 6, "y": 2.5},
+ {"matrix": [4, 3], "x": 7, "y": 2.5},
+ {"matrix": [5, 3], "x": 8, "y": 2.5},
+ {"matrix": [4, 4], "x": 9, "y": 2.5},
+ {"matrix": [5, 4], "x": 10, "y": 2.5},
+ {"matrix": [4, 5], "x": 11, "y": 2.5},
+ {"matrix": [5, 5], "x": 12, "y": 2.5},
+ {"matrix": [4, 6], "x": 13, "y": 2.5},
+ {"matrix": [5, 6], "x": 14, "y": 2.5},
+ {"matrix": [4, 7], "x": 15, "y": 2.5},
+ {"matrix": [5, 7], "x": 16, "y": 2.5},
+ {"matrix": [4, 8], "x": 17, "y": 2.5},
+ {"matrix": [5, 8], "x": 18, "y": 2.5, "w": 1.5},
+
+ {"matrix": [6, 0], "x": 0, "y": 3.5},
+ {"matrix": [7, 0], "x": 1, "y": 3.5},
+ {"matrix": [6, 1], "x": 2, "y": 3.5},
+ {"matrix": [7, 1], "x": 3, "y": 3.5},
+
+ {"matrix": [6, 2], "x": 4.5, "y": 3.5, "w": 1.75},
+ {"matrix": [7, 2], "x": 6.25, "y": 3.5},
+ {"matrix": [6, 3], "x": 7.25, "y": 3.5},
+ {"matrix": [7, 3], "x": 8.25, "y": 3.5},
+ {"matrix": [6, 4], "x": 9.25, "y": 3.5},
+ {"matrix": [7, 4], "x": 10.25, "y": 3.5},
+ {"matrix": [6, 5], "x": 11.25, "y": 3.5},
+ {"matrix": [7, 5], "x": 12.25, "y": 3.5},
+ {"matrix": [6, 6], "x": 13.25, "y": 3.5},
+ {"matrix": [7, 6], "x": 14.25, "y": 3.5},
+ {"matrix": [6, 7], "x": 15.25, "y": 3.5},
+ {"matrix": [7, 7], "x": 16.25, "y": 3.5},
+ {"matrix": [6, 8], "x": 17.25, "y": 3.5, "w": 2.25},
+
+ {"matrix": [8, 0], "x": 0, "y": 4.5},
+ {"matrix": [9, 0], "x": 1, "y": 4.5},
+ {"matrix": [8, 1], "x": 2, "y": 4.5},
+ {"matrix": [9, 1], "x": 3, "y": 4.5},
+
+ {"matrix": [8, 2], "x": 4.25, "y": 4.75},
+
+ {"matrix": [9, 2], "x": 5.5, "y": 4.5, "w": 1.25},
+ {"matrix": [8, 3], "x": 6.75, "y": 4.5},
+ {"matrix": [9, 3], "x": 7.75, "y": 4.5},
+ {"matrix": [8, 4], "x": 8.75, "y": 4.5},
+ {"matrix": [9, 4], "x": 9.75, "y": 4.5},
+ {"matrix": [8, 5], "x": 10.75, "y": 4.5},
+ {"matrix": [9, 5], "x": 11.75, "y": 4.5},
+ {"matrix": [8, 6], "x": 12.75, "y": 4.5},
+ {"matrix": [9, 6], "x": 13.75, "y": 4.5},
+ {"matrix": [8, 7], "x": 14.75, "y": 4.5},
+ {"matrix": [9, 7], "x": 15.75, "y": 4.5},
+ {"matrix": [8, 8], "x": 16.75, "y": 4.5, "w": 1.75},
+ {"matrix": [9, 8], "x": 18.5, "y": 4.5},
+
+ {"matrix": [10, 0], "x": 0, "y": 5.5},
+ {"matrix": [11, 0], "x": 1, "y": 5.5},
+ {"matrix": [10, 1], "x": 2, "y": 5.5},
+
+ {"matrix": [11, 1], "x": 3.25, "y": 5.75},
+ {"matrix": [10, 2], "x": 4.25, "y": 5.75},
+ {"matrix": [11, 2], "x": 5.25, "y": 5.75},
+
+ {"matrix": [10, 3], "x": 6.5, "y": 5.5, "w": 1.25},
+ {"matrix": [11, 3], "x": 7.75, "y": 5.5, "w": 1.25},
+ {"matrix": [11, 5], "x": 9, "y": 5.5, "w": 6.25},
+ {"matrix": [11, 7], "x": 15.25, "y": 5.5, "w": 1.5},
+ {"matrix": [10, 8], "x": 16.75, "y": 5.5, "w": 1.25},
+ {"matrix": [11, 8], "x": 18, "y": 5.5, "w": 1.5}
]
}
}
diff --git a/keyboards/aeboards/ext65/rev1/info.json b/keyboards/aeboards/ext65/rev1/info.json
index d56d3902c2..ffe8d2443e 100644
--- a/keyboards/aeboards/ext65/rev1/info.json
+++ b/keyboards/aeboards/ext65/rev1/info.json
@@ -17,103 +17,104 @@
"layouts": {
"LAYOUT_ext65": {
"layout": [
- {"x": 0, "y": 0},
- {"x": 1, "y": 0},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0},
+ {"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},
- {"x": 4.5, "y": 0},
- {"x": 5.5, "y": 0},
- {"x": 6.5, "y": 0},
- {"x": 7.5, "y": 0},
- {"x": 8.5, "y": 0},
- {"x": 9.5, "y": 0},
- {"x": 10.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": 17.5, "y": 0},
- {"x": 18.5, "y": 0},
- {"x": 19.5, "y": 0},
+ {"matrix": [0, 2], "x": 4.5, "y": 0},
+ {"matrix": [1, 2], "x": 5.5, "y": 0},
+ {"matrix": [0, 3], "x": 6.5, "y": 0},
+ {"matrix": [1, 3], "x": 7.5, "y": 0},
+ {"matrix": [0, 4], "x": 8.5, "y": 0},
+ {"matrix": [1, 4], "x": 9.5, "y": 0},
+ {"matrix": [0, 5], "x": 10.5, "y": 0},
+ {"matrix": [1, 5], "x": 11.5, "y": 0},
+ {"matrix": [0, 6], "x": 12.5, "y": 0},
+ {"matrix": [1, 6], "x": 13.5, "y": 0},
+ {"matrix": [0, 7], "x": 14.5, "y": 0},
+ {"matrix": [1, 7], "x": 15.5, "y": 0},
+ {"matrix": [0, 8], "x": 16.5, "y": 0},
+ {"matrix": [1, 8], "x": 17.5, "y": 0},
+ {"matrix": [5, 8], "x": 18.5, "y": 0},
+ {"matrix": [0, 9], "x": 19.5, "y": 0},
- {"x": 0, "y": 1},
- {"x": 1, "y": 1},
- {"x": 2, "y": 1},
- {"x": 3, "y": 1},
+ {"matrix": [2, 0], "x": 0, "y": 1},
+ {"matrix": [3, 0], "x": 1, "y": 1},
+ {"matrix": [2, 1], "x": 2, "y": 1},
+ {"matrix": [3, 1], "x": 3, "y": 1},
- {"x": 4.5, "y": 1, "w": 1.5},
- {"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": 14, "y": 1},
- {"x": 15, "y": 1},
- {"x": 16, "y": 1},
- {"x": 17, "y": 1},
- {"x": 18, "y": 1, "w": 1.5},
- {"x": 19.5, "y": 1},
+ {"matrix": [2, 2], "x": 4.5, "y": 1, "w": 1.5},
+ {"matrix": [3, 2], "x": 6, "y": 1},
+ {"matrix": [2, 3], "x": 7, "y": 1},
+ {"matrix": [3, 3], "x": 8, "y": 1},
+ {"matrix": [2, 4], "x": 9, "y": 1},
+ {"matrix": [3, 4], "x": 10, "y": 1},
+ {"matrix": [2, 5], "x": 11, "y": 1},
+ {"matrix": [3, 5], "x": 12, "y": 1},
+ {"matrix": [2, 6], "x": 13, "y": 1},
+ {"matrix": [3, 6], "x": 14, "y": 1},
+ {"matrix": [2, 7], "x": 15, "y": 1},
+ {"matrix": [3, 7], "x": 16, "y": 1},
+ {"matrix": [2, 8], "x": 17, "y": 1},
+ {"matrix": [3, 8], "x": 18, "y": 1, "w": 1.5},
+ {"matrix": [2, 9], "x": 19.5, "y": 1},
- {"x": 0, "y": 2},
- {"x": 1, "y": 2},
- {"x": 2, "y": 2},
- {"x": 3, "y": 2},
+ {"matrix": [4, 0], "x": 0, "y": 2},
+ {"matrix": [5, 0], "x": 1, "y": 2},
+ {"matrix": [4, 1], "x": 2, "y": 2},
+ {"matrix": [5, 1], "x": 3, "y": 2},
- {"x": 4.5, "y": 2, "w": 1.75},
- {"x": 6.25, "y": 2},
- {"x": 7.25, "y": 2},
- {"x": 8.25, "y": 2},
- {"x": 9.25, "y": 2},
- {"x": 10.25, "y": 2},
- {"x": 11.25, "y": 2},
- {"x": 12.25, "y": 2},
- {"x": 13.25, "y": 2},
- {"x": 14.25, "y": 2},
- {"x": 15.25, "y": 2},
- {"x": 16.25, "y": 2},
- {"x": 17.25, "y": 2, "w": 2.25},
- {"x": 19.5, "y": 2},
+ {"matrix": [4, 2], "x": 4.5, "y": 2, "w": 1.75},
+ {"matrix": [5, 2], "x": 6.25, "y": 2},
+ {"matrix": [4, 3], "x": 7.25, "y": 2},
+ {"matrix": [5, 3], "x": 8.25, "y": 2},
+ {"matrix": [4, 4], "x": 9.25, "y": 2},
+ {"matrix": [5, 4], "x": 10.25, "y": 2},
+ {"matrix": [4, 5], "x": 11.25, "y": 2},
+ {"matrix": [5, 5], "x": 12.25, "y": 2},
+ {"matrix": [4, 6], "x": 13.25, "y": 2},
+ {"matrix": [5, 6], "x": 14.25, "y": 2},
+ {"matrix": [4, 7], "x": 15.25, "y": 2},
+ {"matrix": [5, 7], "x": 16.25, "y": 2},
+ {"matrix": [4, 8], "x": 17.25, "y": 2, "w": 2.25},
+ {"matrix": [4, 9], "x": 19.5, "y": 2},
- {"x": 0, "y": 3},
- {"x": 1, "y": 3},
- {"x": 2, "y": 3},
- {"x": 3, "y": 3},
+ {"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},
- {"x": 4.5, "y": 3, "w": 2.25},
- {"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},
- {"x": 13.75, "y": 3},
- {"x": 14.75, "y": 3},
- {"x": 15.75, "y": 3},
- {"x": 16.75, "y": 3, "w": 1.75},
- {"x": 18.5, "y": 3},
- {"x": 19.5, "y": 3},
+ {"matrix": [6, 2], "x": 4.5, "y": 3, "w": 2.25},
+ {"matrix": [7, 2], "x": 6.75, "y": 3},
+ {"matrix": [6, 3], "x": 7.75, "y": 3},
+ {"matrix": [7, 3], "x": 8.75, "y": 3},
+ {"matrix": [6, 4], "x": 9.75, "y": 3},
+ {"matrix": [7, 4], "x": 10.75, "y": 3},
+ {"matrix": [6, 5], "x": 11.75, "y": 3},
+ {"matrix": [7, 5], "x": 12.75, "y": 3},
+ {"matrix": [6, 6], "x": 13.75, "y": 3},
+ {"matrix": [7, 6], "x": 14.75, "y": 3},
+ {"matrix": [6, 7], "x": 15.75, "y": 3},
+ {"matrix": [7, 8], "x": 16.75, "y": 3, "w": 1.75},
+ {"matrix": [6, 8], "x": 18.5, "y": 3},
+ {"matrix": [7, 9], "x": 19.5, "y": 3},
- {"x": 0, "y": 4},
- {"x": 1, "y": 4},
- {"x": 2, "y": 4},
- {"x": 3, "y": 4},
- {"x": 4.5, "y": 4, "w": 1.5},
- {"x": 6, "y": 4},
- {"x": 7, "y": 4, "w": 1.5},
- {"x": 8.5, "y": 4, "w": 6.25},
- {"x": 14.75, "y": 4, "w": 1.25},
- {"x": 16, "y": 4},
+ {"matrix": [8, 0], "x": 0, "y": 4},
+ {"matrix": [9, 0], "x": 1, "y": 4},
+ {"matrix": [8, 1], "x": 2, "y": 4},
+ {"matrix": [9, 1], "x": 3, "y": 4},
- {"x": 17.5, "y": 4},
- {"x": 18.5, "y": 4},
- {"x": 19.5, "y": 4}
+ {"matrix": [8, 2], "x": 4.5, "y": 4, "w": 1.5},
+ {"matrix": [9, 2], "x": 6, "y": 4},
+ {"matrix": [8, 3], "x": 7, "y": 4, "w": 1.5},
+ {"matrix": [8, 5], "x": 8.5, "y": 4, "w": 6.25},
+ {"matrix": [9, 6], "x": 14.75, "y": 4, "w": 1.25},
+ {"matrix": [8, 7], "x": 16, "y": 4},
+
+ {"matrix": [9, 8], "x": 17.5, "y": 4},
+ {"matrix": [8, 8], "x": 18.5, "y": 4},
+ {"matrix": [9, 9], "x": 19.5, "y": 4}
]
}
}
diff --git a/keyboards/aeboards/ext65/rev1/rev1.c b/keyboards/aeboards/ext65/rev1/rev1.c
index c1e81204db..adbae94816 100644
--- a/keyboards/aeboards/ext65/rev1/rev1.c
+++ b/keyboards/aeboards/ext65/rev1/rev1.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "rev1.h"
+#include "quantum.h"
void keyboard_pre_init_user(void) {
// Call the keyboard pre init code.
diff --git a/keyboards/aeboards/ext65/rev1/rev1.h b/keyboards/aeboards/ext65/rev1/rev1.h
deleted file mode 100644
index fadfef6ddc..0000000000
--- a/keyboards/aeboards/ext65/rev1/rev1.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2020 Harrison Chan (Xelus)
- *
- * 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_ext65( \
- K000, K100, K001, K101, K002, K102, K003, K103, K004, K104, K005, K105, K006, K106, K007, K107, K008, K108, K508, K009, \
- K200, K300, K201, K301, K202, K302, K203, K303, K204, K304, K205, K305, K206, K306, K207, K307, K208, K308, K209, \
- K400, K500, K401, K501, K402, K502, K403, K503, K404, K504, K405, K505, K406, K506, K407, K507, K408, K409, \
- K600, K700, K601, K701, K602, K702, K603, K703, K604, K704, K605, K705, K606, K706, K607, K708, K608, K709, \
- K800, K900, K801, K901, K802, K902, K803, K805, K906, K807, K908, K808, K909 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, ____ }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, ____ }, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409 }, \
- { K500, K501, K502, K503, K504, K505, K506, K507, K508, ____ }, \
- { K600, K601, K602, K603, K604, K605, K606, K607, K608, ____ }, \
- { K700, K701, K702, K703, K704, K705, K706, ____, K708, K709 }, \
- { K800, K801, K802, K803, ____, K805, ____, K807, K808, ____ }, \
- { K900, K901, K902, ____, ____, ____, K906, ____, K908, K909 } \
-}
diff --git a/keyboards/aeboards/ext65/rev2/info.json b/keyboards/aeboards/ext65/rev2/info.json
index 159f8e8787..bfdcae090e 100644
--- a/keyboards/aeboards/ext65/rev2/info.json
+++ b/keyboards/aeboards/ext65/rev2/info.json
@@ -26,103 +26,104 @@
"layouts": {
"LAYOUT_ext65": {
"layout": [
- {"x": 0, "y": 0},
- {"x": 1, "y": 0},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0},
+ {"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},
- {"x": 4.5, "y": 0},
- {"x": 5.5, "y": 0},
- {"x": 6.5, "y": 0},
- {"x": 7.5, "y": 0},
- {"x": 8.5, "y": 0},
- {"x": 9.5, "y": 0},
- {"x": 10.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": 17.5, "y": 0},
- {"x": 18.5, "y": 0},
- {"x": 19.5, "y": 0},
+ {"matrix": [0, 2], "x": 4.5, "y": 0},
+ {"matrix": [1, 2], "x": 5.5, "y": 0},
+ {"matrix": [0, 3], "x": 6.5, "y": 0},
+ {"matrix": [1, 3], "x": 7.5, "y": 0},
+ {"matrix": [0, 4], "x": 8.5, "y": 0},
+ {"matrix": [1, 4], "x": 9.5, "y": 0},
+ {"matrix": [0, 5], "x": 10.5, "y": 0},
+ {"matrix": [1, 5], "x": 11.5, "y": 0},
+ {"matrix": [0, 6], "x": 12.5, "y": 0},
+ {"matrix": [1, 6], "x": 13.5, "y": 0},
+ {"matrix": [0, 7], "x": 14.5, "y": 0},
+ {"matrix": [1, 7], "x": 15.5, "y": 0},
+ {"matrix": [0, 8], "x": 16.5, "y": 0},
+ {"matrix": [1, 8], "x": 17.5, "y": 0},
+ {"matrix": [5, 8], "x": 18.5, "y": 0},
+ {"matrix": [0, 9], "x": 19.5, "y": 0},
- {"x": 0, "y": 1},
- {"x": 1, "y": 1},
- {"x": 2, "y": 1},
- {"x": 3, "y": 1},
+ {"matrix": [2, 0], "x": 0, "y": 1},
+ {"matrix": [3, 0], "x": 1, "y": 1},
+ {"matrix": [2, 1], "x": 2, "y": 1},
+ {"matrix": [3, 1], "x": 3, "y": 1},
- {"x": 4.5, "y": 1, "w": 1.5},
- {"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": 14, "y": 1},
- {"x": 15, "y": 1},
- {"x": 16, "y": 1},
- {"x": 17, "y": 1},
- {"x": 18, "y": 1, "w": 1.5},
- {"x": 19.5, "y": 1},
+ {"matrix": [2, 2], "x": 4.5, "y": 1, "w": 1.5},
+ {"matrix": [3, 2], "x": 6, "y": 1},
+ {"matrix": [2, 3], "x": 7, "y": 1},
+ {"matrix": [3, 3], "x": 8, "y": 1},
+ {"matrix": [2, 4], "x": 9, "y": 1},
+ {"matrix": [3, 4], "x": 10, "y": 1},
+ {"matrix": [2, 5], "x": 11, "y": 1},
+ {"matrix": [3, 5], "x": 12, "y": 1},
+ {"matrix": [2, 6], "x": 13, "y": 1},
+ {"matrix": [3, 6], "x": 14, "y": 1},
+ {"matrix": [2, 7], "x": 15, "y": 1},
+ {"matrix": [3, 7], "x": 16, "y": 1},
+ {"matrix": [2, 8], "x": 17, "y": 1},
+ {"matrix": [3, 8], "x": 18, "y": 1, "w": 1.5},
+ {"matrix": [2, 9], "x": 19.5, "y": 1},
- {"x": 0, "y": 2},
- {"x": 1, "y": 2},
- {"x": 2, "y": 2},
- {"x": 3, "y": 2},
+ {"matrix": [4, 0], "x": 0, "y": 2},
+ {"matrix": [5, 0], "x": 1, "y": 2},
+ {"matrix": [4, 1], "x": 2, "y": 2},
+ {"matrix": [5, 1], "x": 3, "y": 2},
- {"x": 4.5, "y": 2, "w": 1.75},
- {"x": 6.25, "y": 2},
- {"x": 7.25, "y": 2},
- {"x": 8.25, "y": 2},
- {"x": 9.25, "y": 2},
- {"x": 10.25, "y": 2},
- {"x": 11.25, "y": 2},
- {"x": 12.25, "y": 2},
- {"x": 13.25, "y": 2},
- {"x": 14.25, "y": 2},
- {"x": 15.25, "y": 2},
- {"x": 16.25, "y": 2},
- {"x": 17.25, "y": 2, "w": 2.25},
- {"x": 19.5, "y": 2},
+ {"matrix": [4, 2], "x": 4.5, "y": 2, "w": 1.75},
+ {"matrix": [5, 2], "x": 6.25, "y": 2},
+ {"matrix": [4, 3], "x": 7.25, "y": 2},
+ {"matrix": [5, 3], "x": 8.25, "y": 2},
+ {"matrix": [4, 4], "x": 9.25, "y": 2},
+ {"matrix": [5, 4], "x": 10.25, "y": 2},
+ {"matrix": [4, 5], "x": 11.25, "y": 2},
+ {"matrix": [5, 5], "x": 12.25, "y": 2},
+ {"matrix": [4, 6], "x": 13.25, "y": 2},
+ {"matrix": [5, 6], "x": 14.25, "y": 2},
+ {"matrix": [4, 7], "x": 15.25, "y": 2},
+ {"matrix": [5, 7], "x": 16.25, "y": 2},
+ {"matrix": [4, 8], "x": 17.25, "y": 2, "w": 2.25},
+ {"matrix": [4, 9], "x": 19.5, "y": 2},
- {"x": 0, "y": 3},
- {"x": 1, "y": 3},
- {"x": 2, "y": 3},
- {"x": 3, "y": 3},
+ {"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},
- {"x": 4.5, "y": 3, "w": 2.25},
- {"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},
- {"x": 13.75, "y": 3},
- {"x": 14.75, "y": 3},
- {"x": 15.75, "y": 3},
- {"x": 16.75, "y": 3, "w": 1.75},
- {"x": 18.5, "y": 3},
- {"x": 19.5, "y": 3},
+ {"matrix": [6, 2], "x": 4.5, "y": 3, "w": 2.25},
+ {"matrix": [7, 2], "x": 6.75, "y": 3},
+ {"matrix": [6, 3], "x": 7.75, "y": 3},
+ {"matrix": [7, 3], "x": 8.75, "y": 3},
+ {"matrix": [6, 4], "x": 9.75, "y": 3},
+ {"matrix": [7, 4], "x": 10.75, "y": 3},
+ {"matrix": [6, 5], "x": 11.75, "y": 3},
+ {"matrix": [7, 5], "x": 12.75, "y": 3},
+ {"matrix": [6, 6], "x": 13.75, "y": 3},
+ {"matrix": [7, 6], "x": 14.75, "y": 3},
+ {"matrix": [6, 7], "x": 15.75, "y": 3},
+ {"matrix": [7, 8], "x": 16.75, "y": 3, "w": 1.75},
+ {"matrix": [6, 8], "x": 18.5, "y": 3},
+ {"matrix": [7, 9], "x": 19.5, "y": 3},
- {"x": 0, "y": 4},
- {"x": 1, "y": 4},
- {"x": 2, "y": 4},
- {"x": 3, "y": 4},
- {"x": 4.5, "y": 4, "w": 1.5},
- {"x": 6, "y": 4},
- {"x": 7, "y": 4, "w": 1.5},
- {"x": 8.5, "y": 4, "w": 6.25},
- {"x": 14.75, "y": 4, "w": 1.25},
- {"x": 16, "y": 4},
+ {"matrix": [8, 0], "x": 0, "y": 4},
+ {"matrix": [9, 0], "x": 1, "y": 4},
+ {"matrix": [8, 1], "x": 2, "y": 4},
+ {"matrix": [9, 1], "x": 3, "y": 4},
- {"x": 17.5, "y": 4},
- {"x": 18.5, "y": 4},
- {"x": 19.5, "y": 4}
+ {"matrix": [8, 2], "x": 4.5, "y": 4, "w": 1.5},
+ {"matrix": [9, 2], "x": 6, "y": 4},
+ {"matrix": [8, 3], "x": 7, "y": 4, "w": 1.5},
+ {"matrix": [8, 5], "x": 8.5, "y": 4, "w": 6.25},
+ {"matrix": [9, 6], "x": 14.75, "y": 4, "w": 1.25},
+ {"matrix": [8, 7], "x": 16, "y": 4},
+
+ {"matrix": [9, 8], "x": 17.5, "y": 4},
+ {"matrix": [8, 8], "x": 18.5, "y": 4},
+ {"matrix": [9, 9], "x": 19.5, "y": 4}
]
}
}
diff --git a/keyboards/aeboards/ext65/rev2/rev2.c b/keyboards/aeboards/ext65/rev2/rev2.c
index 998a91ccfc..6fe2d469dc 100644
--- a/keyboards/aeboards/ext65/rev2/rev2.c
+++ b/keyboards/aeboards/ext65/rev2/rev2.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "rev2.h"
+#include "quantum.h"
// Tested and verified working on ext65rev2
void matrix_io_delay(void) { __asm__ volatile("nop\nnop\nnop\n"); }
diff --git a/keyboards/aeboards/ext65/rev2/rev2.h b/keyboards/aeboards/ext65/rev2/rev2.h
deleted file mode 100644
index fadfef6ddc..0000000000
--- a/keyboards/aeboards/ext65/rev2/rev2.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2020 Harrison Chan (Xelus)
- *
- * 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_ext65( \
- K000, K100, K001, K101, K002, K102, K003, K103, K004, K104, K005, K105, K006, K106, K007, K107, K008, K108, K508, K009, \
- K200, K300, K201, K301, K202, K302, K203, K303, K204, K304, K205, K305, K206, K306, K207, K307, K208, K308, K209, \
- K400, K500, K401, K501, K402, K502, K403, K503, K404, K504, K405, K505, K406, K506, K407, K507, K408, K409, \
- K600, K700, K601, K701, K602, K702, K603, K703, K604, K704, K605, K705, K606, K706, K607, K708, K608, K709, \
- K800, K900, K801, K901, K802, K902, K803, K805, K906, K807, K908, K808, K909 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, ____ }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, ____ }, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409 }, \
- { K500, K501, K502, K503, K504, K505, K506, K507, K508, ____ }, \
- { K600, K601, K602, K603, K604, K605, K606, K607, K608, ____ }, \
- { K700, K701, K702, K703, K704, K705, K706, ____, K708, K709 }, \
- { K800, K801, K802, K803, ____, K805, ____, K807, K808, ____ }, \
- { K900, K901, K902, ____, ____, ____, K906, ____, K908, K909 } \
-}
diff --git a/keyboards/aeboards/ext65/rev3/info.json b/keyboards/aeboards/ext65/rev3/info.json
index 90d59a943c..bb507545a0 100644
--- a/keyboards/aeboards/ext65/rev3/info.json
+++ b/keyboards/aeboards/ext65/rev3/info.json
@@ -22,425 +22,99 @@
"layouts": {
"LAYOUT_ext65_hotswap": {
"layout": [
- {
- "x": 0,
- "y": 0
- },
- {
- "x": 1,
- "y": 0
- },
- {
- "x": 2,
- "y": 0
- },
- {
- "x": 3,
- "y": 0
- },
- {
- "label": "Esc",
- "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": "_",
- "x": 15.5,
- "y": 0
- },
- {
- "label": "+",
- "x": 16.5,
- "y": 0
- },
- {
- "label": "Backspace",
- "x": 17.5,
- "y": 0,
- "w": 2
- },
- {
- "label": "Home",
- "x": 19.5,
- "y": 0
- },
- {
- "x": 0,
- "y": 1,
- "h": 2
- },
- {
- "x": 1,
- "y": 1
- },
- {
- "x": 2,
- "y": 1
- },
- {
- "x": 3,
- "y": 1
- },
- {
- "label": "Tab",
- "x": 4.5,
- "y": 1,
- "w": 1.5
- },
- {
- "label": "Q",
- "x": 6,
- "y": 1
- },
- {
- "label": "W",
- "x": 7,
- "y": 1
- },
- {
- "label": "E",
- "x": 8,
- "y": 1
- },
- {
- "label": "R",
- "x": 9,
- "y": 1
- },
- {
- "label": "T",
- "x": 10,
- "y": 1
- },
- {
- "label": "Y",
- "x": 11,
- "y": 1
- },
- {
- "label": "U",
- "x": 12,
- "y": 1
- },
- {
- "label": "I",
- "x": 13,
- "y": 1
- },
- {
- "label": "O",
- "x": 14,
- "y": 1
- },
- {
- "label": "P",
- "x": 15,
- "y": 1
- },
- {
- "label": "{",
- "x": 16,
- "y": 1
- },
- {
- "label": "}",
- "x": 17,
- "y": 1
- },
- {
- "label": "|",
- "x": 18,
- "y": 1,
- "w": 1.5
- },
- {
- "label": "PgUp",
- "x": 19.5,
- "y": 1
- },
- {
- "x": 1,
- "y": 2
- },
- {
- "x": 2,
- "y": 2
- },
- {
- "x": 3,
- "y": 2
- },
- {
- "label": "Caps Lock",
- "x": 4.5,
- "y": 2,
- "w": 1.75
- },
- {
- "label": "A",
- "x": 6.25,
- "y": 2
- },
- {
- "label": "S",
- "x": 7.25,
- "y": 2
- },
- {
- "label": "D",
- "x": 8.25,
- "y": 2
- },
- {
- "label": "F",
- "x": 9.25,
- "y": 2
- },
- {
- "label": "G",
- "x": 10.25,
- "y": 2
- },
- {
- "label": "H",
- "x": 11.25,
- "y": 2
- },
- {
- "label": "J",
- "x": 12.25,
- "y": 2
- },
- {
- "label": "K",
- "x": 13.25,
- "y": 2
- },
- {
- "label": "L",
- "x": 14.25,
- "y": 2
- },
- {
- "label": ":",
- "x": 15.25,
- "y": 2
- },
- {
- "label": "\"",
- "x": 16.25,
- "y": 2
- },
- {
- "label": "Enter",
- "x": 17.25,
- "y": 2,
- "w": 2.25
- },
- {
- "label": "PgDn",
- "x": 19.5,
- "y": 2
- },
- {
- "x": 0,
- "y": 3,
- "h": 2
- },
- {
- "x": 1,
- "y": 3
- },
- {
- "x": 2,
- "y": 3
- },
- {
- "x": 3,
- "y": 3
- },
- {
- "label": "Shift",
- "x": 4.5,
- "y": 3,
- "w": 2.25
- },
- {
- "label": "Z",
- "x": 6.75,
- "y": 3
- },
- {
- "label": "X",
- "x": 7.75,
- "y": 3
- },
- {
- "label": "C",
- "x": 8.75,
- "y": 3
- },
- {
- "label": "V",
- "x": 9.75,
- "y": 3
- },
- {
- "label": "B",
- "x": 10.75,
- "y": 3
- },
- {
- "label": "N",
- "x": 11.75,
- "y": 3
- },
- {
- "label": "M",
- "x": 12.75,
- "y": 3
- },
- {
- "label": "<",
- "x": 13.75,
- "y": 3
- },
- {
- "label": ">",
- "x": 14.75,
- "y": 3
- },
- {
- "label": "?",
- "x": 15.75,
- "y": 3
- },
- {
- "label": "Shift",
- "x": 16.75,
- "y": 3,
- "w": 1.75
- },
- {
- "label": "\u2191",
- "x": 18.5,
- "y": 3
- },
- {
- "label": "End",
- "x": 19.5,
- "y": 3
- },
- {
- "x": 1,
- "y": 4
- },
- {
- "x": 2,
- "y": 4,
- "w": 2
- },
- {
- "label": "Ctrl",
- "x": 4.5,
- "y": 4,
- "w": 1.25
- },
- {
- "label": "Win",
- "x": 5.75,
- "y": 4,
- "w": 1.25
- },
- {
- "label": "Alt",
- "x": 7,
- "y": 4,
- "w": 1.25
- },
- {
- "label": "Space",
- "x": 8.25,
- "y": 4,
- "w": 6.25
- },
- {
- "label": "Alt",
- "x": 14.5,
- "y": 4,
- "w": 1.5
- },
- {
- "label": "Fn",
- "x": 16,
- "y": 4,
- "w": 1.5
- },
- {
- "label": "\u2190",
- "x": 17.5,
- "y": 4
- },
- {
- "label": "\u2193",
- "x": 18.5,
- "y": 4
- },
- {
- "label": "\u2192",
- "x": 19.5,
- "y": 4
- }
+ {"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.5, "y": 0},
+ {"matrix": [1, 2], "x": 5.5, "y": 0},
+ {"matrix": [0, 3], "x": 6.5, "y": 0},
+ {"matrix": [1, 3], "x": 7.5, "y": 0},
+ {"matrix": [0, 4], "x": 8.5, "y": 0},
+ {"matrix": [1, 4], "x": 9.5, "y": 0},
+ {"matrix": [0, 5], "x": 10.5, "y": 0},
+ {"matrix": [1, 5], "x": 11.5, "y": 0},
+ {"matrix": [0, 6], "x": 12.5, "y": 0},
+ {"matrix": [1, 6], "x": 13.5, "y": 0},
+ {"matrix": [0, 7], "x": 14.5, "y": 0},
+ {"matrix": [1, 7], "x": 15.5, "y": 0},
+ {"matrix": [0, 8], "x": 16.5, "y": 0},
+ {"matrix": [1, 8], "x": 17.5, "y": 0, "w": 2},
+ {"matrix": [0, 9], "x": 19.5, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1, "h": 2},
+ {"matrix": [3, 0], "x": 1, "y": 1},
+ {"matrix": [2, 1], "x": 2, "y": 1},
+ {"matrix": [3, 1], "x": 3, "y": 1},
+
+ {"matrix": [2, 2], "x": 4.5, "y": 1, "w": 1.5},
+ {"matrix": [3, 2], "x": 6, "y": 1},
+ {"matrix": [2, 3], "x": 7, "y": 1},
+ {"matrix": [3, 3], "x": 8, "y": 1},
+ {"matrix": [2, 4], "x": 9, "y": 1},
+ {"matrix": [3, 4], "x": 10, "y": 1},
+ {"matrix": [2, 5], "x": 11, "y": 1},
+ {"matrix": [3, 5], "x": 12, "y": 1},
+ {"matrix": [2, 6], "x": 13, "y": 1},
+ {"matrix": [3, 6], "x": 14, "y": 1},
+ {"matrix": [2, 7], "x": 15, "y": 1},
+ {"matrix": [3, 7], "x": 16, "y": 1},
+ {"matrix": [2, 8], "x": 17, "y": 1},
+ {"matrix": [3, 8], "x": 18, "y": 1, "w": 1.5},
+ {"matrix": [2, 9], "x": 19.5, "y": 1},
+
+ {"matrix": [5, 0], "x": 1, "y": 2},
+ {"matrix": [4, 1], "x": 2, "y": 2},
+ {"matrix": [5, 1], "x": 3, "y": 2},
+
+ {"matrix": [4, 2], "x": 4.5, "y": 2, "w": 1.75},
+ {"matrix": [5, 2], "x": 6.25, "y": 2},
+ {"matrix": [4, 3], "x": 7.25, "y": 2},
+ {"matrix": [5, 3], "x": 8.25, "y": 2},
+ {"matrix": [4, 4], "x": 9.25, "y": 2},
+ {"matrix": [5, 4], "x": 10.25, "y": 2},
+ {"matrix": [4, 5], "x": 11.25, "y": 2},
+ {"matrix": [5, 5], "x": 12.25, "y": 2},
+ {"matrix": [4, 6], "x": 13.25, "y": 2},
+ {"matrix": [5, 6], "x": 14.25, "y": 2},
+ {"matrix": [4, 7], "x": 15.25, "y": 2},
+ {"matrix": [5, 7], "x": 16.25, "y": 2},
+ {"matrix": [4, 8], "x": 17.25, "y": 2, "w": 2.25},
+ {"matrix": [4, 9], "x": 19.5, "y": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3, "h": 2},
+ {"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.5, "y": 3, "w": 2.25},
+ {"matrix": [7, 2], "x": 6.75, "y": 3},
+ {"matrix": [6, 3], "x": 7.75, "y": 3},
+ {"matrix": [7, 3], "x": 8.75, "y": 3},
+ {"matrix": [6, 4], "x": 9.75, "y": 3},
+ {"matrix": [7, 4], "x": 10.75, "y": 3},
+ {"matrix": [6, 5], "x": 11.75, "y": 3},
+ {"matrix": [7, 5], "x": 12.75, "y": 3},
+ {"matrix": [6, 6], "x": 13.75, "y": 3},
+ {"matrix": [7, 6], "x": 14.75, "y": 3},
+ {"matrix": [6, 7], "x": 15.75, "y": 3},
+ {"matrix": [7, 8], "x": 16.75, "y": 3, "w": 1.75},
+ {"matrix": [6, 8], "x": 18.5, "y": 3},
+ {"matrix": [7, 9], "x": 19.5, "y": 3},
+
+ {"matrix": [9, 0], "x": 1, "y": 4},
+ {"matrix": [8, 1], "x": 2, "y": 4, "w": 2},
+
+ {"matrix": [8, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [9, 2], "x": 5.75, "y": 4, "w": 1.25},
+ {"matrix": [8, 3], "x": 7, "y": 4, "w": 1.25},
+ {"matrix": [8, 5], "x": 8.25, "y": 4, "w": 6.25},
+ {"matrix": [9, 6], "x": 14.5, "y": 4, "w": 1.5},
+ {"matrix": [8, 7], "x": 16, "y": 4, "w": 1.5},
+ {"matrix": [9, 8], "x": 17.5, "y": 4},
+ {"matrix": [8, 8], "x": 18.5, "y": 4},
+ {"matrix": [9, 9], "x": 19.5, "y": 4}
]
}
}
diff --git a/keyboards/aeboards/ext65/rev3/rev3.c b/keyboards/aeboards/ext65/rev3/rev3.c
index 14523afe35..b5e27756ec 100644
--- a/keyboards/aeboards/ext65/rev3/rev3.c
+++ b/keyboards/aeboards/ext65/rev3/rev3.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "rev3.h"
+#include "quantum.h"
// Tested and verified working on EXT65 Rev3
void matrix_io_delay(void) { __asm__ volatile("nop\nnop\nnop\n"); }
diff --git a/keyboards/aeboards/ext65/rev3/rev3.h b/keyboards/aeboards/ext65/rev3/rev3.h
deleted file mode 100644
index 7f1525bb40..0000000000
--- a/keyboards/aeboards/ext65/rev3/rev3.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2022 Harrison Chan (Xelus)
- *
- * 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_ext65_hotswap( \
- K000, K100, K001, K101, K002, K102, K003, K103, K004, K104, K005, K105, K006, K106, K007, K107, K008, K108, K009, \
- K200, K300, K201, K301, K202, K302, K203, K303, K204, K304, K205, K305, K206, K306, K207, K307, K208, K308, K209, \
- K500, K401, K501, K402, K502, K403, K503, K404, K504, K405, K505, K406, K506, K407, K507, K408, K409, \
- K600, K700, K601, K701, K602, K702, K603, K703, K604, K704, K605, K705, K606, K706, K607, K708, K608, K709, \
- K900, K801, K802, K902, K803, K805, K906, K807, K908, K808, K909 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, ____ }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, ____ }, \
- { ____, K401, K402, K403, K404, K405, K406, K407, K408, K409 }, \
- { K500, K501, K502, K503, K504, K505, K506, K507, ____, ____ }, \
- { K600, K601, K602, K603, K604, K605, K606, K607, K608, ____ }, \
- { K700, K701, K702, K703, K704, K705, K706, ____, K708, K709 }, \
- { ____, K801, K802, K803, ____, K805, ____, K807, K808, ____ }, \
- { K900, ____, K902, ____, ____, ____, K906, ____, K908, K909 } \
-}
diff --git a/keyboards/alfredslab/swift65/hotswap/hotswap.h b/keyboards/alfredslab/swift65/hotswap/hotswap.h
deleted file mode 100644
index ab9c3d8250..0000000000
--- a/keyboards/alfredslab/swift65/hotswap/hotswap.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2022 Steven Phillips (spooknik)
- *
- * 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_7u_space( \
- 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, \
- K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
- 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, XXX, K2D, K2E }, \
- { XXX, K31, 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, K4E }, \
-}
diff --git a/keyboards/alfredslab/swift65/hotswap/info.json b/keyboards/alfredslab/swift65/hotswap/info.json
index 2e7f9bf2c2..e246fcc85f 100644
--- a/keyboards/alfredslab/swift65/hotswap/info.json
+++ b/keyboards/alfredslab/swift65/hotswap/info.json
@@ -25,71 +25,79 @@
"layouts": {
"LAYOUT_7u_space": {
"layout": [
- { "label": "K00 (B1,F7)", "x": 0, "y": 0 },
- { "label": "K01 (B1,F6)", "x": 1, "y": 0 },
- { "label": "K02 (B1,F5)", "x": 2, "y": 0 },
- { "label": "K03 (B1,F4)", "x": 3, "y": 0 },
- { "label": "K04 (B1,F1)", "x": 4, "y": 0 },
- { "label": "K05 (B1,F0)", "x": 5, "y": 0 },
- { "label": "K06 (B1,C7)", "x": 6, "y": 0 },
- { "label": "K07 (B1,C6)", "x": 7, "y": 0 },
- { "label": "K08 (B1,B6)", "x": 8, "y": 0 },
- { "label": "K09 (B1,B5)", "x": 9, "y": 0 },
- { "label": "K0A (B1,B4)", "x": 10, "y": 0 },
- { "label": "K0B (B1,D7)", "x": 11, "y": 0 },
- { "label": "K0C (B1,D5)", "x": 12, "y": 0 },
- { "label": "K0D (B1,D3)", "x": 13, "y": 0, "w": 2 },
- { "label": "K0E (B1,D1)", "x": 15.25, "y": 0 },
- { "label": "K10 (B2,F7)", "x": 0, "y": 1, "w": 1.5 },
- { "label": "K11 (B2,F6)", "x": 1.5, "y": 1 },
- { "label": "K12 (B2,F5)", "x": 2.5, "y": 1 },
- { "label": "K13 (B2,F4)", "x": 3.5, "y": 1 },
- { "label": "K14 (B2,F1)", "x": 4.5, "y": 1 },
- { "label": "K15 (B2,F0)", "x": 5.5, "y": 1 },
- { "label": "K16 (B2,C7)", "x": 6.5, "y": 1 },
- { "label": "K17 (B2,C6)", "x": 7.5, "y": 1 },
- { "label": "K18 (B2,B6)", "x": 8.5, "y": 1 },
- { "label": "K19 (B2,B5)", "x": 9.5, "y": 1 },
- { "label": "K1A (B2,B4)", "x": 10.5, "y": 1 },
- { "label": "K1B (B2,D7)", "x": 11.5, "y": 1 },
- { "label": "K1C (B2,D5)", "x": 12.5, "y": 1 },
- { "label": "K1D (B2,D3)", "x": 13.5, "y": 1, "w": 1.5 },
- { "label": "K1E (B2,D1)", "x": 15.25, "y": 1 },
- { "label": "K20 (B3,F7)", "x": 0, "y": 2, "w": 1.75 },
- { "label": "K21 (B3,F6)", "x": 1.75, "y": 2 },
- { "label": "K22 (B3,F5)", "x": 2.75, "y": 2 },
- { "label": "K23 (B3,F4)", "x": 3.75, "y": 2 },
- { "label": "K24 (B3,F1)", "x": 4.75, "y": 2 },
- { "label": "K25 (B3,F0)", "x": 5.75, "y": 2 },
- { "label": "K26 (B3,C7)", "x": 6.75, "y": 2 },
- { "label": "K27 (B3,C6)", "x": 7.75, "y": 2 },
- { "label": "K28 (B3,B6)", "x": 8.75, "y": 2 },
- { "label": "K29 (B3,B5)", "x": 9.75, "y": 2 },
- { "label": "K2A (B3,B4)", "x": 10.75, "y": 2 },
- { "label": "K2B (B3,D7)", "x": 11.75, "y": 2 },
- { "label": "K2D (B3,D3)", "x": 12.75, "y": 2, "w": 2.25 },
- { "label": "K2E (B3,D1)", "x": 15.25, "y": 2 },
- { "label": "K31 (D6,F6)", "x": 0, "y": 3, "w": 2.25 },
- { "label": "K32 (D6,F5)", "x": 2.25, "y": 3 },
- { "label": "K33 (D6,F4)", "x": 3.25, "y": 3 },
- { "label": "K34 (D6,F1)", "x": 4.25, "y": 3 },
- { "label": "K35 (D6,F0)", "x": 5.25, "y": 3 },
- { "label": "K36 (D6,C7)", "x": 6.25, "y": 3 },
- { "label": "K37 (D6,C6)", "x": 7.25, "y": 3 },
- { "label": "K38 (D6,B6)", "x": 8.25, "y": 3 },
- { "label": "K39 (D6,B5)", "x": 9.25, "y": 3 },
- { "label": "K3A (D6,B4)", "x": 10.25, "y": 3 },
- { "label": "K3B (D6,D7)", "x": 11.25, "y": 3 },
- { "label": "K3C (D6,D5)", "x": 12.25, "y": 3, "w": 1.75 },
- { "label": "K3D (D6,D3)", "x": 14, "y": 3 },
- { "label": "K40 (D4,F7)", "x": 0, "y": 4, "w": 1.5 },
- { "label": "K41 (D4,F6)", "x": 1.5, "y": 4},
- { "label": "K42 (D4,F5)", "x": 2.5, "y": 4, "w": 1.5 },
- { "label": "K46 (D4,C7)", "x": 4, "y": 4, "w": 7},
- { "label": "K4B (D4,D7)", "x": 11, "y": 4, "w": 1.5 },
- { "label": "K4C (D4,D5)", "x": 13, "y": 4 },
- { "label": "K4D (D4,D3)", "x": 14, "y": 4 },
- { "label": "K4E (D4,D1)", "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": [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": [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": [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.25, "y": 2},
+
+ {"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, 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.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}
]
}
}
diff --git a/keyboards/alfredslab/swift65/solder/info.json b/keyboards/alfredslab/swift65/solder/info.json
index 79583e099c..abaaf12353 100644
--- a/keyboards/alfredslab/swift65/solder/info.json
+++ b/keyboards/alfredslab/swift65/solder/info.json
@@ -25,298 +25,314 @@
"layouts": {
"LAYOUT_625u_space": {
"layout": [
- {"label":"K00 (B1,F7)", "x":0, "y":0},
- {"label":"K01 (B1,F6)", "x":1, "y":0},
- {"label":"K02 (B1,F5)", "x":2, "y":0},
- {"label":"K03 (B1,F4)", "x":3, "y":0},
- {"label":"K04 (B1,F1)", "x":4, "y":0},
- {"label":"K05 (B1,F0)", "x":5, "y":0},
- {"label":"K06 (B1,C7)", "x":6, "y":0},
- {"label":"K07 (B1,C6)", "x":7, "y":0},
- {"label":"K08 (B1,B6)", "x":8, "y":0},
- {"label":"K09 (B1,B5)", "x":9, "y":0},
- {"label":"K0A (B1,B4)", "x":10, "y":0},
- {"label":"K0B (B1,D7)", "x":11, "y":0},
- {"label":"K0C (B1,D5)", "x":12, "y":0},
- {"label":"K0D (B1,D3)", "x":13, "y":0, "w":2},
- {"label":"K0E (B1,D1)", "x":15.25, "y":0},
-
- {"label":"K10 (B2,F7)", "x":0, "y":1, "w":1.5},
- {"label":"K11 (B2,F6)", "x":1.5, "y":1},
- {"label":"K12 (B2,F5)", "x":2.5, "y":1},
- {"label":"K13 (B2,F4)", "x":3.5, "y":1},
- {"label":"K14 (B2,F1)", "x":4.5, "y":1},
- {"label":"K15 (B2,F0)", "x":5.5, "y":1},
- {"label":"K16 (B2,C7)", "x":6.5, "y":1},
- {"label":"K17 (B2,C6)", "x":7.5, "y":1},
- {"label":"K18 (B2,B6)", "x":8.5, "y":1},
- {"label":"K19 (B2,B5)", "x":9.5, "y":1},
- {"label":"K1A (B2,B4)", "x":10.5, "y":1},
- {"label":"K1B (B2,D7)", "x":11.5, "y":1},
- {"label":"K1C (B2,D5)", "x":12.5, "y":1},
- {"label":"K1D (B2,D3)", "x":13.5, "y":1, "w":1.5},
- {"label":"K1E (B2,D1)", "x":15.25, "y":1},
-
- {"label":"K20 (B3,F7)", "x":0, "y":2, "w":1.75},
- {"label":"K21 (B3,F6)", "x":1.75, "y":2},
- {"label":"K22 (B3,F5)", "x":2.75, "y":2},
- {"label":"K23 (B3,F4)", "x":3.75, "y":2},
- {"label":"K24 (B3,F1)", "x":4.75, "y":2},
- {"label":"K25 (B3,F0)", "x":5.75, "y":2},
- {"label":"K26 (B3,C7)", "x":6.75, "y":2},
- {"label":"K27 (B3,C6)", "x":7.75, "y":2},
- {"label":"K28 (B3,B6)", "x":8.75, "y":2},
- {"label":"K29 (B3,B5)", "x":9.75, "y":2},
- {"label":"K2A (B3,B4)", "x":10.75, "y":2},
- {"label":"K2B (B3,D7)", "x":11.75, "y":2},
- {"label":"K2C (B3,D5)", "x":12.75, "y":2, "w":2.25},
- {"label":"K2E (B3,D1)", "x":15.25, "y":2},
-
- {"label":"K30 (D4,F7)", "x":0, "y":3, "w":2.25},
- {"label":"K32 (D4,F5)", "x":2.25, "y":3},
- {"label":"K33 (D4,F4)", "x":3.25, "y":3},
- {"label":"K34 (D4,F1)", "x":4.25, "y":3},
- {"label":"K35 (D4,F0)", "x":5.25, "y":3},
- {"label":"K36 (D4,C7)", "x":6.25, "y":3},
- {"label":"K37 (D4,C6)", "x":7.25, "y":3},
- {"label":"K38 (D4,B6)", "x":8.25, "y":3},
- {"label":"K39 (D4,B5)", "x":9.25, "y":3},
- {"label":"K3A (D4,B4)", "x":10.25, "y":3},
- {"label":"K3B (D4,D7)", "x":11.25, "y":3},
- {"label":"K3C (D4,D5)", "x":12.25, "y":3, "w":1.75},
- {"label":"K3D (D4,D3)", "x":14, "y":3},
-
- {"label":"K40 (D6,F7)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (D6,F6)", "x":1.25, "y":4, "w":1.25},
- {"label":"K43 (D6,F4)", "x":2.5, "y":4, "w":1.25},
- {"label":"K46 (D6,C7)", "x":3.75, "y":4, "w":6.25},
- {"label":"K4A (D6,B4)", "x":10, "y":4, "w":1.25},
- {"label":"K4B (D6,D7)", "x":11.25, "y":4, "w":1.25},
- {"label":"K4C (D6,D5)", "x":13, "y":4},
- {"label":"K4D (D6,D3)", "x":14, "y":4},
- {"label":"K4E (D6,D1)", "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": [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": [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": [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": [2, 14], "x": 15.25, "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": [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, "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_625u_space_split_bs": {
"layout": [
- {"label":"K00 (B1,F7)", "x":0, "y":0},
- {"label":"K01 (B1,F6)", "x":1, "y":0},
- {"label":"K02 (B1,F5)", "x":2, "y":0},
- {"label":"K03 (B1,F4)", "x":3, "y":0},
- {"label":"K04 (B1,F1)", "x":4, "y":0},
- {"label":"K05 (B1,F0)", "x":5, "y":0},
- {"label":"K06 (B1,C7)", "x":6, "y":0},
- {"label":"K07 (B1,C6)", "x":7, "y":0},
- {"label":"K08 (B1,B6)", "x":8, "y":0},
- {"label":"K09 (B1,B5)", "x":9, "y":0},
- {"label":"K0A (B1,B4)", "x":10, "y":0},
- {"label":"K0B (B1,D7)", "x":11, "y":0},
- {"label":"K0C (B1,D5)", "x":12, "y":0},
- {"label":"K0D (B1,D3)", "x":13, "y":0},
- {"label":"K0F (B1,D0)", "x":14, "y":0},
- {"label":"K0E (B1,D1)", "x":15.25, "y":0},
-
- {"label":"K10 (B2,F7)", "x":0, "y":1, "w":1.5},
- {"label":"K11 (B2,F6)", "x":1.5, "y":1},
- {"label":"K12 (B2,F5)", "x":2.5, "y":1},
- {"label":"K13 (B2,F4)", "x":3.5, "y":1},
- {"label":"K14 (B2,F1)", "x":4.5, "y":1},
- {"label":"K15 (B2,F0)", "x":5.5, "y":1},
- {"label":"K16 (B2,C7)", "x":6.5, "y":1},
- {"label":"K17 (B2,C6)", "x":7.5, "y":1},
- {"label":"K18 (B2,B6)", "x":8.5, "y":1},
- {"label":"K19 (B2,B5)", "x":9.5, "y":1},
- {"label":"K1A (B2,B4)", "x":10.5, "y":1},
- {"label":"K1B (B2,D7)", "x":11.5, "y":1},
- {"label":"K1C (B2,D5)", "x":12.5, "y":1},
- {"label":"K1D (B2,D3)", "x":13.5, "y":1, "w":1.5},
- {"label":"K1E (B2,D1)", "x":15.25, "y":1},
-
- {"label":"K20 (B3,F7)", "x":0, "y":2, "w":1.75},
- {"label":"K21 (B3,F6)", "x":1.75, "y":2},
- {"label":"K22 (B3,F5)", "x":2.75, "y":2},
- {"label":"K23 (B3,F4)", "x":3.75, "y":2},
- {"label":"K24 (B3,F1)", "x":4.75, "y":2},
- {"label":"K25 (B3,F0)", "x":5.75, "y":2},
- {"label":"K26 (B3,C7)", "x":6.75, "y":2},
- {"label":"K27 (B3,C6)", "x":7.75, "y":2},
- {"label":"K28 (B3,B6)", "x":8.75, "y":2},
- {"label":"K29 (B3,B5)", "x":9.75, "y":2},
- {"label":"K2A (B3,B4)", "x":10.75, "y":2},
- {"label":"K2B (B3,D7)", "x":11.75, "y":2},
- {"label":"K2C (B3,D5)", "x":12.75, "y":2, "w":2.25},
- {"label":"K2E (B3,D1)", "x":15.25, "y":2},
-
- {"label":"K30 (D4,F7)", "x":0, "y":3, "w":2.25},
- {"label":"K32 (D4,F5)", "x":2.25, "y":3},
- {"label":"K33 (D4,F4)", "x":3.25, "y":3},
- {"label":"K34 (D4,F1)", "x":4.25, "y":3},
- {"label":"K35 (D4,F0)", "x":5.25, "y":3},
- {"label":"K36 (D4,C7)", "x":6.25, "y":3},
- {"label":"K37 (D4,C6)", "x":7.25, "y":3},
- {"label":"K38 (D4,B6)", "x":8.25, "y":3},
- {"label":"K39 (D4,B5)", "x":9.25, "y":3},
- {"label":"K3A (D4,B4)", "x":10.25, "y":3},
- {"label":"K3B (D4,D7)", "x":11.25, "y":3},
- {"label":"K3C (D4,D5)", "x":12.25, "y":3, "w":1.75},
- {"label":"K3D (D4,D3)", "x":14, "y":3},
-
- {"label":"K40 (D6,F7)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (D6,F6)", "x":1.25, "y":4, "w":1.25},
- {"label":"K43 (D6,F4)", "x":2.5, "y":4, "w":1.25},
- {"label":"K46 (D6,C7)", "x":3.75, "y":4, "w":6.25},
- {"label":"K4A (D6,B4)", "x":10, "y":4, "w":1.25},
- {"label":"K4B (D6,D7)", "x":11.25, "y":4, "w":1.25},
- {"label":"K4C (D6,D5)", "x":13, "y":4},
- {"label":"K4D (D6,D3)", "x":14, "y":4},
- {"label":"K4E (D6,D1)", "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": [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, 15], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.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": [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": [2, 14], "x": 15.25, "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": [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, "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_space": {
"layout": [
- {"label":"K00 (B1,F7)", "x":0, "y":0},
- {"label":"K01 (B1,F6)", "x":1, "y":0},
- {"label":"K02 (B1,F5)", "x":2, "y":0},
- {"label":"K03 (B1,F4)", "x":3, "y":0},
- {"label":"K04 (B1,F1)", "x":4, "y":0},
- {"label":"K05 (B1,F0)", "x":5, "y":0},
- {"label":"K06 (B1,C7)", "x":6, "y":0},
- {"label":"K07 (B1,C6)", "x":7, "y":0},
- {"label":"K08 (B1,B6)", "x":8, "y":0},
- {"label":"K09 (B1,B5)", "x":9, "y":0},
- {"label":"K0A (B1,B4)", "x":10, "y":0},
- {"label":"K0B (B1,D7)", "x":11, "y":0},
- {"label":"K0C (B1,D5)", "x":12, "y":0},
- {"label":"K0D (B1,D3)", "x":13, "y":0, "w":2},
- {"label":"K0E (B1,D1)", "x":15.25, "y":0},
-
- {"label":"K10 (B2,F7)", "x":0, "y":1, "w":1.5},
- {"label":"K11 (B2,F6)", "x":1.5, "y":1},
- {"label":"K12 (B2,F5)", "x":2.5, "y":1},
- {"label":"K13 (B2,F4)", "x":3.5, "y":1},
- {"label":"K14 (B2,F1)", "x":4.5, "y":1},
- {"label":"K15 (B2,F0)", "x":5.5, "y":1},
- {"label":"K16 (B2,C7)", "x":6.5, "y":1},
- {"label":"K17 (B2,C6)", "x":7.5, "y":1},
- {"label":"K18 (B2,B6)", "x":8.5, "y":1},
- {"label":"K19 (B2,B5)", "x":9.5, "y":1},
- {"label":"K1A (B2,B4)", "x":10.5, "y":1},
- {"label":"K1B (B2,D7)", "x":11.5, "y":1},
- {"label":"K1C (B2,D5)", "x":12.5, "y":1},
- {"label":"K1D (B2,D3)", "x":13.5, "y":1, "w":1.5},
- {"label":"K1E (B2,D1)", "x":15.25, "y":1},
-
- {"label":"K20 (B3,F7)", "x":0, "y":2, "w":1.75},
- {"label":"K21 (B3,F6)", "x":1.75, "y":2},
- {"label":"K22 (B3,F5)", "x":2.75, "y":2},
- {"label":"K23 (B3,F4)", "x":3.75, "y":2},
- {"label":"K24 (B3,F1)", "x":4.75, "y":2},
- {"label":"K25 (B3,F0)", "x":5.75, "y":2},
- {"label":"K26 (B3,C7)", "x":6.75, "y":2},
- {"label":"K27 (B3,C6)", "x":7.75, "y":2},
- {"label":"K28 (B3,B6)", "x":8.75, "y":2},
- {"label":"K29 (B3,B5)", "x":9.75, "y":2},
- {"label":"K2A (B3,B4)", "x":10.75, "y":2},
- {"label":"K2B (B3,D7)", "x":11.75, "y":2},
- {"label":"K2C (B3,D5)", "x":12.75, "y":2, "w":2.25},
- {"label":"K2E (B3,D1)", "x":15.25, "y":2},
-
- {"label":"K30 (D4,F7)", "x":0, "y":3, "w":2.25},
- {"label":"K32 (D4,F5)", "x":2.25, "y":3},
- {"label":"K33 (D4,F4)", "x":3.25, "y":3},
- {"label":"K34 (D4,F1)", "x":4.25, "y":3},
- {"label":"K35 (D4,F0)", "x":5.25, "y":3},
- {"label":"K36 (D4,C7)", "x":6.25, "y":3},
- {"label":"K37 (D4,C6)", "x":7.25, "y":3},
- {"label":"K38 (D4,B6)", "x":8.25, "y":3},
- {"label":"K39 (D4,B5)", "x":9.25, "y":3},
- {"label":"K3A (D4,B4)", "x":10.25, "y":3},
- {"label":"K3B (D4,D7)", "x":11.25, "y":3},
- {"label":"K3C (D4,D5)", "x":12.25, "y":3, "w":1.75},
- {"label":"K3D (D4,D3)", "x":14, "y":3},
-
- {"label":"K40 (D6,F7)", "x":0, "y":4, "w":1.5},
- {"label":"K41 (D6,F6)", "x":1.5, "y":4},
- {"label":"K43 (D6,F4)", "x":2.5, "y":4, "w":1.5},
- {"label":"K46 (D6,C7)", "x":4, "y":4, "w":7},
- {"label":"K4B (D6,D7)", "x":11, "y":4, "w":1.5},
- {"label":"K4C (D6,D5)", "x":13, "y":4},
- {"label":"K4D (D6,D3)", "x":14, "y":4},
- {"label":"K4E (D6,D1)", "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": [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": [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": [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": [2, 14], "x": 15.25, "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": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"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, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
},
"LAYOUT_7u_space_split_bs": {
"layout": [
- {"label":"K00 (B1,F7)", "x":0, "y":0},
- {"label":"K01 (B1,F6)", "x":1, "y":0},
- {"label":"K02 (B1,F5)", "x":2, "y":0},
- {"label":"K03 (B1,F4)", "x":3, "y":0},
- {"label":"K04 (B1,F1)", "x":4, "y":0},
- {"label":"K05 (B1,F0)", "x":5, "y":0},
- {"label":"K06 (B1,C7)", "x":6, "y":0},
- {"label":"K07 (B1,C6)", "x":7, "y":0},
- {"label":"K08 (B1,B6)", "x":8, "y":0},
- {"label":"K09 (B1,B5)", "x":9, "y":0},
- {"label":"K0A (B1,B4)", "x":10, "y":0},
- {"label":"K0B (B1,D7)", "x":11, "y":0},
- {"label":"K0C (B1,D5)", "x":12, "y":0},
- {"label":"K0D (B1,D3)", "x":13, "y":0},
- {"label":"K0F (B1,D0)", "x":14, "y":0},
- {"label":"K0E (B1,D1)", "x":15.25, "y":0},
-
- {"label":"K10 (B2,F7)", "x":0, "y":1, "w":1.5},
- {"label":"K11 (B2,F6)", "x":1.5, "y":1},
- {"label":"K12 (B2,F5)", "x":2.5, "y":1},
- {"label":"K13 (B2,F4)", "x":3.5, "y":1},
- {"label":"K14 (B2,F1)", "x":4.5, "y":1},
- {"label":"K15 (B2,F0)", "x":5.5, "y":1},
- {"label":"K16 (B2,C7)", "x":6.5, "y":1},
- {"label":"K17 (B2,C6)", "x":7.5, "y":1},
- {"label":"K18 (B2,B6)", "x":8.5, "y":1},
- {"label":"K19 (B2,B5)", "x":9.5, "y":1},
- {"label":"K1A (B2,B4)", "x":10.5, "y":1},
- {"label":"K1B (B2,D7)", "x":11.5, "y":1},
- {"label":"K1C (B2,D5)", "x":12.5, "y":1},
- {"label":"K1D (B2,D3)", "x":13.5, "y":1, "w":1.5},
- {"label":"K1E (B2,D1)", "x":15.25, "y":1},
-
- {"label":"K20 (B3,F7)", "x":0, "y":2, "w":1.75},
- {"label":"K21 (B3,F6)", "x":1.75, "y":2},
- {"label":"K22 (B3,F5)", "x":2.75, "y":2},
- {"label":"K23 (B3,F4)", "x":3.75, "y":2},
- {"label":"K24 (B3,F1)", "x":4.75, "y":2},
- {"label":"K25 (B3,F0)", "x":5.75, "y":2},
- {"label":"K26 (B3,C7)", "x":6.75, "y":2},
- {"label":"K27 (B3,C6)", "x":7.75, "y":2},
- {"label":"K28 (B3,B6)", "x":8.75, "y":2},
- {"label":"K29 (B3,B5)", "x":9.75, "y":2},
- {"label":"K2A (B3,B4)", "x":10.75, "y":2},
- {"label":"K2B (B3,D7)", "x":11.75, "y":2},
- {"label":"K2C (B3,D5)", "x":12.75, "y":2, "w":2.25},
- {"label":"K2E (B3,D1)", "x":15.25, "y":2},
-
- {"label":"K30 (D4,F7)", "x":0, "y":3, "w":2.25},
- {"label":"K32 (D4,F5)", "x":2.25, "y":3},
- {"label":"K33 (D4,F4)", "x":3.25, "y":3},
- {"label":"K34 (D4,F1)", "x":4.25, "y":3},
- {"label":"K35 (D4,F0)", "x":5.25, "y":3},
- {"label":"K36 (D4,C7)", "x":6.25, "y":3},
- {"label":"K37 (D4,C6)", "x":7.25, "y":3},
- {"label":"K38 (D4,B6)", "x":8.25, "y":3},
- {"label":"K39 (D4,B5)", "x":9.25, "y":3},
- {"label":"K3A (D4,B4)", "x":10.25, "y":3},
- {"label":"K3B (D4,D7)", "x":11.25, "y":3},
- {"label":"K3C (D4,D5)", "x":12.25, "y":3, "w":1.75},
- {"label":"K3D (D4,D3)", "x":14, "y":3},
-
- {"label":"K40 (D6,F7)", "x":0, "y":4, "w":1.5},
- {"label":"K41 (D6,F6)", "x":1.5, "y":4},
- {"label":"K43 (D6,F4)", "x":2.5, "y":4, "w":1.5},
- {"label":"K46 (D6,C7)", "x":4, "y":4, "w":7},
- {"label":"K4B (D6,D7)", "x":11, "y":4, "w":1.5},
- {"label":"K4C (D6,D5)", "x":13, "y":4},
- {"label":"K4D (D6,D3)", "x":14, "y":4},
- {"label":"K4E (D6,D1)", "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": [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, 15], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.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": [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": [2, 14], "x": 15.25, "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": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"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, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
}
}
diff --git a/keyboards/alfredslab/swift65/solder/solder.h b/keyboards/alfredslab/swift65/solder/solder.h
deleted file mode 100644
index 651497bec4..0000000000
--- a/keyboards/alfredslab/swift65/solder/solder.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2021 Steven Phillips (spooknik)
- *
- * 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_625u_space( \
- 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, K2E, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
- K40, K41, K43, K46, K4A, K4B, K4C, K4D, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, XXX }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, XXX }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, XXX }, \
- { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX }, \
- { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E, XXX }, \
-}
-
-#define LAYOUT_625u_space_split_bs( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, 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, K2E, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
- K40, K41, K43, K46, K4A, K4B, K4C, K4D, K4E \
-) { \
- { 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, XXX }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, XXX }, \
- { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX }, \
- { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E, XXX }, \
-}
-
-#define LAYOUT_7u_space( \
- 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, K2E, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
- K40, K41, K43, K46, K4B, K4C, K4D, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, XXX }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, XXX }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, XXX }, \
- { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX }, \
- { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, K4C, K4D, K4E, XXX }, \
-}
-
-#define LAYOUT_7u_space_split_bs( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, 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, K2E, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
- K40, K41, K43, K46, K4B, K4C, K4D, K4E \
-) { \
- { 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, XXX }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, XXX }, \
- { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX }, \
- { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, K4C, K4D, K4E, XXX }, \
-}
diff --git a/keyboards/baguette/baguette.c b/keyboards/baguette/baguette.c
index 42c8435b66..d3bb879f35 100644
--- a/keyboards/baguette/baguette.c
+++ b/keyboards/baguette/baguette.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 "baguette.h"
+#include "quantum.h"
#ifndef DEBOUNCE
# define DEBOUNCE 5
diff --git a/keyboards/baguette/baguette.h b/keyboards/baguette/baguette.h
deleted file mode 100644
index 70440f7627..0000000000
--- a/keyboards/baguette/baguette.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright 2018 Yiancar
- *
- * 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 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_ansi( \
- 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, k2D, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
- k42, k43, k47, 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, XXX, k1F }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX, XXX }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, XXX }, \
- { XXX, XXX, k42, k43, XXX, XXX, XXX, k47, XXX, XXX, XXX, k4B, k4C, k4D, k4E, k4F } \
-}
-
-#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, k1F, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k1D, k2D, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
- k42, k43, k47, 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, XXX, XXX, k1F }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k1D, k2D, XXX, XXX }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, XXX }, \
- { XXX, XXX, k42, k43, XXX, XXX, XXX, k47, XXX, XXX, XXX, k4B, k4C, k4D, k4E, k4F } \
-}
diff --git a/keyboards/baguette/info.json b/keyboards/baguette/info.json
index c691bb4ffe..0a008f45fa 100644
--- a/keyboards/baguette/info.json
+++ b/keyboards/baguette/info.json
@@ -23,145 +23,158 @@
"layouts": {
"LAYOUT_ansi": {
"layout": [
- {"label":"`", "x":0, "y":0},
- {"label":"1", "x":1, "y":0},
- {"label":"2", "x":2, "y":0},
- {"label":"3", "x":3, "y":0},
- {"label":"4", "x":4, "y":0},
- {"label":"5", "x":5, "y":0},
- {"label":"6", "x":6, "y":0},
- {"label":"7", "x":7, "y":0},
- {"label":"8", "x":8, "y":0},
- {"label":"9", "x":9, "y":0},
- {"label":"0", "x":10, "y":0},
- {"label":"-", "x":11, "y":0},
- {"label":"=", "x":12, "y":0},
- {"label":"Backspace", "x":13, "y":0},
- {"label":"Backspace2", "x":14, "y":0},
- {"label":"Insert", "x":15.5, "y":0},
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"Q", "x":1.5, "y":1},
- {"label":"W", "x":2.5, "y":1},
- {"label":"E", "x":3.5, "y":1},
- {"label":"R", "x":4.5, "y":1},
- {"label":"T", "x":5.5, "y":1},
- {"label":"Y", "x":6.5, "y":1},
- {"label":"U", "x":7.5, "y":1},
- {"label":"I", "x":8.5, "y":1},
- {"label":"O", "x":9.5, "y":1},
- {"label":"P", "x":10.5, "y":1},
- {"label":"[", "x":11.5, "y":1},
- {"label":"]", "x":12.5, "y":1},
- {"label":"\\", "x":13.5, "y":1, "w":1.5},
- {"label":"Delete", "x":15.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":"Enter", "x":12.75, "y":2, "w":2.25},
- {"label":"Shift", "x":0, "y":3, "w":1.25},
- {"label":"ISO \\", "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":"JP RO", "x":12.25, "y":3},
- {"label":"Shift", "x":13.25, "y":3, "w":1.25},
- {"label":"Up", "x":14.5, "y":3},
- {"label":"GUI", "x":1.25, "y":4},
- {"label":"Alt", "x":2.25, "y":4, "w":1.25},
- {"label":"Space", "x":3.5, "y":4, "w":6.25},
- {"label":"Ctrl", "x":9.75, "y":4, "w":1.25},
- {"label":"Fn", "x":11, "y":4},
- {"label":"Left", "x":13.5, "y":4},
- {"label":"Down", "x":14.5, "y":4},
- {"label":"Right", "x":15.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": [0, 15], "x": 15.5, "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, 15], "x": 15.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, 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},
+ {"matrix": [3, 13], "x": 13.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 14], "x": 14.5, "y": 3},
+
+ {"matrix": [4, 2], "x": 1.25, "y": 4},
+ {"matrix": [4, 3], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 3.5, "y": 4, "w": 6.25},
+ {"matrix": [4, 11], "x": 9.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 11, "y": 4},
+
+ {"matrix": [4, 13], "x": 13.5, "y": 4},
+ {"matrix": [4, 14], "x": 14.5, "y": 4},
+ {"matrix": [4, 15], "x": 15.5, "y": 4}
]
},
-
"LAYOUT_iso": {
"layout": [
- {"label":"`", "x":0, "y":0},
- {"label":"1", "x":1, "y":0},
- {"label":"2", "x":2, "y":0},
- {"label":"3", "x":3, "y":0},
- {"label":"4", "x":4, "y":0},
- {"label":"5", "x":5, "y":0},
- {"label":"6", "x":6, "y":0},
- {"label":"7", "x":7, "y":0},
- {"label":"8", "x":8, "y":0},
- {"label":"9", "x":9, "y":0},
- {"label":"0", "x":10, "y":0},
- {"label":"-", "x":11, "y":0},
- {"label":"=", "x":12, "y":0},
- {"label":"Backspace", "x":13, "y":0},
- {"label":"Backspace2", "x":14, "y":0},
- {"label":"Insert", "x":15.5, "y":0},
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"Q", "x":1.5, "y":1},
- {"label":"W", "x":2.5, "y":1},
- {"label":"E", "x":3.5, "y":1},
- {"label":"R", "x":4.5, "y":1},
- {"label":"T", "x":5.5, "y":1},
- {"label":"Y", "x":6.5, "y":1},
- {"label":"U", "x":7.5, "y":1},
- {"label":"I", "x":8.5, "y":1},
- {"label":"O", "x":9.5, "y":1},
- {"label":"P", "x":10.5, "y":1},
- {"label":"[", "x":11.5, "y":1},
- {"label":"]", "x":12.5, "y":1},
- {"label":"Delete", "x":15.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":"ISO #", "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":"ISO \\", "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":"\\", "x":12.25, "y":3},
- {"label":"Shift", "x":13.25, "y":3, "w":1.25},
- {"label":"Up", "x":14.5, "y":3},
- {"label":"GUI", "x":1.25, "y":4},
- {"label":"Alt", "x":2.25, "y":4, "w":1.25},
- {"label":"Space", "x":3.5, "y":4, "w":6.25},
- {"label":"Ctrl", "x":9.75, "y":4, "w":1.25},
- {"label":"Fn", "x":11, "y":4},
- {"label":"Left", "x":13.5, "y":4},
- {"label":"Down", "x":14.5, "y":4},
- {"label":"Right", "x":15.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": [0, 15], "x": 15.5, "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, 15], "x": 15.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.25},
+ {"matrix": [3, 14], "x": 14.5, "y": 3},
+
+ {"matrix": [4, 2], "x": 1.25, "y": 4},
+ {"matrix": [4, 3], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 3.5, "y": 4, "w": 6.25},
+ {"matrix": [4, 11], "x": 9.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 11, "y": 4},
+
+ {"matrix": [4, 13], "x": 13.5, "y": 4},
+ {"matrix": [4, 14], "x": 14.5, "y": 4},
+ {"matrix": [4, 15], "x": 15.5, "y": 4}
]
}
}
diff --git a/keyboards/bajjak/bajjak.h b/keyboards/bajjak/bajjak.h
index 25c51273d1..52f14ad3ea 100644
--- a/keyboards/bajjak/bajjak.h
+++ b/keyboards/bajjak/bajjak.h
@@ -126,30 +126,3 @@ typedef union {
} keyboard_config_t;
extern keyboard_config_t keyboard_config;
-
-#define LAYOUT_6x7( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
- 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, \
- L40, L41, L42, L43, L44, L45, R41, R42, R43, R44, R45, R46, \
- L50, L51, L52, L53, L54, R52, R53, R54, R55, R56, \
- L65, L66, R60, R61, \
- L64, R62, \
- L63, L62, L61, R65, R64, R63 \
- ) { \
- { L00, L10, L20, L30, L40, L50, KC_NO }, \
- { L01, L11, L21, L31, L41, L51, L61 }, \
- { L02, L12, L22, L32, L42, L52, L62 }, \
- { L03, L13, L23, L33, L43, L53, L63 }, \
- { L04, L14, L24, L34, L44, L54, L64 }, \
- { L05, L15, L25, L35, L45, KC_NO, L65 }, \
- { L06, L16, L26, L36, KC_NO, KC_NO, L66 }, \
- { R00, R10, R20, R30, KC_NO, KC_NO, R60 }, \
- { R01, R11, R21, R31, R41, KC_NO, R61 }, \
- { R02, R12, R22, R32, R42, R52, R62 }, \
- { R03, R13, R23, R33, R43, R53, R63 }, \
- { R04, R14, R24, R34, R44, R54, R64 }, \
- { R05, R15, R25, R35, R45, R55, R65 },\
- { R06, R16, R26, R36, R46, R56, KC_NO } \
- }
diff --git a/keyboards/bajjak/info.json b/keyboards/bajjak/info.json
index ee519b01f6..a280cb9ed8 100644
--- a/keyboards/bajjak/info.json
+++ b/keyboards/bajjak/info.json
@@ -13,27 +13,113 @@
"layouts": {
"LAYOUT_6x7": {
"layout": [
- {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
- {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
+ {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+ {"matrix": [1, 0], "x": 1.5, "y": 0.375},
+ {"matrix": [2, 0], "x": 2.5, "y": 0.125},
+ {"matrix": [3, 0], "x": 3.5, "y": 0},
+ {"matrix": [4, 0], "x": 4.5, "y": 0.125},
+ {"matrix": [5, 0], "x": 5.5, "y": 0.25},
+ {"matrix": [6, 0], "x": 6.5, "y": 0.25},
- {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25},
- {"x":9.5, "y":1.25}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
+ {"matrix": [7, 0], "x": 9.5, "y": 0.25},
+ {"matrix": [8, 0], "x": 10.5, "y": 0.25},
+ {"matrix": [9, 0], "x": 11.5, "y": 0.125},
+ {"matrix": [10, 0], "x": 12.5, "y": 0},
+ {"matrix": [11, 0], "x": 13.5, "y": 0.125},
+ {"matrix": [12, 0], "x": 14.5, "y": 0.375},
+ {"matrix": [13, 0], "x": 15.5, "y": 0.375, "w": 1.5},
- {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25},
- {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
+ {"matrix": [0, 1], "x": 0, "y": 1.375, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+ {"matrix": [2, 1], "x": 2.5, "y": 1.125},
+ {"matrix": [3, 1], "x": 3.5, "y": 1},
+ {"matrix": [4, 1], "x": 4.5, "y": 1.125},
+ {"matrix": [5, 1], "x": 5.5, "y": 1.25},
+ {"matrix": [6, 1], "x": 6.5, "y": 1.25},
- {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":3.25},
- {"x":9.5, "y":3.25}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
+ {"matrix": [7, 1], "x": 9.5, "y": 1.25},
+ {"matrix": [8, 1], "x": 10.5, "y": 1.25},
+ {"matrix": [9, 1], "x": 11.5, "y": 1.125},
+ {"matrix": [10, 1], "x": 12.5, "y": 1},
+ {"matrix": [11, 1], "x": 13.5, "y": 1.125},
+ {"matrix": [12, 1], "x": 14.5, "y": 1.375},
+ {"matrix": [13, 1], "x": 15.5, "y": 1.375, "w": 1.5},
- {"x":0, "y":4.375, "w":1.5}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125}, {"x":5.5, "y":4.25},
- {"x":10.5, "y":4.25}, {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375, "w":1.5},
+ {"matrix": [0, 2], "x": 0, "y": 2.375, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 2.375},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+ {"matrix": [3, 2], "x": 3.5, "y": 2},
+ {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+ {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+ {"matrix": [6, 2], "x": 6.5, "y": 2.25},
- {"x":0, "y":5.375, "w":1.5}, {"x":1.5, "y":5.375}, {"x":2.5, "y":5.125}, {"x":3.5, "y":5}, {"x":4.5, "y":5.125},
- {"x":11.5, "y":5.125}, {"x":12.5, "y":5}, {"x":13.5, "y":5.125}, {"x":14.5, "y":5.375}, {"x":15.5, "y":5.375, "w":1.5},
+ {"matrix": [7, 2], "x": 9.5, "y": 2.25},
+ {"matrix": [8, 2], "x": 10.5, "y": 2.25},
+ {"matrix": [9, 2], "x": 11.5, "y": 2.125},
+ {"matrix": [10, 2], "x": 12.5, "y": 2},
+ {"matrix": [11, 2], "x": 13.5, "y": 2.125},
+ {"matrix": [12, 2], "x": 14.5, "y": 2.375},
+ {"matrix": [13, 2], "x": 15.5, "y": 2.375, "w": 1.5},
- {"x":6, "y":6}, {"x":7, "y":6}, {"x":9, "y":6}, {"x":10, "y":6},
- {"x":7, "y":7}, {"x":9, "y":7},
- {"x":5, "y":7, "h":2}, {"x":6, "y":7, "h":2}, {"x":7, "y":8}, {"x":9, "y":8}, {"x":10, "y":7, "h":2}, {"x":11, "y":7, "h":2}
+ {"matrix": [0, 3], "x": 0, "y": 3.375, "w": 1.5},
+ {"matrix": [1, 3], "x": 1.5, "y": 3.375},
+ {"matrix": [2, 3], "x": 2.5, "y": 3.125},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [4, 3], "x": 4.5, "y": 3.125},
+ {"matrix": [5, 3], "x": 5.5, "y": 3.25},
+ {"matrix": [6, 3], "x": 6.5, "y": 3.25},
+
+ {"matrix": [7, 3], "x": 9.5, "y": 3.25},
+ {"matrix": [8, 3], "x": 10.5, "y": 3.25},
+ {"matrix": [9, 3], "x": 11.5, "y": 3.125},
+ {"matrix": [10, 3], "x": 12.5, "y": 3},
+ {"matrix": [11, 3], "x": 13.5, "y": 3.125},
+ {"matrix": [12, 3], "x": 14.5, "y": 3.375},
+ {"matrix": [13, 3], "x": 15.5, "y": 3.375, "w": 1.5},
+
+ {"matrix": [0, 4], "x": 0, "y": 4.375, "w": 1.5},
+ {"matrix": [1, 4], "x": 1.5, "y": 4.375},
+ {"matrix": [2, 4], "x": 2.5, "y": 4.125},
+ {"matrix": [3, 4], "x": 3.5, "y": 4},
+ {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+ {"matrix": [5, 4], "x": 5.5, "y": 4.25},
+
+ {"matrix": [8, 4], "x": 10.5, "y": 4.25},
+ {"matrix": [9, 4], "x": 11.5, "y": 4.125},
+ {"matrix": [10, 4], "x": 12.5, "y": 4},
+ {"matrix": [11, 4], "x": 13.5, "y": 4.125},
+ {"matrix": [12, 4], "x": 14.5, "y": 4.375},
+ {"matrix": [13, 4], "x": 15.5, "y": 4.375, "w": 1.5},
+
+ {"matrix": [0, 5], "x": 0, "y": 5.375, "w": 1.5},
+ {"matrix": [1, 5], "x": 1.5, "y": 5.375},
+ {"matrix": [2, 5], "x": 2.5, "y": 5.125},
+ {"matrix": [3, 5], "x": 3.5, "y": 5},
+ {"matrix": [4, 5], "x": 4.5, "y": 5.125},
+
+ {"matrix": [9, 5], "x": 11.5, "y": 5.125},
+ {"matrix": [10, 5], "x": 12.5, "y": 5},
+ {"matrix": [11, 5], "x": 13.5, "y": 5.125},
+ {"matrix": [12, 5], "x": 14.5, "y": 5.375},
+ {"matrix": [13, 5], "x": 15.5, "y": 5.375, "w": 1.5},
+
+ {"matrix": [5, 6], "x": 6, "y": 6},
+ {"matrix": [6, 6], "x": 7, "y": 6},
+
+ {"matrix": [7, 6], "x": 9, "y": 6},
+ {"matrix": [8, 6], "x": 10, "y": 6},
+
+ {"matrix": [4, 6], "x": 7, "y": 7},
+
+ {"matrix": [9, 6], "x": 9, "y": 7},
+
+ {"matrix": [3, 6], "x": 5, "y": 7, "h": 2},
+ {"matrix": [2, 6], "x": 6, "y": 7, "h": 2},
+ {"matrix": [1, 6], "x": 7, "y": 8},
+
+ {"matrix": [12, 6], "x": 9, "y": 8},
+ {"matrix": [11, 6], "x": 10, "y": 7, "h": 2},
+ {"matrix": [10, 6], "x": 11, "y": 7, "h": 2}
]
}
}
diff --git a/keyboards/bbrfkr/dynamis/dynamis.c b/keyboards/bbrfkr/dynamis/dynamis.c
index 8655cbc7bc..f21bf24900 100644
--- a/keyboards/bbrfkr/dynamis/dynamis.c
+++ b/keyboards/bbrfkr/dynamis/dynamis.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "dynamis.h"
+#include "quantum.h"
#ifdef ENCODER_ENABLE
bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/bbrfkr/dynamis/dynamis.h b/keyboards/bbrfkr/dynamis/dynamis.h
deleted file mode 100644
index a88b81669c..0000000000
--- a/keyboards/bbrfkr/dynamis/dynamis.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Copyright 2022 bbrfkr
- *
- * 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 │56 │55 │54 │53 │52 │51 │50 │90 │ │50 │ 2u Backspace
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ └─┬─────┤
- * │10 │11 │12 │13 │14 │15 │16 │66 │65 │64 │63 │62 │61 │60 │ │ │
- * 2.25u ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ┌──┴┐70 │ ISO Enter
- * LShift │20 │21 │22 │23 │24 │25 │26 │76 │75 │74 │73 │72 │70 │ │71 │ │
- * ┌────────┐ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤┌───┐ ┌─┴───┴────┤
- * │31 │ │30 │31 │32 │33 │34 │35 │36 │86 │85 │84 │83 │82 │81 │80 ││91 │ │81 │ 2.75u RShift
- * └────────┘ ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬────┬┴┬──┴┼───┼───┐ └──────────┘
- * │40 │41 │42 │43 │44 │45 │46 │96 │95 │ │94 │93 │92 │
- * └────┴────┴────┴────────┴────┴──────────┴────┴────┴────┘ └───┴───┴───┘
- * ┌────┬────┬────┬────────────────────────┬────┬────┬────┐
- * │40 │41 │42 │43 │46 │96 │95 │ 6.25u Spacebar
- * └────┴────┴────┴────────────────────────┴────┴────┴────┘
- */
-
-#define LAYOUT_ansi( \
- C00, C01, C02, C03, C04, C05, C06, C56, C55, C54, C53, C52, C51, C50, C90, \
- C10, C11, C12, C13, C14, C15, C16, C66, C65, C64, C63, C62, C61, C60, \
- C20, C21, C22, C23, C24, C25, C26, C76, C75, C74, C73, C72, C70, \
- C30, C31, C32, C33, C34, C35, C36, C86, C85, C84, C83, C82, C81, C80, C91, \
- C40, C41, C42, C43, C44, C45, C46, C96, C95, C94, C93, C92 \
- ) \
- { \
- { C00, C01, C02, C03, C04, C05, C06 }, \
- { C10, C11, C12, C13, C14, C15, C16 }, \
- { C20, C21, C22, C23, C24, C25, C26 }, \
- { C30, C31, C32, C33, C34, C35, C36 }, \
- { C40, C41, C42, C43, C44, C45, C46 }, \
- { C50, C51, C52, C53, C54, C55, C56 }, \
- { C60, C61, C62, C63, C64, C65, C66 }, \
- { C70, XXX, C72, C73, C74, C75, C76 }, \
- { C80, C81, C82, C83, C84, C85, C86 }, \
- { C90, C91, C92, C93, C94, C95, C96 } \
- }
-
-#define LAYOUT_iso( \
- C00, C01, C02, C03, C04, C05, C06, C56, C55, C54, C53, C52, C51, C50, C90, \
- C10, C11, C12, C13, C14, C15, C16, C66, C65, C64, C63, C62, C61, \
- C20, C21, C22, C23, C24, C25, C26, C76, C75, C74, C73, C72, C71, C70, \
- C30, C31, C32, C33, C34, C35, C36, C86, C85, C84, C83, C82, C81, C80, C91, \
- C40, C41, C42, C43, C44, C45, C46, C96, C95, C94, C93, C92 \
- ) \
- { \
- { C00, C01, C02, C03, C04, C05, C06 }, \
- { C10, C11, C12, C13, C14, C15, C16 }, \
- { C20, C21, C22, C23, C24, C25, C26 }, \
- { C30, C31, C32, C33, C34, C35, C36 }, \
- { C40, C41, C42, C43, C44, C45, C46 }, \
- { C50, C51, C52, C53, C54, C55, C56 }, \
- { XXX, C61, C62, C63, C64, C65, C66 }, \
- { C70, C71, C72, C73, C74, C75, C76 }, \
- { C80, C81, C82, C83, C84, C85, C86 }, \
- { C90, C91, C92, C93, C94, C95, C96 } \
- }
diff --git a/keyboards/bbrfkr/dynamis/info.json b/keyboards/bbrfkr/dynamis/info.json
index 5c1723b16c..c9f403a045 100644
--- a/keyboards/bbrfkr/dynamis/info.json
+++ b/keyboards/bbrfkr/dynamis/info.json
@@ -26,156 +26,160 @@
"layouts": {
"LAYOUT_ansi": {
"layout": [
- {"label":"`", "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":"Delete", "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": [5, 6], "x": 7, "y": 0},
+ {"matrix": [5, 5], "x": 8, "y": 0},
+ {"matrix": [5, 4], "x": 9, "y": 0},
+ {"matrix": [5, 3], "x": 10, "y": 0},
+ {"matrix": [5, 2], "x": 11, "y": 0},
+ {"matrix": [5, 1], "x": 12, "y": 0},
+ {"matrix": [5, 0], "x": 13, "y": 0},
+ {"matrix": [9, 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},
+ {"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": [6, 6], "x": 7.5, "y": 1},
+ {"matrix": [6, 5], "x": 8.5, "y": 1},
+ {"matrix": [6, 4], "x": 9.5, "y": 1},
+ {"matrix": [6, 3], "x": 10.5, "y": 1},
+ {"matrix": [6, 2], "x": 11.5, "y": 1},
+ {"matrix": [6, 1], "x": 12.5, "y": 1},
+ {"matrix": [6, 0], "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},
+ {"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": [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, 0], "x": 12.75, "y": 2, "w": 2.25},
- { "x": 0, "y": 3, "w": 1.25 },
- {"label":"Shift", "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":"Lower", "x":14, "y":3},
- {"label":"Up", "x":15.25, "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": [8, 6], "x": 7.25, "y": 3},
+ {"matrix": [8, 5], "x": 8.25, "y": 3},
+ {"matrix": [8, 4], "x": 9.25, "y": 3},
+ {"matrix": [8, 3], "x": 10.25, "y": 3},
+ {"matrix": [8, 2], "x": 11.25, "y": 3},
+ {"matrix": [8, 1], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [8, 0], "x": 14, "y": 3},
- {"label":"Ctrl", "x":0, "y":4, "w":1.25},
- {"label":"Alt", "x":1.25, "y":4, "w":1.25},
- {"label":"Lower", "x":2.5, "y":4, "w":1.25},
- {"label":"Space", "x":3.75, "y":4, "w":2.25},
- {"label":"Space", "x":6, "y":4, "w":1.25},
- {"label":"Enter", "x":7.25, "y":4, "w":2.75},
- {"label":"Raise", "x":10, "y":4, "w":1.25},
- {"label":"Alt", "x":11.25, "y":4, "w":1.25},
- {"label":"Ctrl", "x":12.5, "y":4, "w":1.25},
- {"label":"Left", "x":14.25, "y":4},
- {"label":"Down", "x":15.25, "y":4},
- {"label":"Right", "x":16.25, "y":4}
+ {"matrix": [9, 1], "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, 3], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 7.25, "y": 4, "w": 2.75},
+ {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [9, 6], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+
+ {"matrix": [9, 4], "x": 14.25, "y": 4},
+ {"matrix": [9, 3], "x": 15.25, "y": 4},
+ {"matrix": [9, 2], "x": 16.25, "y": 4}
]
},
"LAYOUT_iso": {
"layout": [
- {"label":"`", "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":"Delete", "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": [5, 6], "x": 7, "y": 0},
+ {"matrix": [5, 5], "x": 8, "y": 0},
+ {"matrix": [5, 4], "x": 9, "y": 0},
+ {"matrix": [5, 3], "x": 10, "y": 0},
+ {"matrix": [5, 2], "x": 11, "y": 0},
+ {"matrix": [5, 1], "x": 12, "y": 0},
+ {"matrix": [5, 0], "x": 13, "y": 0},
+ {"matrix": [9, 0], "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": [6, 6], "x": 7.5, "y": 1},
+ {"matrix": [6, 5], "x": 8.5, "y": 1},
+ {"matrix": [6, 4], "x": 9.5, "y": 1},
+ {"matrix": [6, 3], "x": 10.5, "y": 1},
+ {"matrix": [6, 2], "x": 11.5, "y": 1},
+ {"matrix": [6, 1], "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": [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": 1, "w": 1.25, "h": 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},
+ {"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": 7.25, "y": 3},
+ {"matrix": [8, 5], "x": 8.25, "y": 3},
+ {"matrix": [8, 4], "x": 9.25, "y": 3},
+ {"matrix": [8, 3], "x": 10.25, "y": 3},
+ {"matrix": [8, 2], "x": 11.25, "y": 3},
+ {"matrix": [8, 1], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [8, 0], "x": 14, "y": 3},
- {"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":"#", "x":12.75, "y":2},
- {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
+ {"matrix": [9, 1], "x": 15.25, "y": 3},
- { "x": 0, "y": 3, "w": 1.25 },
- {"label":"Shift", "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":"Lower", "x":14, "y":3},
- {"label":"Up", "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, 3], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 7.25, "y": 4, "w": 2.75},
+ {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [9, 6], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
- {"label":"Ctrl", "x":0, "y":4, "w":1.25},
- {"label":"Alt", "x":1.25, "y":4, "w":1.25},
- {"label":"Lower", "x":2.5, "y":4, "w":1.25},
- {"label":"Space", "x":3.75, "y":4, "w":2.25},
- {"label":"Space", "x":6, "y":4, "w":1.25},
- {"label":"Enter", "x":7.25, "y":4, "w":2.75},
- {"label":"Raise", "x":10, "y":4, "w":1.25},
- {"label":"Alt", "x":11.25, "y":4, "w":1.25},
- {"label":"Ctrl", "x":12.5, "y":4, "w":1.25},
- {"label":"Left", "x":14.25, "y":4},
- {"label":"Down", "x":15.25, "y":4},
- {"label":"Right", "x":16.25, "y":4}
+ {"matrix": [9, 4], "x": 14.25, "y": 4},
+ {"matrix": [9, 3], "x": 15.25, "y": 4},
+ {"matrix": [9, 2], "x": 16.25, "y": 4}
]
}
}
diff --git a/keyboards/bear_face/v1/info.json b/keyboards/bear_face/v1/info.json
index 8d3f685e91..8dedc0b1c7 100644
--- a/keyboards/bear_face/v1/info.json
+++ b/keyboards/bear_face/v1/info.json
@@ -5,94 +5,94 @@
"layouts": {
"LAYOUT_83_ansi": {
"layout": [
- {"label":"Esc", "x":0, "y":0, "w":1.5},
- {"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":5.5, "y":0},
- {"label":"F6", "x":6.5, "y":0},
- {"label":"F7", "x":7.5, "y":0},
- {"label":"F8", "x":8.5, "y":0},
- {"label":"F9", "x":9.5, "y":0},
- {"label":"F10", "x":10.5, "y":0},
- {"label":"F11", "x":11.5, "y":0},
- {"label":"F12", "x":12.5, "y":0},
- {"label":"Pn", "x":13.5, "y":0},
- {"label":"Delete", "x":14.5, "y":0, "w":1.5},
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+ {"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": [0, 12], "x": 12.5, "y": 0},
+ {"matrix": [0, 13], "x": 13.5, "y": 0},
+ {"matrix": [0, 14], "x": 14.5, "y": 0, "w": 1.5},
- {"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},
+ {"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, 14], "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":"Pg Up", "x":15, "y":2},
+ {"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},
- {"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":"Pg Dn", "x":15, "y":3},
+ {"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, 13], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 14], "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":"Up", "x":14, "y":4},
- {"label":"End", "x":15, "y":4},
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"matrix": [4, 1], "x": 2.25, "y": 4},
+ {"matrix": [4, 2], "x": 3.25, "y": 4},
+ {"matrix": [4, 3], "x": 4.25, "y": 4},
+ {"matrix": [4, 4], "x": 5.25, "y": 4},
+ {"matrix": [4, 5], "x": 6.25, "y": 4},
+ {"matrix": [4, 6], "x": 7.25, "y": 4},
+ {"matrix": [4, 7], "x": 8.25, "y": 4},
+ {"matrix": [4, 8], "x": 9.25, "y": 4},
+ {"matrix": [4, 9], "x": 10.25, "y": 4},
+ {"matrix": [4, 10], "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},
- {"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":6.25},
- {"label":"Alt", "x":10, "y":5},
- {"label":"Fn", "x":11, "y":5},
- {"label":"Ctrl", "x":12, "y":5},
- {"label":"Left", "x":13, "y":5},
- {"label":"Down", "x":14, "y":5},
- {"label":"Right", "x":15, "y":5}
+ {"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, 5], "x": 3.75, "y": 5, "w": 6.25},
+ {"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/bear_face/v1/v1.c b/keyboards/bear_face/v1/v1.c
index 3f10d10994..f4960d9178 100644
--- a/keyboards/bear_face/v1/v1.c
+++ b/keyboards/bear_face/v1/v1.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 "v1.h"
+#include "quantum.h"
void keyboard_pre_init_kb(void) {
//Sets LED pin as output
diff --git a/keyboards/bear_face/v1/v1.h b/keyboards/bear_face/v1/v1.h
deleted file mode 100644
index 2337a4f731..0000000000
--- a/keyboards/bear_face/v1/v1.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright 2020 chemicalwill <https://github.com/chemicalwill>
-
-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_83_ansi( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \
- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K412, K413, K414, \
- K500, K501, K502, K505, K509, K510, K511, K512, K513, K514 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, KC_NO, K412, K413, K414 }, \
- { K500, K501, K502, KC_NO, KC_NO, K505, KC_NO, KC_NO, KC_NO, K509, K510, K511, K512, K513, K514 } \
-}
diff --git a/keyboards/bear_face/v2/info.json b/keyboards/bear_face/v2/info.json
index 978ee59e49..908165babb 100644
--- a/keyboards/bear_face/v2/info.json
+++ b/keyboards/bear_face/v2/info.json
@@ -5,188 +5,187 @@
"layouts": {
"LAYOUT_83_ansi": {
"layout": [
- {"label":"Esc", "x":0, "y":0, "w":1.5},
- {"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":5.5, "y":0},
- {"label":"F6", "x":6.5, "y":0},
- {"label":"F7", "x":7.5, "y":0},
- {"label":"F8", "x":8.5, "y":0},
- {"label":"F9", "x":9.5, "y":0},
- {"label":"F10", "x":10.5, "y":0},
- {"label":"F11", "x":11.5, "y":0},
- {"label":"F12", "x":12.5, "y":0},
- {"label":"Pn", "x":13.5, "y":0},
- {"label":"Delete", "x":14.5, "y":0, "w":1.5},
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+ {"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": [0, 12], "x": 12.5, "y": 0},
+ {"matrix": [0, 13], "x": 13.5, "y": 0},
+ {"matrix": [0, 14], "x": 14.5, "y": 0, "w": 1.5},
- {"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},
+ {"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, 14], "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":"Pg Up", "x":15, "y":2},
+ {"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},
- {"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":"Pg Dn", "x":15, "y":3},
+ {"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, 13], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 14], "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":"Up", "x":14, "y":4},
- {"label":"End", "x":15, "y":4},
+ {"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},
- {"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":6.25},
- {"label":"Alt", "x":10, "y":5},
- {"label":"Fn", "x":11, "y":5},
- {"label":"Ctrl", "x":12, "y":5},
- {"label":"Left", "x":13, "y":5},
- {"label":"Down", "x":14, "y":5},
- {"label":"Right", "x":15, "y":5}
+ {"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, 5], "x": 3.75, "y": 5, "w": 6.25},
+ {"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_84_iso": {
"layout": [
- {"label":"Esc", "x":0, "y":0, "w":1.5},
- {"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":5.5, "y":0},
- {"label":"F6", "x":6.5, "y":0},
- {"label":"F7", "x":7.5, "y":0},
- {"label":"F8", "x":8.5, "y":0},
- {"label":"F9", "x":9.5, "y":0},
- {"label":"F10", "x":10.5, "y":0},
- {"label":"F11", "x":11.5, "y":0},
- {"label":"F12", "x":12.5, "y":0},
- {"label":"Pn", "x":13.5, "y":0},
- {"label":"Delete", "x":14.5, "y":0, "w":1.5},
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+ {"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": [0, 12], "x": 12.5, "y": 0},
+ {"matrix": [0, 13], "x": 13.5, "y": 0},
+ {"matrix": [0, 14], "x": 14.5, "y": 0, "w": 1.5},
- {"label":"\u00ac", "x":0, "y":1},
- {"label":"!", "x":1, "y":1},
- {"label":"@", "x":2, "y":1},
- {"label":"\u00a3", "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},
+ {"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, 14], "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":"Pg Up", "x":15, "y":2},
+ {"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, 14], "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":"~", "x":12.75, "y":3},
- {"label":"Enter", "x":13.75, "y":2, "w":1.25, "h":2},
- {"label":"Pg Dn", "x":15, "y":3},
+ {"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": 2, "w": 1.25, "h": 2},
+ {"matrix": [3, 14], "x": 15, "y": 3},
- {"label":"Shift", "x":0, "y":4, "w":1.25},
- {"label":"|", "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":"Up", "x":14, "y":4},
- {"label":"End", "x":15, "y":4},
+ {"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},
- {"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":6.25},
- {"label":"Alt Gr", "x":10, "y":5},
- {"label":"Fn", "x":11, "y":5},
- {"label":"Ctrl", "x":12, "y":5},
- {"label":"Left", "x":13, "y":5},
- {"label":"Down", "x":14, "y":5},
- {"label":"Right", "x":15, "y":5}
+ {"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, 5], "x": 3.75, "y": 5, "w": 6.25},
+ {"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/bear_face/v2/v2.c b/keyboards/bear_face/v2/v2.c
index cf97145688..f4960d9178 100644
--- a/keyboards/bear_face/v2/v2.c
+++ b/keyboards/bear_face/v2/v2.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 "v2.h"
+#include "quantum.h"
void keyboard_pre_init_kb(void) {
//Sets LED pin as output
diff --git a/keyboards/bear_face/v2/v2.h b/keyboards/bear_face/v2/v2.h
deleted file mode 100644
index 57004e56b5..0000000000
--- a/keyboards/bear_face/v2/v2.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-Copyright 2020 chemicalwill <https://github.com/chemicalwill>
-
-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_83_ansi( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \
- K400, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, \
- K500, K501, K502, K505, K509, K510, K511, K512, K513, K514 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \
- { K400, KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414 }, \
- { K500, K501, K502, KC_NO, KC_NO, K505, KC_NO, KC_NO, KC_NO, K509, K510, K511, K512, K513, K514 } \
-}
-
-#define LAYOUT_84_iso( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, \
- K500, K501, K502, K505, K509, K510, K511, K512, K513, K514 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414 }, \
- { K500, K501, K502, KC_NO, KC_NO, K505, KC_NO, KC_NO, KC_NO, K509, K510, K511, K512, K513, K514 } \
-}
diff --git a/keyboards/boardrun/classic/classic.h b/keyboards/boardrun/classic/classic.h
deleted file mode 100644
index 173c686c74..0000000000
--- a/keyboards/boardrun/classic/classic.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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_classic( \
- k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114, \
- k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214, \
- k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314, \
- k41, k42, k43, k44, k45, k46, k47, k48, k49, k410, k411, k412, k413, k414, \
- k52, k53, k54, k55, k56, k57, k51, k58, k59, k510, k511, k512, k513 \
-) \
-{ \
- { k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114 , KC_NO, KC_NO, KC_NO,}, \
- { k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214 , KC_NO, KC_NO, KC_NO,}, \
- { k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314 , KC_NO, KC_NO, KC_NO,}, \
- { k41, k42, k43, k44, k45, k46, k47, k48, k49, k410, k411, k412, k413, k414 , KC_NO, KC_NO, KC_NO,}, \
- { k51, k52, k53, k54, k55, k56, k57, k58, k59, k510, k511, k512, k513, KC_NO, KC_NO, KC_NO, KC_NO} \
-}
diff --git a/keyboards/boardrun/classic/info.json b/keyboards/boardrun/classic/info.json
index 74f53cf2cd..8259afcdcc 100644
--- a/keyboards/boardrun/classic/info.json
+++ b/keyboards/boardrun/classic/info.json
@@ -22,82 +22,86 @@
"layouts": {
"LAYOUT_classic": {
"layout": [
- {"y":0, "x":0, "label":"Esc", "w":1.5},
- {"y":0, "x":1.5, "label":"1"},
- {"y":0, "x":2.5, "label":"2"},
- {"y":0, "x":3.5, "label":"3"},
- {"y":0, "x":4.5, "label":"4"},
- {"y":0, "x":5.5, "label":"5"},
- {"y":0, "x":6.5, "label":"-"},
- {"y":0, "x":9, "label":"="},
- {"y":0, "x":10, "label":"6"},
- {"y":0, "x":11, "label":"7"},
- {"y":0, "x":12, "label":"8"},
- {"y":0, "x":13, "label":"9"},
- {"y":0, "x":14, "label":"0"},
- {"y":0, "x":15, "label":"Backspace", "w":1.5},
-
- {"y":1, "x":0, "label":"Tab", "w":1.5},
- {"y":1, "x":1.5, "label":"Q"},
- {"y":1, "x":2.5, "label":"W"},
- {"y":1, "x":3.5, "label":"E"},
- {"y":1, "x":4.5, "label":"R"},
- {"y":1, "x":5.5, "label":"T"},
- {"y":1, "x":6.5, "label":"["},
- {"y":1, "x":9, "label":"]"},
- {"y":1, "x":10, "label":"Y"},
- {"y":1, "x":11, "label":"U"},
- {"y":1, "x":12, "label":"I"},
- {"y":1, "x":13, "label":"O"},
- {"y":1, "x":14, "label":"P"},
- {"y":1, "x":15, "label":"\\", "w":1.5},
-
- {"y":2, "x":0, "label":"LCtrl", "w":1.5},
- {"y":2, "x":1.5, "label":"A"},
- {"y":2, "x":2.5, "label":"S"},
- {"y":2, "x":3.5, "label":"D"},
- {"y":2, "x":4.5, "label":"F"},
- {"y":2, "x":5.5, "label":"G"},
- {"y":2, "x":6.5, "label":"Home"},
- {"y":2, "x":9, "label":"PgUp"},
- {"y":2, "x":10, "label":"H"},
- {"y":2, "x":11, "label":"J"},
- {"y":2, "x":12, "label":"K"},
- {"y":2, "x":13, "label":"L"},
- {"y":2, "x":14, "label":";"},
- {"y":2, "x":15, "label":"'", "w":1.5},
-
- {"y":3, "x":0, "label":"LShift", "w":1.5},
- {"y":3, "x":1.5, "label":"Z"},
- {"y":3, "x":2.5, "label":"X"},
- {"y":3, "x":3.5, "label":"C"},
- {"y":3, "x":4.5, "label":"V"},
- {"y":3, "x":5.5, "label":"B"},
- {"y":3, "x":6.5, "label":"End"},
- {"y":3, "x":9, "label":"PgDn"},
- {"y":3, "x":10, "label":"N"},
- {"y":3, "x":11, "label":"M"},
- {"y":3, "x":12, "label":","},
- {"y":3, "x":13, "label":"."},
- {"y":3, "x":14, "label":"/"},
- {"y":3, "x":15, "label":"RShift / Enter", "w":1.5},
-
- {"y":4, "x":1.5, "label":"LGui"},
- {"y":4, "x":2.5, "label":"Del"},
- {"y":4, "x":3.5, "label":"`"},
- {"y":4, "x":4.5, "label":"LAlt"},
- {"y":4, "x":5.5, "label":"Space"},
- {"y":4, "x":6.5, "label":"Space"},
- {"y":4, "x":7.75,"label":"Fn"},
- {"y":4, "x":9, "label":"Space / AltGr"},
- {"y":4, "x":10, "label":"Space / AltGr"},
- {"y":4, "x":11, "label":"Left"},
- {"y":4, "x":12, "label":"Down"},
- {"y":4, "x":13, "label":"Up"},
- {"y":4, "x":14, "label":"Right"}
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+ {"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": 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": [0, 12], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0, "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": 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": [1, 12], "x": 14, "y": 1},
+ {"matrix": [1, 13], "x": 15, "y": 1, "w": 1.5},
+
+ {"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": 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": [2, 12], "x": 14, "y": 2},
+ {"matrix": [2, 13], "x": 15, "y": 2, "w": 1.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [3, 1], "x": 1.5, "y": 3},
+ {"matrix": [3, 2], "x": 2.5, "y": 3},
+ {"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": 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": [3, 12], "x": 14, "y": 3},
+ {"matrix": [3, 13], "x": 15, "y": 3, "w": 1.5},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4},
+ {"matrix": [4, 3], "x": 3.5, "y": 4},
+ {"matrix": [4, 4], "x": 4.5, "y": 4},
+ {"matrix": [4, 5], "x": 5.5, "y": 4},
+ {"matrix": [4, 6], "x": 6.5, "y": 4},
+
+ {"matrix": [4, 0], "x": 7.75, "y": 4},
+
+ {"matrix": [4, 7], "x": 9, "y": 4},
+ {"matrix": [4, 8], "x": 10, "y": 4},
+ {"matrix": [4, 9], "x": 11, "y": 4},
+ {"matrix": [4, 10], "x": 12, "y": 4},
+ {"matrix": [4, 11], "x": 13, "y": 4},
+ {"matrix": [4, 12], "x": 14, "y": 4}
]
}
}
-
}
diff --git a/keyboards/bolsa/damapad/damapad.c b/keyboards/bolsa/damapad/damapad.c
index c2464d3f95..6057181fa3 100644
--- a/keyboards/bolsa/damapad/damapad.c
+++ b/keyboards/bolsa/damapad/damapad.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 "damapad.h"
+#include "quantum.h"
#ifdef OLED_ENABLE
bool oled_task_kb(void) {
diff --git a/keyboards/bolsa/damapad/damapad.h b/keyboards/bolsa/damapad/damapad.h
deleted file mode 100644
index 9f0d0d4170..0000000000
--- a/keyboards/bolsa/damapad/damapad.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-Copyright 2021 Matthew Dias
-
-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_wkl( \
- K00, K01, K02, K03, K04, K05, \
- K10, K11, K12, K13, K14, K15, \
- K20, K21, K23, K25 \
-) { \
- { K00, K01, K02, K03, K04, K05 }, \
- { K10, K11, K12, K13, K14, K15 }, \
- { K20, K21, XXX, K23, XXX, K25 } \
-}
-
-#define LAYOUT_bar( \
- K00, K01, K02, K03, K04, K05, \
- K10, K11, K12, K13, K14, K15, \
- K20, K23, K25 \
-) { \
- { K00, K01, K02, K03, K04, K05 }, \
- { K10, K11, K12, K13, K14, K15 }, \
- { K20, XXX, XXX, K23, XXX, K25 } \
-}
diff --git a/keyboards/bolsa/damapad/info.json b/keyboards/bolsa/damapad/info.json
index 22d4ba3d39..2a3867c6d5 100644
--- a/keyboards/bolsa/damapad/info.json
+++ b/keyboards/bolsa/damapad/info.json
@@ -22,106 +22,53 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_wkl": {
- "layout": [{
- "x": 5.25,
- "y": 0
- }, {
- "x": 0,
- "y": 0.25
- }, {
- "x": 1,
- "y": 0.25
- }, {
- "x": 2,
- "y": 0.25
- }, {
- "x": 3,
- "y": 0.25
- }, {
- "x": 4,
- "y": 0.25
- }, {
- "x": 0,
- "y": 1.25
- }, {
- "x": 1,
- "y": 1.25
- }, {
- "x": 2,
- "y": 1.25
- }, {
- "x": 3,
- "y": 1.25
- }, {
- "x": 4,
- "y": 1.25
- }, {
- "x": 5.25,
- "y": 1.25
- }, {
- "x": 0,
- "y": 2.25
- }, {
- "x": 1.75,
- "y": 2.25
- }, {
- "x": 2.75,
- "y": 2.25,
- "w": 2.25
- }, {
- "x": 5.25,
- "y": 2.25
- }]
+ "layout": [
+ {"matrix": [0, 0], "x": 5.25, "y": 0},
+
+ {"matrix": [0, 1], "x": 0, "y": 0.25},
+ {"matrix": [0, 2], "x": 1, "y": 0.25},
+ {"matrix": [0, 3], "x": 2, "y": 0.25},
+ {"matrix": [0, 4], "x": 3, "y": 0.25},
+ {"matrix": [0, 5], "x": 4, "y": 0.25},
+
+ {"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.25, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25},
+ {"matrix": [2, 1], "x": 1.75, "y": 2.25},
+ {"matrix": [2, 3], "x": 2.75, "y": 2.25, "w": 2.25},
+
+ {"matrix": [2, 5], "x": 5.25, "y": 2.25}
+ ]
},
"LAYOUT_bar": {
- "layout": [{
- "x": 5.25,
- "y": 0
- }, {
- "x": 0,
- "y": 0.25
- }, {
- "x": 1,
- "y": 0.25
- }, {
- "x": 2,
- "y": 0.25
- }, {
- "x": 3,
- "y": 0.25
- }, {
- "x": 4,
- "y": 0.25
- }, {
- "x": 0,
- "y": 1.25
- }, {
- "x": 1,
- "y": 1.25
- }, {
- "x": 2,
- "y": 1.25
- }, {
- "x": 3,
- "y": 1.25
- }, {
- "x": 4,
- "y": 1.25
- }, {
- "x": 5.25,
- "y": 1.25
- }, {
- "x": 0,
- "y": 2.25,
- "w": 2.75
- }, {
- "x": 2.75,
- "y": 2.25,
- "w": 2.25
- }, {
- "x": 5.25,
- "y": 2.25
- }]
+ "layout": [
+ {"matrix": [0, 0], "x": 5.25, "y": 0},
+
+ {"matrix": [0, 1], "x": 0, "y": 0.25},
+ {"matrix": [0, 2], "x": 1, "y": 0.25},
+ {"matrix": [0, 3], "x": 2, "y": 0.25},
+ {"matrix": [0, 4], "x": 3, "y": 0.25},
+ {"matrix": [0, 5], "x": 4, "y": 0.25},
+
+ {"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.25, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 2.75},
+ {"matrix": [2, 3], "x": 2.75, "y": 2.25, "w": 2.25},
+
+ {"matrix": [2, 5], "x": 5.25, "y": 2.25}
+ ]
}
}
}
diff --git a/keyboards/capsunlocked/cu24/cu24.h b/keyboards/capsunlocked/cu24/cu24.h
deleted file mode 100644
index 8e3daa4758..0000000000
--- a/keyboards/capsunlocked/cu24/cu24.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright 2018 Yiancar
- *
- * 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 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_grid( \
- k00, k01, k02, k03, \
- k10, k11, k12, k13, \
- k20, k21, k22, k23, \
- k30, k31, k32, k33, \
- k40, k41, k42, k43, \
- k50, k51, k52, k53 \
-) { \
- { k00, k01, k02, k03 }, \
- { k10, k11, k12, k13 }, \
- { k20, k21, k22, k23 }, \
- { k30, k31, k32, k33 }, \
- { k40, k41, k42, k43 }, \
- { k50, k51, k52, k53 } \
-}
-
-#define LAYOUT_numpad( \
- k00, k01, k02, k03, \
- k10, k11, k12, k13, \
- k20, k21, k22, k23, \
- k30, k31, k32, \
- k40, k41, k42, k43, \
- k51, k52 \
-) { \
- { k00, k01, k02, k03 }, \
- { k10, k11, k12, k13 }, \
- { k20, k21, k22, k23 }, \
- { k30, k31, k32, XXX }, \
- { k40, k41, k42, k43 }, \
- { XXX, k51, k52, XXX } \
-}
diff --git a/keyboards/capsunlocked/cu24/info.json b/keyboards/capsunlocked/cu24/info.json
index 22ef9df89b..66860a95c3 100644
--- a/keyboards/capsunlocked/cu24/info.json
+++ b/keyboards/capsunlocked/cu24/info.json
@@ -25,11 +25,67 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_grid": {
- "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"+", "x":3, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"x":3, "y":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"Enter", "x":3, "y":3}, {"label":"0", "x":0, "y":4}, {"x":1, "y":4}, {"label":".", "x":2, "y":4}, {"x":3, "y":4}, {"x":0, "y":5}, {"x":1, "y":5}, {"x":2, "y":5}, {"x":3, "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": [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": [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": [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": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5},
+ {"matrix": [5, 1], "x": 1, "y": 5},
+ {"matrix": [5, 2], "x": 2, "y": 5},
+ {"matrix": [5, 3], "x": 3, "y": 5}
+ ]
+ },
"LAYOUT_numpad": {
- "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"+", "x":3, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"x":3, "y":2, "h":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"0", "x":0, "y":4}, {"x":1, "y":4}, {"label":".", "x":2, "y":4}, {"x":3, "y":4, "h":2}, {"x":0, "y":5, "w":2}, {"x":2, "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": [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": [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, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4, "h": 2},
+
+ {"matrix": [5, 1], "x": 0, "y": 5, "w": 2},
+ {"matrix": [5, 2], "x": 2, "y": 5}
+ ]
}
}
}
diff --git a/keyboards/chavdai40/info.json b/keyboards/chavdai40/info.json
index 36b8511bf1..081f7fc50e 100644
--- a/keyboards/chavdai40/info.json
+++ b/keyboards/chavdai40/info.json
@@ -5,99 +5,5 @@
"usb": {
"vid": "0x16D0",
"pid": "0x0F95"
- },
- "layouts": {
- "LAYOUT_44key": {
- "layout": [
- {"x":0, "y":0, "w":1.5},
- {"label":"Q", "x":1.5, "y":0},
- {"label":"W", "x":2.5, "y":0},
- {"label":"E", "x":3.5, "y":0},
- {"label":"R", "x":4.5, "y":0},
- {"label":"T", "x":5.5, "y":0},
- {"label":"Y", "x":6.5, "y":0},
- {"label":"U", "x":7.5, "y":0},
- {"label":"I", "x":8.5, "y":0},
- {"label":"O", "x":9.5, "y":0},
- {"label":"P", "x":10.5, "y":0},
- {"label":"_", "x":11.5, "y":0},
- {"label":"Backspace", "x":12.5, "y":0, "w":1.5},
- {"label":"Ctrl", "x":0, "y":1, "w":1.75},
- {"label":"A", "x":1.75, "y":1},
- {"label":"S", "x":2.75, "y":1},
- {"label":"D", "x":3.75, "y":1},
- {"label":"F", "x":4.75, "y":1},
- {"label":"G", "x":5.75, "y":1},
- {"label":"H", "x":6.75, "y":1},
- {"label":"J", "x":7.75, "y":1},
- {"label":"K", "x":8.75, "y":1},
- {"label":"L", "x":9.75, "y":1},
- {"label":":", "x":10.75, "y":1},
- {"label":"Enter", "x":11.75, "y":1, "w":2.25},
- {"label":"Shift", "x":0, "y":2, "w":2.25},
- {"label":"Z", "x":2.25, "y":2},
- {"label":"X", "x":3.25, "y":2},
- {"label":"C", "x":4.25, "y":2},
- {"label":"V", "x":5.25, "y":2},
- {"label":"B", "x":6.25, "y":2},
- {"label":"N", "x":7.25, "y":2},
- {"label":"M", "x":8.25, "y":2},
- {"label":"<", "x":9.25, "y":2},
- {"label":">", "x":10.25, "y":2},
- {"label":"?", "x":11.25, "y":2, "w":1.25},
- {"x":12.5, "y":2, "w":1.25},
- {"label":"Alt", "x":1.38, "y":3, "w":1.25},
- {"label":"Win", "x":2.63, "y":3, "w":1.25},
- {"x":3.88, "y":3, "w":2.25},
- {"x":6.13, "y":3, "w":2.75},
- {"label":"Win", "x":8.88, "y":3, "w":1.25},
- {"label":"Alt", "x":10.13, "y":3, "w":1.25},
- {"label":"Esc", "x":11.38, "y":3, "w":1.25}]
- },
- "LAYOUT_42key": {
- "layout": [
- {"x":0, "y":0, "w":1.5},
- {"label":"Q", "x":1.5, "y":0},
- {"label":"W", "x":2.5, "y":0},
- {"label":"E", "x":3.5, "y":0},
- {"label":"R", "x":4.5, "y":0},
- {"label":"T", "x":5.5, "y":0},
- {"label":"Y", "x":6.5, "y":0},
- {"label":"U", "x":7.5, "y":0},
- {"label":"I", "x":8.5, "y":0},
- {"label":"O", "x":9.5, "y":0},
- {"label":"P", "x":10.5, "y":0},
- {"label":"_", "x":11.5, "y":0},
- {"label":"Backspace", "x":12.5, "y":0, "w":1.5},
- {"label":"Ctrl", "x":0, "y":1, "w":1.75},
- {"label":"A", "x":1.75, "y":1},
- {"label":"S", "x":2.75, "y":1},
- {"label":"D", "x":3.75, "y":1},
- {"label":"F", "x":4.75, "y":1},
- {"label":"G", "x":5.75, "y":1},
- {"label":"H", "x":6.75, "y":1},
- {"label":"J", "x":7.75, "y":1},
- {"label":"K", "x":8.75, "y":1},
- {"label":"L", "x":9.75, "y":1},
- {"label":":", "x":10.75, "y":1},
- {"label":"Enter", "x":11.75, "y":1, "w":2.25},
- {"label":"Shift", "x":0, "y":2, "w":2.25},
- {"label":"Z", "x":2.25, "y":2},
- {"label":"X", "x":3.25, "y":2},
- {"label":"C", "x":4.25, "y":2},
- {"label":"V", "x":5.25, "y":2},
- {"label":"B", "x":6.25, "y":2},
- {"label":"N", "x":7.25, "y":2},
- {"label":"M", "x":8.25, "y":2},
- {"label":"<", "x":9.25, "y":2},
- {"label":">", "x":10.25, "y":2},
- {"label":"?", "x":11.25, "y":2, "w":1.25},
- {"x":12.5, "y":2, "w":1.25},
- {"label":"Alt", "x":1.38, "y":3, "w":1.25},
- {"label":"Win", "x":2.63, "y":3, "w":1.25},
- {"x":3.88, "y":3, "w":6.25},
- {"label":"Win", "x":10.13, "y":3, "w":1.25},
- {"label":"Alt", "x":11.38, "y":3, "w":1.25}]
- }
}
}
diff --git a/keyboards/chavdai40/rev1/info.json b/keyboards/chavdai40/rev1/info.json
index 0e518b6de0..511dff4ad1 100644
--- a/keyboards/chavdai40/rev1/info.json
+++ b/keyboards/chavdai40/rev1/info.json
@@ -9,5 +9,107 @@
},
"diode_direction": "COL2ROW",
"processor": "STM32F042",
- "bootloader": "stm32-dfu"
+ "bootloader": "stm32-dfu",
+ "layouts": {
+ "LAYOUT_42key": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+ {"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": [0, 12], "x": 12.5, "y": 0, "w": 1.5},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
+ {"matrix": [1, 1], "x": 1.75, "y": 1},
+ {"matrix": [1, 2], "x": 2.75, "y": 1},
+ {"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, "w": 2.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 2.25},
+ {"matrix": [2, 1], "x": 2.25, "y": 2},
+ {"matrix": [2, 2], "x": 3.25, "y": 2},
+ {"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, "w": 1.25},
+ {"matrix": [2, 11], "x": 12.5, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 1.38, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 2.63, "y": 3, "w": 1.25},
+ {"matrix": [3, 5], "x": 3.88, "y": 3, "w": 6.25},
+ {"matrix": [3, 9], "x": 10.13, "y": 3, "w": 1.25},
+ {"matrix": [3, 10], "x": 11.38, "y": 3, "w": 1.25}
+ ]
+ },
+ "LAYOUT_44key": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+ {"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": [0, 12], "x": 12.5, "y": 0, "w": 1.5},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
+ {"matrix": [1, 1], "x": 1.75, "y": 1},
+ {"matrix": [1, 2], "x": 2.75, "y": 1},
+ {"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, "w": 2.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 2.25},
+ {"matrix": [2, 1], "x": 2.25, "y": 2},
+ {"matrix": [2, 2], "x": 3.25, "y": 2},
+ {"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, "w": 1.25},
+ {"matrix": [2, 11], "x": 12.5, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 1.38, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 2.63, "y": 3, "w": 1.25},
+ {"matrix": [3, 3], "x": 3.88, "y": 3, "w": 2.25},
+ {"matrix": [3, 5], "x": 6.13, "y": 3, "w": 2.75},
+ {"matrix": [3, 8], "x": 8.88, "y": 3, "w": 1.25},
+ {"matrix": [3, 9], "x": 10.13, "y": 3, "w": 1.25},
+ {"matrix": [3, 10], "x": 11.38, "y": 3, "w": 1.25}
+ ]
+ }
+ }
}
diff --git a/keyboards/chavdai40/rev1/rev1.h b/keyboards/chavdai40/rev1/rev1.h
deleted file mode 100644
index c5899e24bc..0000000000
--- a/keyboards/chavdai40/rev1/rev1.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2020 t-miyajima
- *
- * 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 a shortcut to help you visually see your layout.
-
-#define LAYOUT_44key( \
- 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 \
-) { \
- { 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, XXX }, \
- { k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, XXX }, \
- { k38, k39, XXX, k40, XXX, k41, XXX, XXX, k42, k43, k44, XXX, XXX } \
-}
-
-#define LAYOUT_42key( \
- 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, k41, k43, k44 \
-) { \
- { 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, XXX }, \
- { k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, XXX }, \
- { k38, k39, XXX, XXX, XXX, k41, XXX, XXX, XXX, k43, k44, XXX, XXX } \
-}
-
diff --git a/keyboards/chavdai40/rev2/info.json b/keyboards/chavdai40/rev2/info.json
index 3216cb565d..97cd474fa0 100644
--- a/keyboards/chavdai40/rev2/info.json
+++ b/keyboards/chavdai40/rev2/info.json
@@ -9,5 +9,107 @@
},
"diode_direction": "COL2ROW",
"processor": "STM32F042",
- "bootloader": "stm32-dfu"
+ "bootloader": "stm32-dfu",
+ "layouts": {
+ "LAYOUT_42key": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+ {"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": [0, 12], "x": 12.5, "y": 0, "w": 1.5},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
+ {"matrix": [1, 1], "x": 1.75, "y": 1},
+ {"matrix": [1, 2], "x": 2.75, "y": 1},
+ {"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, "w": 2.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 2.25},
+ {"matrix": [2, 1], "x": 2.25, "y": 2},
+ {"matrix": [2, 2], "x": 3.25, "y": 2},
+ {"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, "w": 1.25},
+ {"matrix": [2, 11], "x": 12.5, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 1.38, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 2.63, "y": 3, "w": 1.25},
+ {"matrix": [3, 5], "x": 3.88, "y": 3, "w": 6.25},
+ {"matrix": [3, 9], "x": 10.13, "y": 3, "w": 1.25},
+ {"matrix": [3, 10], "x": 11.38, "y": 3, "w": 1.25}
+ ]
+ },
+ "LAYOUT_44key": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+ {"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": [0, 12], "x": 12.5, "y": 0, "w": 1.5},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
+ {"matrix": [1, 1], "x": 1.75, "y": 1},
+ {"matrix": [1, 2], "x": 2.75, "y": 1},
+ {"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, "w": 2.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 2.25},
+ {"matrix": [2, 1], "x": 2.25, "y": 2},
+ {"matrix": [2, 2], "x": 3.25, "y": 2},
+ {"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, "w": 1.25},
+ {"matrix": [2, 11], "x": 12.5, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 1.38, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 2.63, "y": 3, "w": 1.25},
+ {"matrix": [3, 3], "x": 3.88, "y": 3, "w": 2.25},
+ {"matrix": [3, 5], "x": 6.13, "y": 3, "w": 2.75},
+ {"matrix": [3, 8], "x": 8.88, "y": 3, "w": 1.25},
+ {"matrix": [3, 9], "x": 10.13, "y": 3, "w": 1.25},
+ {"matrix": [3, 10], "x": 11.38, "y": 3, "w": 1.25}
+ ]
+ }
+ }
}
diff --git a/keyboards/chavdai40/rev2/rev2.h b/keyboards/chavdai40/rev2/rev2.h
deleted file mode 100644
index c5899e24bc..0000000000
--- a/keyboards/chavdai40/rev2/rev2.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2020 t-miyajima
- *
- * 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 a shortcut to help you visually see your layout.
-
-#define LAYOUT_44key( \
- 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 \
-) { \
- { 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, XXX }, \
- { k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, XXX }, \
- { k38, k39, XXX, k40, XXX, k41, XXX, XXX, k42, k43, k44, XXX, XXX } \
-}
-
-#define LAYOUT_42key( \
- 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, k41, k43, k44 \
-) { \
- { 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, XXX }, \
- { k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, XXX }, \
- { k38, k39, XXX, XXX, XXX, k41, XXX, XXX, XXX, k43, k44, XXX, XXX } \
-}
-
diff --git a/keyboards/checkerboards/candybar_ortho/candybar_ortho.h b/keyboards/checkerboards/candybar_ortho/candybar_ortho.h
deleted file mode 100644
index 692024ff20..0000000000
--- a/keyboards/checkerboards/candybar_ortho/candybar_ortho.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright 2021 Nathan Spears
- *
- * 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_grid( \
- k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, k08, \
- k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, k28, \
- k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, k48, \
- k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k67, k77, k68 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, XXX }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k08 }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, XXX }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k28 }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, XXX }, \
- { k50, k51, k52, k53, k54, k55, k56, k57, k48 }, \
- { k60, k61, k62, k63, k64, k65, k66, k67, XXX }, \
- { k70, k71, k72, k73, k74, k75, k76, k77, k68 } \
-}
-#define LAYOUT_2x3u( \
- k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, k08, \
- k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, k28, \
- k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, k48, \
- k60, k70, k61, k71, k72, k73, k64, k74, k75, k76, k67, k77, k68 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, XXX }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k08 }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, XXX }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k28 }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, XXX }, \
- { k50, k51, k52, k53, k54, k55, k56, k57, k48 }, \
- { k60, k61, XXX, XXX, k64, XXX, XXX, k67, XXX }, \
- { k70, k71, k72, k73, k74, k75, k76, k77, k68 } \
-}
-#define LAYOUT_7u( \
- k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, k08, \
- k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, k28, \
- k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, k48, \
- k60, k70, k61, k71, k62, k64, k66, k76, k67, k77, k68 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, XXX }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k08 }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, XXX }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k28 }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, XXX }, \
- { k50, k51, k52, k53, k54, k55, k56, k57, k48 }, \
- { k60, k61, k62, XXX, k64, XXX, k66, k67, XXX }, \
- { k70, k71, XXX, XXX, XXX, XXX, k76, k77, k68 } \
-}
diff --git a/keyboards/checkerboards/candybar_ortho/info.json b/keyboards/checkerboards/candybar_ortho/info.json
index 036ea9e49b..3369eee53d 100644
--- a/keyboards/checkerboards/candybar_ortho/info.json
+++ b/keyboards/checkerboards/candybar_ortho/info.json
@@ -20,13 +20,219 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_grid": {
- "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}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"label":"Y", "x":11, "y":0}, {"label":"U", "x":12, "y":0}, {"label":"I", "x":13, "y":0}, {"label":"O", "x":14, "y":0}, {"label":"P", "x":15, "y":0}, {"label":"Back Space", "x":16, "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}, {"x":6, "y":1}, {"label":"7", "x":7, "y":1}, {"label":"8", "x":8, "y":1}, {"label":"9", "x":9, "y":1}, {"x":10, "y":1}, {"label":"H", "x":11, "y":1}, {"label":"J", "x":12, "y":1}, {"label":"K", "x":13, "y":1}, {"label":"L", "x":14, "y":1}, {"label":";", "x":15, "y":1}, {"label":"'", "x":16, "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}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"label":"N", "x":11, "y":2}, {"label":"M", "x":12, "y":2}, {"label":",", "x":13, "y":2}, {"label":".", "x":14, "y":2}, {"label":"/", "x":15, "y":2}, {"label":"Return", "x":16, "y":2}, {"x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"label":"&dArr;", "x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"label":"8", "x":7, "y":3}, {"x":8, "y":3}, {"label":"10", "x":9, "y":3}, {"label":"11", "x":10, "y":3}, {"label":"12", "x":11, "y":3}, {"label":"&uArr;", "x":12, "y":3}, {"label":"&larr;", "x":13, "y":3}, {"label":"15", "x":14, "y":3}, {"label":"&uarr;", "x":15, "y":3}, {"label":"&rarr;", "x":16, "y":3}]
- },
+ "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": [1, 6], "x": 13, "y": 0},
+ {"matrix": [0, 7], "x": 14, "y": 0},
+ {"matrix": [1, 7], "x": 15, "y": 0},
+ {"matrix": [1, 8], "x": 16, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1},
+ {"matrix": [3, 0], "x": 1, "y": 1},
+ {"matrix": [2, 1], "x": 2, "y": 1},
+ {"matrix": [3, 1], "x": 3, "y": 1},
+ {"matrix": [2, 2], "x": 4, "y": 1},
+ {"matrix": [3, 2], "x": 5, "y": 1},
+ {"matrix": [2, 3], "x": 6, "y": 1},
+ {"matrix": [3, 3], "x": 7, "y": 1},
+ {"matrix": [2, 4], "x": 8, "y": 1},
+ {"matrix": [3, 4], "x": 9, "y": 1},
+ {"matrix": [2, 5], "x": 10, "y": 1},
+ {"matrix": [3, 5], "x": 11, "y": 1},
+ {"matrix": [2, 6], "x": 12, "y": 1},
+ {"matrix": [3, 6], "x": 13, "y": 1},
+ {"matrix": [2, 7], "x": 14, "y": 1},
+ {"matrix": [3, 7], "x": 15, "y": 1},
+ {"matrix": [3, 8], "x": 16, "y": 1},
+
+ {"matrix": [4, 0], "x": 0, "y": 2},
+ {"matrix": [5, 0], "x": 1, "y": 2},
+ {"matrix": [4, 1], "x": 2, "y": 2},
+ {"matrix": [5, 1], "x": 3, "y": 2},
+ {"matrix": [4, 2], "x": 4, "y": 2},
+ {"matrix": [5, 2], "x": 5, "y": 2},
+ {"matrix": [4, 3], "x": 6, "y": 2},
+ {"matrix": [5, 3], "x": 7, "y": 2},
+ {"matrix": [4, 4], "x": 8, "y": 2},
+ {"matrix": [5, 4], "x": 9, "y": 2},
+ {"matrix": [4, 5], "x": 10, "y": 2},
+ {"matrix": [5, 5], "x": 11, "y": 2},
+ {"matrix": [4, 6], "x": 12, "y": 2},
+ {"matrix": [5, 6], "x": 13, "y": 2},
+ {"matrix": [4, 7], "x": 14, "y": 2},
+ {"matrix": [5, 7], "x": 15, "y": 2},
+ {"matrix": [5, 8], "x": 16, "y": 2},
+
+ {"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": [7, 6], "x": 13, "y": 3},
+ {"matrix": [6, 7], "x": 14, "y": 3},
+ {"matrix": [7, 7], "x": 15, "y": 3},
+ {"matrix": [7, 8], "x": 16, "y": 3}
+ ]
+ },
"LAYOUT_2x3u": {
- "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}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"label":"Y", "x":11, "y":0}, {"label":"U", "x":12, "y":0}, {"label":"I", "x":13, "y":0}, {"label":"O", "x":14, "y":0}, {"label":"P", "x":15, "y":0}, {"label":"Back Space", "x":16, "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}, {"x":6, "y":1}, {"label":"7", "x":7, "y":1}, {"label":"8", "x":8, "y":1}, {"label":"9", "x":9, "y":1}, {"x":10, "y":1}, {"label":"H", "x":11, "y":1}, {"label":"J", "x":12, "y":1}, {"label":"K", "x":13, "y":1}, {"label":"L", "x":14, "y":1}, {"label":";", "x":15, "y":1}, {"label":"'", "x":16, "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}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"label":"N", "x":11, "y":2}, {"label":"M", "x":12, "y":2}, {"label":",", "x":13, "y":2}, {"label":".", "x":14, "y":2}, {"label":"/", "x":15, "y":2}, {"label":"Return", "x":16, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3, "w":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3, "w":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":16, "y":3}]
- },
+ "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": [1, 6], "x": 13, "y": 0},
+ {"matrix": [0, 7], "x": 14, "y": 0},
+ {"matrix": [1, 7], "x": 15, "y": 0},
+ {"matrix": [1, 8], "x": 16, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1},
+ {"matrix": [3, 0], "x": 1, "y": 1},
+ {"matrix": [2, 1], "x": 2, "y": 1},
+ {"matrix": [3, 1], "x": 3, "y": 1},
+ {"matrix": [2, 2], "x": 4, "y": 1},
+ {"matrix": [3, 2], "x": 5, "y": 1},
+ {"matrix": [2, 3], "x": 6, "y": 1},
+ {"matrix": [3, 3], "x": 7, "y": 1},
+ {"matrix": [2, 4], "x": 8, "y": 1},
+ {"matrix": [3, 4], "x": 9, "y": 1},
+ {"matrix": [2, 5], "x": 10, "y": 1},
+ {"matrix": [3, 5], "x": 11, "y": 1},
+ {"matrix": [2, 6], "x": 12, "y": 1},
+ {"matrix": [3, 6], "x": 13, "y": 1},
+ {"matrix": [2, 7], "x": 14, "y": 1},
+ {"matrix": [3, 7], "x": 15, "y": 1},
+ {"matrix": [3, 8], "x": 16, "y": 1},
+
+ {"matrix": [4, 0], "x": 0, "y": 2},
+ {"matrix": [5, 0], "x": 1, "y": 2},
+ {"matrix": [4, 1], "x": 2, "y": 2},
+ {"matrix": [5, 1], "x": 3, "y": 2},
+ {"matrix": [4, 2], "x": 4, "y": 2},
+ {"matrix": [5, 2], "x": 5, "y": 2},
+ {"matrix": [4, 3], "x": 6, "y": 2},
+ {"matrix": [5, 3], "x": 7, "y": 2},
+ {"matrix": [4, 4], "x": 8, "y": 2},
+ {"matrix": [5, 4], "x": 9, "y": 2},
+ {"matrix": [4, 5], "x": 10, "y": 2},
+ {"matrix": [5, 5], "x": 11, "y": 2},
+ {"matrix": [4, 6], "x": 12, "y": 2},
+ {"matrix": [5, 6], "x": 13, "y": 2},
+ {"matrix": [4, 7], "x": 14, "y": 2},
+ {"matrix": [5, 7], "x": 15, "y": 2},
+ {"matrix": [5, 8], "x": 16, "y": 2},
+
+ {"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": [7, 2], "x": 4, "y": 3, "w": 3},
+ {"matrix": [7, 3], "x": 7, "y": 3},
+ {"matrix": [6, 4], "x": 8, "y": 3},
+ {"matrix": [7, 4], "x": 9, "y": 3},
+ {"matrix": [7, 5], "x": 10, "y": 3, "w": 3},
+ {"matrix": [7, 6], "x": 13, "y": 3},
+ {"matrix": [6, 7], "x": 14, "y": 3},
+ {"matrix": [7, 7], "x": 15, "y": 3},
+ {"matrix": [7, 8], "x": 16, "y": 3}
+ ]
+ },
"LAYOUT_7u": {
- "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}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"label":"Y", "x":11, "y":0}, {"label":"U", "x":12, "y":0}, {"label":"I", "x":13, "y":0}, {"label":"O", "x":14, "y":0}, {"label":"P", "x":15, "y":0}, {"label":"Back Space", "x":16, "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}, {"x":6, "y":1}, {"label":"7", "x":7, "y":1}, {"label":"8", "x":8, "y":1}, {"label":"9", "x":9, "y":1}, {"x":10, "y":1}, {"label":"H", "x":11, "y":1}, {"label":"J", "x":12, "y":1}, {"label":"K", "x":13, "y":1}, {"label":"L", "x":14, "y":1}, {"label":";", "x":15, "y":1}, {"label":"'", "x":16, "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}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"label":"N", "x":11, "y":2}, {"label":"M", "x":12, "y":2}, {"label":",", "x":13, "y":2}, {"label":".", "x":14, "y":2}, {"label":"/", "x":15, "y":2}, {"label":"Return", "x":16, "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":7}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":16, "y":3}]
- }
+ "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": [1, 6], "x": 13, "y": 0},
+ {"matrix": [0, 7], "x": 14, "y": 0},
+ {"matrix": [1, 7], "x": 15, "y": 0},
+ {"matrix": [1, 8], "x": 16, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1},
+ {"matrix": [3, 0], "x": 1, "y": 1},
+ {"matrix": [2, 1], "x": 2, "y": 1},
+ {"matrix": [3, 1], "x": 3, "y": 1},
+ {"matrix": [2, 2], "x": 4, "y": 1},
+ {"matrix": [3, 2], "x": 5, "y": 1},
+ {"matrix": [2, 3], "x": 6, "y": 1},
+ {"matrix": [3, 3], "x": 7, "y": 1},
+ {"matrix": [2, 4], "x": 8, "y": 1},
+ {"matrix": [3, 4], "x": 9, "y": 1},
+ {"matrix": [2, 5], "x": 10, "y": 1},
+ {"matrix": [3, 5], "x": 11, "y": 1},
+ {"matrix": [2, 6], "x": 12, "y": 1},
+ {"matrix": [3, 6], "x": 13, "y": 1},
+ {"matrix": [2, 7], "x": 14, "y": 1},
+ {"matrix": [3, 7], "x": 15, "y": 1},
+ {"matrix": [3, 8], "x": 16, "y": 1},
+
+ {"matrix": [4, 0], "x": 0, "y": 2},
+ {"matrix": [5, 0], "x": 1, "y": 2},
+ {"matrix": [4, 1], "x": 2, "y": 2},
+ {"matrix": [5, 1], "x": 3, "y": 2},
+ {"matrix": [4, 2], "x": 4, "y": 2},
+ {"matrix": [5, 2], "x": 5, "y": 2},
+ {"matrix": [4, 3], "x": 6, "y": 2},
+ {"matrix": [5, 3], "x": 7, "y": 2},
+ {"matrix": [4, 4], "x": 8, "y": 2},
+ {"matrix": [5, 4], "x": 9, "y": 2},
+ {"matrix": [4, 5], "x": 10, "y": 2},
+ {"matrix": [5, 5], "x": 11, "y": 2},
+ {"matrix": [4, 6], "x": 12, "y": 2},
+ {"matrix": [5, 6], "x": 13, "y": 2},
+ {"matrix": [4, 7], "x": 14, "y": 2},
+ {"matrix": [5, 7], "x": 15, "y": 2},
+ {"matrix": [5, 8], "x": 16, "y": 2},
+
+ {"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": [6, 4], "x": 5, "y": 3, "w": 7},
+ {"matrix": [6, 6], "x": 12, "y": 3},
+ {"matrix": [7, 6], "x": 13, "y": 3},
+ {"matrix": [6, 7], "x": 14, "y": 3},
+ {"matrix": [7, 7], "x": 15, "y": 3},
+ {"matrix": [7, 8], "x": 16, "y": 3}
+ ]
+ }
}
}
diff --git a/keyboards/checkerboards/plexus75/info.json b/keyboards/checkerboards/plexus75/info.json
index c9e04c36b4..538abd8959 100644
--- a/keyboards/checkerboards/plexus75/info.json
+++ b/keyboards/checkerboards/plexus75/info.json
@@ -20,13 +20,235 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_2x2u": {
- "layout": [{"label":"=", "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":"[", "x":6, "y":0}, {"label":"]", "x":7, "y":0}, {"label":"`", "x":8, "y":0}, {"label":"6", "x":9, "y":0}, {"label":"7", "x":10, "y":0}, {"label":"8", "x":11, "y":0}, {"label":"9", "x":12, "y":0}, {"label":"9", "x":13, "y":0}, {"label":"-", "x":14, "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":"7", "x":6, "y":1}, {"label":"8", "x":7, "y":1}, {"label":"9", "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":"Back Space", "x":14, "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":"4", "x":6, "y":2}, {"label":"5", "x":7, "y":2}, {"label":"6", "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":"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":"1", "x":6, "y":3}, {"label":"2", "x":7, "y":3}, {"label":"3", "x":8, "y":3}, {"label":"N", "x":9, "y":3}, {"label":"M", "x":10, "y":3}, {"label":",", "x":11, "y":3}, {"label":".", "x":12, "y":3}, {"label":"/", "x":13, "y":3}, {"label":"Return", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"OS", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4}, {"x":5, "y":4, "w":2}, {"x":7, "y":4}, {"x":8, "y":4, "w":2}, {"x":10, "y":4}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"OS", "x":12.5, "y":4}, {"label":"Ctrl", "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": [0, 14], "x": 14, "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": [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": [2, 12], "x": 12, "y": 2},
+ {"matrix": [2, 13], "x": 13, "y": 2},
+ {"matrix": [2, 14], "x": 14, "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},
+ {"matrix": [3, 12], "x": 12, "y": 3},
+ {"matrix": [3, 13], "x": 13, "y": 3},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+
+ {"matrix": [4, 1], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 1.5, "y": 4},
+ {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 5], "x": 4, "y": 4},
+ {"matrix": [4, 6], "x": 5, "y": 4, "w": 2},
+ {"matrix": [4, 7], "x": 7, "y": 4},
+ {"matrix": [4, 8], "x": 8, "y": 4, "w": 2},
+ {"matrix": [4, 9], "x": 10, "y": 4},
+ {"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_2x3u": {
- "layout": [{"label":"=", "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":"[", "x":6, "y":0}, {"label":"]", "x":7, "y":0}, {"label":"`", "x":8, "y":0}, {"label":"6", "x":9, "y":0}, {"label":"7", "x":10, "y":0}, {"label":"8", "x":11, "y":0}, {"label":"9", "x":12, "y":0}, {"label":"9", "x":13, "y":0}, {"label":"-", "x":14, "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":"7", "x":6, "y":1}, {"label":"8", "x":7, "y":1}, {"label":"9", "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":"Back Space", "x":14, "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":"4", "x":6, "y":2}, {"label":"5", "x":7, "y":2}, {"label":"6", "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":"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":"1", "x":6, "y":3}, {"label":"2", "x":7, "y":3}, {"label":"3", "x":8, "y":3}, {"label":"N", "x":9, "y":3}, {"label":"M", "x":10, "y":3}, {"label":",", "x":11, "y":3}, {"label":".", "x":12, "y":3}, {"label":"/", "x":13, "y":3}, {"label":"Return", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"OS", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":3}, {"x":7, "y":4}, {"x":8, "y":4, "w":3}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"OS", "x":12.5, "y":4}, {"label":"Ctrl", "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": [0, 14], "x": 14, "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": [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": [2, 12], "x": 12, "y": 2},
+ {"matrix": [2, 13], "x": 13, "y": 2},
+ {"matrix": [2, 14], "x": 14, "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},
+ {"matrix": [3, 12], "x": 12, "y": 3},
+ {"matrix": [3, 13], "x": 13, "y": 3},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+
+ {"matrix": [4, 1], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 1.5, "y": 4},
+ {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 5], "x": 4, "y": 4, "w": 3},
+ {"matrix": [4, 7], "x": 7, "y": 4},
+ {"matrix": [4, 8], "x": 8, "y": 4, "w": 3},
+ {"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_7u": {
- "layout": [{"label":"=", "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":"[", "x":6, "y":0}, {"label":"]", "x":7, "y":0}, {"label":"`", "x":8, "y":0}, {"label":"6", "x":9, "y":0}, {"label":"7", "x":10, "y":0}, {"label":"8", "x":11, "y":0}, {"label":"9", "x":12, "y":0}, {"label":"9", "x":13, "y":0}, {"label":"-", "x":14, "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":"7", "x":6, "y":1}, {"label":"8", "x":7, "y":1}, {"label":"9", "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":"Back Space", "x":14, "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":"4", "x":6, "y":2}, {"label":"5", "x":7, "y":2}, {"label":"6", "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":"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":"1", "x":6, "y":3}, {"label":"2", "x":7, "y":3}, {"label":"3", "x":8, "y":3}, {"label":"N", "x":9, "y":3}, {"label":"M", "x":10, "y":3}, {"label":",", "x":11, "y":3}, {"label":".", "x":12, "y":3}, {"label":"/", "x":13, "y":3}, {"label":"Return", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"OS", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"label":"", "x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"OS", "x":12.5, "y":4}, {"label":"Ctrl", "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": [0, 14], "x": 14, "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": [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": [2, 12], "x": 12, "y": 2},
+ {"matrix": [2, 13], "x": 13, "y": 2},
+ {"matrix": [2, 14], "x": 14, "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},
+ {"matrix": [3, 12], "x": 12, "y": 3},
+ {"matrix": [3, 13], "x": 13, "y": 3},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+
+ {"matrix": [4, 1], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 1.5, "y": 4},
+ {"matrix": [4, 4], "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/checkerboards/plexus75/plexus75.h b/keyboards/checkerboards/plexus75/plexus75.h
deleted file mode 100644
index 0f4cee6887..0000000000
--- a/keyboards/checkerboards/plexus75/plexus75.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright 2020 Nathan Spears
- *
- * 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_2x2u( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314, \
- k41, k42, k44, k45, k46, k47, k48, k49, k410, k412, k413 \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014 }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114 }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214 }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314 }, \
- { KC_NO, k41, k42, KC_NO, k44, k45, k46, k47, k48, k49, k410, KC_NO, k412, k413, KC_NO } \
-}
-
-#define LAYOUT_2x3u( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314, \
- k41, k42, k44, k45, k47, k48, k410, k412, k413 \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014 }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114 }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214 }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314 }, \
- { KC_NO, k41, k42, KC_NO, k44, k45, KC_NO, k47, k48, KC_NO, k410, KC_NO, k412, k413, KC_NO } \
-}
-
-#define LAYOUT_7u( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314, \
- k41, k42, k44, k47, k410, k412, k413 \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014 }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114 }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214 }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314 }, \
- { KC_NO, k41, k42, KC_NO, k44, KC_NO, KC_NO, k47, KC_NO, KC_NO, k410, KC_NO, k412, k413, KC_NO } \
-}
diff --git a/keyboards/checkerboards/plexus75_he/info.json b/keyboards/checkerboards/plexus75_he/info.json
index 071b47c797..fc1dfc9fd5 100644
--- a/keyboards/checkerboards/plexus75_he/info.json
+++ b/keyboards/checkerboards/plexus75_he/info.json
@@ -20,13 +20,235 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_2x3u": {
- "layout": [{"label":"=", "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":"[", "x":6, "y":0}, {"label":"]", "x":7, "y":0}, {"label":"`", "x":8, "y":0}, {"label":"6", "x":9, "y":0}, {"label":"7", "x":10, "y":0}, {"label":"8", "x":11, "y":0}, {"label":"9", "x":12, "y":0}, {"label":"9", "x":13, "y":0}, {"label":"-", "x":14, "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":"7", "x":6, "y":1}, {"label":"8", "x":7, "y":1}, {"label":"9", "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":"Back Space", "x":14, "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":"4", "x":6, "y":2}, {"label":"5", "x":7, "y":2}, {"label":"6", "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":"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":"1", "x":6, "y":3}, {"label":"2", "x":7, "y":3}, {"label":"3", "x":8, "y":3}, {"label":"N", "x":9, "y":3}, {"label":"M", "x":10, "y":3}, {"label":",", "x":11, "y":3}, {"label":".", "x":12, "y":3}, {"label":"/", "x":13, "y":3}, {"label":"Return", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"OS", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":3}, {"x":7, "y":4}, {"x":8, "y":4, "w":3}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"OS", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}]
- },
- "LAYOUT_2x2u": {
- "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"1,1", "x":2, "y":0}, {"label":"1,2", "x":3, "y":0}, {"label":"0,2", "x":4, "y":0}, {"label":"0,3", "x":5, "y":0}, {"label":"1,3", "x":6, "y":0}, {"label":"1,4", "x":7, "y":0}, {"label":"0,4", "x":8, "y":0}, {"label":"0,5", "x":9, "y":0}, {"label":"1,5", "x":10, "y":0}, {"label":"1,6", "x":11, "y":0}, {"label":"0,6", "x":12, "y":0}, {"label":"0,7", "x":13, "y":0}, {"label":"1,7", "x":14, "y":0}, {"label":"2,0", "x":0, "y":1}, {"label":"2,1", "x":1, "y":1}, {"label":"3,1", "x":2, "y":1}, {"label":"3,2", "x":3, "y":1}, {"label":"2,2", "x":4, "y":1}, {"label":"2,3", "x":5, "y":1}, {"label":"3,3", "x":6, "y":1}, {"label":"3,4", "x":7, "y":1}, {"label":"2,4", "x":8, "y":1}, {"label":"2,5", "x":9, "y":1}, {"label":"3,5", "x":10, "y":1}, {"label":"3,6", "x":11, "y":1}, {"label":"2,6", "x":12, "y":1}, {"label":"2,7", "x":13, "y":1}, {"label":"3,7", "x":14, "y":1}, {"label":"4,0", "x":0, "y":2}, {"label":"4,1", "x":1, "y":2}, {"label":"5,1", "x":2, "y":2}, {"label":"5,2", "x":3, "y":2}, {"label":"4,2", "x":4, "y":2}, {"label":"4,3", "x":5, "y":2}, {"label":"5,3", "x":6, "y":2}, {"label":"5,4", "x":7, "y":2}, {"label":"4,4", "x":8, "y":2}, {"label":"4,5", "x":9, "y":2}, {"label":"5,5", "x":10, "y":2}, {"label":"5,6", "x":11, "y":2}, {"label":"4,6", "x":12, "y":2}, {"label":"4,7", "x":13, "y":2}, {"label":"5,7", "x":14, "y":2}, {"label":"6,0", "x":0, "y":3}, {"label":"6,1", "x":1, "y":3}, {"label":"7,1", "x":2, "y":3}, {"label":"7,2", "x":3, "y":3}, {"label":"6,2", "x":4, "y":3}, {"label":"6,3", "x":5, "y":3}, {"label":"7,3", "x":6, "y":3}, {"label":"7,4", "x":7, "y":3}, {"label":"6,4", "x":8, "y":3}, {"label":"6,5", "x":9, "y":3}, {"label":"7,5", "x":10, "y":3}, {"label":"7,6", "x":11, "y":3}, {"label":"6,6", "x":12, "y":3}, {"label":"6,7", "x":13, "y":3}, {"label":"7,7", "x":14, "y":3}, {"label":"8,0", "x":0, "y":4, "w":1.5}, {"label":"8,1", "x":1.5, "y":4}, {"label":"8,2", "x":2.5, "y":4, "w":1.5}, {"label":"9,2", "x":4, "y":4}, {"label":"8,3", "x":5, "y":4, "w":2}, {"label":"8,4", "x":7, "y":4}, {"label":"8,5", "x":8, "y":4, "w":2}, {"label":"9,5", "x":10, "y":4}, {"label":"8,6", "x":11, "y":4, "w":1.5}, {"label":"8,7", "x":12.5, "y":4}, {"label":"9,7", "x":13.5, "y":4, "w":1.5}]
- },
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [1, 1], "x": 2, "y": 0},
+ {"matrix": [1, 2], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [0, 3], "x": 5, "y": 0},
+ {"matrix": [1, 3], "x": 6, "y": 0},
+ {"matrix": [1, 4], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [0, 5], "x": 9, "y": 0},
+ {"matrix": [1, 5], "x": 10, "y": 0},
+ {"matrix": [1, 6], "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},
+ {"matrix": [2, 1], "x": 1, "y": 1},
+ {"matrix": [3, 1], "x": 2, "y": 1},
+ {"matrix": [3, 2], "x": 3, "y": 1},
+ {"matrix": [2, 2], "x": 4, "y": 1},
+ {"matrix": [2, 3], "x": 5, "y": 1},
+ {"matrix": [3, 3], "x": 6, "y": 1},
+ {"matrix": [3, 4], "x": 7, "y": 1},
+ {"matrix": [2, 4], "x": 8, "y": 1},
+ {"matrix": [2, 5], "x": 9, "y": 1},
+ {"matrix": [3, 5], "x": 10, "y": 1},
+ {"matrix": [3, 6], "x": 11, "y": 1},
+ {"matrix": [2, 6], "x": 12, "y": 1},
+ {"matrix": [2, 7], "x": 13, "y": 1},
+ {"matrix": [3, 7], "x": 14, "y": 1},
+
+ {"matrix": [4, 0], "x": 0, "y": 2},
+ {"matrix": [4, 1], "x": 1, "y": 2},
+ {"matrix": [5, 1], "x": 2, "y": 2},
+ {"matrix": [5, 2], "x": 3, "y": 2},
+ {"matrix": [4, 2], "x": 4, "y": 2},
+ {"matrix": [4, 3], "x": 5, "y": 2},
+ {"matrix": [5, 3], "x": 6, "y": 2},
+ {"matrix": [5, 4], "x": 7, "y": 2},
+ {"matrix": [4, 4], "x": 8, "y": 2},
+ {"matrix": [4, 5], "x": 9, "y": 2},
+ {"matrix": [5, 5], "x": 10, "y": 2},
+ {"matrix": [5, 6], "x": 11, "y": 2},
+ {"matrix": [4, 6], "x": 12, "y": 2},
+ {"matrix": [4, 7], "x": 13, "y": 2},
+ {"matrix": [5, 7], "x": 14, "y": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3},
+ {"matrix": [6, 1], "x": 1, "y": 3},
+ {"matrix": [7, 1], "x": 2, "y": 3},
+ {"matrix": [7, 2], "x": 3, "y": 3},
+ {"matrix": [6, 2], "x": 4, "y": 3},
+ {"matrix": [6, 3], "x": 5, "y": 3},
+ {"matrix": [7, 3], "x": 6, "y": 3},
+ {"matrix": [7, 4], "x": 7, "y": 3},
+ {"matrix": [6, 4], "x": 8, "y": 3},
+ {"matrix": [6, 5], "x": 9, "y": 3},
+ {"matrix": [7, 5], "x": 10, "y": 3},
+ {"matrix": [7, 6], "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.5},
+ {"matrix": [8, 1], "x": 1.5, "y": 4},
+ {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [8, 3], "x": 4, "y": 4, "w": 3},
+ {"matrix": [8, 4], "x": 7, "y": 4},
+ {"matrix": [8, 5], "x": 8, "y": 4, "w": 3},
+ {"matrix": [8, 6], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [8, 7], "x": 12.5, "y": 4},
+ {"matrix": [9, 7], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_2x2u": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [1, 1], "x": 2, "y": 0},
+ {"matrix": [1, 2], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [0, 3], "x": 5, "y": 0},
+ {"matrix": [1, 3], "x": 6, "y": 0},
+ {"matrix": [1, 4], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [0, 5], "x": 9, "y": 0},
+ {"matrix": [1, 5], "x": 10, "y": 0},
+ {"matrix": [1, 6], "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},
+ {"matrix": [2, 1], "x": 1, "y": 1},
+ {"matrix": [3, 1], "x": 2, "y": 1},
+ {"matrix": [3, 2], "x": 3, "y": 1},
+ {"matrix": [2, 2], "x": 4, "y": 1},
+ {"matrix": [2, 3], "x": 5, "y": 1},
+ {"matrix": [3, 3], "x": 6, "y": 1},
+ {"matrix": [3, 4], "x": 7, "y": 1},
+ {"matrix": [2, 4], "x": 8, "y": 1},
+ {"matrix": [2, 5], "x": 9, "y": 1},
+ {"matrix": [3, 5], "x": 10, "y": 1},
+ {"matrix": [3, 6], "x": 11, "y": 1},
+ {"matrix": [2, 6], "x": 12, "y": 1},
+ {"matrix": [2, 7], "x": 13, "y": 1},
+ {"matrix": [3, 7], "x": 14, "y": 1},
+
+ {"matrix": [4, 0], "x": 0, "y": 2},
+ {"matrix": [4, 1], "x": 1, "y": 2},
+ {"matrix": [5, 1], "x": 2, "y": 2},
+ {"matrix": [5, 2], "x": 3, "y": 2},
+ {"matrix": [4, 2], "x": 4, "y": 2},
+ {"matrix": [4, 3], "x": 5, "y": 2},
+ {"matrix": [5, 3], "x": 6, "y": 2},
+ {"matrix": [5, 4], "x": 7, "y": 2},
+ {"matrix": [4, 4], "x": 8, "y": 2},
+ {"matrix": [4, 5], "x": 9, "y": 2},
+ {"matrix": [5, 5], "x": 10, "y": 2},
+ {"matrix": [5, 6], "x": 11, "y": 2},
+ {"matrix": [4, 6], "x": 12, "y": 2},
+ {"matrix": [4, 7], "x": 13, "y": 2},
+ {"matrix": [5, 7], "x": 14, "y": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3},
+ {"matrix": [6, 1], "x": 1, "y": 3},
+ {"matrix": [7, 1], "x": 2, "y": 3},
+ {"matrix": [7, 2], "x": 3, "y": 3},
+ {"matrix": [6, 2], "x": 4, "y": 3},
+ {"matrix": [6, 3], "x": 5, "y": 3},
+ {"matrix": [7, 3], "x": 6, "y": 3},
+ {"matrix": [7, 4], "x": 7, "y": 3},
+ {"matrix": [6, 4], "x": 8, "y": 3},
+ {"matrix": [6, 5], "x": 9, "y": 3},
+ {"matrix": [7, 5], "x": 10, "y": 3},
+ {"matrix": [7, 6], "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.5},
+ {"matrix": [8, 1], "x": 1.5, "y": 4},
+ {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [9, 2], "x": 4, "y": 4},
+ {"matrix": [8, 3], "x": 5, "y": 4, "w": 2},
+ {"matrix": [8, 4], "x": 7, "y": 4},
+ {"matrix": [8, 5], "x": 8, "y": 4, "w": 2},
+ {"matrix": [9, 5], "x": 10, "y": 4},
+ {"matrix": [8, 6], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [8, 7], "x": 12.5, "y": 4},
+ {"matrix": [9, 7], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
"LAYOUT_7u": {
- "layout": [{"label":"=", "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":"[", "x":6, "y":0}, {"label":"]", "x":7, "y":0}, {"label":"`", "x":8, "y":0}, {"label":"6", "x":9, "y":0}, {"label":"7", "x":10, "y":0}, {"label":"8", "x":11, "y":0}, {"label":"9", "x":12, "y":0}, {"label":"9", "x":13, "y":0}, {"label":"-", "x":14, "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":"7", "x":6, "y":1}, {"label":"8", "x":7, "y":1}, {"label":"9", "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":"Back Space", "x":14, "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":"4", "x":6, "y":2}, {"label":"5", "x":7, "y":2}, {"label":"6", "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":"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":"1", "x":6, "y":3}, {"label":"2", "x":7, "y":3}, {"label":"3", "x":8, "y":3}, {"label":"N", "x":9, "y":3}, {"label":"M", "x":10, "y":3}, {"label":",", "x":11, "y":3}, {"label":".", "x":12, "y":3}, {"label":"/", "x":13, "y":3}, {"label":"Return", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"OS", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"label":"", "x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"OS", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}]
- }
- }
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [1, 1], "x": 2, "y": 0},
+ {"matrix": [1, 2], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [0, 3], "x": 5, "y": 0},
+ {"matrix": [1, 3], "x": 6, "y": 0},
+ {"matrix": [1, 4], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [0, 5], "x": 9, "y": 0},
+ {"matrix": [1, 5], "x": 10, "y": 0},
+ {"matrix": [1, 6], "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},
+ {"matrix": [2, 1], "x": 1, "y": 1},
+ {"matrix": [3, 1], "x": 2, "y": 1},
+ {"matrix": [3, 2], "x": 3, "y": 1},
+ {"matrix": [2, 2], "x": 4, "y": 1},
+ {"matrix": [2, 3], "x": 5, "y": 1},
+ {"matrix": [3, 3], "x": 6, "y": 1},
+ {"matrix": [3, 4], "x": 7, "y": 1},
+ {"matrix": [2, 4], "x": 8, "y": 1},
+ {"matrix": [2, 5], "x": 9, "y": 1},
+ {"matrix": [3, 5], "x": 10, "y": 1},
+ {"matrix": [3, 6], "x": 11, "y": 1},
+ {"matrix": [2, 6], "x": 12, "y": 1},
+ {"matrix": [2, 7], "x": 13, "y": 1},
+ {"matrix": [3, 7], "x": 14, "y": 1},
+
+ {"matrix": [4, 0], "x": 0, "y": 2},
+ {"matrix": [4, 1], "x": 1, "y": 2},
+ {"matrix": [5, 1], "x": 2, "y": 2},
+ {"matrix": [5, 2], "x": 3, "y": 2},
+ {"matrix": [4, 2], "x": 4, "y": 2},
+ {"matrix": [4, 3], "x": 5, "y": 2},
+ {"matrix": [5, 3], "x": 6, "y": 2},
+ {"matrix": [5, 4], "x": 7, "y": 2},
+ {"matrix": [4, 4], "x": 8, "y": 2},
+ {"matrix": [4, 5], "x": 9, "y": 2},
+ {"matrix": [5, 5], "x": 10, "y": 2},
+ {"matrix": [5, 6], "x": 11, "y": 2},
+ {"matrix": [4, 6], "x": 12, "y": 2},
+ {"matrix": [4, 7], "x": 13, "y": 2},
+ {"matrix": [5, 7], "x": 14, "y": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3},
+ {"matrix": [6, 1], "x": 1, "y": 3},
+ {"matrix": [7, 1], "x": 2, "y": 3},
+ {"matrix": [7, 2], "x": 3, "y": 3},
+ {"matrix": [6, 2], "x": 4, "y": 3},
+ {"matrix": [6, 3], "x": 5, "y": 3},
+ {"matrix": [7, 3], "x": 6, "y": 3},
+ {"matrix": [7, 4], "x": 7, "y": 3},
+ {"matrix": [6, 4], "x": 8, "y": 3},
+ {"matrix": [6, 5], "x": 9, "y": 3},
+ {"matrix": [7, 5], "x": 10, "y": 3},
+ {"matrix": [7, 6], "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.5},
+ {"matrix": [8, 1], "x": 1.5, "y": 4},
+ {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [8, 4], "x": 4, "y": 4, "w": 7},
+ {"matrix": [8, 6], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [8, 7], "x": 12.5, "y": 4},
+ {"matrix": [9, 7], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ }
+ }
}
diff --git a/keyboards/checkerboards/plexus75_he/plexus75_he.h b/keyboards/checkerboards/plexus75_he/plexus75_he.h
deleted file mode 100644
index 0a01c6e144..0000000000
--- a/keyboards/checkerboards/plexus75_he/plexus75_he.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Copyright 2021 Nathan Spears
- *
- * 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_2x2u( \
- k00, k01, k11, k12, k02, k03, k13, k14, k04, k05, k15, k16, k06, k07, k17, \
- k20, k21, k31, k32, k22, k23, k33, k34, k24, k25, k35, k36, k26, k27, k37, \
- k40, k41, k51, k52, k42, k43, k53, k54, k44, k45, k55, k56, k46, k47, k57, \
- k60, k61, k71, k72, k62, k63, k73, k74, k64, k65, k75, k76, k66, k67, k77, \
- k80, k81, k82, k92, k83, k84, k85, k95, k86, k87, k97 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07 }, \
- { XXX, k11, k12, k13, k14, k15, k16, k17 }, \
- { k20, k21, k22, k23, k24, k25, k26, k27 }, \
- { XXX, k31, k32, k33, k34, k35, k36, k37 }, \
- { k40, k41, k42, k43, k44, k45, k46, k47 }, \
- { XXX, k51, k52, k53, k54, k55, k56, k57 }, \
- { k60, k61, k62, k63, k64, k65, k66, k67 }, \
- { XXX, k71, k72, k73, k74, k75, k76, k77 }, \
- { k80, k81, k82, k83, k84, k85, k86, k87 }, \
- { XXX, XXX, k92, XXX, XXX, k95, XXX, k97 } \
-}
-#define LAYOUT_2x3u( \
- k00, k01, k11, k12, k02, k03, k13, k14, k04, k05, k15, k16, k06, k07, k17, \
- k20, k21, k31, k32, k22, k23, k33, k34, k24, k25, k35, k36, k26, k27, k37, \
- k40, k41, k51, k52, k42, k43, k53, k54, k44, k45, k55, k56, k46, k47, k57, \
- k60, k61, k71, k72, k62, k63, k73, k74, k64, k65, k75, k76, k66, k67, k77, \
- k80, k81, k82, k83, k84, k85, k86, k87, k97 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07 }, \
- { XXX, k11, k12, k13, k14, k15, k16, k17 }, \
- { k20, k21, k22, k23, k24, k25, k26, k27 }, \
- { XXX, k31, k32, k33, k34, k35, k36, k37 }, \
- { k40, k41, k42, k43, k44, k45, k46, k47 }, \
- { XXX, k51, k52, k53, k54, k55, k56, k57 }, \
- { k60, k61, k62, k63, k64, k65, k66, k67 }, \
- { XXX, k71, k72, k73, k74, k75, k76, k77 }, \
- { k80, k81, k82, k83, k84, k85, k86, k87 }, \
- { XXX, XXX, XXX, XXX, XXX, XXX, XXX, k97 } \
-}
-#define LAYOUT_7u( \
- k00, k01, k11, k12, k02, k03, k13, k14, k04, k05, k15, k16, k06, k07, k17, \
- k20, k21, k31, k32, k22, k23, k33, k34, k24, k25, k35, k36, k26, k27, k37, \
- k40, k41, k51, k52, k42, k43, k53, k54, k44, k45, k55, k56, k46, k47, k57, \
- k60, k61, k71, k72, k62, k63, k73, k74, k64, k65, k75, k76, k66, k67, k77, \
- k80, k81, k82, k84, k86, k87, k97 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07 }, \
- { XXX, k11, k12, k13, k14, k15, k16, k17 }, \
- { k20, k21, k22, k23, k24, k25, k26, k27 }, \
- { XXX, k31, k32, k33, k34, k35, k36, k37 }, \
- { k40, k41, k42, k43, k44, k45, k46, k47 }, \
- { XXX, k51, k52, k53, k54, k55, k56, k57 }, \
- { k60, k61, k62, k63, k64, k65, k66, k67 }, \
- { XXX, k71, k72, k73, k74, k75, k76, k77 }, \
- { k80, k81, k82, XXX, k84, XXX, k86, k87 }, \
- { XXX, XXX, XXX, XXX, XXX, XXX, XXX, k97 } \
-}
diff --git a/keyboards/checkerboards/quark_plus/info.json b/keyboards/checkerboards/quark_plus/info.json
index 8f68d8c0c6..0d47ec2ec4 100644
--- a/keyboards/checkerboards/quark_plus/info.json
+++ b/keyboards/checkerboards/quark_plus/info.json
@@ -32,21 +32,216 @@
"processor": "atmega32u2",
"bootloader": "atmel-dfu",
"layouts": {
- "LAYOUT_grid": {
- "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":"Back Space", "x":11, "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":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "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":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"CTRL", "x":0, "y":3}, {"label":"WIN", "x":1, "y":3}, {"label":"MENU", "x":2, "y":3}, {"label":"ALT", "x":3, "y":3}, {"label":"&dArr;", "x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"label":"&uArr;", "x":7, "y":3}, {"label":"LEFT", "x":8, "y":3}, {"label":"DOWN", "x":9, "y":3}, {"label":"UP", "x":10, "y":3}, {"label":"RIGHT", "x":11, "y":3}]
- },
- "LAYOUT_2u": {
- "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":"Back Space", "x":11, "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":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "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":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"CTRL", "x":0, "y":3}, {"label":"WIN", "x":1, "y":3}, {"label":"MENU", "x":2, "y":3}, {"label":"ALT", "x":3, "y":3}, {"label":"&dArr;", "x":4, "y":3}, {"x":5, "y":3, "w":2}, {"label":"&uArr;", "x":7, "y":3}, {"label":"LEFT", "x":8, "y":3}, {"label":"DOWN", "x":9, "y":3}, {"label":"UP", "x":10, "y":3}, {"label":"RIGHT", "x":11, "y":3}]
- },
- "LAYOUT_2x225u": {
- "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":"Back Space", "x":11, "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":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "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":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"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, "w":2.25}, {"x":6, "y":3, "w":2.25}, {"label":"ALT", "x":8.25, "y":3, "w":1.25}, {"label":"MENU", "x":9.5, "y":3, "w":1.25}, {"label":"CTRL", "x":10.75, "y":3, "w":1.25}]
- },
- "LAYOUT_2x3u": {
- "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":"Back Space", "x":11, "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":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "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":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"CTRL", "x":0, "y":3}, {"label":"WIN", "x":1, "y":3}, {"label":"ALT", "x":2, "y":3}, {"x":3, "y":3, "w":3}, {"x":6, "y":3, "w":3}, {"label":"ALT", "x":9, "y":3}, {"label":"MENU", "x":10, "y":3}, {"label":"CTRL", "x":11, "y":3}]
- }
- }
- }
+ "LAYOUT_grid": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [1, 1], "x": 2, "y": 0},
+ {"matrix": [0, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+ {"matrix": [1, 3], "x": 6, "y": 0},
+ {"matrix": [0, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [1, 5], "x": 10, "y": 0},
+ {"matrix": [0, 5], "x": 11, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1},
+ {"matrix": [3, 0], "x": 1, "y": 1},
+ {"matrix": [3, 1], "x": 2, "y": 1},
+ {"matrix": [2, 1], "x": 3, "y": 1},
+ {"matrix": [2, 2], "x": 4, "y": 1},
+ {"matrix": [3, 2], "x": 5, "y": 1},
+ {"matrix": [3, 3], "x": 6, "y": 1},
+ {"matrix": [2, 3], "x": 7, "y": 1},
+ {"matrix": [2, 4], "x": 8, "y": 1},
+ {"matrix": [3, 4], "x": 9, "y": 1},
+ {"matrix": [3, 5], "x": 10, "y": 1},
+ {"matrix": [2, 5], "x": 11, "y": 1},
+
+ {"matrix": [4, 0], "x": 0, "y": 2},
+ {"matrix": [5, 0], "x": 1, "y": 2},
+ {"matrix": [5, 1], "x": 2, "y": 2},
+ {"matrix": [4, 1], "x": 3, "y": 2},
+ {"matrix": [4, 2], "x": 4, "y": 2},
+ {"matrix": [5, 2], "x": 5, "y": 2},
+ {"matrix": [5, 3], "x": 6, "y": 2},
+ {"matrix": [4, 3], "x": 7, "y": 2},
+ {"matrix": [4, 4], "x": 8, "y": 2},
+ {"matrix": [5, 4], "x": 9, "y": 2},
+ {"matrix": [5, 5], "x": 10, "y": 2},
+ {"matrix": [4, 5], "x": 11, "y": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3},
+ {"matrix": [7, 0], "x": 1, "y": 3},
+ {"matrix": [7, 1], "x": 2, "y": 3},
+ {"matrix": [6, 1], "x": 3, "y": 3},
+ {"matrix": [6, 2], "x": 4, "y": 3},
+ {"matrix": [7, 2], "x": 5, "y": 3},
+ {"matrix": [7, 3], "x": 6, "y": 3},
+ {"matrix": [6, 3], "x": 7, "y": 3},
+ {"matrix": [6, 4], "x": 8, "y": 3},
+ {"matrix": [7, 4], "x": 9, "y": 3},
+ {"matrix": [7, 5], "x": 10, "y": 3},
+ {"matrix": [6, 5], "x": 11, "y": 3}
+ ]
+ },
+ "LAYOUT_2u": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [1, 1], "x": 2, "y": 0},
+ {"matrix": [0, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+ {"matrix": [1, 3], "x": 6, "y": 0},
+ {"matrix": [0, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [1, 5], "x": 10, "y": 0},
+ {"matrix": [0, 5], "x": 11, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1},
+ {"matrix": [3, 0], "x": 1, "y": 1},
+ {"matrix": [3, 1], "x": 2, "y": 1},
+ {"matrix": [2, 1], "x": 3, "y": 1},
+ {"matrix": [2, 2], "x": 4, "y": 1},
+ {"matrix": [3, 2], "x": 5, "y": 1},
+ {"matrix": [3, 3], "x": 6, "y": 1},
+ {"matrix": [2, 3], "x": 7, "y": 1},
+ {"matrix": [2, 4], "x": 8, "y": 1},
+ {"matrix": [3, 4], "x": 9, "y": 1},
+ {"matrix": [3, 5], "x": 10, "y": 1},
+ {"matrix": [2, 5], "x": 11, "y": 1},
+
+ {"matrix": [4, 0], "x": 0, "y": 2},
+ {"matrix": [5, 0], "x": 1, "y": 2},
+ {"matrix": [5, 1], "x": 2, "y": 2},
+ {"matrix": [4, 1], "x": 3, "y": 2},
+ {"matrix": [4, 2], "x": 4, "y": 2},
+ {"matrix": [5, 2], "x": 5, "y": 2},
+ {"matrix": [5, 3], "x": 6, "y": 2},
+ {"matrix": [4, 3], "x": 7, "y": 2},
+ {"matrix": [4, 4], "x": 8, "y": 2},
+ {"matrix": [5, 4], "x": 9, "y": 2},
+ {"matrix": [5, 5], "x": 10, "y": 2},
+ {"matrix": [4, 5], "x": 11, "y": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3},
+ {"matrix": [7, 0], "x": 1, "y": 3},
+ {"matrix": [7, 1], "x": 2, "y": 3},
+ {"matrix": [6, 1], "x": 3, "y": 3},
+ {"matrix": [6, 2], "x": 4, "y": 3},
+ {"matrix": [7, 3], "x": 5, "y": 3, "w": 2},
+ {"matrix": [6, 3], "x": 7, "y": 3},
+ {"matrix": [6, 4], "x": 8, "y": 3},
+ {"matrix": [7, 4], "x": 9, "y": 3},
+ {"matrix": [7, 5], "x": 10, "y": 3},
+ {"matrix": [6, 5], "x": 11, "y": 3}
+ ]
+ },
+ "LAYOUT_2x225u": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [1, 1], "x": 2, "y": 0},
+ {"matrix": [0, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+ {"matrix": [1, 3], "x": 6, "y": 0},
+ {"matrix": [0, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [1, 5], "x": 10, "y": 0},
+ {"matrix": [0, 5], "x": 11, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1},
+ {"matrix": [3, 0], "x": 1, "y": 1},
+ {"matrix": [3, 1], "x": 2, "y": 1},
+ {"matrix": [2, 1], "x": 3, "y": 1},
+ {"matrix": [2, 2], "x": 4, "y": 1},
+ {"matrix": [3, 2], "x": 5, "y": 1},
+ {"matrix": [3, 3], "x": 6, "y": 1},
+ {"matrix": [2, 3], "x": 7, "y": 1},
+ {"matrix": [2, 4], "x": 8, "y": 1},
+ {"matrix": [3, 4], "x": 9, "y": 1},
+ {"matrix": [3, 5], "x": 10, "y": 1},
+ {"matrix": [2, 5], "x": 11, "y": 1},
+
+ {"matrix": [4, 0], "x": 0, "y": 2},
+ {"matrix": [5, 0], "x": 1, "y": 2},
+ {"matrix": [5, 1], "x": 2, "y": 2},
+ {"matrix": [4, 1], "x": 3, "y": 2},
+ {"matrix": [4, 2], "x": 4, "y": 2},
+ {"matrix": [5, 2], "x": 5, "y": 2},
+ {"matrix": [5, 3], "x": 6, "y": 2},
+ {"matrix": [4, 3], "x": 7, "y": 2},
+ {"matrix": [4, 4], "x": 8, "y": 2},
+ {"matrix": [5, 4], "x": 9, "y": 2},
+ {"matrix": [5, 5], "x": 10, "y": 2},
+ {"matrix": [4, 5], "x": 11, "y": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [7, 0], "x": 1.25, "y": 3, "w": 1.25},
+ {"matrix": [6, 1], "x": 2.5, "y": 3, "w": 1.25},
+ {"matrix": [6, 2], "x": 3.75, "y": 3, "w": 2.25},
+ {"matrix": [6, 3], "x": 6, "y": 3, "w": 2.25},
+ {"matrix": [6, 4], "x": 8.25, "y": 3, "w": 1.25},
+ {"matrix": [7, 5], "x": 9.5, "y": 3, "w": 1.25},
+ {"matrix": [6, 5], "x": 10.75, "y": 3, "w": 1.25}
+ ]
+ },
+ "LAYOUT_2x3u": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [1, 1], "x": 2, "y": 0},
+ {"matrix": [0, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+ {"matrix": [1, 3], "x": 6, "y": 0},
+ {"matrix": [0, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [1, 5], "x": 10, "y": 0},
+ {"matrix": [0, 5], "x": 11, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1},
+ {"matrix": [3, 0], "x": 1, "y": 1},
+ {"matrix": [3, 1], "x": 2, "y": 1},
+ {"matrix": [2, 1], "x": 3, "y": 1},
+ {"matrix": [2, 2], "x": 4, "y": 1},
+ {"matrix": [3, 2], "x": 5, "y": 1},
+ {"matrix": [3, 3], "x": 6, "y": 1},
+ {"matrix": [2, 3], "x": 7, "y": 1},
+ {"matrix": [2, 4], "x": 8, "y": 1},
+ {"matrix": [3, 4], "x": 9, "y": 1},
+ {"matrix": [3, 5], "x": 10, "y": 1},
+ {"matrix": [2, 5], "x": 11, "y": 1},
+
+ {"matrix": [4, 0], "x": 0, "y": 2},
+ {"matrix": [5, 0], "x": 1, "y": 2},
+ {"matrix": [5, 1], "x": 2, "y": 2},
+ {"matrix": [4, 1], "x": 3, "y": 2},
+ {"matrix": [4, 2], "x": 4, "y": 2},
+ {"matrix": [5, 2], "x": 5, "y": 2},
+ {"matrix": [5, 3], "x": 6, "y": 2},
+ {"matrix": [4, 3], "x": 7, "y": 2},
+ {"matrix": [4, 4], "x": 8, "y": 2},
+ {"matrix": [5, 4], "x": 9, "y": 2},
+ {"matrix": [5, 5], "x": 10, "y": 2},
+ {"matrix": [4, 5], "x": 11, "y": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3},
+ {"matrix": [7, 0], "x": 1, "y": 3},
+ {"matrix": [7, 1], "x": 2, "y": 3},
+ {"matrix": [6, 2], "x": 3, "y": 3, "w": 3},
+ {"matrix": [6, 3], "x": 6, "y": 3, "w": 3},
+ {"matrix": [7, 4], "x": 9, "y": 3},
+ {"matrix": [7, 5], "x": 10, "y": 3},
+ {"matrix": [6, 5], "x": 11, "y": 3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/checkerboards/quark_plus/quark_plus.c b/keyboards/checkerboards/quark_plus/quark_plus.c
index 0c0ae0cf4e..84e2375a74 100644
--- a/keyboards/checkerboards/quark_plus/quark_plus.c
+++ b/keyboards/checkerboards/quark_plus/quark_plus.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "quark_plus.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/checkerboards/quark_plus/quark_plus.h b/keyboards/checkerboards/quark_plus/quark_plus.h
deleted file mode 100644
index ca98b3957e..0000000000
--- a/keyboards/checkerboards/quark_plus/quark_plus.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Copyright 2022 Nathan Spears
- *
- * 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_grid( \
- k00, k10, k11, k01, k02, k12, k13, k03, k04, k14, k15, k05, \
- k20, k30, k31, k21, k22, k32, k33, k23, k24, k34, k35, k25, \
- k40, k50, k51, k41, k42, k52, k53, k43, k44, k54, k55, k45, \
- k60, k70, k71, k61, k62, k72, k73, k63, k64, k74, k75, k65 \
-) { \
- { k00, k01, k02, k03, k04, k05 }, \
- { k10, k11, k12, k13, k14, k15 }, \
- { k20, k21, k22, k23, k24, k25 }, \
- { k30, k31, k32, k33, k34, k35 }, \
- { k40, k41, k42, k43, k44, k45 }, \
- { k50, k51, k52, k53, k54, k55 }, \
- { k60, k61, k62, k63, k64, k65 }, \
- { k70, k71, k72, k73, k74, k75 } \
-}
-#define LAYOUT_2u( \
- k00, k10, k11, k01, k02, k12, k13, k03, k04, k14, k15, k05, \
- k20, k30, k31, k21, k22, k32, k33, k23, k24, k34, k35, k25, \
- k40, k50, k51, k41, k42, k52, k53, k43, k44, k54, k55, k45, \
- k60, k70, k71, k61, k62, k73, k63, k64, k74, k75, k65 \
-) { \
- { k00, k01, k02, k03, k04, k05 }, \
- { k10, k11, k12, k13, k14, k15 }, \
- { k20, k21, k22, k23, k24, k25 }, \
- { k30, k31, k32, k33, k34, k35 }, \
- { k40, k41, k42, k43, k44, k45 }, \
- { k50, k51, k52, k53, k54, k55 }, \
- { k60, k61, k62, k63, k64, k65 }, \
- { k70, k71, XXX, k73, k74, k75 } \
-}
-#define LAYOUT_2x225u( \
- k00, k10, k11, k01, k02, k12, k13, k03, k04, k14, k15, k05, \
- k20, k30, k31, k21, k22, k32, k33, k23, k24, k34, k35, k25, \
- k40, k50, k51, k41, k42, k52, k53, k43, k44, k54, k55, k45, \
- k60, k70, k61, k62, k63, k64, k75, k65 \
-) { \
- { k00, k01, k02, k03, k04, k05 }, \
- { k10, k11, k12, k13, k14, k15 }, \
- { k20, k21, k22, k23, k24, k25 }, \
- { k30, k31, k32, k33, k34, k35 }, \
- { k40, k41, k42, k43, k44, k45 }, \
- { k50, k51, k52, k53, k54, k55 }, \
- { k60, k61, k62, k63, k64, k65 }, \
- { k70, XXX, XXX, XXX, XXX, k75 } \
-}
-#define LAYOUT_2x3u( \
- k00, k10, k11, k01, k02, k12, k13, k03, k04, k14, k15, k05, \
- k20, k30, k31, k21, k22, k32, k33, k23, k24, k34, k35, k25, \
- k40, k50, k51, k41, k42, k52, k53, k43, k44, k54, k55, k45, \
- k60, k70, k71, k62, k63, k74, k75, k65 \
-) { \
- { k00, k01, k02, k03, k04, k05 }, \
- { k10, k11, k12, k13, k14, k15 }, \
- { k20, k21, k22, k23, k24, k25 }, \
- { k30, k31, k32, k33, k34, k35 }, \
- { k40, k41, k42, k43, k44, k45 }, \
- { k50, k51, k52, k53, k54, k55 }, \
- { k60, XXX, k62, k63, XXX, k65 }, \
- { k70, k71, XXX, XXX, k74, k75 } \
-}
diff --git a/keyboards/checkerboards/quark_squared/info.json b/keyboards/checkerboards/quark_squared/info.json
index a5fb22db85..bd6233b208 100644
--- a/keyboards/checkerboards/quark_squared/info.json
+++ b/keyboards/checkerboards/quark_squared/info.json
@@ -25,16 +25,236 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_4_2x225u": {
- "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":"Back Space", "x":11, "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":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "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":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Super", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":2.25}, {"x":6, "y":3, "w":2.25}, {"label":"Alt", "x":8.25, "y":3, "w":1.25}, {"label":"Super", "x":9.5, "y":3, "w":1.25}, {"label":"Ctrl", "x":10.75, "y":3, "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": [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, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 3], "x": 2.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 4], "x": 3.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 6], "x": 6, "y": 3, "w": 2.25},
+ {"matrix": [3, 8], "x": 8.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25}
+ ]
},
"LAYOUT_4_2u": {
- "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":"Back Space", "x":11, "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":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "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":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Alt", "x":1.25, "y":3, "w":1.25}, {"label":"Super", "x":2.5, "y":3, "w":1.25}, {"label":"&dArr;", "x":3.75, "y":3, "w":1.25}, {"x":5, "y":3, "w":2}, {"label":"&larr;", "x":7, "y":3, "w":1.25}, {"label":"&darr;", "x":8.25, "y":3, "w":1.25}, {"label":"&uarr;", "x":9.5, "y":3, "w":1.25}, {"label":"&rarr;", "x":10.75, "y":3, "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": [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, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 3], "x": 2.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 4], "x": 3.75, "y": 3, "w": 1.25},
+ {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+ {"matrix": [3, 6], "x": 7, "y": 3, "w": 1.25},
+ {"matrix": [3, 8], "x": 8.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25}
+ ]
},
"LAYOUT_5_2x225u": {
- "layout": [{"label":"-", "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":"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":6, "y":1}, {"label":"U", "x":7, "y":1}, {"label":"I", "x":8, "y":1}, {"label":"O", "x":9, "y":1}, {"label":"P", "x":10, "y":1}, {"label":"Back Space", "x":11, "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":6, "y":2}, {"label":"J", "x":7, "y":2}, {"label":"K", "x":8, "y":2}, {"label":"L", "x":9, "y":2}, {"label":";", "x":10, "y":2}, {"label":"'", "x":11, "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":6, "y":3}, {"label":"M", "x":7, "y":3}, {"label":",", "x":8, "y":3}, {"label":".", "x":9, "y":3}, {"label":"/", "x":10, "y":3}, {"label":"Return", "x":11, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Super", "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.25}, {"x":6, "y":4, "w":2.25}, {"label":"Alt", "x":8.25, "y":4, "w":1.25}, {"label":"Super", "x":9.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":10.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": [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},
+
+ {"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": 2.25},
+ {"matrix": [4, 8], "x": 8.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 9], "x": 9.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.25}
+ ]
},
"LAYOUT_5_2u": {
- "layout": [{"label":"-", "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":"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":6, "y":1}, {"label":"U", "x":7, "y":1}, {"label":"I", "x":8, "y":1}, {"label":"O", "x":9, "y":1}, {"label":"P", "x":10, "y":1}, {"label":"Back Space", "x":11, "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":6, "y":2}, {"label":"J", "x":7, "y":2}, {"label":"K", "x":8, "y":2}, {"label":"L", "x":9, "y":2}, {"label":";", "x":10, "y":2}, {"label":"'", "x":11, "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":6, "y":3}, {"label":"M", "x":7, "y":3}, {"label":",", "x":8, "y":3}, {"label":".", "x":9, "y":3}, {"label":"/", "x":10, "y":3}, {"label":"Return", "x":11, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Super", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"label":"&dArr;", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":2}, {"label":"&uArr;", "x":7, "y":4, "w":1.25}, {"label":"Alt", "x":8.25, "y":4, "w":1.25}, {"label":"Super", "x":9.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":10.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": [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},
+
+ {"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": 1.25},
+ {"matrix": [4, 5], "x": 5, "y": 4, "w": 2},
+ {"matrix": [4, 6], "x": 7, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 8.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 9], "x": 9.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.25}
+ ]
}
}
}
diff --git a/keyboards/checkerboards/quark_squared/quark_squared.c b/keyboards/checkerboards/quark_squared/quark_squared.c
deleted file mode 100644
index fbd7346cc0..0000000000
--- a/keyboards/checkerboards/quark_squared/quark_squared.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Nathan Spears
- *
- * 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 "quark_squared.h"
diff --git a/keyboards/checkerboards/quark_squared/quark_squared.h b/keyboards/checkerboards/quark_squared/quark_squared.h
deleted file mode 100644
index 27f69d1db6..0000000000
--- a/keyboards/checkerboards/quark_squared/quark_squared.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Copyright 2021 Nathan Spears
- *
- * 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_4_2x225u( \
- 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, k33, k34, k36, 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, XXX, k33, k34, XXX, k36, XXX, k38, k39, XXX, k3B }, \
- { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
-}
-
-#define LAYOUT_4_2u( \
- 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, k33, k34, k35, k36, 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, XXX, k33, k34, k35, k36, XXX, k38, k39, XXX, k3B }, \
- { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
-}
-
-#define LAYOUT_5_2x225u( \
- 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, k43, k44, k46, k48, k49, k4B \
-) { \
- { 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, XXX, k43, k44, XXX, k46, XXX, k48, k49, XXX, k4B } \
-}
-
-#define LAYOUT_5_2u( \
- 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, k43, k44, k45, k46, k48, k49, k4B \
-) { \
- { 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, XXX, k43, k44, k45, k46, XXX, k48, k49, XXX, k4B } \
-}
diff --git a/keyboards/coarse/ixora/info.json b/keyboards/coarse/ixora/info.json
index c38424ffa7..8d51f1e927 100644
--- a/keyboards/coarse/ixora/info.json
+++ b/keyboards/coarse/ixora/info.json
@@ -23,16 +23,44 @@
"debounce": 0,
"layouts": {
"LAYOUT_full": {
- "layout": [{"label":"1", "x":0, "y":0}, {"label":"2", "x":1, "y":0}, {"label":"3", "x":2, "y":0}, {"label":"Caps Lock", "x":0, "y":1}, {"label":"Num Lock", "x":1, "y":1}, {"label":"Scroll Lock", "x":2, "y":1}]
+ "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": 0, "y": 1},
+ {"matrix": [0, 4], "x": 1, "y": 1},
+ {"matrix": [0, 5], "x": 2, "y": 1}
+ ]
},
"LAYOUT_blocker_right": {
- "layout": [{"label":"1", "x":0, "y":0}, {"label":"2", "x":1, "y":0}, {"label":"Caps Lock", "x":0, "y":1}, {"label":"Num Lock", "x":1, "y":1}, {"label":"Scroll Lock", "x":2, "y":1}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+
+ {"matrix": [0, 3], "x": 0, "y": 1},
+ {"matrix": [0, 4], "x": 1, "y": 1},
+ {"matrix": [0, 5], "x": 2, "y": 1}
+ ]
},
"LAYOUT_blocker_left": {
- "layout": [{"label":"2", "x":1, "y":0}, {"label":"3", "x":2, "y":0}, {"label":"Caps Lock", "x":0, "y":1}, {"label":"Num Lock", "x":1, "y":1}, {"label":"Scroll Lock", "x":2, "y":1}]
+ "layout": [
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+
+ {"matrix": [0, 3], "x": 0, "y": 1},
+ {"matrix": [0, 4], "x": 1, "y": 1},
+ {"matrix": [0, 5], "x": 2, "y": 1}
+ ]
},
"LAYOUT_arrows": {
- "layout": [{"label":"\u2191", "x":1, "y":0}, {"label":"\u2190", "x":0, "y":1}, {"label":"\u2193", "x":1, "y":1}, {"label":"\u2192", "x":2, "y":1}]
+ "layout": [
+ {"matrix": [0, 1], "x": 1, "y": 0},
+
+ {"matrix": [0, 3], "x": 0, "y": 1},
+ {"matrix": [0, 4], "x": 1, "y": 1},
+ {"matrix": [0, 5], "x": 2, "y": 1}
+ ]
}
}
- }
+}
diff --git a/keyboards/coarse/ixora/ixora.h b/keyboards/coarse/ixora/ixora.h
deleted file mode 100644
index 92cf6586a6..0000000000
--- a/keyboards/coarse/ixora/ixora.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#pragma once
-
-#define XXX KC_NO
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-
-#define LAYOUT_full( \
- K00, K01, K02, \
- K03, K04, K05 \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05 } \
-}
-
-#define LAYOUT_blocker_right( \
- K00, K01, \
- K03, K04, K05 \
-) \
-{ \
- { K00, K01, XXX, K03, K04, K05 } \
-}
-
-#define LAYOUT_blocker_left( \
- K01, K02, \
- K03, K04, K05 \
-) \
-{ \
- { XXX, K01, K02, K03, K04, K05 } \
-}
-
-#define LAYOUT_arrows( \
- K01, \
- K03, K04, K05 \
-) \
-{ \
- { XXX, K01, XXX, K03, K04, K05 } \
-}
-
diff --git a/keyboards/converter/adb_usb/adb_usb.h b/keyboards/converter/adb_usb/adb_usb.h
deleted file mode 100644
index ddbbd71564..0000000000
--- a/keyboards/converter/adb_usb/adb_usb.h
+++ /dev/null
@@ -1,108 +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/>.
-
-Ported to QMK by Peter Roe <pete@13bit.me>
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* M0115/M3501 Apple Extended Keyboard ANSI
- * ,---. ,---------------. ,---------------. ,---------------. ,-----------. ,---.
- * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| |Pwr|
- * `---' `---------------' `---------------' `---------------' `-----------' `---'
- * ,-----------------------------------------------------------. ,-----------. ,---------------.
- * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backspa| |Ins|Hom|PgU| |NmL| =| /| *|
- * |-----------------------------------------------------------| |-----------| |---------------|
- * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| |Del|End|PgD| | 7| 8| 9| -|
- * |-----------------------------------------------------------| `-----------' |---------------|
- * |CapsLo| A| S| D| F| G| H| J| K| L| ;| '|Return | | 4| 5| 6| +|
- * |-----------------------------------------------------------| ,---. |---------------|
- * |Shift | Z| X| C| V| B| N| M| ,| ,| /|Shift | |Up | | 1| 2| 3| |
- * |-----------------------------------------------------------| ,-----------. |-----------|Ent|
- * |Ctrl |Opt |Cmd | Space | |Opt |Ctrl | |Lef|Dow|Rig| | 0| .| |
- * `-----------------------------------------------------------' `-----------' `---------------'
- */
-#define LAYOUT_ext_ansi( \
- k35, k7A, k78, k63, k76, k60, k61, k62, k64, k65, k6D, k67, k6F, k69, k6B, k71, k7F, \
- k32, k12, k13, k14, k15, k17, k16, k1A, k1C, k19, k1D, k1B, k18, k33, k72, k73, k74, k47, k51, k4B, k43, \
- k30, k0C, k0D, k0E, k0F, k11, k10, k20, k22, k1F, k23, k21, k1E, k2A, k75, k77, k79, k59, k5B, k5C, k4E, \
- k39, k00, k01, k02, k03, k05, k04, k26, k28, k25, k29, k27, k24, k56, k57, k58, k45, \
- k38, k06, k07, k08, k09, k0B, k2D, k2E, k2B, k2F, k2C, k7B, k3E, k53, k54, k55,\
- k36, k3A, k37, k31, k7C, k7D, k3B, k3D, k3C, k52, k41, k4C \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07 }, \
- { k08, k09, XXX, 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, XXX, k35, k36, k37 }, \
- { k38, k39, k3A, k3B, k3C, k3D, k3E, XXX }, \
- { XXX, k41, XXX, k43, XXX, k45, XXX, k47 }, \
- { XXX, XXX, XXX, k4B, k4C, XXX, k4E, XXX }, \
- { XXX, k51, k52, k53, k54, k55, k56, k57 }, \
- { k58, k59, XXX, k5B, k5C, XXX, XXX, XXX }, \
- { k60, k61, k62, k63, k64, k65, XXX, k67 }, \
- { XXX, k69, XXX, k6B, XXX, k6D, XXX, k6F }, \
- { XXX, k71, k72, k73, k74, k75, k76, k77 }, \
- { k78, k79, k7A, k7B, k7C, k7D, XXX, k7F } \
-}
-
-/* M0116 Apple Standard Keyboard ANSI
- * +-------+
- * | power |
- * +-------+
- * +---+---+---+---+---+---+---+---+---+---+---+---+---+-----+ +---+---+---+---+
- * |esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | bks | |clr| = | / | * |
- * +---------------------------------------------------------+ +---+---+---+---+
- * | tab | q | w | e | r | t | y | u | i | o | p | [ | ] | | | 7 | 8 | 9 | + |
- * +-----------------------------------------------------+ | +---+---+---+---+
- * | ctrl | a | s | d | f | g | h | j | k | l | ; | ' |return| | 4 | 5 | 6 | - |
- * +---------------------------------------------------------+ +---+---+---+---+
- * | shift | z | x | c | v | b | n | m | , | . | / | shift | | 1 | 2 | 3 | |
- * +---------------------------------------------------------+ +-------+---|ent|
- * |cap|opt|comnd| ` | | \ |lef|rig|dwn|up | | 0 | . | |
- * +---------------------------------------------------------+ +-------+---+---+
- */
-#define LAYOUT_m0116_ansi( \
- k7F, \
- k35, k12, k13, k14, k15, k17, k16, k1A, k1C, k19, k1D, k1B, k18, k33, k47, k51, k4B, k43, \
- k30, k0C, k0D, k0E, k0F, k11, k10, k20, k22, k1F, k23, k21, k1E, k59, k5B, k5C, k45, \
- k36, k00, k01, k02, k03, k05, k04, k26, k28, k25, k29, k27, k24, k56, k57, k58, k4E, \
- k38, k06, k07, k08, k09, k0B, k2D, k2E, k2B, k2F, k2C, k7B, k53, k54, k55, \
- k39, k3A, k37, k32, k31, k2A, k3B, k3C, k3D, k3E, k52, k41, k4C \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07 }, \
- { k08, k09, XXX, 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, XXX, k35, k36, k37 }, \
- { k38, k39, k3A, k3B, k3C, k3D, k3E, XXX }, \
- { XXX, k41, XXX, k43, XXX, k45, XXX, k47 }, \
- { XXX, XXX, XXX, k4B, k4C, XXX, k4E, XXX }, \
- { XXX, k51, k52, k53, k54, k55, k56, k57 }, \
- { k58, k59, XXX, k5B, k5C, 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, k7B, XXX, XXX, XXX, k7F } \
-}
diff --git a/keyboards/converter/adb_usb/info.json b/keyboards/converter/adb_usb/info.json
index f64616e212..b553dfc10f 100644
--- a/keyboards/converter/adb_usb/info.json
+++ b/keyboards/converter/adb_usb/info.json
@@ -11,195 +11,224 @@
"layouts": {
"LAYOUT_ext_ansi": {
"layout": [
- {"label":"Escape", "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":"Eject", "x":21.5, "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":"Backspace", "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":"Num =", "x":19.5, "y":2},
- {"label":"Num /", "x":20.5, "y":2},
- {"label":"Num *", "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":"Num 7", "x":18.5, "y":3},
- {"label":"Num 8", "x":19.5, "y":3},
- {"label":"Num 9", "x":20.5, "y":3},
- {"label":"Num -", "x":21.5, "y":3},
- {"label":"Lcap", "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":"Num 4", "x":18.5, "y":4},
- {"label":"Num 5", "x":19.5, "y":4},
- {"label":"Num 6", "x":20.5, "y":4},
- {"label":"Num +", "x":21.5, "y":4},
- {"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":"Num 1", "x":18.5, "y":5},
- {"label":"Num 2", "x":19.5, "y":5},
- {"label":"Num 3", "x":20.5, "y":5},
- {"label":"Ctrl", "x":0, "y":6, "w":1.5},
- {"label":"Alt", "x":1.5, "y":6, "w":1.25},
- {"label":"Command", "x":2.75, "y":6, "w":1.5},
- {"label":"Space", "x":4.25, "y":6, "w":6.5},
- {"label":"Alt", "x":12.25, "y":6, "w":1.25},
- {"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":"Num 0", "x":18.5, "y":6, "w":2},
- {"label":"Num .", "x":20.5, "y":6},
- {"label":"Num Enter", "x":21.5, "y":5, "h":2}
+ {"matrix": [6, 5], "x": 0, "y": 0},
+
+ {"matrix": [15, 2], "x": 2, "y": 0},
+ {"matrix": [15, 0], "x": 3, "y": 0},
+ {"matrix": [12, 3], "x": 4, "y": 0},
+ {"matrix": [14, 6], "x": 5, "y": 0},
+
+ {"matrix": [12, 0], "x": 6.5, "y": 0},
+ {"matrix": [12, 1], "x": 7.5, "y": 0},
+ {"matrix": [12, 2], "x": 8.5, "y": 0},
+ {"matrix": [12, 4], "x": 9.5, "y": 0},
+
+ {"matrix": [12, 5], "x": 11, "y": 0},
+ {"matrix": [13, 5], "x": 12, "y": 0},
+ {"matrix": [12, 7], "x": 13, "y": 0},
+ {"matrix": [13, 7], "x": 14, "y": 0},
+
+ {"matrix": [13, 1], "x": 15.25, "y": 0},
+ {"matrix": [13, 3], "x": 16.25, "y": 0},
+ {"matrix": [14, 1], "x": 17.25, "y": 0},
+
+ {"matrix": [15, 7], "x": 21.5, "y": 0},
+
+ {"matrix": [6, 2], "x": 0, "y": 2},
+ {"matrix": [2, 2], "x": 1, "y": 2},
+ {"matrix": [2, 3], "x": 2, "y": 2},
+ {"matrix": [2, 4], "x": 3, "y": 2},
+ {"matrix": [2, 5], "x": 4, "y": 2},
+ {"matrix": [2, 7], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [3, 2], "x": 7, "y": 2},
+ {"matrix": [3, 4], "x": 8, "y": 2},
+ {"matrix": [3, 1], "x": 9, "y": 2},
+ {"matrix": [3, 5], "x": 10, "y": 2},
+ {"matrix": [3, 3], "x": 11, "y": 2},
+ {"matrix": [3, 0], "x": 12, "y": 2},
+ {"matrix": [6, 3], "x": 13, "y": 2, "w": 2},
+
+ {"matrix": [14, 2], "x": 15.25, "y": 2},
+ {"matrix": [14, 3], "x": 16.25, "y": 2},
+ {"matrix": [14, 4], "x": 17.25, "y": 2},
+
+ {"matrix": [8, 7], "x": 18.5, "y": 2},
+ {"matrix": [10, 1], "x": 19.5, "y": 2},
+ {"matrix": [9, 3], "x": 20.5, "y": 2},
+ {"matrix": [8, 3], "x": 21.5, "y": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [1, 4], "x": 1.5, "y": 3},
+ {"matrix": [1, 5], "x": 2.5, "y": 3},
+ {"matrix": [1, 6], "x": 3.5, "y": 3},
+ {"matrix": [1, 7], "x": 4.5, "y": 3},
+ {"matrix": [2, 1], "x": 5.5, "y": 3},
+ {"matrix": [2, 0], "x": 6.5, "y": 3},
+ {"matrix": [4, 0], "x": 7.5, "y": 3},
+ {"matrix": [4, 2], "x": 8.5, "y": 3},
+ {"matrix": [3, 7], "x": 9.5, "y": 3},
+ {"matrix": [4, 3], "x": 10.5, "y": 3},
+ {"matrix": [4, 1], "x": 11.5, "y": 3},
+ {"matrix": [3, 6], "x": 12.5, "y": 3},
+ {"matrix": [5, 2], "x": 13.5, "y": 3, "w": 1.5},
+
+ {"matrix": [14, 5], "x": 15.25, "y": 3},
+ {"matrix": [14, 7], "x": 16.25, "y": 3},
+ {"matrix": [15, 1], "x": 17.25, "y": 3},
+
+ {"matrix": [11, 1], "x": 18.5, "y": 3},
+ {"matrix": [11, 3], "x": 19.5, "y": 3},
+ {"matrix": [11, 4], "x": 20.5, "y": 3},
+ {"matrix": [9, 6], "x": 21.5, "y": 3},
+
+ {"matrix": [7, 1], "x": 0, "y": 4, "w": 1.75},
+ {"matrix": [0, 0], "x": 1.75, "y": 4},
+ {"matrix": [0, 1], "x": 2.75, "y": 4},
+ {"matrix": [0, 2], "x": 3.75, "y": 4},
+ {"matrix": [0, 3], "x": 4.75, "y": 4},
+ {"matrix": [0, 5], "x": 5.75, "y": 4},
+ {"matrix": [0, 4], "x": 6.75, "y": 4},
+ {"matrix": [4, 6], "x": 7.75, "y": 4},
+ {"matrix": [5, 0], "x": 8.75, "y": 4},
+ {"matrix": [4, 5], "x": 9.75, "y": 4},
+ {"matrix": [5, 1], "x": 10.75, "y": 4},
+ {"matrix": [4, 7], "x": 11.75, "y": 4},
+ {"matrix": [4, 4], "x": 12.75, "y": 4, "w": 2.25},
+
+ {"matrix": [10, 6], "x": 18.5, "y": 4},
+ {"matrix": [10, 7], "x": 19.5, "y": 4},
+ {"matrix": [11, 0], "x": 20.5, "y": 4},
+ {"matrix": [8, 5], "x": 21.5, "y": 4},
+
+ {"matrix": [7, 0], "x": 0, "y": 5, "w": 2.25},
+ {"matrix": [0, 6], "x": 2.25, "y": 5},
+ {"matrix": [0, 7], "x": 3.25, "y": 5},
+ {"matrix": [1, 0], "x": 4.25, "y": 5},
+ {"matrix": [1, 1], "x": 5.25, "y": 5},
+ {"matrix": [1, 3], "x": 6.25, "y": 5},
+ {"matrix": [5, 5], "x": 7.25, "y": 5},
+ {"matrix": [5, 6], "x": 8.25, "y": 5},
+ {"matrix": [5, 3], "x": 9.25, "y": 5},
+ {"matrix": [5, 7], "x": 10.25, "y": 5},
+ {"matrix": [5, 4], "x": 11.25, "y": 5},
+ {"matrix": [15, 3], "x": 12.25, "y": 5, "w": 2.75},
+
+ {"matrix": [7, 6], "x": 16.25, "y": 5},
+
+ {"matrix": [10, 3], "x": 18.5, "y": 5},
+ {"matrix": [10, 4], "x": 19.5, "y": 5},
+ {"matrix": [10, 5], "x": 20.5, "y": 5},
+
+ {"matrix": [6, 6], "x": 0, "y": 6, "w": 1.5},
+ {"matrix": [7, 2], "x": 1.5, "y": 6, "w": 1.25},
+ {"matrix": [6, 7], "x": 2.75, "y": 6, "w": 1.5},
+ {"matrix": [6, 1], "x": 4.25, "y": 6, "w": 6.5},
+ {"matrix": [15, 4], "x": 12.25, "y": 6, "w": 1.25},
+ {"matrix": [15, 5], "x": 13.5, "y": 6, "w": 1.5},
+
+ {"matrix": [7, 3], "x": 15.25, "y": 6},
+ {"matrix": [7, 5], "x": 16.25, "y": 6},
+ {"matrix": [7, 4], "x": 17.25, "y": 6},
+
+ {"matrix": [10, 2], "x": 18.5, "y": 6, "w": 2},
+ {"matrix": [8, 1], "x": 20.5, "y": 6},
+ {"matrix": [9, 4], "x": 21.5, "y": 5, "h": 2}
]
},
"LAYOUT_m0116_ansi": {
"layout": [
- {"label":"Power", "x":5, "y":0, "w":2},
- {"label":"Esc", "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":"-", "x":11, "y":1.25},
- {"label":"=", "x":12, "y":1.25},
- {"label":"Delete", "x":13, "y":1.25, "w":1.5},
- {"label":"Clear", "x":15.5, "y":1.25},
- {"label":"Num =", "x":16.5, "y":1.25},
- {"label":"Num /", "x":17.5, "y":1.25},
- {"label":"Num *", "x":18.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":"Num 7", "x":15.5, "y":2.25},
- {"label":"Num 8", "x":16.5, "y":2.25},
- {"label":"Num 9", "x":17.5, "y":2.25},
- {"label":"Num +", "x":18.5, "y":2.25},
- {"label":"Ctrl", "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":"Return", "x":12.75, "y":3.25, "w":1.75},
- {"label":"Num 4", "x":15.5, "y":3.25},
- {"label":"Num 5", "x":16.5, "y":3.25},
- {"label":"Num 6", "x":17.5, "y":3.25},
- {"label":"Num -", "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.25},
- {"label":"Num 1", "x":15.5, "y":4.25},
- {"label":"Num 2", "x":16.5, "y":4.25},
- {"label":"Num 3", "x":17.5, "y":4.25},
- {"label":"Caps Lock", "x":0, "y":5.25},
- {"label":"Option", "x":1, "y":5.25},
- {"label":"Command", "x":2, "y":5.25, "w":1.75},
- {"label":"`", "x":3.75, "y":5.25},
- {"label":"Space", "x":4.75, "y":5.25, "w":4.75},
- {"label":"\\", "x":9.5, "y":5.25},
- {"label":"Left", "x":10.5, "y":5.25},
- {"label":"Right", "x":11.5, "y":5.25},
- {"label":"Down", "x":12.5, "y":5.25},
- {"label":"Up", "x":13.5, "y":5.25},
- {"label":"Num 0", "x":15.5, "y":5.25, "w":2},
- {"label":"Num .", "x":17.5, "y":5.25},
- {"label":"Num Enter", "x":18.5, "y":4.25, "h":2}
+ {"matrix": [15, 7], "x": 5, "y": 0, "w": 2},
+
+ {"matrix": [6, 5], "x": 0, "y": 1.25},
+ {"matrix": [2, 2], "x": 1, "y": 1.25},
+ {"matrix": [2, 3], "x": 2, "y": 1.25},
+ {"matrix": [2, 4], "x": 3, "y": 1.25},
+ {"matrix": [2, 5], "x": 4, "y": 1.25},
+ {"matrix": [2, 7], "x": 5, "y": 1.25},
+ {"matrix": [2, 6], "x": 6, "y": 1.25},
+ {"matrix": [3, 2], "x": 7, "y": 1.25},
+ {"matrix": [3, 4], "x": 8, "y": 1.25},
+ {"matrix": [3, 1], "x": 9, "y": 1.25},
+ {"matrix": [3, 5], "x": 10, "y": 1.25},
+ {"matrix": [3, 3], "x": 11, "y": 1.25},
+ {"matrix": [3, 0], "x": 12, "y": 1.25},
+ {"matrix": [6, 3], "x": 13, "y": 1.25, "w": 1.5},
+
+ {"matrix": [8, 7], "x": 15.5, "y": 1.25},
+ {"matrix": [10, 1], "x": 16.5, "y": 1.25},
+ {"matrix": [9, 3], "x": 17.5, "y": 1.25},
+ {"matrix": [8, 3], "x": 18.5, "y": 1.25},
+
+ {"matrix": [6, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [1, 4], "x": 1.5, "y": 2.25},
+ {"matrix": [1, 5], "x": 2.5, "y": 2.25},
+ {"matrix": [1, 6], "x": 3.5, "y": 2.25},
+ {"matrix": [1, 7], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 1], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 0], "x": 6.5, "y": 2.25},
+ {"matrix": [4, 0], "x": 7.5, "y": 2.25},
+ {"matrix": [4, 2], "x": 8.5, "y": 2.25},
+ {"matrix": [3, 7], "x": 9.5, "y": 2.25},
+ {"matrix": [4, 3], "x": 10.5, "y": 2.25},
+ {"matrix": [4, 1], "x": 11.5, "y": 2.25},
+ {"matrix": [3, 6], "x": 12.5, "y": 2.25},
+
+ {"matrix": [11, 1], "x": 15.5, "y": 2.25},
+ {"matrix": [11, 3], "x": 16.5, "y": 2.25},
+ {"matrix": [11, 4], "x": 17.5, "y": 2.25},
+ {"matrix": [8, 5], "x": 18.5, "y": 2.25},
+
+ {"matrix": [6, 6], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [0, 0], "x": 1.75, "y": 3.25},
+ {"matrix": [0, 1], "x": 2.75, "y": 3.25},
+ {"matrix": [0, 2], "x": 3.75, "y": 3.25},
+ {"matrix": [0, 3], "x": 4.75, "y": 3.25},
+ {"matrix": [0, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [0, 4], "x": 6.75, "y": 3.25},
+ {"matrix": [4, 6], "x": 7.75, "y": 3.25},
+ {"matrix": [5, 0], "x": 8.75, "y": 3.25},
+ {"matrix": [4, 5], "x": 9.75, "y": 3.25},
+ {"matrix": [5, 1], "x": 10.75, "y": 3.25},
+ {"matrix": [4, 7], "x": 11.75, "y": 3.25},
+ {"matrix": [4, 4], "x": 12.75, "y": 3.25, "w": 1.75},
+
+ {"matrix": [10, 6], "x": 15.5, "y": 3.25},
+ {"matrix": [10, 7], "x": 16.5, "y": 3.25},
+ {"matrix": [11, 0], "x": 17.5, "y": 3.25},
+ {"matrix": [9, 6], "x": 18.5, "y": 3.25},
+
+ {"matrix": [7, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [0, 6], "x": 2.25, "y": 4.25},
+ {"matrix": [0, 7], "x": 3.25, "y": 4.25},
+ {"matrix": [1, 0], "x": 4.25, "y": 4.25},
+ {"matrix": [1, 1], "x": 5.25, "y": 4.25},
+ {"matrix": [1, 3], "x": 6.25, "y": 4.25},
+ {"matrix": [5, 5], "x": 7.25, "y": 4.25},
+ {"matrix": [5, 6], "x": 8.25, "y": 4.25},
+ {"matrix": [5, 3], "x": 9.25, "y": 4.25},
+ {"matrix": [5, 7], "x": 10.25, "y": 4.25},
+ {"matrix": [5, 4], "x": 11.25, "y": 4.25},
+ {"matrix": [15, 3], "x": 12.25, "y": 4.25, "w": 2.25},
+
+ {"matrix": [10, 3], "x": 15.5, "y": 4.25},
+ {"matrix": [10, 4], "x": 16.5, "y": 4.25},
+ {"matrix": [10, 5], "x": 17.5, "y": 4.25},
+
+ {"matrix": [7, 1], "x": 0, "y": 5.25},
+ {"matrix": [7, 2], "x": 1, "y": 5.25},
+ {"matrix": [6, 7], "x": 2, "y": 5.25, "w": 1.75},
+ {"matrix": [6, 2], "x": 3.75, "y": 5.25},
+ {"matrix": [6, 1], "x": 4.75, "y": 5.25, "w": 4.75},
+ {"matrix": [5, 2], "x": 9.5, "y": 5.25},
+ {"matrix": [7, 3], "x": 10.5, "y": 5.25},
+ {"matrix": [7, 4], "x": 11.5, "y": 5.25},
+ {"matrix": [7, 5], "x": 12.5, "y": 5.25},
+ {"matrix": [7, 6], "x": 13.5, "y": 5.25},
+
+ {"matrix": [10, 2], "x": 15.5, "y": 5.25, "w": 2},
+ {"matrix": [8, 1], "x": 17.5, "y": 5.25},
+ {"matrix": [9, 4], "x": 18.5, "y": 4.25, "h": 2}
]
}
}
diff --git a/keyboards/converter/m0110_usb/info.json b/keyboards/converter/m0110_usb/info.json
index 86aae250df..1869d2dacb 100644
--- a/keyboards/converter/m0110_usb/info.json
+++ b/keyboards/converter/m0110_usb/info.json
@@ -13,163 +13,182 @@
"layouts": {
"LAYOUT_ansi": {
"layout": [
- {"label":"`", "x":0, "y":0},
- {"label":"1", "x":1, "y":0},
- {"label":"2", "x":2, "y":0},
- {"label":"3", "x":3, "y":0},
- {"label":"4", "x":4, "y":0},
- {"label":"5", "x":5, "y":0},
- {"label":"6", "x":6, "y":0},
- {"label":"7", "x":7, "y":0},
- {"label":"8", "x":8, "y":0},
- {"label":"9", "x":9, "y":0},
- {"label":"0", "x":10, "y":0},
- {"label":"-", "x":11, "y":0},
- {"label":"=", "x":12, "y":0},
- {"label":"Backspace", "x":13, "y":0, "w":1.5},
- {"label":"Num Lock", "x":15.25, "y":0},
- {"label":"=", "x":16.25, "y":0},
- {"label":"/", "x":17.25, "y":0},
- {"label":"*", "x":18.25, "y":0},
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"Q", "x":1.5, "y":1},
- {"label":"W", "x":2.5, "y":1},
- {"label":"E", "x":3.5, "y":1},
- {"label":"R", "x":4.5, "y":1},
- {"label":"T", "x":5.5, "y":1},
- {"label":"Y", "x":6.5, "y":1},
- {"label":"U", "x":7.5, "y":1},
- {"label":"I", "x":8.5, "y":1},
- {"label":"O", "x":9.5, "y":1},
- {"label":"P", "x":10.5, "y":1},
- {"label":"[", "x":11.5, "y":1},
- {"label":"]", "x":12.5, "y":1},
- {"label":"7", "x":15.25, "y":1},
- {"label":"8", "x":16.25, "y":1},
- {"label":"9", "x":17.25, "y":1},
- {"label":"-", "x":18.25, "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":"Enter", "x":12.75, "y":2, "w":1.75},
- {"label":"4", "x":15.25, "y":2},
- {"label":"5", "x":16.25, "y":2},
- {"label":"6", "x":17.25, "y":2},
- {"label":"+", "x":18.25, "y":2},
- {"label":"Shift", "x":0, "y":3, "w":2.25},
- {"label":"Z", "x":2.25, "y":3},
- {"label":"X", "x":3.25, "y":3},
- {"label":"C", "x":4.25, "y":3},
- {"label":"V", "x":5.25, "y":3},
- {"label":"B", "x":6.25, "y":3},
- {"label":"N", "x":7.25, "y":3},
- {"label":"M", "x":8.25, "y":3},
- {"label":",", "x":9.25, "y":3},
- {"label":".", "x":10.25, "y":3},
- {"label":"/", "x":11.25, "y":3},
- {"label":"Up", "x":13.5, "y":3},
- {"label":"1", "x":15.25, "y":3},
- {"label":"2", "x":16.25, "y":3},
- {"label":"3", "x":17.25, "y":3},
- {"label":"Enter", "x":18.25, "y":3, "h":2},
- {"label":"Alt", "x":0, "y":4, "w":1.5},
- {"label":"GUI", "x":1.5, "y":4, "w":2},
- {"label":"Space", "x":3.5, "y":4, "w":6},
- {"label":"MO(1)", "x":9.5, "y":4},
- {"label":"\\", "x":10.5, "y":4},
- {"label":"Left", "x":11.5, "y":4},
- {"label":"Right", "x":12.5, "y":4},
- {"label":"Down", "x":13.5, "y":4},
- {"label":"0", "x":15.25, "y":4, "w":2},
- {"label":".", "x":17.25, "y":4}
+ {"matrix": [6, 2], "x": 0, "y": 0},
+ {"matrix": [2, 2], "x": 1, "y": 0},
+ {"matrix": [2, 3], "x": 2, "y": 0},
+ {"matrix": [2, 4], "x": 3, "y": 0},
+ {"matrix": [2, 5], "x": 4, "y": 0},
+ {"matrix": [2, 7], "x": 5, "y": 0},
+ {"matrix": [2, 6], "x": 6, "y": 0},
+ {"matrix": [3, 2], "x": 7, "y": 0},
+ {"matrix": [3, 4], "x": 8, "y": 0},
+ {"matrix": [3, 1], "x": 9, "y": 0},
+ {"matrix": [3, 5], "x": 10, "y": 0},
+ {"matrix": [3, 3], "x": 11, "y": 0},
+ {"matrix": [3, 0], "x": 12, "y": 0},
+ {"matrix": [6, 3], "x": 13, "y": 0, "w": 1.5},
+
+ {"matrix": [8, 7], "x": 15.25, "y": 0},
+ {"matrix": [13, 0], "x": 16.25, "y": 0},
+ {"matrix": [13, 5], "x": 17.25, "y": 0},
+ {"matrix": [12, 2], "x": 18.25, "y": 0},
+
+ {"matrix": [6, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 4], "x": 1.5, "y": 1},
+ {"matrix": [1, 5], "x": 2.5, "y": 1},
+ {"matrix": [1, 6], "x": 3.5, "y": 1},
+ {"matrix": [1, 7], "x": 4.5, "y": 1},
+ {"matrix": [2, 1], "x": 5.5, "y": 1},
+ {"matrix": [2, 0], "x": 6.5, "y": 1},
+ {"matrix": [4, 0], "x": 7.5, "y": 1},
+ {"matrix": [4, 2], "x": 8.5, "y": 1},
+ {"matrix": [3, 7], "x": 9.5, "y": 1},
+ {"matrix": [4, 3], "x": 10.5, "y": 1},
+ {"matrix": [4, 1], "x": 11.5, "y": 1},
+ {"matrix": [3, 6], "x": 12.5, "y": 1},
+
+ {"matrix": [11, 1], "x": 15.25, "y": 1},
+ {"matrix": [11, 3], "x": 16.25, "y": 1},
+ {"matrix": [11, 4], "x": 17.25, "y": 1},
+ {"matrix": [9, 6], "x": 18.25, "y": 1},
+
+ {"matrix": [7, 1], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [0, 0], "x": 1.75, "y": 2},
+ {"matrix": [0, 1], "x": 2.75, "y": 2},
+ {"matrix": [0, 2], "x": 3.75, "y": 2},
+ {"matrix": [0, 3], "x": 4.75, "y": 2},
+ {"matrix": [0, 5], "x": 5.75, "y": 2},
+ {"matrix": [0, 4], "x": 6.75, "y": 2},
+ {"matrix": [4, 6], "x": 7.75, "y": 2},
+ {"matrix": [5, 0], "x": 8.75, "y": 2},
+ {"matrix": [4, 5], "x": 9.75, "y": 2},
+ {"matrix": [5, 1], "x": 10.75, "y": 2},
+ {"matrix": [4, 7], "x": 11.75, "y": 2},
+ {"matrix": [4, 4], "x": 12.75, "y": 2, "w": 1.75},
+
+ {"matrix": [10, 6], "x": 15.25, "y": 2},
+ {"matrix": [10, 7], "x": 16.25, "y": 2},
+ {"matrix": [11, 0], "x": 17.25, "y": 2},
+ {"matrix": [12, 6], "x": 18.25, "y": 2},
+
+ {"matrix": [7, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [0, 6], "x": 2.25, "y": 3},
+ {"matrix": [0, 7], "x": 3.25, "y": 3},
+ {"matrix": [1, 0], "x": 4.25, "y": 3},
+ {"matrix": [1, 1], "x": 5.25, "y": 3},
+ {"matrix": [1, 3], "x": 6.25, "y": 3},
+ {"matrix": [5, 5], "x": 7.25, "y": 3},
+ {"matrix": [5, 6], "x": 8.25, "y": 3},
+ {"matrix": [5, 3], "x": 9.25, "y": 3},
+ {"matrix": [5, 7], "x": 10.25, "y": 3},
+ {"matrix": [5, 4], "x": 11.25, "y": 3},
+
+ {"matrix": [9, 5], "x": 13.5, "y": 3},
+
+ {"matrix": [10, 3], "x": 15.25, "y": 3},
+ {"matrix": [10, 4], "x": 16.25, "y": 3},
+ {"matrix": [10, 5], "x": 17.25, "y": 3},
+ {"matrix": [9, 4], "x": 18.25, "y": 3, "h": 2},
+
+ {"matrix": [7, 2], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [6, 7], "x": 1.5, "y": 4, "w": 2},
+ {"matrix": [6, 1], "x": 3.5, "y": 4, "w": 6},
+ {"matrix": [6, 4], "x": 9.5, "y": 4},
+ {"matrix": [5, 2], "x": 10.5, "y": 4},
+ {"matrix": [8, 6], "x": 11.5, "y": 4},
+ {"matrix": [8, 2], "x": 12.5, "y": 4},
+ {"matrix": [9, 0], "x": 13.5, "y": 4},
+
+ {"matrix": [10, 2], "x": 15.25, "y": 4, "w": 2},
+ {"matrix": [8, 1], "x": 17.25, "y": 4}
]
},
"LAYOUT_iso": {
"layout": [
- {"label":"`", "x":0, "y":0},
- {"label":"1", "x":1, "y":0},
- {"label":"2", "x":2, "y":0},
- {"label":"3", "x":3, "y":0},
- {"label":"4", "x":4, "y":0},
- {"label":"5", "x":5, "y":0},
- {"label":"6", "x":6, "y":0},
- {"label":"7", "x":7, "y":0},
- {"label":"8", "x":8, "y":0},
- {"label":"9", "x":9, "y":0},
- {"label":"0", "x":10, "y":0},
- {"label":"-", "x":11, "y":0},
- {"label":"=", "x":12, "y":0},
- {"label":"Backspace", "x":13, "y":0, "w":1.5},
- {"label":"Num Lock", "x":15.25, "y":0},
- {"label":"=", "x":16.25, "y":0},
- {"label":"/", "x":17.25, "y":0},
- {"label":"*", "x":18.25, "y":0},
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"Q", "x":1.5, "y":1},
- {"label":"W", "x":2.5, "y":1},
- {"label":"E", "x":3.5, "y":1},
- {"label":"R", "x":4.5, "y":1},
- {"label":"T", "x":5.5, "y":1},
- {"label":"Y", "x":6.5, "y":1},
- {"label":"U", "x":7.5, "y":1},
- {"label":"I", "x":8.5, "y":1},
- {"label":"O", "x":9.5, "y":1},
- {"label":"P", "x":10.5, "y":1},
- {"label":"[", "x":11.5, "y":1},
- {"label":"]", "x":12.5, "y":1},
- {"label":"Return", "x":13.75, "y":1, "w":0.75, "h":2},
- {"label":"7", "x":15.25, "y":1},
- {"label":"8", "x":16.25, "y":1},
- {"label":"9", "x":17.25, "y":1},
- {"label":"-", "x":18.25, "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":"4", "x":15.25, "y":2},
- {"label":"5", "x":16.25, "y":2},
- {"label":"6", "x":17.25, "y":2},
- {"label":"+", "x":18.25, "y":2},
- {"label":"Shift", "x":0, "y":3, "w":1.25},
- {"label":"\\", "x":1.25, "y":3},
- {"label":"Z", "x":2.25, "y":3},
- {"label":"X", "x":3.25, "y":3},
- {"label":"C", "x":4.25, "y":3},
- {"label":"V", "x":5.25, "y":3},
- {"label":"B", "x":6.25, "y":3},
- {"label":"N", "x":7.25, "y":3},
- {"label":"M", "x":8.25, "y":3},
- {"label":",", "x":9.25, "y":3},
- {"label":".", "x":10.25, "y":3},
- {"label":"/", "x":11.25, "y":3},
- {"label":"1", "x":15.25, "y":3},
- {"label":"2", "x":16.25, "y":3},
- {"label":"3", "x":17.25, "y":3},
- {"label":"Enter", "x":18.25, "y":3, "h":2},
- {"label":"Option", "x":1, "y":4},
- {"label":"GUI", "x":2, "y":4, "w":1.5},
- {"label":"Space", "x":3.5, "y":4, "w":7.5},
- {"label":"Enter", "x":11, "y":4, "w":1.5},
- {"label":"0", "x":15.25, "y":4, "w":2},
- {"label":".", "x":17.25, "y":4}
+ {"matrix": [6, 2], "x": 0, "y": 0},
+ {"matrix": [2, 2], "x": 1, "y": 0},
+ {"matrix": [2, 3], "x": 2, "y": 0},
+ {"matrix": [2, 4], "x": 3, "y": 0},
+ {"matrix": [2, 5], "x": 4, "y": 0},
+ {"matrix": [2, 7], "x": 5, "y": 0},
+ {"matrix": [2, 6], "x": 6, "y": 0},
+ {"matrix": [3, 2], "x": 7, "y": 0},
+ {"matrix": [3, 4], "x": 8, "y": 0},
+ {"matrix": [3, 1], "x": 9, "y": 0},
+ {"matrix": [3, 5], "x": 10, "y": 0},
+ {"matrix": [3, 3], "x": 11, "y": 0},
+ {"matrix": [3, 0], "x": 12, "y": 0},
+ {"matrix": [6, 3], "x": 13, "y": 0, "w": 1.5},
+
+ {"matrix": [8, 7], "x": 15.25, "y": 0},
+ {"matrix": [13, 0], "x": 16.25, "y": 0},
+ {"matrix": [13, 5], "x": 17.25, "y": 0},
+ {"matrix": [12, 2], "x": 18.25, "y": 0},
+
+ {"matrix": [6, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 4], "x": 1.5, "y": 1},
+ {"matrix": [1, 5], "x": 2.5, "y": 1},
+ {"matrix": [1, 6], "x": 3.5, "y": 1},
+ {"matrix": [1, 7], "x": 4.5, "y": 1},
+ {"matrix": [2, 1], "x": 5.5, "y": 1},
+ {"matrix": [2, 0], "x": 6.5, "y": 1},
+ {"matrix": [4, 0], "x": 7.5, "y": 1},
+ {"matrix": [4, 2], "x": 8.5, "y": 1},
+ {"matrix": [3, 7], "x": 9.5, "y": 1},
+ {"matrix": [4, 3], "x": 10.5, "y": 1},
+ {"matrix": [4, 1], "x": 11.5, "y": 1},
+ {"matrix": [3, 6], "x": 12.5, "y": 1},
+ {"matrix": [5, 2], "x": 13.75, "y": 1, "w": 0.75, "h": 2},
+
+ {"matrix": [11, 1], "x": 15.25, "y": 1},
+ {"matrix": [11, 3], "x": 16.25, "y": 1},
+ {"matrix": [11, 4], "x": 17.25, "y": 1},
+ {"matrix": [9, 6], "x": 18.25, "y": 1},
+
+ {"matrix": [7, 1], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [0, 0], "x": 1.75, "y": 2},
+ {"matrix": [0, 1], "x": 2.75, "y": 2},
+ {"matrix": [0, 2], "x": 3.75, "y": 2},
+ {"matrix": [0, 3], "x": 4.75, "y": 2},
+ {"matrix": [0, 5], "x": 5.75, "y": 2},
+ {"matrix": [0, 4], "x": 6.75, "y": 2},
+ {"matrix": [4, 6], "x": 7.75, "y": 2},
+ {"matrix": [5, 0], "x": 8.75, "y": 2},
+ {"matrix": [4, 5], "x": 9.75, "y": 2},
+ {"matrix": [5, 1], "x": 10.75, "y": 2},
+ {"matrix": [4, 7], "x": 11.75, "y": 2},
+ {"matrix": [4, 4], "x": 12.75, "y": 2},
+
+ {"matrix": [10, 6], "x": 15.25, "y": 2},
+ {"matrix": [10, 7], "x": 16.25, "y": 2},
+ {"matrix": [11, 0], "x": 17.25, "y": 2},
+ {"matrix": [12, 6], "x": 18.25, "y": 2},
+
+ {"matrix": [7, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [0, 6], "x": 1.25, "y": 3},
+ {"matrix": [0, 7], "x": 2.25, "y": 3},
+ {"matrix": [1, 0], "x": 3.25, "y": 3},
+ {"matrix": [1, 1], "x": 4.25, "y": 3},
+ {"matrix": [1, 3], "x": 5.25, "y": 3},
+ {"matrix": [5, 5], "x": 6.25, "y": 3},
+ {"matrix": [5, 6], "x": 7.25, "y": 3},
+ {"matrix": [5, 3], "x": 8.25, "y": 3},
+ {"matrix": [5, 7], "x": 9.25, "y": 3},
+ {"matrix": [5, 4], "x": 10.25, "y": 3},
+ {"matrix": [1, 2], "x": 11.25, "y": 3},
+
+ {"matrix": [10, 3], "x": 15.25, "y": 3},
+ {"matrix": [10, 4], "x": 16.25, "y": 3},
+ {"matrix": [10, 5], "x": 17.25, "y": 3},
+ {"matrix": [9, 4], "x": 18.25, "y": 3, "h": 2},
+
+ {"matrix": [7, 2], "x": 1, "y": 4},
+ {"matrix": [6, 7], "x": 2, "y": 4, "w": 1.5},
+ {"matrix": [6, 4], "x": 3.5, "y": 4, "w": 7.5},
+ {"matrix": [6, 1], "x": 11, "y": 4, "w": 1.5},
+
+ {"matrix": [10, 2], "x": 15.25, "y": 4, "w": 2},
+ {"matrix": [8, 1], "x": 17.25, "y": 4}
]
}
}
diff --git a/keyboards/converter/m0110_usb/m0110_usb.h b/keyboards/converter/m0110_usb/m0110_usb.h
deleted file mode 100644
index 944296afdc..0000000000
--- a/keyboards/converter/m0110_usb/m0110_usb.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
-Copyright 2011,2012,2014,2015 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/>.
-
---------------
-
-Ported to QMK by Techsock <info@techsock.com>
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* Common layout for M0110 and M0110A
- * This keymap works with both keyboards. As you can see, the M0110A is
- * a superset of M0110 keyboard, only one exception is 'Enter'(34) of M0110
- * does not exist on the M0110A.
- *
- * ,---------------------------------------------------------. ,---------------.
- * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backs| |Clr| =| /| *|
- * |---------------------------------------------------------| |---------------|
- * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| | | 7| 8| 9| -|
- * |-----------------------------------------------------' | |---------------|
- * |Caps | A| S| D| F| G| H| J| K| L| ;| '|Return| | 4| 5| 6| +|
- * |---------------------------------------------------------| |---------------|
- * |Shift | Z| X| C| V| B| N| M| ,| ,| /|Shft|Up | | 1| 2| 3| |
- * |---------------------------------------------------------| |-----------|Ent|
- * |Opt |Mac | Space |Ent| \|Lft|Rgt|Dn | | 0| .| |
- * `---------------------------------------------------------' `---------------'
- *
- * M0110A scan codes
- * ,---------------------------------------------------------. ,---------------.
- * | 32| 12| 13| 14| 15| 17| 16| 1A| 1C| 19| 1D| 1B| 18| 33| | 47| 68| 6D| 62|
- * |---------------------------------------------------------| |---------------|
- * | 30| 0C| 0D| 0E| 0F| 11| 10| 20| 22| 1F| 23| 21| 1E| | | 59| 5B| 5C| 4E|
- * |-----------------------------------------------------' | |---------------|
- * | 39| 00| 01| 02| 03| 05| 04| 26| 28| 25| 29| 27| 24| | 56| 57| 58| 66|
- * |---------------------------------------------------------| |---------------|
- * | 38| 06| 07| 08| 09| 0B| 2D| 2E| 2B| 2F| 2C| 38| 4D| | 53| 54| 55| |
- * `---------------------------------------------------------' |-----------| 4C|
- * | 3A| 37| 31 | 2A| 46| 42| 48| | 52| 41| |
- * `---------------------------------------------------------' `---------------'
- *
- * M0110 + M0120 scan codes
- * ,---------------------------------------------------------. ,---------------.
- * | 32| 12| 13| 14| 15| 17| 16| 1A| 1C| 19| 1D| 1B| 18| 33| | 47| 68| 6D| 62|
- * |---------------------------------------------------------| |---------------|
- * | 30| 0C| 0D| 0E| 0F| 11| 10| 20| 22| 1F| 23| 21| 1E| 2A| | 59| 5B| 5C| 4E|
- * |---------------------------------------------------------| |---------------|
- * | 39| 00| 01| 02| 03| 05| 04| 26| 28| 25| 29| 27| 24| | 56| 57| 58| 66|
- * |---------------------------------------------------------| |---------------|
- * | 38| 06| 07| 08| 09| 0B| 2D| 2E| 2B| 2F| 2C| 38| | 53| 54| 55| |
- * `---------------------------------------------------------' |-----------| 4C|
- * | 3A| 37| 31 | 34| 3A| | 52| 41| |
- * `------------------------------------------------' `---------------'
- * Two right and left keys of 38 and 3A are identical, you cannot discriminate those two.
- */
-#define LAYOUT_ansi( \
- K32, K12, K13, K14, K15, K17, K16, K1A, K1C, K19, K1D, K1B, K18, K33, K47, K68, K6D, K62, \
- K30, K0C, K0D, K0E, K0F, K11, K10, K20, K22, K1F, K23, K21, K1E, K59, K5B, K5C, K4E, \
- K39, K00, K01, K02, K03, K05, K04, K26, K28, K25, K29, K27, K24, K56, K57, K58, K66, \
- K38, K06, K07, K08, K09, K0B, K2D, K2E, K2B, K2F, K2C, K4D, K53, K54, K55, K4C, \
- K3A, K37, K31, K34, K2A, K46, K42, K48, K52, K41 \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07 }, \
- { K08, K09, XXX, 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, XXX, XXX, K37 }, \
- { K38, K39, K3A, XXX, XXX, XXX, XXX, XXX }, \
- { XXX, K41, K42, XXX, XXX, XXX, K46, K47 }, \
- { K48, XXX, XXX, XXX, K4C, K4D, K4E, XXX }, \
- { XXX, XXX, K52, K53, K54, K55, K56, K57 }, \
- { K58, K59, XXX, K5B, K5C, XXX, XXX, XXX }, \
- { XXX, XXX, K62, XXX, XXX, XXX, K66, XXX }, \
- { K68, XXX, XXX, XXX, XXX, K6D, XXX, XXX } \
-}
-
-/* International keyboard layout for M0110 + M0120
- * https://en.wikipedia.org/wiki/File:Apple_Macintosh_Plus_Keyboard.jpg
- * Probably International keyboard layout of M0110A doesn't exist.
- *
- * M0110 + M0120 scan codes
- * ,---------------------------------------------------------. ,---------------.
- * | 32| 12| 13| 14| 15| 17| 16| 1A| 1C| 19| 1D| 1B| 18| 33| | 47| 68| 6D| 62|
- * |---------------------------------------------------------| |---------------|
- * | 30| 0C| 0D| 0E| 0F| 11| 10| 20| 22| 1F| 23| 21| 1E| 2A| | 59| 5B| 5C| 4E|
- * |------------------------------------------------------, | |---------------|
- * | 39| 00| 01| 02| 03| 05| 04| 26| 28| 25| 29| 27| 24| | | 56| 57| 58| 66|
- * |---------------------------------------------------------| |---------------|
- * | 38| 06| 07| 08| 09| 0B| 2D| 2E| 2B| 2F| 2C| 0A| 38| | 53| 54| 55| |
- * `---------------------------------------------------------' |-----------| 4C|
- * | 3A| 37| 34 | 31| 3A| | 52| 41| |
- * `------------------------------------------------' `---------------'
- * Two right and left keys of 38 and 3A are identical, you cannot discriminate those two.
- */
-#define LAYOUT_iso( \
- K32, K12, K13, K14, K15, K17, K16, K1A, K1C, K19, K1D, K1B, K18, K33, K47, K68, K6D, K62, \
- K30, K0C, K0D, K0E, K0F, K11, K10, K20, K22, K1F, K23, K21, K1E, K2A, K59, K5B, K5C, K4E, \
- K39, K00, K01, K02, K03, K05, K04, K26, K28, K25, K29, K27, K24, K56, K57, K58, K66, \
- K38, K06, K07, K08, K09, K0B, K2D, K2E, K2B, K2F, K2C, K0A, K53, K54, K55, K4C, \
- K3A, K37, K34, K31, K52, K41 \
-) { \
- { 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, XXX, XXX, K37 }, \
- { K38, K39, K3A, XXX, XXX, XXX, XXX, XXX }, \
- { XXX, K41, XXX, XXX, XXX, XXX, XXX, K47 }, \
- { XXX, XXX, XXX, XXX, K4C, XXX, K4E, XXX }, \
- { XXX, XXX, K52, K53, K54, K55, K56, K57 }, \
- { K58, K59, XXX, K5B, K5C, XXX, XXX, XXX }, \
- { XXX, XXX, K62, XXX, XXX, XXX, K66, XXX }, \
- { K68, XXX, XXX, XXX, XXX, K6D, XXX, XXX } \
-}
diff --git a/keyboards/converter/sun_usb/type5/info.json b/keyboards/converter/sun_usb/type5/info.json
index 23d80c4121..c26e85a65b 100644
--- a/keyboards/converter/sun_usb/type5/info.json
+++ b/keyboards/converter/sun_usb/type5/info.json
@@ -2,373 +2,448 @@
"layouts": {
"LAYOUT_jp_unix": {
"layout": [
- {"label":"HELP", "x":0, "y":0, "w":2},
- {"label":"NO", "x":2.25, "y":0},
- {"label":"F1", "x":4.25, "y":0},
- {"label":"F2", "x":5.25, "y":0},
- {"label":"F3", "x":6.25, "y":0},
- {"label":"F4", "x":7.25, "y":0},
- {"label":"F5", "x":8.75, "y":0},
- {"label":"F6", "x":9.75, "y":0},
- {"label":"F7", "x":10.75, "y":0},
- {"label":"F8", "x":11.75, "y":0},
- {"label":"F9", "x":13.25, "y":0},
- {"label":"F10", "x":14.25, "y":0},
- {"label":"F11", "x":15.25, "y":0},
- {"label":"F12", "x":16.25, "y":0},
- {"label":"PRINT SCREEN", "x":17.5, "y":0},
- {"label":"SCROLL LOCK", "x":18.5, "y":0},
- {"label":"PAUSE", "x":19.5, "y":0},
- {"label":"MUTE", "x":20.75, "y":0},
- {"label":"VOLD", "x":21.75, "y":0},
- {"label":"VOLU", "x":22.75, "y":0},
- {"label":"PWR", "x":23.75, "y":0},
- {"label":"STOP", "x":0, "y":2},
- {"label":"AGAIN", "x":1, "y":2},
- {"label":"ESC", "x":2.25, "y":2},
- {"label":"1", "x":3.25, "y":2},
- {"label":"2", "x":4.25, "y":2},
- {"label":"3", "x":5.25, "y":2},
- {"label":"4", "x":6.25, "y":2},
- {"label":"5", "x":7.25, "y":2},
- {"label":"6", "x":8.25, "y":2},
- {"label":"7", "x":9.25, "y":2},
- {"label":"8", "x":10.25, "y":2},
- {"label":"9", "x":11.25, "y":2},
- {"label":"0", "x":12.25, "y":2},
- {"label":"MINUS", "x":13.25, "y":2},
- {"label":"EQUAL", "x":14.25, "y":2},
- {"label":"BACKSLASH", "x":15.25, "y":2},
- {"label":"GRAVE", "x":16.25, "y":2},
- {"label":"INSERT", "x":17.5, "y":2},
- {"label":"HOME", "x":18.5, "y":2},
- {"label":"PAGE UP", "x":19.5, "y":2},
- {"label":"NUM LOCK", "x":20.75, "y":2},
- {"label":"PSLASH", "x":21.75, "y":2},
- {"label":"PASTERISK", "x":22.75, "y":2},
- {"label":"PMINUS", "x":23.75, "y":2},
- {"label":"MENU", "x":0, "y":3},
- {"label":"UNDO", "x":1, "y":3},
- {"label":"TAB", "x":2.25, "y":3, "w":1.5},
- {"label":"Q", "x":3.75, "y":3},
- {"label":"W", "x":4.75, "y":3},
- {"label":"E", "x":5.75, "y":3},
- {"label":"R", "x":6.75, "y":3},
- {"label":"T", "x":7.75, "y":3},
- {"label":"Y", "x":8.75, "y":3},
- {"label":"U", "x":9.75, "y":3},
- {"label":"I", "x":10.75, "y":3},
- {"label":"O", "x":11.75, "y":3},
- {"label":"P", "x":12.75, "y":3},
- {"label":"LBRACKET", "x":13.75, "y":3},
- {"label":"RBRACKET", "x":14.75, "y":3},
- {"label":"BACKSPACE", "x":15.75, "y":3, "w":1.5},
- {"label":"DELETE", "x":17.5, "y":3},
- {"label":"END", "x":18.5, "y":3},
- {"label":"PAGE DOWN", "x":19.5, "y":3},
- {"label":"P7", "x":20.75, "y":3},
- {"label":"P8", "x":21.75, "y":3},
- {"label":"P9", "x":22.75, "y":3},
- {"label":"PPLUS", "x":23.75, "y":3, "h":2},
- {"label":"SELECT", "x":0, "y":4},
- {"label":"COPY", "x":1, "y":4},
- {"label":"LCTRL", "x":2.25, "y":4, "w":1.75},
- {"label":"A", "x":4, "y":4},
- {"label":"S", "x":5, "y":4},
- {"label":"D", "x":6, "y":4},
- {"label":"F", "x":7, "y":4},
- {"label":"G", "x":8, "y":4},
- {"label":"H", "x":9, "y":4},
- {"label":"J", "x":10, "y":4},
- {"label":"K", "x":11, "y":4},
- {"label":"L", "x":12, "y":4},
- {"label":"SEMICOLON", "x":13, "y":4},
- {"label":"QUOTE", "x":14, "y":4},
- {"label":"ENTER", "x":15, "y":4, "w":2.25},
- {"label":"P4", "x":20.75, "y":4},
- {"label":"P5", "x":21.75, "y":4},
- {"label":"P6", "x":22.75, "y":4},
- {"label":"EXECUTE", "x":0, "y":5},
- {"label":"PASTE", "x":1, "y":5},
- {"label":"LSHIFT", "x":2.25, "y":5, "w":2.25},
- {"label":"Z", "x":4.5, "y":5},
- {"label":"X", "x":5.5, "y":5},
- {"label":"C", "x":6.5, "y":5},
- {"label":"V", "x":7.5, "y":5},
- {"label":"B", "x":8.5, "y":5},
- {"label":"N", "x":9.5, "y":5},
- {"label":"M", "x":10.5, "y":5},
- {"label":"COMMA", "x":11.5, "y":5},
- {"label":"PERIOD", "x":12.5, "y":5},
- {"label":"SLASH", "x":13.5, "y":5},
- {"label":"RSHIFT", "x":14.5, "y":5, "w":2.75},
- {"label":"UP", "x":18.5, "y":5},
- {"label":"P1", "x":20.75, "y":5},
- {"label":"P2", "x":21.75, "y":5},
- {"label":"P3", "x":22.75, "y":5},
- {"label":"PENTER", "x":23.75, "y":5, "h":2},
- {"label":"FIND", "x":0, "y":6},
- {"label":"CUT", "x":1, "y":6},
- {"label":"CAPS LOCK", "x":2.25, "y":6},
- {"label":"LALT", "x":3.25, "y":6},
- {"label":"LGUI", "x":4.25, "y":6},
- {"label":"HENKAN", "x":5.25, "y":6, "w":1.5},
- {"label":"SPACE", "x":6.75, "y":6, "w":5},
- {"label":"MUHENKAN", "x":11.75, "y":6, "w":1.5},
- {"label":"KANA", "x":13.25, "y":6},
- {"label":"RGUI", "x":14.25, "y":6},
- {"label":"APP", "x":15.25, "y":6},
- {"label":"RALT", "x":16.25, "y":6},
- {"label":"LEFT", "x":17.5, "y":6},
- {"label":"DOWN", "x":18.5, "y":6},
- {"label":"RIGHT", "x":19.5, "y":6},
- {"label":"P0", "x":20.75, "y":6, "w":2},
- {"label":"PDOT", "x":22.75, "y":6}
+ {"matrix": [14, 6], "x": 0, "y": 0, "w": 2},
+
+ {"matrix": [1, 7], "x": 2.25, "y": 0},
+
+ {"matrix": [0, 5], "x": 4.25, "y": 0},
+ {"matrix": [0, 6], "x": 5.25, "y": 0},
+ {"matrix": [1, 0], "x": 6.25, "y": 0},
+ {"matrix": [1, 2], "x": 7.25, "y": 0},
+
+ {"matrix": [1, 4], "x": 8.75, "y": 0},
+ {"matrix": [1, 6], "x": 9.75, "y": 0},
+ {"matrix": [2, 0], "x": 10.75, "y": 0},
+ {"matrix": [2, 1], "x": 11.75, "y": 0},
+
+ {"matrix": [2, 2], "x": 13.25, "y": 0},
+ {"matrix": [0, 7], "x": 14.25, "y": 0},
+ {"matrix": [1, 1], "x": 15.25, "y": 0},
+ {"matrix": [1, 3], "x": 16.25, "y": 0},
+
+ {"matrix": [2, 6], "x": 17.5, "y": 0},
+ {"matrix": [2, 7], "x": 18.5, "y": 0},
+ {"matrix": [2, 5], "x": 19.5, "y": 0},
+
+ {"matrix": [5, 5], "x": 20.75, "y": 0},
+ {"matrix": [0, 2], "x": 21.75, "y": 0},
+ {"matrix": [0, 4], "x": 22.75, "y": 0},
+ {"matrix": [6, 0], "x": 23.75, "y": 0},
+
+ {"matrix": [0, 1], "x": 0, "y": 2},
+ {"matrix": [0, 3], "x": 1, "y": 2},
+
+ {"matrix": [3, 5], "x": 2.25, "y": 2},
+ {"matrix": [3, 6], "x": 3.25, "y": 2},
+ {"matrix": [3, 7], "x": 4.25, "y": 2},
+ {"matrix": [4, 0], "x": 5.25, "y": 2},
+ {"matrix": [4, 1], "x": 6.25, "y": 2},
+ {"matrix": [4, 2], "x": 7.25, "y": 2},
+ {"matrix": [4, 3], "x": 8.25, "y": 2},
+ {"matrix": [4, 4], "x": 9.25, "y": 2},
+ {"matrix": [4, 5], "x": 10.25, "y": 2},
+ {"matrix": [4, 6], "x": 11.25, "y": 2},
+ {"matrix": [4, 7], "x": 12.25, "y": 2},
+ {"matrix": [5, 0], "x": 13.25, "y": 2},
+ {"matrix": [5, 1], "x": 14.25, "y": 2},
+ {"matrix": [11, 0], "x": 15.25, "y": 2},
+ {"matrix": [5, 2], "x": 16.25, "y": 2},
+
+ {"matrix": [5, 4], "x": 17.5, "y": 2},
+ {"matrix": [6, 4], "x": 18.5, "y": 2},
+ {"matrix": [12, 0], "x": 19.5, "y": 2},
+
+ {"matrix": [12, 2], "x": 20.75, "y": 2},
+ {"matrix": [5, 6], "x": 21.75, "y": 2},
+ {"matrix": [5, 7], "x": 22.75, "y": 2},
+ {"matrix": [8, 7], "x": 23.75, "y": 2},
+
+ {"matrix": [3, 1], "x": 0, "y": 3},
+ {"matrix": [3, 2], "x": 1, "y": 3},
+
+ {"matrix": [6, 5], "x": 2.25, "y": 3, "w": 1.5},
+ {"matrix": [6, 6], "x": 3.75, "y": 3},
+ {"matrix": [6, 7], "x": 4.75, "y": 3},
+ {"matrix": [7, 0], "x": 5.75, "y": 3},
+ {"matrix": [7, 1], "x": 6.75, "y": 3},
+ {"matrix": [7, 2], "x": 7.75, "y": 3},
+ {"matrix": [7, 3], "x": 8.75, "y": 3},
+ {"matrix": [7, 4], "x": 9.75, "y": 3},
+ {"matrix": [7, 5], "x": 10.75, "y": 3},
+ {"matrix": [7, 6], "x": 11.75, "y": 3},
+ {"matrix": [7, 7], "x": 12.75, "y": 3},
+ {"matrix": [8, 0], "x": 13.75, "y": 3},
+ {"matrix": [8, 1], "x": 14.75, "y": 3},
+ {"matrix": [5, 3], "x": 15.75, "y": 3, "w": 1.5},
+
+ {"matrix": [8, 2], "x": 17.5, "y": 3},
+ {"matrix": [9, 2], "x": 18.5, "y": 3},
+ {"matrix": [15, 3], "x": 19.5, "y": 3},
+
+ {"matrix": [8, 4], "x": 20.75, "y": 3},
+ {"matrix": [8, 5], "x": 21.75, "y": 3},
+ {"matrix": [8, 6], "x": 22.75, "y": 3},
+ {"matrix": [15, 5], "x": 23.75, "y": 3, "h": 2},
+
+ {"matrix": [6, 1], "x": 0, "y": 4},
+ {"matrix": [6, 3], "x": 1, "y": 4},
+
+ {"matrix": [9, 4], "x": 2.25, "y": 4, "w": 1.75},
+ {"matrix": [9, 5], "x": 4, "y": 4},
+ {"matrix": [9, 6], "x": 5, "y": 4},
+ {"matrix": [9, 7], "x": 6, "y": 4},
+ {"matrix": [10, 0], "x": 7, "y": 4},
+ {"matrix": [10, 1], "x": 8, "y": 4},
+ {"matrix": [10, 2], "x": 9, "y": 4},
+ {"matrix": [10, 3], "x": 10, "y": 4},
+ {"matrix": [10, 4], "x": 11, "y": 4},
+ {"matrix": [10, 5], "x": 12, "y": 4},
+ {"matrix": [10, 6], "x": 13, "y": 4},
+ {"matrix": [10, 7], "x": 14, "y": 4},
+ {"matrix": [11, 1], "x": 15, "y": 4, "w": 2.25},
+
+ {"matrix": [11, 3], "x": 20.75, "y": 4},
+ {"matrix": [11, 4], "x": 21.75, "y": 4},
+ {"matrix": [11, 5], "x": 22.75, "y": 4},
+
+ {"matrix": [9, 0], "x": 0, "y": 5},
+ {"matrix": [9, 1], "x": 1, "y": 5},
+
+ {"matrix": [12, 3], "x": 2.25, "y": 5, "w": 2.25},
+ {"matrix": [12, 4], "x": 4.5, "y": 5},
+ {"matrix": [12, 5], "x": 5.5, "y": 5},
+ {"matrix": [12, 6], "x": 6.5, "y": 5},
+ {"matrix": [12, 7], "x": 7.5, "y": 5},
+ {"matrix": [13, 0], "x": 8.5, "y": 5},
+ {"matrix": [13, 1], "x": 9.5, "y": 5},
+ {"matrix": [13, 2], "x": 10.5, "y": 5},
+ {"matrix": [13, 3], "x": 11.5, "y": 5},
+ {"matrix": [13, 4], "x": 12.5, "y": 5},
+ {"matrix": [13, 5], "x": 13.5, "y": 5},
+ {"matrix": [13, 6], "x": 14.5, "y": 5, "w": 2.75},
+
+ {"matrix": [2, 4], "x": 18.5, "y": 5},
+
+ {"matrix": [14, 0], "x": 20.75, "y": 5},
+ {"matrix": [14, 1], "x": 21.75, "y": 5},
+ {"matrix": [14, 2], "x": 22.75, "y": 5},
+ {"matrix": [11, 2], "x": 23.75, "y": 5, "h": 2},
+
+ {"matrix": [11, 7], "x": 0, "y": 6},
+ {"matrix": [12, 1], "x": 1, "y": 6},
+
+ {"matrix": [14, 7], "x": 2.25, "y": 6},
+ {"matrix": [2, 3], "x": 3.25, "y": 6},
+ {"matrix": [15, 0], "x": 4.25, "y": 6},
+ {"matrix": [14, 3], "x": 5.25, "y": 6, "w": 1.5},
+ {"matrix": [15, 1], "x": 6.75, "y": 6, "w": 5},
+ {"matrix": [14, 4], "x": 11.75, "y": 6, "w": 1.5},
+ {"matrix": [14, 5], "x": 13.25, "y": 6},
+ {"matrix": [15, 2], "x": 14.25, "y": 6},
+ {"matrix": [8, 3], "x": 15.25, "y": 6},
+ {"matrix": [1, 5], "x": 16.25, "y": 6},
+
+ {"matrix": [3, 0], "x": 17.5, "y": 6},
+ {"matrix": [3, 3], "x": 18.5, "y": 6},
+ {"matrix": [3, 4], "x": 19.5, "y": 6},
+
+ {"matrix": [11, 6], "x": 20.75, "y": 6, "w": 2},
+ {"matrix": [6, 2], "x": 22.75, "y": 6}
]
},
"LAYOUT_us_unix": {
"layout": [
- {"label":"HELP", "x":0, "y":0, "w":2},
- {"label":"NO", "x":2.25, "y":0},
- {"label":"F1", "x":4.25, "y":0},
- {"label":"F2", "x":5.25, "y":0},
- {"label":"F3", "x":6.25, "y":0},
- {"label":"F4", "x":7.25, "y":0},
- {"label":"F5", "x":8.75, "y":0},
- {"label":"F6", "x":9.75, "y":0},
- {"label":"F7", "x":10.75, "y":0},
- {"label":"F8", "x":11.75, "y":0},
- {"label":"F9", "x":13.25, "y":0},
- {"label":"F10", "x":14.25, "y":0},
- {"label":"F11", "x":15.25, "y":0},
- {"label":"F12", "x":16.25, "y":0},
- {"label":"PRINT SCREEN", "x":17.5, "y":0},
- {"label":"SCROLL LOCK", "x":18.5, "y":0},
- {"label":"PAUSE", "x":19.5, "y":0},
- {"label":"MUTE", "x":20.75, "y":0},
- {"label":"VOLD", "x":21.75, "y":0},
- {"label":"VOLU", "x":22.75, "y":0},
- {"label":"PWR", "x":23.75, "y":0},
- {"label":"STOP", "x":0, "y":2},
- {"label":"AGAIN", "x":1, "y":2},
- {"label":"ESC", "x":2.25, "y":2},
- {"label":"1", "x":3.25, "y":2},
- {"label":"2", "x":4.25, "y":2},
- {"label":"3", "x":5.25, "y":2},
- {"label":"4", "x":6.25, "y":2},
- {"label":"5", "x":7.25, "y":2},
- {"label":"6", "x":8.25, "y":2},
- {"label":"7", "x":9.25, "y":2},
- {"label":"8", "x":10.25, "y":2},
- {"label":"9", "x":11.25, "y":2},
- {"label":"0", "x":12.25, "y":2},
- {"label":"MINUS", "x":13.25, "y":2},
- {"label":"EQUAL", "x":14.25, "y":2},
- {"label":"BACKSLASH", "x":15.25, "y":2},
- {"label":"GRAVE", "x":16.25, "y":2},
- {"label":"INSERT", "x":17.5, "y":2},
- {"label":"HOME", "x":18.5, "y":2},
- {"label":"PAGE UP", "x":19.5, "y":2},
- {"label":"NUM LOCK", "x":20.75, "y":2},
- {"label":"PSLASH", "x":21.75, "y":2},
- {"label":"PASTERISK", "x":22.75, "y":2},
- {"label":"PMINUS", "x":23.75, "y":2},
- {"label":"MENU", "x":0, "y":3},
- {"label":"UNDO", "x":1, "y":3},
- {"label":"TAB", "x":2.25, "y":3, "w":1.5},
- {"label":"Q", "x":3.75, "y":3},
- {"label":"W", "x":4.75, "y":3},
- {"label":"E", "x":5.75, "y":3},
- {"label":"R", "x":6.75, "y":3},
- {"label":"T", "x":7.75, "y":3},
- {"label":"Y", "x":8.75, "y":3},
- {"label":"U", "x":9.75, "y":3},
- {"label":"I", "x":10.75, "y":3},
- {"label":"O", "x":11.75, "y":3},
- {"label":"P", "x":12.75, "y":3},
- {"label":"LBRACKET", "x":13.75, "y":3},
- {"label":"RBRACKET", "x":14.75, "y":3},
- {"label":"BACKSPACE", "x":15.75, "y":3, "w":1.5},
- {"label":"DELETE", "x":17.5, "y":3},
- {"label":"END", "x":18.5, "y":3},
- {"label":"PAGE DOWN", "x":19.5, "y":3},
- {"label":"P7", "x":20.75, "y":3},
- {"label":"P8", "x":21.75, "y":3},
- {"label":"P9", "x":22.75, "y":3},
- {"label":"PPLUS", "x":23.75, "y":3, "h":2},
- {"label":"SELECT", "x":0, "y":4},
- {"label":"COPY", "x":1, "y":4},
- {"label":"LCTRL", "x":2.25, "y":4, "w":1.75},
- {"label":"A", "x":4, "y":4},
- {"label":"S", "x":5, "y":4},
- {"label":"D", "x":6, "y":4},
- {"label":"F", "x":7, "y":4},
- {"label":"G", "x":8, "y":4},
- {"label":"H", "x":9, "y":4},
- {"label":"J", "x":10, "y":4},
- {"label":"K", "x":11, "y":4},
- {"label":"L", "x":12, "y":4},
- {"label":"SEMICOLON", "x":13, "y":4},
- {"label":"QUOTE", "x":14, "y":4},
- {"label":"ENTER", "x":15, "y":4, "w":2.25},
- {"label":"P4", "x":20.75, "y":4},
- {"label":"P5", "x":21.75, "y":4},
- {"label":"P6", "x":22.75, "y":4},
- {"label":"EXECUTE", "x":0, "y":5},
- {"label":"PASTE", "x":1, "y":5},
- {"label":"LSHIFT", "x":2.25, "y":5, "w":2.25},
- {"label":"Z", "x":4.5, "y":5},
- {"label":"X", "x":5.5, "y":5},
- {"label":"C", "x":6.5, "y":5},
- {"label":"V", "x":7.5, "y":5},
- {"label":"B", "x":8.5, "y":5},
- {"label":"N", "x":9.5, "y":5},
- {"label":"M", "x":10.5, "y":5},
- {"label":"COMMA", "x":11.5, "y":5},
- {"label":"PERIOD", "x":12.5, "y":5},
- {"label":"SLASH", "x":13.5, "y":5},
- {"label":"RSHIFT", "x":14.5, "y":5, "w":2.75},
- {"label":"UP", "x":18.5, "y":5},
- {"label":"P1", "x":20.75, "y":5},
- {"label":"P2", "x":21.75, "y":5},
- {"label":"P3", "x":22.75, "y":5},
- {"label":"PENTER", "x":23.75, "y":5, "h":2},
- {"label":"FIND", "x":0, "y":6},
- {"label":"CUT", "x":1, "y":6},
- {"label":"CAPS LOCK", "x":2.25, "y":6, "w":1.75},
- {"label":"LALT", "x":4, "y":6},
- {"label":"LGUI", "x":5, "y":6},
- {"label":"SPACE", "x":6, "y":6, "w":8.25},
- {"label":"RGUI", "x":14.25, "y":6},
- {"label":"APP", "x":15.25, "y":6},
- {"label":"RALT", "x":16.25, "y":6},
- {"label":"LEFT", "x":17.5, "y":6},
- {"label":"DOWN", "x":18.5, "y":6},
- {"label":"RIGHT", "x":19.5, "y":6},
- {"label":"P0", "x":20.75, "y":6, "w":2},
- {"label":"PDOT", "x":22.75, "y":6}
+ {"matrix": [14, 6], "x": 0, "y": 0, "w": 2},
+
+ {"matrix": [1, 7], "x": 2.25, "y": 0},
+
+ {"matrix": [0, 5], "x": 4.25, "y": 0},
+ {"matrix": [0, 6], "x": 5.25, "y": 0},
+ {"matrix": [1, 0], "x": 6.25, "y": 0},
+ {"matrix": [1, 2], "x": 7.25, "y": 0},
+
+ {"matrix": [1, 4], "x": 8.75, "y": 0},
+ {"matrix": [1, 6], "x": 9.75, "y": 0},
+ {"matrix": [2, 0], "x": 10.75, "y": 0},
+ {"matrix": [2, 1], "x": 11.75, "y": 0},
+
+ {"matrix": [2, 2], "x": 13.25, "y": 0},
+ {"matrix": [0, 7], "x": 14.25, "y": 0},
+ {"matrix": [1, 1], "x": 15.25, "y": 0},
+ {"matrix": [1, 3], "x": 16.25, "y": 0},
+
+ {"matrix": [2, 6], "x": 17.5, "y": 0},
+ {"matrix": [2, 7], "x": 18.5, "y": 0},
+ {"matrix": [2, 5], "x": 19.5, "y": 0},
+
+ {"matrix": [5, 5], "x": 20.75, "y": 0},
+ {"matrix": [0, 2], "x": 21.75, "y": 0},
+ {"matrix": [0, 4], "x": 22.75, "y": 0},
+ {"matrix": [6, 0], "x": 23.75, "y": 0},
+
+ {"matrix": [0, 1], "x": 0, "y": 2},
+ {"matrix": [0, 3], "x": 1, "y": 2},
+
+ {"matrix": [3, 5], "x": 2.25, "y": 2},
+ {"matrix": [3, 6], "x": 3.25, "y": 2},
+ {"matrix": [3, 7], "x": 4.25, "y": 2},
+ {"matrix": [4, 0], "x": 5.25, "y": 2},
+ {"matrix": [4, 1], "x": 6.25, "y": 2},
+ {"matrix": [4, 2], "x": 7.25, "y": 2},
+ {"matrix": [4, 3], "x": 8.25, "y": 2},
+ {"matrix": [4, 4], "x": 9.25, "y": 2},
+ {"matrix": [4, 5], "x": 10.25, "y": 2},
+ {"matrix": [4, 6], "x": 11.25, "y": 2},
+ {"matrix": [4, 7], "x": 12.25, "y": 2},
+ {"matrix": [5, 0], "x": 13.25, "y": 2},
+ {"matrix": [5, 1], "x": 14.25, "y": 2},
+ {"matrix": [11, 0], "x": 15.25, "y": 2},
+ {"matrix": [5, 2], "x": 16.25, "y": 2},
+
+ {"matrix": [5, 4], "x": 17.5, "y": 2},
+ {"matrix": [6, 4], "x": 18.5, "y": 2},
+ {"matrix": [12, 0], "x": 19.5, "y": 2},
+
+ {"matrix": [12, 2], "x": 20.75, "y": 2},
+ {"matrix": [5, 6], "x": 21.75, "y": 2},
+ {"matrix": [5, 7], "x": 22.75, "y": 2},
+ {"matrix": [8, 7], "x": 23.75, "y": 2},
+
+ {"matrix": [3, 1], "x": 0, "y": 3},
+ {"matrix": [3, 2], "x": 1, "y": 3},
+
+ {"matrix": [6, 5], "x": 2.25, "y": 3, "w": 1.5},
+ {"matrix": [6, 6], "x": 3.75, "y": 3},
+ {"matrix": [6, 7], "x": 4.75, "y": 3},
+ {"matrix": [7, 0], "x": 5.75, "y": 3},
+ {"matrix": [7, 1], "x": 6.75, "y": 3},
+ {"matrix": [7, 2], "x": 7.75, "y": 3},
+ {"matrix": [7, 3], "x": 8.75, "y": 3},
+ {"matrix": [7, 4], "x": 9.75, "y": 3},
+ {"matrix": [7, 5], "x": 10.75, "y": 3},
+ {"matrix": [7, 6], "x": 11.75, "y": 3},
+ {"matrix": [7, 7], "x": 12.75, "y": 3},
+ {"matrix": [8, 0], "x": 13.75, "y": 3},
+ {"matrix": [8, 1], "x": 14.75, "y": 3},
+ {"matrix": [5, 3], "x": 15.75, "y": 3, "w": 1.5},
+
+ {"matrix": [8, 2], "x": 17.5, "y": 3},
+ {"matrix": [9, 2], "x": 18.5, "y": 3},
+ {"matrix": [15, 3], "x": 19.5, "y": 3},
+
+ {"matrix": [8, 4], "x": 20.75, "y": 3},
+ {"matrix": [8, 5], "x": 21.75, "y": 3},
+ {"matrix": [8, 6], "x": 22.75, "y": 3},
+ {"matrix": [15, 5], "x": 23.75, "y": 3, "h": 2},
+
+ {"matrix": [6, 1], "x": 0, "y": 4},
+ {"matrix": [6, 3], "x": 1, "y": 4},
+
+ {"matrix": [9, 4], "x": 2.25, "y": 4, "w": 1.75},
+ {"matrix": [9, 5], "x": 4, "y": 4},
+ {"matrix": [9, 6], "x": 5, "y": 4},
+ {"matrix": [9, 7], "x": 6, "y": 4},
+ {"matrix": [10, 0], "x": 7, "y": 4},
+ {"matrix": [10, 1], "x": 8, "y": 4},
+ {"matrix": [10, 2], "x": 9, "y": 4},
+ {"matrix": [10, 3], "x": 10, "y": 4},
+ {"matrix": [10, 4], "x": 11, "y": 4},
+ {"matrix": [10, 5], "x": 12, "y": 4},
+ {"matrix": [10, 6], "x": 13, "y": 4},
+ {"matrix": [10, 7], "x": 14, "y": 4},
+ {"matrix": [11, 1], "x": 15, "y": 4, "w": 2.25},
+
+ {"matrix": [11, 3], "x": 20.75, "y": 4},
+ {"matrix": [11, 4], "x": 21.75, "y": 4},
+ {"matrix": [11, 5], "x": 22.75, "y": 4},
+
+ {"matrix": [9, 0], "x": 0, "y": 5},
+ {"matrix": [9, 1], "x": 1, "y": 5},
+
+ {"matrix": [12, 3], "x": 2.25, "y": 5, "w": 2.25},
+ {"matrix": [12, 4], "x": 4.5, "y": 5},
+ {"matrix": [12, 5], "x": 5.5, "y": 5},
+ {"matrix": [12, 6], "x": 6.5, "y": 5},
+ {"matrix": [12, 7], "x": 7.5, "y": 5},
+ {"matrix": [13, 0], "x": 8.5, "y": 5},
+ {"matrix": [13, 1], "x": 9.5, "y": 5},
+ {"matrix": [13, 2], "x": 10.5, "y": 5},
+ {"matrix": [13, 3], "x": 11.5, "y": 5},
+ {"matrix": [13, 4], "x": 12.5, "y": 5},
+ {"matrix": [13, 5], "x": 13.5, "y": 5},
+ {"matrix": [13, 6], "x": 14.5, "y": 5, "w": 2.75},
+
+ {"matrix": [2, 4], "x": 18.5, "y": 5},
+
+ {"matrix": [14, 0], "x": 20.75, "y": 5},
+ {"matrix": [14, 1], "x": 21.75, "y": 5},
+ {"matrix": [14, 2], "x": 22.75, "y": 5},
+ {"matrix": [11, 2], "x": 23.75, "y": 5, "h": 2},
+
+ {"matrix": [11, 7], "x": 0, "y": 6},
+ {"matrix": [12, 1], "x": 1, "y": 6},
+
+ {"matrix": [14, 7], "x": 2.25, "y": 6, "w": 1.75},
+ {"matrix": [2, 3], "x": 4, "y": 6},
+ {"matrix": [15, 0], "x": 5, "y": 6},
+ {"matrix": [15, 1], "x": 6, "y": 6, "w": 8.25},
+ {"matrix": [15, 2], "x": 14.25, "y": 6},
+ {"matrix": [8, 3], "x": 15.25, "y": 6},
+ {"matrix": [1, 5], "x": 16.25, "y": 6},
+
+ {"matrix": [3, 0], "x": 17.5, "y": 6},
+ {"matrix": [3, 3], "x": 18.5, "y": 6},
+ {"matrix": [3, 4], "x": 19.5, "y": 6},
+
+ {"matrix": [11, 6], "x": 20.75, "y": 6, "w": 2},
+ {"matrix": [6, 2], "x": 22.75, "y": 6}
]
},
"LAYOUT_ansi": {
"layout": [
- {"label":"HELP", "x":0, "y":0, "w":2},
- {"label":"ESC", "x":2.25, "y":0},
- {"label":"F1", "x":4.25, "y":0},
- {"label":"F2", "x":5.25, "y":0},
- {"label":"F3", "x":6.25, "y":0},
- {"label":"F4", "x":7.25, "y":0},
- {"label":"F5", "x":8.75, "y":0},
- {"label":"F6", "x":9.75, "y":0},
- {"label":"F7", "x":10.75, "y":0},
- {"label":"F8", "x":11.75, "y":0},
- {"label":"F9", "x":13.25, "y":0},
- {"label":"F10", "x":14.25, "y":0},
- {"label":"F11", "x":15.25, "y":0},
- {"label":"F12", "x":16.25, "y":0},
- {"label":"PRINT SCREEN", "x":17.5, "y":0},
- {"label":"SCROLL LOCK", "x":18.5, "y":0},
- {"label":"PAUSE", "x":19.5, "y":0},
- {"label":"MUTE", "x":20.75, "y":0},
- {"label":"VOLD", "x":21.75, "y":0},
- {"label":"VOLU", "x":22.75, "y":0},
- {"label":"PWR", "x":23.75, "y":0},
- {"label":"STOP", "x":0, "y":2},
- {"label":"AGAIN", "x":1, "y":2},
- {"label":"GRAVE", "x":2.25, "y":2},
- {"label":"1", "x":3.25, "y":2},
- {"label":"2", "x":4.25, "y":2},
- {"label":"3", "x":5.25, "y":2},
- {"label":"4", "x":6.25, "y":2},
- {"label":"5", "x":7.25, "y":2},
- {"label":"6", "x":8.25, "y":2},
- {"label":"7", "x":9.25, "y":2},
- {"label":"8", "x":10.25, "y":2},
- {"label":"9", "x":11.25, "y":2},
- {"label":"0", "x":12.25, "y":2},
- {"label":"MINUS", "x":13.25, "y":2},
- {"label":"EQUAL", "x":14.25, "y":2},
- {"label":"BACKSPACE", "x":15.25, "y":2, "w":2},
- {"label":"INSERT", "x":17.5, "y":2},
- {"label":"HOME", "x":18.5, "y":2},
- {"label":"PAGE UP", "x":19.5, "y":2},
- {"label":"NUM LOCK", "x":20.75, "y":2},
- {"label":"PSLASH", "x":21.75, "y":2},
- {"label":"PASTERISK", "x":22.75, "y":2},
- {"label":"PMINUS", "x":23.75, "y":2},
- {"label":"MENU", "x":0, "y":3},
- {"label":"UNDO", "x":1, "y":3},
- {"label":"TAB", "x":2.25, "y":3, "w":1.5},
- {"label":"Q", "x":3.75, "y":3},
- {"label":"W", "x":4.75, "y":3},
- {"label":"E", "x":5.75, "y":3},
- {"label":"R", "x":6.75, "y":3},
- {"label":"T", "x":7.75, "y":3},
- {"label":"Y", "x":8.75, "y":3},
- {"label":"U", "x":9.75, "y":3},
- {"label":"I", "x":10.75, "y":3},
- {"label":"O", "x":11.75, "y":3},
- {"label":"P", "x":12.75, "y":3},
- {"label":"LBRACKET", "x":13.75, "y":3},
- {"label":"RBRACKET", "x":14.75, "y":3},
- {"label":"BACKSLASH", "x":15.75, "y":3, "w":1.5},
- {"label":"DELETE", "x":17.5, "y":3},
- {"label":"END", "x":18.5, "y":3},
- {"label":"PAGE DOWN", "x":19.5, "y":3},
- {"label":"P7", "x":20.75, "y":3},
- {"label":"P8", "x":21.75, "y":3},
- {"label":"P9", "x":22.75, "y":3},
- {"label":"PPLUS", "x":23.75, "y":3, "h":2},
- {"label":"SELECT", "x":0, "y":4},
- {"label":"COPY", "x":1, "y":4},
- {"label":"CAPS LOCK", "x":2.25, "y":4, "w":1.75},
- {"label":"A", "x":4, "y":4},
- {"label":"S", "x":5, "y":4},
- {"label":"D", "x":6, "y":4},
- {"label":"F", "x":7, "y":4},
- {"label":"G", "x":8, "y":4},
- {"label":"H", "x":9, "y":4},
- {"label":"J", "x":10, "y":4},
- {"label":"K", "x":11, "y":4},
- {"label":"L", "x":12, "y":4},
- {"label":"SEMICOLON", "x":13, "y":4},
- {"label":"QUOTE", "x":14, "y":4},
- {"label":"ENTER", "x":15, "y":4, "w":2.25},
- {"label":"P4", "x":20.75, "y":4},
- {"label":"P5", "x":21.75, "y":4},
- {"label":"P6", "x":22.75, "y":4},
- {"label":"EXECUTE", "x":0, "y":5},
- {"label":"PASTE", "x":1, "y":5},
- {"label":"LSHIFT", "x":2.25, "y":5, "w":2.25},
- {"label":"Z", "x":4.5, "y":5},
- {"label":"X", "x":5.5, "y":5},
- {"label":"C", "x":6.5, "y":5},
- {"label":"V", "x":7.5, "y":5},
- {"label":"B", "x":8.5, "y":5},
- {"label":"N", "x":9.5, "y":5},
- {"label":"M", "x":10.5, "y":5},
- {"label":"COMMA", "x":11.5, "y":5},
- {"label":"PERIOD", "x":12.5, "y":5},
- {"label":"SLASH", "x":13.5, "y":5},
- {"label":"RSHIFT", "x":14.5, "y":5, "w":2.75},
- {"label":"UP", "x":18.5, "y":5},
- {"label":"P1", "x":20.75, "y":5},
- {"label":"P2", "x":21.75, "y":5},
- {"label":"P3", "x":22.75, "y":5},
- {"label":"PENTER", "x":23.75, "y":5, "h":2},
- {"label":"FIND", "x":0, "y":6},
- {"label":"CUT", "x":1, "y":6},
- {"label":"LCTRL", "x":2.25, "y":6, "w":1.75},
- {"label":"LALT", "x":4, "y":6},
- {"label":"LGUI", "x":5, "y":6},
- {"label":"SPACE", "x":6, "y":6, "w":8.25},
- {"label":"RGUI", "x":14.25, "y":6},
- {"label":"APP", "x":15.25, "y":6},
- {"label":"RALT", "x":16.25, "y":6},
- {"label":"LEFT", "x":17.5, "y":6},
- {"label":"DOWN", "x":18.5, "y":6},
- {"label":"RIGHT", "x":19.5, "y":6},
- {"label":"P0", "x":20.75, "y":6, "w":2},
- {"label":"PDOT", "x":22.75, "y":6}
+ {"matrix": [14, 6], "x": 0, "y": 0, "w": 2},
+
+ {"matrix": [3, 5], "x": 2.25, "y": 0},
+
+ {"matrix": [0, 5], "x": 4.25, "y": 0},
+ {"matrix": [0, 6], "x": 5.25, "y": 0},
+ {"matrix": [1, 0], "x": 6.25, "y": 0},
+ {"matrix": [1, 2], "x": 7.25, "y": 0},
+
+ {"matrix": [1, 4], "x": 8.75, "y": 0},
+ {"matrix": [1, 6], "x": 9.75, "y": 0},
+ {"matrix": [2, 0], "x": 10.75, "y": 0},
+ {"matrix": [2, 1], "x": 11.75, "y": 0},
+
+ {"matrix": [2, 2], "x": 13.25, "y": 0},
+ {"matrix": [0, 7], "x": 14.25, "y": 0},
+ {"matrix": [1, 1], "x": 15.25, "y": 0},
+ {"matrix": [1, 3], "x": 16.25, "y": 0},
+
+ {"matrix": [2, 6], "x": 17.5, "y": 0},
+ {"matrix": [2, 7], "x": 18.5, "y": 0},
+ {"matrix": [2, 5], "x": 19.5, "y": 0},
+
+ {"matrix": [5, 5], "x": 20.75, "y": 0},
+ {"matrix": [0, 2], "x": 21.75, "y": 0},
+ {"matrix": [0, 4], "x": 22.75, "y": 0},
+ {"matrix": [6, 0], "x": 23.75, "y": 0},
+
+ {"matrix": [0, 1], "x": 0, "y": 2},
+ {"matrix": [0, 3], "x": 1, "y": 2},
+
+ {"matrix": [5, 2], "x": 2.25, "y": 2},
+ {"matrix": [3, 6], "x": 3.25, "y": 2},
+ {"matrix": [3, 7], "x": 4.25, "y": 2},
+ {"matrix": [4, 0], "x": 5.25, "y": 2},
+ {"matrix": [4, 1], "x": 6.25, "y": 2},
+ {"matrix": [4, 2], "x": 7.25, "y": 2},
+ {"matrix": [4, 3], "x": 8.25, "y": 2},
+ {"matrix": [4, 4], "x": 9.25, "y": 2},
+ {"matrix": [4, 5], "x": 10.25, "y": 2},
+ {"matrix": [4, 6], "x": 11.25, "y": 2},
+ {"matrix": [4, 7], "x": 12.25, "y": 2},
+ {"matrix": [5, 0], "x": 13.25, "y": 2},
+ {"matrix": [5, 1], "x": 14.25, "y": 2},
+ {"matrix": [5, 3], "x": 15.25, "y": 2, "w": 2},
+
+ {"matrix": [5, 4], "x": 17.5, "y": 2},
+ {"matrix": [6, 4], "x": 18.5, "y": 2},
+ {"matrix": [12, 0], "x": 19.5, "y": 2},
+
+ {"matrix": [12, 2], "x": 20.75, "y": 2},
+ {"matrix": [5, 6], "x": 21.75, "y": 2},
+ {"matrix": [5, 7], "x": 22.75, "y": 2},
+ {"matrix": [8, 7], "x": 23.75, "y": 2},
+
+ {"matrix": [3, 1], "x": 0, "y": 3},
+ {"matrix": [3, 2], "x": 1, "y": 3},
+
+ {"matrix": [6, 5], "x": 2.25, "y": 3, "w": 1.5},
+ {"matrix": [6, 6], "x": 3.75, "y": 3},
+ {"matrix": [6, 7], "x": 4.75, "y": 3},
+ {"matrix": [7, 0], "x": 5.75, "y": 3},
+ {"matrix": [7, 1], "x": 6.75, "y": 3},
+ {"matrix": [7, 2], "x": 7.75, "y": 3},
+ {"matrix": [7, 3], "x": 8.75, "y": 3},
+ {"matrix": [7, 4], "x": 9.75, "y": 3},
+ {"matrix": [7, 5], "x": 10.75, "y": 3},
+ {"matrix": [7, 6], "x": 11.75, "y": 3},
+ {"matrix": [7, 7], "x": 12.75, "y": 3},
+ {"matrix": [8, 0], "x": 13.75, "y": 3},
+ {"matrix": [8, 1], "x": 14.75, "y": 3},
+ {"matrix": [11, 0], "x": 15.75, "y": 3, "w": 1.5},
+
+ {"matrix": [8, 2], "x": 17.5, "y": 3},
+ {"matrix": [9, 2], "x": 18.5, "y": 3},
+ {"matrix": [15, 3], "x": 19.5, "y": 3},
+
+ {"matrix": [8, 4], "x": 20.75, "y": 3},
+ {"matrix": [8, 5], "x": 21.75, "y": 3},
+ {"matrix": [8, 6], "x": 22.75, "y": 3},
+ {"matrix": [15, 5], "x": 23.75, "y": 3, "h": 2},
+
+ {"matrix": [6, 1], "x": 0, "y": 4},
+ {"matrix": [6, 3], "x": 1, "y": 4},
+
+ {"matrix": [14, 7], "x": 2.25, "y": 4, "w": 1.75},
+ {"matrix": [9, 5], "x": 4, "y": 4},
+ {"matrix": [9, 6], "x": 5, "y": 4},
+ {"matrix": [9, 7], "x": 6, "y": 4},
+ {"matrix": [10, 0], "x": 7, "y": 4},
+ {"matrix": [10, 1], "x": 8, "y": 4},
+ {"matrix": [10, 2], "x": 9, "y": 4},
+ {"matrix": [10, 3], "x": 10, "y": 4},
+ {"matrix": [10, 4], "x": 11, "y": 4},
+ {"matrix": [10, 5], "x": 12, "y": 4},
+ {"matrix": [10, 6], "x": 13, "y": 4},
+ {"matrix": [10, 7], "x": 14, "y": 4},
+ {"matrix": [11, 1], "x": 15, "y": 4, "w": 2.25},
+
+ {"matrix": [11, 3], "x": 20.75, "y": 4},
+ {"matrix": [11, 4], "x": 21.75, "y": 4},
+ {"matrix": [11, 5], "x": 22.75, "y": 4},
+
+ {"matrix": [9, 0], "x": 0, "y": 5},
+ {"matrix": [9, 1], "x": 1, "y": 5},
+
+ {"matrix": [12, 3], "x": 2.25, "y": 5, "w": 2.25},
+ {"matrix": [12, 4], "x": 4.5, "y": 5},
+ {"matrix": [12, 5], "x": 5.5, "y": 5},
+ {"matrix": [12, 6], "x": 6.5, "y": 5},
+ {"matrix": [12, 7], "x": 7.5, "y": 5},
+ {"matrix": [13, 0], "x": 8.5, "y": 5},
+ {"matrix": [13, 1], "x": 9.5, "y": 5},
+ {"matrix": [13, 2], "x": 10.5, "y": 5},
+ {"matrix": [13, 3], "x": 11.5, "y": 5},
+ {"matrix": [13, 4], "x": 12.5, "y": 5},
+ {"matrix": [13, 5], "x": 13.5, "y": 5},
+ {"matrix": [13, 6], "x": 14.5, "y": 5, "w": 2.75},
+
+ {"matrix": [2, 4], "x": 18.5, "y": 5},
+
+ {"matrix": [14, 0], "x": 20.75, "y": 5},
+ {"matrix": [14, 1], "x": 21.75, "y": 5},
+ {"matrix": [14, 2], "x": 22.75, "y": 5},
+ {"matrix": [11, 2], "x": 23.75, "y": 5, "h": 2},
+
+ {"matrix": [11, 7], "x": 0, "y": 6},
+ {"matrix": [12, 1], "x": 1, "y": 6},
+
+ {"matrix": [9, 4], "x": 2.25, "y": 6, "w": 1.75},
+ {"matrix": [2, 3], "x": 4, "y": 6},
+ {"matrix": [15, 0], "x": 5, "y": 6},
+ {"matrix": [15, 1], "x": 6, "y": 6, "w": 8.25},
+ {"matrix": [15, 2], "x": 14.25, "y": 6},
+ {"matrix": [8, 3], "x": 15.25, "y": 6},
+ {"matrix": [1, 5], "x": 16.25, "y": 6},
+
+ {"matrix": [3, 0], "x": 17.5, "y": 6},
+ {"matrix": [3, 3], "x": 18.5, "y": 6},
+ {"matrix": [3, 4], "x": 19.5, "y": 6},
+
+ {"matrix": [11, 6], "x": 20.75, "y": 6, "w": 2},
+ {"matrix": [6, 2], "x": 22.75, "y": 6}
]
}
}
diff --git a/keyboards/converter/sun_usb/type5/type5.h b/keyboards/converter/sun_usb/type5/type5.h
deleted file mode 100644
index d4c9cc267c..0000000000
--- a/keyboards/converter/sun_usb/type5/type5.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- Copyright 2012 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
-
-/* sun type 5 keyboard, JP Unix-style
-,-------. ,---, ,---------------. ,---------------. ,---------------. ,-----------. ,---------------.
-| 76 | | 0F| | 05| 06| 08| 0A| | 0C| 0E| 10| 11| | 12| 07| 09| 0B| | 16| 17| 15| | 2D| 02| 04| 30|
-`-------' `---' `---------------' `---------------' `---------------' `-----------' `---------------'
-,-------. ,-----------------------------------------------------------. ,-----------. ,---------------.
-| 01| 03| | 1D| 1E| 1F| 20| 21| 22| 23| 24| 25| 26| 27| 28| 29| 58| 2A| | 2C| 34| 60| | 62| 2E| 2F| 47|
-|-------| |-----------------------------------------------------------| |------------ |---------------|
-| 19| 1A| | 35 | 36| 37| 38| 39| 3A| 3B| 3C| 3D| 3E| 3F| 40| 41| 2B | | 42| 4A| 7B| | 44| 45| 46| |
-|-------| |-----------------------------------------------------------| `-----------' |-----------| 7D|
-| 31| 33| | 4C | 4D| 4E| 4F| 50| 51| 52| 53| 54| 55| 56| 57| 59 | | 5B| 5C| 5D| |
-|-------| |-----------------------------------------------------------| ,---. |-----------|---|
-| 48| 49| | 63 | 64| 65| 66| 67| 68| 69| 6A| 6B| 6C| 6D| 6E | | 14| | 70| 71| 72| |
-|-------| |-----------------------------------------------------------| .-----------. |-----------| 5A|
-| 5F| 61| | 77 | 13| 78 |*73 | 79 |*74 |*75| 7A | 43| 0D| | 18| 1B| 1C| | 5E | 32| |
-`-------' `-----------------------------------------------------------' `-----------' `---------------'
-*/
-#define LAYOUT_jp_unix( \
- K76, K0F, K05, K06, K08, K0A, K0C, K0E, K10, K11, K12, K07, K09, K0B, K16, K17, K15, K2D, K02, K04, K30, \
- K01, K03, K1D, K1E, K1F, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K58, K2A, K2C, K34, K60, K62, K2E, K2F, K47, \
- K19, K1A, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K40, K41, K2B, K42, K4A, K7B, K44, K45, K46, K7D, \
- K31, K33, K4C, K4D, K4E, K4F, K50, K51, K52, K53, K54, K55, K56, K57, K59, K5B, K5C, K5D, \
- K48, K49, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K14, K70, K71, K72, K5A, \
- K5F, K61, K77, K13, K78, K73, K79, K74, K75, K7A, K43, K0D, K18, K1B, K1C, K5E, K32 \
-) { \
- { 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, XXX, 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, XXX }, \
- { K70, K71, K72, K73, K74, K75, K76, K77 }, \
- { K78, K79, K7A, K7B, XXX, K7D, XXX, XXX } \
-}
-
-/* Sun type 5 keyboard, US Unix-style
-,-------. ,---, ,---------------. ,---------------. ,---------------. ,-----------. ,---------------.
-| 76 | | 0F| | 05| 06| 08| 0A| | 0C| 0E| 10| 11| | 12| 07| 09| 0B| | 16| 17| 15| | 2D| 02| 04| 30|
-`-------' `---' `---------------' `---------------' `---------------' `-----------' `---------------'
-,-------. ,-----------------------------------------------------------. ,-----------. ,---------------.
-| 01| 03| | 1D| 1E| 1F| 20| 21| 22| 23| 24| 25| 26| 27| 28| 29| 58| 2A| | 2C| 34| 60| | 62| 2E| 2F| 47|
-|-------| |-----------------------------------------------------------| |------------ |---------------|
-| 19| 1A| | 35 | 36| 37| 38| 39| 3A| 3B| 3C| 3D| 3E| 3F| 40| 41| 2B | | 42| 4A| 7B| | 44| 45| 46| |
-|-------| |-----------------------------------------------------------| `-----------' |-----------| 7D|
-| 31| 33| | 4C | 4D| 4E| 4F| 50| 51| 52| 53| 54| 55| 56| 57| 59 | | 5B| 5C| 5D| |
-|-------| |-----------------------------------------------------------| ,---. |-----------|---|
-| 48| 49| | 63 | 64| 65| 66| 67| 68| 69| 6A| 6B| 6C| 6D| 6E | | 14| | 70| 71| 72| |
-|-------| |-----------------------------------------------------------| .-----------. |-----------| 5A|
-| 5F| 61| | 77 | 13| 78 | 79 | 7A | 43| 0D| | 18| 1B| 1C| | 5E | 32| |
-`-------' `-----------------------------------------------------------' `-----------' `---------------'
-*/
-#define LAYOUT_us_unix( \
- K76, K0F, K05, K06, K08, K0A, K0C, K0E, K10, K11, K12, K07, K09, K0B, K16, K17, K15, K2D, K02, K04, K30, \
- K01, K03, K1D, K1E, K1F, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K58, K2A, K2C, K34, K60, K62, K2E, K2F, K47, \
- K19, K1A, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K40, K41, K2B, K42, K4A, K7B, K44, K45, K46, K7D, \
- K31, K33, K4C, K4D, K4E, K4F, K50, K51, K52, K53, K54, K55, K56, K57, K59, K5B, K5C, K5D, \
- K48, K49, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K14, K70, K71, K72, K5A, \
- K5F, K61, K77, K13, K78, K79, K7A, K43, K0D, K18, K1B, K1C, K5E, K32 \
-) { \
- { 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, XXX, 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, XXX }, \
- { K70, K71, K72, XXX, XXX, XXX, K76, K77 }, \
- { K78, K79, K7A, K7B, XXX, K7D, XXX, XXX } \
-}
-
-/* Sun type 5 keyboard, US ANSI-style
- ,-------. ,---, ,---------------. ,---------------. ,---------------. ,-----------. ,---------------.
- | 76 | | 1D| | 05| 06| 08| 0A| | 0C| 0E| 10| 11| | 12| 07| 09| 0B| | 16| 17| 15| | 2D| 02| 04| 30|
- `-------' `---' `---------------' `---------------' `---------------' `-----------' `---------------'
- ,-------. ,-----------------------------------------------------------. ,-----------. ,---------------.
- | 01| 03| | 2A| 1E| 1F| 20| 21| 22| 23| 24| 25| 26| 27| 28| 29| 2B | | 2C| 34| 60| | 62| 2E| 2F| 47|
- |-------| |-----------------------------------------------------------| |------------ |---------------|
- | 19| 1A| | 35 | 36| 37| 38| 39| 3A| 3B| 3C| 3D| 3E| 3F| 40| 41| 58 | | 42| 4A| 7B| | 44| 45| 46| |
- |-------| |-----------------------------------------------------------| `-----------' |-----------| 7D|
- | 31| 33| | 77 | 4D| 4E| 4F| 50| 51| 52| 53| 54| 55| 56| 57| 59 | | 5B| 5C| 5D| |
- |-------| |-----------------------------------------------------------| ,---. |-----------|---|
- | 48| 49| | 63 | 64| 65| 66| 67| 68| 69| 6A| 6B| 6C| 6D| 6E | | 14| | 70| 71| 72| |
- |-------| |-----------------------------------------------------------| .-----------. |-----------| 5A|
- | 5F| 61| | 4C | 13| 78 | 79 | 7A | 43| 0D| | 18| 1B| 1C| | 5E | 32| |
- `-------' `-----------------------------------------------------------' `-----------' `---------------'
-*/
-#define LAYOUT_ansi( \
- K76, K1D, K05, K06, K08, K0A, K0C, K0E, K10, K11, K12, K07, K09, K0B, K16, K17, K15, K2D, K02, K04, K30, \
- K01, K03, K2A, K1E, K1F, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2B, K2C, K34, K60, K62, K2E, K2F, K47, \
- K19, K1A, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K40, K41, K58, K42, K4A, K7B, K44, K45, K46, K7D, \
- K31, K33, K77, K4D, K4E, K4F, K50, K51, K52, K53, K54, K55, K56, K57, K59, K5B, K5C, K5D, \
- K48, K49, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K14, K70, K71, K72, K5A, \
- K5F, K61, K4C, K13, K78, K79, K7A, K43, K0D, K18, K1B, K1C, K5E, K32 \
-) { \
- { XXX, K01, K02, K03, K04, K05, K06, K07 }, \
- { K08, K09, K0A, K0B, K0C, K0D, K0E, XXX }, \
- { 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, XXX, 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, XXX }, \
- { K70, K71, K72, XXX, XXX, XXX, K76, K77 }, \
- { K78, K79, K7A, K7B, XXX, K7D, XXX, XXX } \
-}
diff --git a/keyboards/crimsonkeyboards/resume1800/info.json b/keyboards/crimsonkeyboards/resume1800/info.json
index 4a259cbd93..b8cd36dbed 100644
--- a/keyboards/crimsonkeyboards/resume1800/info.json
+++ b/keyboards/crimsonkeyboards/resume1800/info.json
@@ -20,25 +20,240 @@
"processor": "atmega32a",
"bootloader": "usbasploader",
"layouts": {
- "LAYOUT_resume1800_ansi_all": {
+ "LAYOUT_resume1800_ansi_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":"F13", "x":13, "y":0}, {"label":"F14", "x":14, "y":0}, {"label":"PrtSc", "x":15, "y":0}, {"label":"Scroll Lock", "x":16, "y":0}, {"label":"Pause", "x":17, "y":0}, {"label":"Insert", "x":18, "y":0}, {"label":"End", "x":19, "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":"Delete", "x":15, "y":1}, {"label":"Num Lock", "x":16, "y":1}, {"label":"/", "x":17, "y":1}, {"label":"*", "x":18, "y":1}, {"label":"-", "x":19, "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":"Home", "x":15, "y":2}, {"label":"7", "x":16, "y":2}, {"label":"8", "x":17, "y":2}, {"label":"9", "x":18, "y":2}, {"label":"+", "x":19, "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":"PgUp", "x":15, "y":3}, {"label":"4", "x":16, "y":3}, {"label":"5", "x":17, "y":3}, {"label":"6", "x":18, "y":3}, {"label":"=", "x":19, "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":"PgDn", "x":15, "y":4}, {"label":"1", "x":16, "y":4}, {"label":"2", "x":17, "y":4}, {"label":"3", "x":18, "y":4}, {"label":"Enter", "x":19, "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}, {"label":"Space", "x":3.75, "y":5, "w":6.25}, {"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}, {"label":"00", "x":16, "y":5}, {"label":"0", "x":17, "y":5}, {"label":".", "x":18, "y":5}, {"label":"Bksp", "x":19, "y":5}
- ]
- },
- "LAYOUT_resume1800_iso_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":"F13", "x":13, "y":0}, {"label":"F14", "x":14, "y":0}, {"label":"PrtSc", "x":15, "y":0}, {"label":"Scroll Lock", "x":16, "y":0}, {"label":"Pause", "x":17, "y":0}, {"label":"Insert", "x":18, "y":0}, {"label":"End", "x":19, "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":"Delete", "x":15, "y":1}, {"label":"Num Lock", "x":16, "y":1}, {"label":"/", "x":17, "y":1}, {"label":"*", "x":18, "y":1}, {"label":"-", "x":19, "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":"Enter", "x":13.75, "y":2, "w":1.25, "h":2}, {"label":"Home", "x":15, "y":2}, {"label":"7", "x":16, "y":2}, {"label":"8", "x":17, "y":2}, {"label":"9", "x":18, "y":2}, {"label":"+", "x":19, "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":"|", "x":12.75, "y":3}, {"label":"PgUp", "x":15, "y":3}, {"label":"4", "x":16, "y":3}, {"label":"5", "x":17, "y":3}, {"label":"6", "x":18, "y":3}, {"label":"=", "x":19, "y":3},
- {"label":"Shift", "x":0, "y":4, "w":1.25}, {"label":"~", "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":"PgDn", "x":15, "y":4}, {"label":"1", "x":16, "y":4}, {"label":"2", "x":17, "y":4}, {"label":"3", "x":18, "y":4}, {"label":"Enter", "x":19, "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":6.25}, {"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}, {"label":"00", "x":16, "y":5}, {"label":"0", "x":17, "y":5}, {"label":".", "x":18, "y":5}, {"label":"Bksp", "x":19, "y":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": [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": [0, 18], "x": 18, "y": 0},
+ {"matrix": [0, 19], "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": [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": [1, 16], "x": 16, "y": 1},
+ {"matrix": [1, 17], "x": 17, "y": 1},
+ {"matrix": [1, 18], "x": 18, "y": 1},
+ {"matrix": [1, 19], "x": 19, "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, 15], "x": 15, "y": 2},
+ {"matrix": [2, 16], "x": 16, "y": 2},
+ {"matrix": [2, 17], "x": 17, "y": 2},
+ {"matrix": [2, 18], "x": 18, "y": 2},
+ {"matrix": [2, 19], "x": 19, "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, 13], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 15], "x": 15, "y": 3},
+ {"matrix": [3, 16], "x": 16, "y": 3},
+ {"matrix": [3, 17], "x": 17, "y": 3},
+ {"matrix": [3, 18], "x": 18, "y": 3},
+ {"matrix": [3, 19], "x": 19, "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, 15], "x": 15, "y": 4},
+ {"matrix": [4, 16], "x": 16, "y": 4},
+ {"matrix": [4, 17], "x": 17, "y": 4},
+ {"matrix": [4, 18], "x": 18, "y": 4},
+ {"matrix": [4, 19], "x": 19, "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, 6], "x": 3.75, "y": 5, "w": 6.25},
+ {"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, 15], "x": 15, "y": 5},
+ {"matrix": [5, 16], "x": 16, "y": 5},
+ {"matrix": [5, 17], "x": 17, "y": 5},
+ {"matrix": [5, 18], "x": 18, "y": 5},
+ {"matrix": [5, 19], "x": 19, "y": 5}
+ ]
+ },
+ "LAYOUT_resume1800_iso_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": [0, 18], "x": 18, "y": 0},
+ {"matrix": [0, 19], "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": [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": [1, 16], "x": 16, "y": 1},
+ {"matrix": [1, 17], "x": 17, "y": 1},
+ {"matrix": [1, 18], "x": 18, "y": 1},
+ {"matrix": [1, 19], "x": 19, "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, 15], "x": 15, "y": 2},
+ {"matrix": [2, 16], "x": 16, "y": 2},
+ {"matrix": [2, 17], "x": 17, "y": 2},
+ {"matrix": [2, 18], "x": 18, "y": 2},
+ {"matrix": [2, 19], "x": 19, "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, 13], "x": 12.75, "y": 3},
+ {"matrix": [3, 15], "x": 15, "y": 3},
+ {"matrix": [3, 16], "x": 16, "y": 3},
+ {"matrix": [3, 17], "x": 17, "y": 3},
+ {"matrix": [3, 18], "x": 18, "y": 3},
+ {"matrix": [3, 19], "x": 19, "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, 15], "x": 15, "y": 4},
+ {"matrix": [4, 16], "x": 16, "y": 4},
+ {"matrix": [4, 17], "x": 17, "y": 4},
+ {"matrix": [4, 18], "x": 18, "y": 4},
+ {"matrix": [4, 19], "x": 19, "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, 6], "x": 3.75, "y": 5, "w": 6.25},
+ {"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, 15], "x": 15, "y": 5},
+ {"matrix": [5, 16], "x": 16, "y": 5},
+ {"matrix": [5, 17], "x": 17, "y": 5},
+ {"matrix": [5, 18], "x": 18, "y": 5},
+ {"matrix": [5, 19], "x": 19, "y": 5}
+ ]
+ }
}
} \ No newline at end of file
diff --git a/keyboards/crimsonkeyboards/resume1800/resume1800.h b/keyboards/crimsonkeyboards/resume1800/resume1800.h
deleted file mode 100644
index 861fe3c032..0000000000
--- a/keyboards/crimsonkeyboards/resume1800/resume1800.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *
- * 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 _x_ KC_NO
-
-#include "quantum.h"
-
-#define LAYOUT_resume1800_ansi_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I, K0J, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, K1G, K1H, K1I, K1J, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, K2G, K2H, K2I, K2J, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3F, K3G, K3H, K3I, K3J, \
- K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4F, K4G, K4H, K4I, K4J, \
- K50, K51, K52, K56, K59, K5A, K5B, K5C, K5D, K5F, K5G, K5H, K5I, K5J \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I, K0J }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, _x_, K1F, K1G, K1H, K1I, K1J }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, _x_, K2F, K2G, K2H, K2I, K2J }, \
-{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, K3D, _x_, K3F, K3G, K3H, K3I, K3J }, \
-{ K40, _x_, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, _x_, K4F, K4G, K4H, K4I, K4J }, \
-{ K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, K59, K5A, K5B, K5C, K5D, _x_, K5F, K5G, K5H, K5I, K5J } \
-}
-
-#define LAYOUT_resume1800_iso_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I, K0J, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, K1G, K1H, K1I, K1J, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, K2G, K2H, K2I, K2J, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3F, K3G, K3H, K3I, K3J, \
- K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4F, K4G, K4H, K4I, K4J, \
- K50, K51, K52, K56, K59, K5A, K5B, K5C, K5D, K5F, K5G, K5H, K5I, K5J \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I, K0J }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, _x_, K1F, K1G, K1H, K1I, K1J }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, _x_, K2F, K2G, K2H, K2I, K2J }, \
-{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, K3D, _x_, K3F, K3G, K3H, K3I, K3J }, \
-{ K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, _x_, K4F, K4G, K4H, K4I, K4J }, \
-{ K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, K59, K5A, K5B, K5C, K5D, _x_, K5F, K5G, K5H, K5I, K5J } \
-}
diff --git a/keyboards/delikeeb/vaneelaex/info.json b/keyboards/delikeeb/vaneelaex/info.json
index 0095254388..752fc8c3d1 100644
--- a/keyboards/delikeeb/vaneelaex/info.json
+++ b/keyboards/delikeeb/vaneelaex/info.json
@@ -18,320 +18,75 @@
"layouts": {
"LAYOUT_ss_6x12": {
"layout": [
- {
- "x": 0,
- "y": 0
- },
- {
- "label": "7",
- "x": 1,
- "y": 0
- },
- {
- "label": "8",
- "x": 2,
- "y": 0
- },
- {
- "label": "9",
- "x": 3,
- "y": 0
- },
- {
- "label": "TAB",
- "x": 4,
- "y": 0
- },
- {
- "label": "Q",
- "x": 5,
- "y": 0
- },
- {
- "label": "W",
- "x": 6,
- "y": 0
- },
- {
- "label": "E",
- "x": 7,
- "y": 0
- },
- {
- "label": "R",
- "x": 8,
- "y": 0
- },
- {
- "label": "T",
- "x": 9,
- "y": 0
- },
- {
- "label": "Y",
- "x": 10,
- "y": 0
- },
- {
- "label": "U",
- "x": 11,
- "y": 0
- },
- {
- "label": "I",
- "x": 12,
- "y": 0
- },
- {
- "label": "O",
- "x": 13,
- "y": 0
- },
- {
- "label": "P",
- "x": 14,
- "y": 0
- },
- {
- "label": "BS",
- "x": 15,
- "y": 0,
- "w": 1.5
- },
- {
- "x": 0,
- "y": 1
- },
- {
- "label": "4",
- "x": 1,
- "y": 1
- },
- {
- "label": "5",
- "x": 2,
- "y": 1
- },
- {
- "label": "6",
- "x": 3,
- "y": 1
- },
- {
- "label": "ESC",
- "x": 4,
- "y": 1,
- "w": 1.25
- },
- {
- "label": "A",
- "x": 5.25,
- "y": 1
- },
- {
- "label": "S",
- "x": 6.25,
- "y": 1
- },
- {
- "label": "D",
- "x": 7.25,
- "y": 1
- },
- {
- "label": "F",
- "x": 8.25,
- "y": 1
- },
- {
- "label": "G",
- "x": 9.25,
- "y": 1
- },
- {
- "label": "H",
- "x": 10.25,
- "y": 1
- },
- {
- "label": "J",
- "x": 11.25,
- "y": 1
- },
- {
- "label": "K",
- "x": 12.25,
- "y": 1
- },
- {
- "label": "L",
- "x": 13.25,
- "y": 1
- },
- {
- "label": ";",
- "x": 14.25,
- "y": 1
- },
- {
- "label": "ENTER",
- "x": 15.25,
- "y": 1,
- "w": 1.25
- },
- {
- "x": 0,
- "y": 2
- },
- {
- "label": "1",
- "x": 1,
- "y": 2
- },
- {
- "label": "2",
- "x": 2,
- "y": 2
- },
- {
- "label": "3",
- "x": 3,
- "y": 2
- },
- {
- "label": "SHIFT",
- "x": 4,
- "y": 2,
- "w": 1.5
- },
- {
- "label": "Z",
- "x": 5.5,
- "y": 2
- },
- {
- "label": "X",
- "x": 6.5,
- "y": 2
- },
- {
- "label": "C",
- "x": 7.5,
- "y": 2
- },
- {
- "label": "V",
- "x": 8.5,
- "y": 2
- },
- {
- "label": "B",
- "x": 9.5,
- "y": 2
- },
- {
- "label": "N",
- "x": 10.5,
- "y": 2
- },
- {
- "label": "M",
- "x": 11.5,
- "y": 2
- },
- {
- "label": ",",
- "x": 12.5,
- "y": 2
- },
- {
- "label": ".",
- "x": 13.5,
- "y": 2
- },
- {
- "label": "/",
- "x": 14.5,
- "y": 2
- },
- {
- "label": "SHIFT",
- "x": 15.5,
- "y": 2
- },
- {
- "x": 0,
- "y": 3
- },
- {
- "x": 1,
- "y": 3
- },
- {
- "x": 2,
- "y": 3
- },
- {
- "label": "0",
- "x": 3,
- "y": 3
- },
- {
- "label": "CTRL",
- "x": 4,
- "y": 3
- },
- {
- "label": "GUI",
- "x": 5,
- "y": 3
- },
- {
- "label": "ALT",
- "x": 6,
- "y": 3
- },
- {
- "x": 7,
- "y": 3
- },
- {
- "label": "LOWER",
- "x": 8,
- "y": 3,
- "w": 1.25
- },
- {
- "x": 9.25,
- "y": 3
- },
- {
- "x": 10.25,
- "y": 3
- },
- {
- "label": "RAISE",
- "x": 11.25,
- "y": 3,
- "w": 1.25
- },
- {
- "x": 12.5,
- "y": 3
- },
- {
- "x": 13.5,
- "y": 3
- },
- {
- "x": 14.5,
- "y": 3
- },
- {
- "x": 15.5,
- "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},
+ {"matrix": [0, 8], "x": 12, "y": 0},
+ {"matrix": [0, 9], "x": 13, "y": 0},
+ {"matrix": [0, 10], "x": 14, "y": 0},
+ {"matrix": [0, 11], "x": 15, "y": 0, "w": 1.5},
+
+ {"matrix": [4, 8], "x": 0, "y": 1},
+ {"matrix": [4, 9], "x": 1, "y": 1},
+ {"matrix": [4, 10], "x": 2, "y": 1},
+ {"matrix": [4, 11], "x": 3, "y": 1},
+ {"matrix": [1, 0], "x": 4, "y": 1, "w": 1.25},
+ {"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},
+ {"matrix": [1, 8], "x": 12.25, "y": 1},
+ {"matrix": [1, 9], "x": 13.25, "y": 1},
+ {"matrix": [1, 10], "x": 14.25, "y": 1},
+ {"matrix": [1, 11], "x": 15.25, "y": 1, "w": 1.25},
+
+ {"matrix": [4, 4], "x": 0, "y": 2},
+ {"matrix": [4, 5], "x": 1, "y": 2},
+ {"matrix": [4, 6], "x": 2, "y": 2},
+ {"matrix": [4, 7], "x": 3, "y": 2},
+ {"matrix": [2, 0], "x": 4, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 5.5, "y": 2},
+ {"matrix": [2, 2], "x": 6.5, "y": 2},
+ {"matrix": [2, 3], "x": 7.5, "y": 2},
+ {"matrix": [2, 4], "x": 8.5, "y": 2},
+ {"matrix": [2, 5], "x": 9.5, "y": 2},
+ {"matrix": [2, 6], "x": 10.5, "y": 2},
+ {"matrix": [2, 7], "x": 11.5, "y": 2},
+ {"matrix": [2, 8], "x": 12.5, "y": 2},
+ {"matrix": [2, 9], "x": 13.5, "y": 2},
+ {"matrix": [2, 10], "x": 14.5, "y": 2},
+ {"matrix": [2, 11], "x": 15.5, "y": 2},
+
+ {"matrix": [4, 0], "x": 0, "y": 3},
+ {"matrix": [4, 1], "x": 1, "y": 3},
+ {"matrix": [4, 2], "x": 2, "y": 3},
+ {"matrix": [4, 3], "x": 3, "y": 3},
+ {"matrix": [3, 0], "x": 4, "y": 3},
+ {"matrix": [3, 1], "x": 5, "y": 3},
+ {"matrix": [3, 2], "x": 6, "y": 3},
+ {"matrix": [3, 3], "x": 7, "y": 3},
+ {"matrix": [3, 4], "x": 8, "y": 3, "w": 1.25},
+ {"matrix": [3, 5], "x": 9.25, "y": 3},
+ {"matrix": [3, 6], "x": 10.25, "y": 3},
+ {"matrix": [3, 7], "x": 11.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 8], "x": 12.5, "y": 3},
+ {"matrix": [3, 9], "x": 13.5, "y": 3},
+ {"matrix": [3, 10], "x": 14.5, "y": 3},
+ {"matrix": [3, 11], "x": 15.5, "y": 3}
]
}
}
+
}
diff --git a/keyboards/delikeeb/vaneelaex/vaneelaex.h b/keyboards/delikeeb/vaneelaex/vaneelaex.h
deleted file mode 100644
index 9b2d74ecef..0000000000
--- a/keyboards/delikeeb/vaneelaex/vaneelaex.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2020 noclew
- *
- * 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_ss_6x12( \
- k62, k63, k64, k65, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, \
- k58, k59, k60, k61, k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, \
- k54, k55, k56, k57, k25, k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, \
- k50, k51, k52, k53, k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47, k48 \
-) \
-{ \
- { 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 }, \
- { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60, k61 }, \
- { k62, k63, k64, k65, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
-}
diff --git a/keyboards/deltasplit75/v2/info.json b/keyboards/deltasplit75/v2/info.json
index 366982d8a5..857fa12e9a 100644
--- a/keyboards/deltasplit75/v2/info.json
+++ b/keyboards/deltasplit75/v2/info.json
@@ -21,11 +21,207 @@
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
- "LAYOUT_v2": {
- "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":8, "y":0}, {"label":"F8", "x":9, "y":0}, {"label":"F9", "x":10, "y":0}, {"label":"F10", "x":11, "y":0}, {"label":"F11", "x":12, "y":0}, {"label":"F12", "x":13, "y":0}, {"label":"Print", "x":14, "y":0}, {"label":"Scroll", "x":15, "y":0}, {"label":"Pause", "x":16, "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, "y":1}, {"label":"*", "x":9, "y":1}, {"label":"(", "x":10, "y":1}, {"label":")", "x":11, "y":1}, {"label":"_", "x":12, "y":1}, {"label":"+", "x":13, "y":1}, {"label":"Back", "x":14, "y":1}, {"label":"Trns", "x":15, "y":1}, {"label":"Home", "x":16, "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":7.5, "y":2}, {"label":"U", "x":8.5, "y":2}, {"label":"I", "x":9.5, "y":2}, {"label":"O", "x":10.5, "y":2}, {"label":"P", "x":11.5, "y":2}, {"label":"{", "x":12.5, "y":2}, {"label":"}", "x":13.5, "y":2}, {"label":"Back", "x":14.5, "y":2, "w":1.5}, {"label":"PgUp", "x":16, "y":2}, {"label":"Ctrl", "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":7.75, "y":3}, {"label":"J", "x":8.75, "y":3}, {"label":"K", "x":9.75, "y":3}, {"label":"L", "x":10.75, "y":3}, {"label":":", "x":11.75, "y":3}, {"label":"\"", "x":12.75, "y":3}, {"label":"Trns", "x":13.75, "y":3}, {"label":"Enter", "x":14.75, "y":3, "w":1.25}, {"label":"PgDn", "x":16, "y":3}, {"label":"Shift", "x":0, "y":4, "w":1.25}, {"label":"Trns", "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":"B", "x":7.25, "y":4}, {"label":"N", "x":8.25, "y":4}, {"label":"M", "x":9.25, "y":4}, {"label":"<", "x":10.25, "y":4}, {"label":">", "x":11.25, "y":4}, {"label":"?", "x":12.25, "y":4}, {"label":"Shift", "x":13.25, "y":4, "w":1.75}, {"label":"Up", "x":15, "y":4}, {"label":"End", "x":16, "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}, {"label":"Space", "x":3.75, "y":5, "w":2}, {"label":"Fn", "x":5.75, "y":5}, {"label":"Space", "x":7.75, "y":5, "w":2.75}, {"label":"Alt", "x":10.5, "y":5, "w":1.25}, {"label":"Win", "x":11.75, "y":5}, {"label":"Ctrl", "x":12.75, "y":5, "w":1.25}, {"label":"Left", "x":14, "y":5}, {"label":"Down", "x":15, "y":5}, {"label":"Right", "x":16, "y":5}]
- },
- "LAYOUT_protosplit": {
- "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":8, "y":0}, {"label":"F8", "x":9, "y":0}, {"label":"F9", "x":10, "y":0}, {"label":"F10", "x":11, "y":0}, {"label":"F11", "x":12, "y":0}, {"label":"F12", "x":13, "y":0}, {"label":"Insert", "x":14, "y":0}, {"label":"Home", "x":15, "y":0}, {"label":"PgUp", "x":16, "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, "y":1}, {"label":"*", "x":9, "y":1}, {"label":"(", "x":10, "y":1}, {"label":")", "x":11, "y":1}, {"label":"_", "x":12, "y":1}, {"label":"+", "x":13, "y":1}, {"label":"Delete", "x":14, "y":1}, {"label":"End", "x":15, "y":1}, {"label":"PgDn", "x":16, "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":7.5, "y":2}, {"label":"U", "x":8.5, "y":2}, {"label":"I", "x":9.5, "y":2}, {"label":"O", "x":10.5, "y":2}, {"label":"P", "x":11.5, "y":2}, {"label":"{", "x":12.5, "y":2}, {"label":"}", "x":13.5, "y":2}, {"label":"Back", "x":14.5, "y":2, "w":1.5}, {"label":"Scroll", "x":16, "y":2}, {"label":"Ctrl", "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":7.75, "y":3}, {"label":"J", "x":8.75, "y":3}, {"label":"K", "x":9.75, "y":3}, {"label":"L", "x":10.75, "y":3}, {"label":":", "x":11.75, "y":3}, {"label":"\"", "x":12.75, "y":3}, {"label":"Enter", "x":13.75, "y":3, "w":2.25}, {"label":"Pause", "x":16, "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":"B", "x":7.25, "y":4}, {"label":"N", "x":8.25, "y":4}, {"label":"M", "x":9.25, "y":4}, {"label":"<", "x":10.25, "y":4}, {"label":">", "x":11.25, "y":4}, {"label":"?", "x":12.25, "y":4}, {"label":"Shift", "x":13.25, "y":4, "w":1.75}, {"label":"Up", "x":15, "y":4}, {"label":"Print", "x":16, "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}, {"label":"Space", "x":3.75, "y":5, "w":2}, {"label":"Fn", "x":5.75, "y":5}, {"label":"Space", "x":7.75, "y":5, "w":2.75}, {"label":"Alt", "x":10.5, "y":5, "w":1.25}, {"label":"Win", "x":11.75, "y":5}, {"label":"Ctrl", "x":12.75, "y":5, "w":1.25}, {"label":"Left", "x":14, "y":5}, {"label":"Down", "x":15, "y":5}, {"label":"Right", "x":16, "y":5}]
- }
+ "LAYOUT_v2": {
+ "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": [7, 0], "x": 8, "y": 0},
+ {"matrix": [7, 1], "x": 9, "y": 0},
+ {"matrix": [7, 2], "x": 10, "y": 0},
+ {"matrix": [7, 3], "x": 11, "y": 0},
+ {"matrix": [7, 4], "x": 12, "y": 0},
+ {"matrix": [7, 5], "x": 13, "y": 0},
+ {"matrix": [7, 6], "x": 14, "y": 0},
+ {"matrix": [7, 7], "x": 15, "y": 0},
+ {"matrix": [13, 2], "x": 16, "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": [8, 0], "x": 8, "y": 1},
+ {"matrix": [8, 1], "x": 9, "y": 1},
+ {"matrix": [8, 2], "x": 10, "y": 1},
+ {"matrix": [8, 3], "x": 11, "y": 1},
+ {"matrix": [8, 4], "x": 12, "y": 1},
+ {"matrix": [8, 5], "x": 13, "y": 1},
+ {"matrix": [8, 6], "x": 14, "y": 1},
+ {"matrix": [8, 7], "x": 15, "y": 1},
+ {"matrix": [13, 3], "x": 16, "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": [9, 0], "x": 7.5, "y": 2},
+ {"matrix": [9, 1], "x": 8.5, "y": 2},
+ {"matrix": [9, 2], "x": 9.5, "y": 2},
+ {"matrix": [9, 3], "x": 10.5, "y": 2},
+ {"matrix": [9, 4], "x": 11.5, "y": 2},
+ {"matrix": [9, 5], "x": 12.5, "y": 2},
+ {"matrix": [9, 6], "x": 13.5, "y": 2},
+ {"matrix": [9, 7], "x": 14.5, "y": 2, "w": 1.5},
+ {"matrix": [13, 4], "x": 16, "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": [10, 0], "x": 7.75, "y": 3},
+ {"matrix": [10, 1], "x": 8.75, "y": 3},
+ {"matrix": [10, 2], "x": 9.75, "y": 3},
+ {"matrix": [10, 3], "x": 10.75, "y": 3},
+ {"matrix": [10, 4], "x": 11.75, "y": 3},
+ {"matrix": [10, 5], "x": 12.75, "y": 3},
+ {"matrix": [10, 6], "x": 13.75, "y": 3},
+ {"matrix": [10, 7], "x": 14.75, "y": 3, "w": 1.25},
+ {"matrix": [13, 5], "x": 16, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [5, 3], "x": 1.25, "y": 4},
+ {"matrix": [4, 1], "x": 2.25, "y": 4},
+ {"matrix": [4, 2], "x": 3.25, "y": 4},
+ {"matrix": [4, 3], "x": 4.25, "y": 4},
+ {"matrix": [4, 4], "x": 5.25, "y": 4},
+ {"matrix": [4, 5], "x": 6.25, "y": 4},
+ {"matrix": [11, 0], "x": 7.25, "y": 4},
+ {"matrix": [11, 1], "x": 8.25, "y": 4},
+ {"matrix": [11, 2], "x": 9.25, "y": 4},
+ {"matrix": [11, 3], "x": 10.25, "y": 4},
+ {"matrix": [11, 4], "x": 11.25, "y": 4},
+ {"matrix": [11, 5], "x": 12.25, "y": 4},
+ {"matrix": [11, 6], "x": 13.25, "y": 4, "w": 1.75},
+ {"matrix": [11, 7], "x": 15, "y": 4},
+ {"matrix": [13, 6], "x": 16, "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, 4], "x": 3.75, "y": 5, "w": 2},
+ {"matrix": [5, 5], "x": 5.75, "y": 5},
+ {"matrix": [12, 0], "x": 7.75, "y": 5, "w": 2.75},
+ {"matrix": [12, 1], "x": 10.5, "y": 5, "w": 1.25},
+ {"matrix": [12, 2], "x": 11.75, "y": 5},
+ {"matrix": [12, 3], "x": 12.75, "y": 5, "w": 1.25},
+ {"matrix": [12, 6], "x": 14, "y": 5},
+ {"matrix": [12, 7], "x": 15, "y": 5},
+ {"matrix": [13, 7], "x": 16, "y": 5}
+ ]
+ },
+ "LAYOUT_protosplit": {
+ "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": [7, 0], "x": 8, "y": 0},
+ {"matrix": [7, 1], "x": 9, "y": 0},
+ {"matrix": [7, 2], "x": 10, "y": 0},
+ {"matrix": [7, 3], "x": 11, "y": 0},
+ {"matrix": [7, 4], "x": 12, "y": 0},
+ {"matrix": [7, 5], "x": 13, "y": 0},
+ {"matrix": [7, 6], "x": 14, "y": 0},
+ {"matrix": [7, 7], "x": 15, "y": 0},
+ {"matrix": [13, 2], "x": 16, "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": [8, 0], "x": 8, "y": 1},
+ {"matrix": [8, 1], "x": 9, "y": 1},
+ {"matrix": [8, 2], "x": 10, "y": 1},
+ {"matrix": [8, 3], "x": 11, "y": 1},
+ {"matrix": [8, 4], "x": 12, "y": 1},
+ {"matrix": [8, 5], "x": 13, "y": 1},
+ {"matrix": [8, 6], "x": 14, "y": 1},
+ {"matrix": [8, 7], "x": 15, "y": 1},
+ {"matrix": [13, 3], "x": 16, "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": [9, 0], "x": 7.5, "y": 2},
+ {"matrix": [9, 1], "x": 8.5, "y": 2},
+ {"matrix": [9, 2], "x": 9.5, "y": 2},
+ {"matrix": [9, 3], "x": 10.5, "y": 2},
+ {"matrix": [9, 4], "x": 11.5, "y": 2},
+ {"matrix": [9, 5], "x": 12.5, "y": 2},
+ {"matrix": [9, 6], "x": 13.5, "y": 2},
+ {"matrix": [9, 7], "x": 14.5, "y": 2, "w": 1.5},
+ {"matrix": [13, 4], "x": 16, "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": [10, 0], "x": 7.75, "y": 3},
+ {"matrix": [10, 1], "x": 8.75, "y": 3},
+ {"matrix": [10, 2], "x": 9.75, "y": 3},
+ {"matrix": [10, 3], "x": 10.75, "y": 3},
+ {"matrix": [10, 4], "x": 11.75, "y": 3},
+ {"matrix": [10, 5], "x": 12.75, "y": 3},
+ {"matrix": [10, 7], "x": 13.75, "y": 3, "w": 2.25},
+ {"matrix": [13, 5], "x": 16, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"matrix": [4, 1], "x": 2.25, "y": 4},
+ {"matrix": [4, 2], "x": 3.25, "y": 4},
+ {"matrix": [4, 3], "x": 4.25, "y": 4},
+ {"matrix": [4, 4], "x": 5.25, "y": 4},
+ {"matrix": [4, 5], "x": 6.25, "y": 4},
+
+ {"matrix": [11, 0], "x": 7.25, "y": 4},
+ {"matrix": [11, 1], "x": 8.25, "y": 4},
+ {"matrix": [11, 2], "x": 9.25, "y": 4},
+ {"matrix": [11, 3], "x": 10.25, "y": 4},
+ {"matrix": [11, 4], "x": 11.25, "y": 4},
+ {"matrix": [11, 5], "x": 12.25, "y": 4},
+ {"matrix": [11, 6], "x": 13.25, "y": 4, "w": 1.75},
+ {"matrix": [11, 7], "x": 15, "y": 4},
+ {"matrix": [13, 6], "x": 16, "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, 4], "x": 3.75, "y": 5, "w": 2},
+ {"matrix": [5, 5], "x": 5.75, "y": 5},
+
+ {"matrix": [12, 0], "x": 7.75, "y": 5, "w": 2.75},
+ {"matrix": [12, 1], "x": 10.5, "y": 5, "w": 1.25},
+ {"matrix": [12, 2], "x": 11.75, "y": 5},
+ {"matrix": [12, 3], "x": 12.75, "y": 5, "w": 1.25},
+ {"matrix": [12, 6], "x": 14, "y": 5},
+ {"matrix": [12, 7], "x": 15, "y": 5},
+ {"matrix": [13, 7], "x": 16, "y": 5}
+ ]
+ }
}
}
diff --git a/keyboards/deltasplit75/v2/v2.h b/keyboards/deltasplit75/v2/v2.h
deleted file mode 100644
index 0373a6fe02..0000000000
--- a/keyboards/deltasplit75/v2/v2.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-//matrix is defined in a weird way here; the layout on both sides are asymmetrical, but the "matrix" is symmetrical but with empty gaps
-//the last column is defined as a separate row because the firmware currently doesnt support more than 8 columns (this layout has 9 columns per side) K45 and K110 are the Bs on both sides; K53 and K106 are extra keys for ISO
-#define LAYOUT_v2( \
- K00, K01, K02, K03, K04, K05, K06, K70, K71, K72, K73, K74, K75, K76, K77, K132, \
- K10, K11, K12, K13, K14, K15, K16, K80, K81, K82, K83, K84, K85, K86, K87, K133, \
- K20, K21, K22, K23, K24, K25, K90, K91, K92, K93, K94, K95, K96, K97, K134, \
- K30, K31, K32, K33, K34, K35, K100, K101, K102, K103, K104, K105, K106, K107, K135, \
- K40, K53, K41, K42, K43, K44, K45, K110, K111, K112, K113, K114, K115, K116, K117, K136, \
- K50, K51, K52, K54, K55, K120, K121, K122, K123, K126, K127, K137 \
- ) \
- { \
- { K00, K01, K02, K03, K04, K05, K06, KC_NO}, \
- { K10, K11, K12, K13, K14, K15, K16, KC_NO}, \
- { K20, K21, K22, K23, K24, K25, KC_NO, KC_NO}, \
- { K30, K31, K32, K33, K34, K35, KC_NO, KC_NO}, \
- { K40, K41, K42, K43, K44, K45, KC_NO, KC_NO}, \
- { K50, K51, K52, K53, K54, K55, KC_NO, KC_NO}, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO}, \
- { K70 , K71, K72, K73, K74, K75, K76, K77}, \
- { K80, K81, K82, K83, K84, K85, K86, K87}, \
- { K90, K91, K92, K93, K94, K95, K96, K97}, \
- { K100, K101, K102, K103, K104, K105, K106, K107}, \
- { K110, K111, K112, K113, K114, K115, K116, K117}, \
- { K120, K121, K122, K123, KC_NO, KC_NO, K126, K127}, \
- { KC_NO, KC_NO, K132, K133, K134, K135, K136, K137} \
- }
-
-#define LAYOUT_protosplit( \
- K00, K01, K02, K03, K04, K05, K06, K70, K71, K72, K73, K74, K75, K76, K77, K132, \
- K10, K11, K12, K13, K14, K15, K16, K80, K81, K82, K83, K84, K85, K86, K87, K133, \
- K20, K21, K22, K23, K24, K25, K90, K91, K92, K93, K94, K95, K96, K97, K134, \
- K30, K31, K32, K33, K34, K35, K100, K101, K102, K103, K104, K105, K107, K135, \
- K40, K41, K42, K43, K44, K45, K110, K111, K112, K113, K114, K115, K116, K117, K136, \
- K50, K51, K52, K54, K55, K120, K121, K122, K123, K126, K127, K137 \
- ) \
- { \
- { K00, K01, K02, K03, K04, K05, K06, KC_NO}, \
- { K10, K11, K12, K13, K14, K15, K16, KC_NO}, \
- { K20, K21, K22, K23, K24, K25, KC_NO, KC_NO}, \
- { K30, K31, K32, K33, K34, K35, KC_NO, KC_NO}, \
- { K40, K41, K42, K43, K44, K45, KC_NO, KC_NO}, \
- { K50, K51, K52, KC_NO, K54, K55, KC_NO, KC_NO}, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO}, \
- { K70 , K71, K72, K73, K74, K75, K76, K77}, \
- { K80, K81, K82, K83, K84, K85, K86, K87}, \
- { K90, K91, K92, K93, K94, K95, K96, K97}, \
- { K100, K101, K102, K103, K104, K105, KC_NO, K107}, \
- { K110, K111, K112, K113, K114, K115, K116, K117}, \
- { K120, K121, K122, K123, KC_NO, KC_NO, K126, K127}, \
- { KC_NO, KC_NO, K132, K133, K134, K135, K136, K137} \
- }
diff --git a/keyboards/dinofizz/fnrow/v1/info.json b/keyboards/dinofizz/fnrow/v1/info.json
index a52e887df8..9beff28ec8 100644
--- a/keyboards/dinofizz/fnrow/v1/info.json
+++ b/keyboards/dinofizz/fnrow/v1/info.json
@@ -18,71 +18,22 @@
"layouts": {
"LAYOUT_fn_row": {
"layout": [
- {
- "label": "SW1",
- "x": 0,
- "y": 0
- },
- {
- "label": "SW3",
- "x": 2,
- "y": 0
- },
- {
- "label": "SW5",
- "x": 3,
- "y": 0
- },
- {
- "label": "SW7",
- "x": 4,
- "y": 0
- },
- {
- "label": "SW9",
- "x": 5,
- "y": 0
- },
- {
- "label": "SW11",
- "x": 6.5,
- "y": 0
- },
- {
- "label": "SW13",
- "x": 7.5,
- "y": 0
- },
- {
- "label": "SW2",
- "x": 8.5,
- "y": 0
- },
- {
- "label": "SW4",
- "x": 9.5,
- "y": 0
- },
- {
- "label": "SW6",
- "x": 11,
- "y": 0
- },
- {
- "label": "SW8",
- "x": 12,
- "y": 0
- },
- {
- "label": "SW10",
- "x": 13,
- "y": 0
- },
- {
- "label": "SW12",
- "x": 14,
- "y": 0
- }
+ {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [1, 0], "x": 8.5, "y": 0},
+ {"matrix": [1, 1], "x": 9.5, "y": 0},
+
+ {"matrix": [1, 2], "x": 11, "y": 0},
+ {"matrix": [1, 3], "x": 12, "y": 0},
+ {"matrix": [1, 4], "x": 13, "y": 0},
+ {"matrix": [1, 5], "x": 14, "y": 0}
]
}
}
diff --git a/keyboards/dinofizz/fnrow/v1/v1.c b/keyboards/dinofizz/fnrow/v1/v1.c
index a5c5b21eac..d2a5cd7120 100644
--- a/keyboards/dinofizz/fnrow/v1/v1.c
+++ b/keyboards/dinofizz/fnrow/v1/v1.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 "v1.h"
+#include "quantum.h"
void keyboard_pre_init_kb(void) {
// Immediately set the LED pin as an output and set it ON
diff --git a/keyboards/dinofizz/fnrow/v1/v1.h b/keyboards/dinofizz/fnrow/v1/v1.h
deleted file mode 100644
index ce9209cad9..0000000000
--- a/keyboards/dinofizz/fnrow/v1/v1.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 Dino Fizzotti
- *
- * 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_fn_row( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, }, \
- { K007, K008, K009, K010, K011, K012, KC_NO }, \
-}
diff --git a/keyboards/drhigsby/bkf/bkf.h b/keyboards/drhigsby/bkf/bkf.h
deleted file mode 100644
index 3ea53e2de5..0000000000
--- a/keyboards/drhigsby/bkf/bkf.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright 2021 drhigsby
- *
- * 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 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 zzzz KC_NO
-
-#define LAYOUT_625uC( \
- k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k311, \
- 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, k306, k308, k309, k310 \
-) { \
- { 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, zzzz, zzzz, zzzz, k306, zzzz, k308, k309, k310, k311 } \
-}
-
-#define LAYOUT_2x3uC( \
- k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k311, \
- 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, k304, k306, k308, k309, k310 \
-) { \
- { 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, zzzz, k304, zzzz, k306, zzzz, k308, k309, k310, k311 } \
-}
diff --git a/keyboards/drhigsby/bkf/info.json b/keyboards/drhigsby/bkf/info.json
index d2a22b3d20..25d79416dc 100644
--- a/keyboards/drhigsby/bkf/info.json
+++ b/keyboards/drhigsby/bkf/info.json
@@ -21,13 +21,108 @@
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
- "LAYOUT_625uC": {
- "layout": [{"label":"Tab", "x":0, "y":0, "w":1.5}, {"label":"Q", "x":1.5, "y":0}, {"label":"W", "x":2.5, "y":0}, {"label":"E", "x":3.5, "y":0}, {"label":"R", "x":4.5, "y":0}, {"label":"T", "x":5.5, "y":0}, {"label":"Y", "x":6.5, "y":0}, {"label":"U", "x":7.5, "y":0}, {"label":"I", "x":8.5, "y":0}, {"label":"O", "x":9.5, "y":0}, {"label":"P", "x":10.5, "y":0}, {"label":"{", "x":11.5, "y":0}, {"label":"}", "x":12.5, "y":0}, {"label":"Caps Lock", "x":0, "y":1, "w":1.75}, {"label":"A", "x":1.75, "y":1}, {"label":"S", "x":2.75, "y":1}, {"label":"D", "x":3.75, "y":1}, {"label":"F", "x":4.75, "y":1}, {"label":"G", "x":5.75, "y":1}, {"label":"H", "x":6.75, "y":1}, {"label":"J", "x":7.75, "y":1}, {"label":"K", "x":8.75, "y":1}, {"label":"L", "x":9.75, "y":1}, {"label":":", "x":10.75, "y":1}, {"label":"Control", "x":11.75, "y":1, "w":1.75}, {"label":"Shift", "x":0, "y":2, "w":2.25}, {"label":"Z", "x":2.25, "y":2}, {"label":"X", "x":3.25, "y":2}, {"label":"C", "x":4.25, "y":2}, {"label":"V", "x":5.25, "y":2}, {"label":"B", "x":6.25, "y":2}, {"label":"N", "x":7.25, "y":2}, {"label":"M", "x":8.25, "y":2}, {"label":"<", "x":9.25, "y":2}, {"label":">", "x":10.25, "y":2}, {"label":"?", "x":11.25, "y":2}, {"label":"Shift", "x":12.25, "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}, {"label":"", "x":3.75, "y":3, "w":6.25}, {"label":"Alt", "x":10, "y":3, "w":1.25}, {"label":"Win", "x":11.25, "y":3}, {"label":"Menu", "x":12.25, "y":3, "w":1.25}]
- },
+ "LAYOUT_625uC": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+ {"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": [3, 11], "x": 12.5, "y": 0},
- "LAYOUT_2x3uC": {
- "layout": [{"label":"Tab", "x":0, "y":0, "w":1.5}, {"label":"Q", "x":1.5, "y":0}, {"label":"W", "x":2.5, "y":0}, {"label":"E", "x":3.5, "y":0}, {"label":"R", "x":4.5, "y":0}, {"label":"T", "x":5.5, "y":0}, {"label":"Y", "x":6.5, "y":0}, {"label":"U", "x":7.5, "y":0}, {"label":"I", "x":8.5, "y":0}, {"label":"O", "x":9.5, "y":0}, {"label":"P", "x":10.5, "y":0}, {"label":"{", "x":11.5, "y":0}, {"label":"}", "x":12.5, "y":0}, {"label":"Caps Lock", "x":0, "y":1, "w":1.75}, {"label":"A", "x":1.75, "y":1}, {"label":"S", "x":2.75, "y":1}, {"label":"D", "x":3.75, "y":1}, {"label":"F", "x":4.75, "y":1}, {"label":"G", "x":5.75, "y":1}, {"label":"H", "x":6.75, "y":1}, {"label":"J", "x":7.75, "y":1}, {"label":"K", "x":8.75, "y":1}, {"label":"L", "x":9.75, "y":1}, {"label":":", "x":10.75, "y":1}, {"label":"Control", "x":11.75, "y":1, "w":1.75}, {"label":"Shift", "x":0, "y":2, "w":2.25}, {"label":"Z", "x":2.25, "y":2}, {"label":"X", "x":3.25, "y":2}, {"label":"C", "x":4.25, "y":2}, {"label":"V", "x":5.25, "y":2}, {"label":"B", "x":6.25, "y":2}, {"label":"N", "x":7.25, "y":2}, {"label":"M", "x":8.25, "y":2}, {"label":"<", "x":9.25, "y":2}, {"label":">", "x":10.25, "y":2}, {"label":"?", "x":11.25, "y":2}, {"label":"Shift", "x":12.25, "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}, {"label":"", "x":3.75, "y":3, "w":3}, {"label":"", "x":6.75, "y":3, "w":3}, {"label":"Alt", "x":9.75, "y":3, "w":1.25}, {"label":"Win", "x":11, "y":3, "w":1.25}, {"label":"Menu", "x":12.25, "y":3, "w":1.25}]
- }
-
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
+ {"matrix": [1, 1], "x": 1.75, "y": 1},
+ {"matrix": [1, 2], "x": 2.75, "y": 1},
+ {"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, "w": 1.75},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 2.25},
+ {"matrix": [2, 1], "x": 2.25, "y": 2},
+ {"matrix": [2, 2], "x": 3.25, "y": 2},
+ {"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, "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, 6], "x": 3.75, "y": 3, "w": 6.25},
+ {"matrix": [3, 8], "x": 10, "y": 3, "w": 1.25},
+ {"matrix": [3, 9], "x": 11.25, "y": 3},
+ {"matrix": [3, 10], "x": 12.25, "y": 3, "w": 1.25}
+ ]
+ },
+ "LAYOUT_2x3uC": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+ {"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": [3, 11], "x": 12.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
+ {"matrix": [1, 1], "x": 1.75, "y": 1},
+ {"matrix": [1, 2], "x": 2.75, "y": 1},
+ {"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, "w": 1.75},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 2.25},
+ {"matrix": [2, 1], "x": 2.25, "y": 2},
+ {"matrix": [2, 2], "x": 3.25, "y": 2},
+ {"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, "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, "w": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3, "w": 3},
+ {"matrix": [3, 8], "x": 9.75, "y": 3, "w": 1.25},
+ {"matrix": [3, 9], "x": 11, "y": 3, "w": 1.25},
+ {"matrix": [3, 10], "x": 12.25, "y": 3, "w": 1.25}
+ ]
}
+ }
}
diff --git a/keyboards/drhigsby/packrat/info.json b/keyboards/drhigsby/packrat/info.json
index 0525824da3..7b74841a6a 100644
--- a/keyboards/drhigsby/packrat/info.json
+++ b/keyboards/drhigsby/packrat/info.json
@@ -21,24 +21,233 @@
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
- "LAYOUT_3uc": {
- "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":"KNOB!", "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":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1}, {"label":"Any", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":":", "x":10, "y":1}, {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"B", "x":4, "y":2}, {"label":"Any", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":"<", "x":8, "y":2}, {"label":">", "x":9, "y":2}, {"label":"?", "x":10, "y":2}, {"label":"Ctrl", "x":0.5, "y":3, "w":1.25}, {"label":"Alt", "x":1.75, "y":3, "w":1.25}, {"label":"Raise", "x":3, "y":3}, {"label":"", "x":4, "y":3, "w":3}, {"label":"Lower", "x":7, "y":3}, {"label":"Win", "x":8, "y":3, "w":1.25}, {"label":"Fn", "x":9.25, "y":3, "w":1.25}]
- },
-
- "LAYOUT_2x2uc": {
- "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":"KNOB!", "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":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1}, {"label":"Any", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":":", "x":10, "y":1}, {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"B", "x":4, "y":2}, {"label":"Any", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":"<", "x":8, "y":2}, {"label":">", "x":9, "y":2}, {"label":"?", "x":10, "y":2}, {"label":"Ctrl", "x":0.5, "y":3, "w":1.25}, {"label":"Alt", "x":1.75, "y":3, "w":1.25}, {"label":"", "x":3, "y":3, "w":2}, {"label":"Any", "x":5, "y":3}, {"label":"", "x":6, "y":3, "w":2}, {"label":"Win", "x":8, "y":3, "w":1.25}, {"label":"Fn", "x":9.25, "y":3, "w":1.25}]
- },
-
- "LAYOUT_7uc": {
- "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":"KNOB!", "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":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1}, {"label":"Any", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":":", "x":10, "y":1}, {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"B", "x":4, "y":2}, {"label":"Any", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":"<", "x":8, "y":2}, {"label":">", "x":9, "y":2}, {"label":"?", "x":10, "y":2}, {"label":"Ctrl", "x":0.5, "y":3, "w":1.5}, {"label":"", "x":2, "y":3, "w":7}, {"label":"Alt", "x":9, "y":3, "w":1.5}]
- },
-
- "LAYOUT_2x3uc": {
- "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":"KNOB!", "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":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1}, {"label":"Any", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":":", "x":10, "y":1}, {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"B", "x":4, "y":2}, {"label":"Any", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":"<", "x":8, "y":2}, {"label":">", "x":9, "y":2}, {"label":"?", "x":10, "y":2}, {"label":"Ctrl", "x":0.5, "y":3}, {"label":"Alt", "x":1.5, "y":3}, {"label":"", "x":2.5, "y":3, "w":3}, {"label":"", "x":5.5, "y":3, "w":3}, {"label":"Win", "x":8.5, "y":3}, {"label":"Fn", "x":9.5, "y":3}]
- },
-
- "LAYOUT_6uc": {
- "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":"KNOB!", "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":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1}, {"label":"Any", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":":", "x":10, "y":1}, {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"B", "x":4, "y":2}, {"label":"Any", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":"<", "x":8, "y":2}, {"label":">", "x":9, "y":2}, {"label":"?", "x":10, "y":2}, {"label":"Ctrl", "x":0.5, "y":3}, {"label":"Alt", "x":1.5, "y":3}, {"label":"", "x":2.5, "y":3, "w":6}, {"label":"Win", "x":8.5, "y":3}, {"label":"Fn", "x":9.5, "y":3}]
- }
+ "LAYOUT_3uc": {
+ "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": [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": [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": [3, 1], "x": 0.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 2], "x": 1.75, "y": 3, "w": 1.25},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 5], "x": 4, "y": 3, "w": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3, "w": 1.25},
+ {"matrix": [3, 9], "x": 9.25, "y": 3, "w": 1.25}
+ ]
+ },
+ "LAYOUT_2x2uc": {
+ "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": [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": [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": [3, 1], "x": 0.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 2], "x": 1.75, "y": 3, "w": 1.25},
+ {"matrix": [3, 3], "x": 3, "y": 3, "w": 2},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 7], "x": 6, "y": 3, "w": 2},
+ {"matrix": [3, 8], "x": 8, "y": 3, "w": 1.25},
+ {"matrix": [3, 9], "x": 9.25, "y": 3, "w": 1.25}
+ ]
+ },
+ "LAYOUT_7uc": {
+ "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": [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": [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": [3, 1], "x": 0.5, "y": 3, "w": 1.5},
+ {"matrix": [3, 5], "x": 2, "y": 3, "w": 7},
+ {"matrix": [3, 9], "x": 9, "y": 3, "w": 1.5}
+ ]
+ },
+ "LAYOUT_2x3uc": {
+ "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": [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": [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": [3, 1], "x": 0.5, "y": 3},
+ {"matrix": [3, 2], "x": 1.5, "y": 3},
+ {"matrix": [3, 3], "x": 2.5, "y": 3, "w": 3},
+ {"matrix": [3, 7], "x": 5.5, "y": 3, "w": 3},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [3, 9], "x": 9.5, "y": 3}
+ ]
+ },
+ "LAYOUT_6uc": {
+ "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": [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": [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": [3, 1], "x": 0.5, "y": 3},
+ {"matrix": [3, 2], "x": 1.5, "y": 3},
+ {"matrix": [3, 5], "x": 2.5, "y": 3, "w": 6},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [3, 9], "x": 9.5, "y": 3}
+ ]
}
+ }
}
diff --git a/keyboards/drhigsby/packrat/packrat.c b/keyboards/drhigsby/packrat/packrat.c
deleted file mode 100644
index dc8f3b41b4..0000000000
--- a/keyboards/drhigsby/packrat/packrat.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 drhigsby
- *
- * 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 "packrat.h"
diff --git a/keyboards/drhigsby/packrat/packrat.h b/keyboards/drhigsby/packrat/packrat.h
deleted file mode 100644
index 91d0af7b7a..0000000000
--- a/keyboards/drhigsby/packrat/packrat.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Copyright 2021 drhigsby
- *
- * 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_3uc( \
- k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, \
- k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, \
- k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, \
- k301, k302, k303, k305, k307, k308, k309 \
-) { \
- { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010 }, \
- { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110 }, \
- { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210 }, \
- { KC_NO, k301, k302, k303, KC_NO, k305, KC_NO, k307, k308, k309 } \
-}
-
-#define LAYOUT_2x2uc( \
- k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, \
- k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, \
- k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, \
- k301, k302, k303, k305, k307, k308, k309 \
-) { \
- { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010 }, \
- { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110 }, \
- { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210 }, \
- { KC_NO, k301, k302, k303, KC_NO, k305, KC_NO, k307, k308, k309 } \
-}
-
-#define LAYOUT_7uc( \
- k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, \
- k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, \
- k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, \
- k301, k305, k309 \
-) { \
- { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010 }, \
- { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110 }, \
- { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210 }, \
- { KC_NO, k301, KC_NO, KC_NO, KC_NO, k305, KC_NO, KC_NO, KC_NO, k309 } \
-}
-
-#define LAYOUT_2x3uc( \
- k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, \
- k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, \
- k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, \
- k301, k302, k303, k307, k308, k309 \
-) { \
- { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010 }, \
- { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110 }, \
- { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210 }, \
- { KC_NO, k301, k302, k303, KC_NO, KC_NO, KC_NO, k307, k308, k309 } \
-}
-
-#define LAYOUT_6uc( \
- k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, \
- k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, \
- k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, \
- k301, k302, k305, k308, k309 \
-) { \
- { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010 }, \
- { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110 }, \
- { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210 }, \
- { KC_NO, k301, k302, KC_NO, KC_NO, k305, KC_NO, KC_NO, k308, k309 } \
-}
diff --git a/keyboards/ebastler/isometria_75/rev1/info.json b/keyboards/ebastler/isometria_75/rev1/info.json
index f279d22543..8151451a32 100644
--- a/keyboards/ebastler/isometria_75/rev1/info.json
+++ b/keyboards/ebastler/isometria_75/rev1/info.json
@@ -32,94 +32,105 @@
"layouts": {
"LAYOUT_iso": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"F1", "x":1.25, "y":0},
- {"label":"F2", "x":2.25, "y":0},
- {"label":"F3", "x":3.25, "y":0},
- {"label":"F4", "x":4.25, "y":0},
- {"label":"F5", "x":5.5, "y":0},
- {"label":"F6", "x":6.5, "y":0},
- {"label":"F7", "x":7.5, "y":0},
- {"label":"F8", "x":8.5, "y":0},
- {"label":"F9", "x":9.75, "y":0},
- {"label":"F10", "x":10.75, "y":0},
- {"label":"F11", "x":11.75, "y":0},
- {"label":"F12", "x":12.75, "y":0},
- {"label":"PRINT SCREEN", "x":14, "y":0},
- {"label":"PLAY/PAUSE", "x":15.25, "y":0},
-
- {"label":"`", "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":"-", "x":11, "y":1.25},
- {"label":"=", "x":12, "y":1.25},
- {"label":"BACKSPACE", "x":13, "y":1.25, "w":2},
- {"label":"HOME", "x":15.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":"[", "x":11.5, "y":2.25},
- {"label":"]", "x":12.5, "y":2.25},
- {"label":"PAGE UP", "x":15.25, "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":"ISO #", "x":12.75, "y":3.25},
- {"label":"ENTER", "x":13.75, "y":2.25, "w":1.25, "h":2},
- {"label":"PAGE DOWN", "x":15.25, "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.5},
- {"label":"UP", "x":14, "y":4.5},
- {"label":"END", "x":15.25, "y":4.25},
-
- {"label":"CTRL", "x":0, "y":5.25, "w":1.25},
- {"label":"SUPER", "x":1.25, "y":5.25, "w":1.25},
- {"label":"ALT", "x":2.5, "y":5.25, "w":1.25},
- {"label":"SPACE", "x":3.75, "y":5.25, "w":6.25},
- {"label":"ALT", "x":10, "y":5.25, "w":1.5},
- {"label":"FUNC", "x":11.5, "y":5.25, "w":1.25},
- {"label":"LEFT", "x":13, "y":5.5},
- {"label":"DOWN", "x":14, "y":5.5},
- {"label":"RIGHT", "x":15, "y":5.5}
+ {"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, 6], "x": 5.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.75, "y": 0},
+ {"matrix": [0, 11], "x": 10.75, "y": 0},
+ {"matrix": [0, 12], "x": 11.75, "y": 0},
+ {"matrix": [0, 13], "x": 12.75, "y": 0},
+
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [0, 15], "x": 15.25, "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": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 2], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 13], "x": 12.5, "y": 2.25},
+
+ {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+ {"matrix": [3, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 15], "x": 15.25, "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, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.5},
+
+ {"matrix": [4, 14], "x": 14, "y": 4.5},
+
+ {"matrix": [4, 15], "x": 15.25, "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, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
+
+ {"matrix": [5, 13], "x": 13, "y": 5.5},
+ {"matrix": [5, 14], "x": 14, "y": 5.5},
+ {"matrix": [5, 15], "x": 15, "y": 5.5}
]
}
}
diff --git a/keyboards/ebastler/isometria_75/rev1/rev1.h b/keyboards/ebastler/isometria_75/rev1/rev1.h
deleted file mode 100644
index 9aea3a06d7..0000000000
--- a/keyboards/ebastler/isometria_75/rev1/rev1.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 Moritz Plattner
- *
- * 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_iso( \
- K000, K001, K002, K003, K004, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K114, K115, \
- K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K215, \
- K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, \
- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K413, K414, K415, \
- K500, K501, K502, K506, K510, K511, K513, K514, K515 \
-) { \
- { K000, K001, K002, K003, K004, KC_NO, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015 } , \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO, K114, K115 } , \
- { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, KC_NO, K215 } , \
- { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315 } , \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, KC_NO, K413, K414, K415 } , \
- { K500, K501, K502, KC_NO, KC_NO, KC_NO, K506, KC_NO, KC_NO, KC_NO, K510, K511, KC_NO, K513, K514, K515 } \
-}
diff --git a/keyboards/ergoslab/rev1/info.json b/keyboards/ergoslab/rev1/info.json
index 5f00b666d1..d786799810 100644
--- a/keyboards/ergoslab/rev1/info.json
+++ b/keyboards/ergoslab/rev1/info.json
@@ -24,58 +24,67 @@
"layouts": {
"LAYOUT_ergoslab": {
"layout": [
- {"label":"Q", "x":0, "y":0.625},
- {"label":"W", "x":1, "y":0.125},
- {"label":"E", "x":2, "y":0},
- {"label":"R", "x":3, "y":0.125},
- {"label":"T", "x":4, "y":0.25},
- {"label":"Y", "x":8, "y":0.25},
- {"label":"U", "x":9, "y":0.125},
- {"label":"I", "x":10, "y":0},
- {"label":"O", "x":11, "y":0.125},
- {"label":"P", "x":12, "y":0.625},
- {"label":"A", "x":0, "y":1.625},
- {"label":"S", "x":1, "y":1.125},
- {"label":"D", "x":2, "y":1},
- {"label":"F", "x":3, "y":1.125},
- {"label":"G", "x":4, "y":1.25},
- {"label":"H", "x":8, "y":1.25},
- {"label":"J", "x":9, "y":1.125},
- {"label":"K", "x":10, "y":1},
- {"label":"L", "x":11, "y":1.125},
- {"label":";", "x":12, "y":1.625},
- {"label":"Z", "x":0, "y":2.625},
- {"label":"X", "x":1, "y":2.125},
- {"label":"C", "x":2, "y":2},
- {"label":"V", "x":3, "y":2.125},
- {"label":"B", "x":4, "y":2.25},
- {"label":"N", "x":8, "y":2.25},
- {"label":"M", "x":9, "y":2.125},
- {"label":",", "x":10, "y":2},
- {"label":".", "x":11, "y":2.125},
- {"label":"/", "x":12, "y":2.625},
- {"label":"'", "x":0, "y":3.625},
- {"label":"Alt", "x":1, "y":3.125},
- {"label":"Del", "x":2, "y":3},
- {"label":"Enter", "x":3, "y":3.125},
- {"label":"Shift", "x":4, "y":3.25},
- {"label":"Ctrl", "x":5, "y":3.25},
- {"label":"Numb", "x":7, "y":3.25},
- {"label":"Space", "x":8, "y":3.25},
- {"label":"Left", "x":9, "y":3.125},
- {"label":"Down", "x":10, "y":3},
- {"label":"Up", "x":11, "y":3.125},
- {"label":"Right", "x":12, "y":3.625},
- {"label":"[", "x":1, "y":4.25},
- {"label":"(", "x":2, "y":4.25},
- {"label":"Esc", "x":3, "y":4.25},
- {"label":"Media", "x":4, "y":4.25},
- {"label":"GUI", "x":5, "y":4.25},
- {"label":"Tab", "x":7, "y":4.25},
- {"label":"Mouse", "x":8, "y":4.25},
- {"label":"Bspc", "x":9, "y":4.25},
- {"label":")", "x":10, "y":4.25},
- {"label":"]", "x":11, "y":4.25}
+ {"matrix": [0, 0], "x": 0, "y": 0.625},
+ {"matrix": [0, 1], "x": 1, "y": 0.125},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.125},
+ {"matrix": [0, 4], "x": 4, "y": 0.25},
+
+ {"matrix": [5, 4], "x": 8, "y": 0.25},
+ {"matrix": [5, 3], "x": 9, "y": 0.125},
+ {"matrix": [5, 2], "x": 10, "y": 0},
+ {"matrix": [5, 1], "x": 11, "y": 0.125},
+ {"matrix": [5, 0], "x": 12, "y": 0.625},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.625},
+ {"matrix": [1, 1], "x": 1, "y": 1.125},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.125},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+
+ {"matrix": [6, 4], "x": 8, "y": 1.25},
+ {"matrix": [6, 3], "x": 9, "y": 1.125},
+ {"matrix": [6, 2], "x": 10, "y": 1},
+ {"matrix": [6, 1], "x": 11, "y": 1.125},
+ {"matrix": [6, 0], "x": 12, "y": 1.625},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.625},
+ {"matrix": [2, 1], "x": 1, "y": 2.125},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.125},
+ {"matrix": [2, 4], "x": 4, "y": 2.25},
+
+ {"matrix": [7, 4], "x": 8, "y": 2.25},
+ {"matrix": [7, 3], "x": 9, "y": 2.125},
+ {"matrix": [7, 2], "x": 10, "y": 2},
+ {"matrix": [7, 1], "x": 11, "y": 2.125},
+ {"matrix": [7, 0], "x": 12, "y": 2.625},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.625},
+ {"matrix": [3, 1], "x": 1, "y": 3.125},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3.125},
+ {"matrix": [3, 4], "x": 4, "y": 3.25},
+ {"matrix": [3, 5], "x": 5, "y": 3.25},
+
+ {"matrix": [8, 5], "x": 7, "y": 3.25},
+ {"matrix": [8, 4], "x": 8, "y": 3.25},
+ {"matrix": [8, 3], "x": 9, "y": 3.125},
+ {"matrix": [8, 2], "x": 10, "y": 3},
+ {"matrix": [8, 1], "x": 11, "y": 3.125},
+ {"matrix": [8, 0], "x": 12, "y": 3.625},
+
+ {"matrix": [4, 1], "x": 1, "y": 4.25},
+ {"matrix": [4, 2], "x": 2, "y": 4.25},
+ {"matrix": [4, 3], "x": 3, "y": 4.25},
+ {"matrix": [4, 4], "x": 4, "y": 4.25},
+ {"matrix": [4, 5], "x": 5, "y": 4.25},
+
+ {"matrix": [9, 5], "x": 7, "y": 4.25},
+ {"matrix": [9, 4], "x": 8, "y": 4.25},
+ {"matrix": [9, 3], "x": 9, "y": 4.25},
+ {"matrix": [9, 2], "x": 10, "y": 4.25},
+ {"matrix": [9, 1], "x": 11, "y": 4.25}
]
}
}
diff --git a/keyboards/ergoslab/rev1/rev1.c b/keyboards/ergoslab/rev1/rev1.c
index 115dab51e4..104bb39c39 100644
--- a/keyboards/ergoslab/rev1/rev1.c
+++ b/keyboards/ergoslab/rev1/rev1.c
@@ -1,4 +1,4 @@
-#include "rev1.h"
+#include "quantum.h"
#ifdef SWAP_HANDS_ENABLE
__attribute__ ((weak))
diff --git a/keyboards/ergoslab/rev1/rev1.h b/keyboards/ergoslab/rev1/rev1.h
deleted file mode 100644
index d7fd53a31e..0000000000
--- a/keyboards/ergoslab/rev1/rev1.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ergoslab( \
- L00, L01, L02, L03, L04, R04, R03, R02, R01, R00, \
- L10, L11, L12, L13, L14, R14, R13, R12, R11, R10, \
- L20, L21, L22, L23, L24, R24, R23, R22, R21, R20, \
- L30, L31, L32, L33, L34, L35, R35, R34, R33, R32, R31, R30, \
- L41, L42, L43, L44, L45, R45, R44, R43, R42, R41 \
-) { \
- { L00, L01, L02, L03, L04, KC_NO }, \
- { L10, L11, L12, L13, L14, KC_NO }, \
- { L20, L21, L22, L23, L24, KC_NO }, \
- { L30, L31, L32, L33, L34, L35 }, \
- { KC_NO, L41, L42, L43, L44, L45 }, \
- { R00, R01, R02, R03, R04, KC_NO }, \
- { R10, R11, R12, R13, R14, KC_NO }, \
- { R20, R21, R22, R23, R24, KC_NO }, \
- { R30, R31, R32, R33, R34, R35 }, \
- { KC_NO, R41, R42, R43, R44, R45 } \
- }
diff --git a/keyboards/eu_isolation/eu_isolation.h b/keyboards/eu_isolation/eu_isolation.h
deleted file mode 100644
index 90ff29e69f..0000000000
--- a/keyboards/eu_isolation/eu_isolation.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2020 Austin "TuckTuckFloof" Ashmore
-*
-* 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_euiso_mit( \
- 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, \
- k32, k33, k34, k35, k36, k37, k39, k3a, k3b, k3c, k3d \
-) \
-{ \
- { ___, ___, 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 }, \
- { ___, ___, k32, k33, k34, k35, k36, k37, ___, k39, k3a, k3b, k3c, k3d } \
-}
-
-#define LAYOUT_euiso_ortho( \
- 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, \
- k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d \
-) \
-{ \
- { ___, ___, 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 }, \
- { ___, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d } \
-}
-
-#define LAYOUT_euiso_bigspace( \
- 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, \
- k32, k33, k37, k3c, k3d \
-) \
-{ \
- { ___, ___, 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 }, \
- { ___, ___, k32, k33, ___, ___, ___, k37, ___, ___, ___, ___, k3c, k3d } \
-}
diff --git a/keyboards/eu_isolation/info.json b/keyboards/eu_isolation/info.json
index 352b83445d..f181418cf0 100644
--- a/keyboards/eu_isolation/info.json
+++ b/keyboards/eu_isolation/info.json
@@ -18,173 +18,171 @@
"layouts": {
"LAYOUT_euiso_ortho": {
"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},
+ {"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},
- {"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},
+ {"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},
- {"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":12, "y":2},
- {"x":13, "y":2},
+ {"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": [2, 12], "x": 12, "y": 2},
+ {"matrix": [2, 13], "x": 13, "y": 2},
- {"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}
+ {"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}
]
},
-
"LAYOUT_euiso_mit": {
"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},
+ {"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},
- {"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},
+ {"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},
- {"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":12, "y":2},
- {"x":13, "y":2},
+ {"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": [2, 12], "x": 12, "y": 2},
+ {"matrix": [2, 13], "x": 13, "y": 2},
- {"x":2, "y":3},
- {"x":3, "y":3},
- {"x":4, "y":3},
- {"x":5, "y":3},
- {"x":6, "y":3},
- {"x":7, "y":3, "w":2},
- {"x":9, "y":3},
- {"x":10, "y":3},
- {"x":11, "y":3},
- {"x":12, "y":3},
- {"x":13, "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, "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}
]
},
-
"LAYOUT_euiso_bigspace": {
"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},
+ {"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},
- {"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},
+ {"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},
- {"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":12, "y":2},
- {"x":13, "y":2},
+ {"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": [2, 12], "x": 12, "y": 2},
+ {"matrix": [2, 13], "x": 13, "y": 2},
- {"x":2, "y":3, "w":1.25},
- {"x":3.25, "y":3, "w":1.25},
- {"x":4.5, "y":3, "w":7},
- {"x":11.5, "y":3, "w":1.25},
- {"x":12.75, "y":3, "w":1.25}
+ {"matrix": [3, 2], "x": 2, "y": 3, "w": 1.25},
+ {"matrix": [3, 3], "x": 3.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 7], "x": 4.5, "y": 3, "w": 7},
+ {"matrix": [3, 12], "x": 11.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 1.25}
]
}
}
diff --git a/keyboards/evolv/evolv.c b/keyboards/evolv/evolv.c
deleted file mode 100644
index 54f92c9dbc..0000000000
--- a/keyboards/evolv/evolv.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
-
-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 "evolv.h"
diff --git a/keyboards/evolv/evolv.h b/keyboards/evolv/evolv.h
deleted file mode 100644
index 22eb2da4da..0000000000
--- a/keyboards/evolv/evolv.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
-
-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"
-
-#define LAYOUT_evolv_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, K1D, K1E, K3D, K3F , \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K1F, K0F , K2F, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, K4F , \
- K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, \
- K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, 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, ___, ___, ___, K56, ___, ___, ___, K5A, K5B, K5C, K5D, K5E, ___} \
-}
-
-#define LAYOUT_evolv_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, K1E, K3D, K3F , \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K1F, K0F , K2F, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, K4F , \
- K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, \
- K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E \
-){ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, 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, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F}, \
- { K50, K51, K52, ___, ___, ___, K56, ___, ___, ___, K5A, K5B, K5C, K5D, K5E, ___} \
-}
diff --git a/keyboards/evolv/info.json b/keyboards/evolv/info.json
index 097dfb43cb..6510da93ea 100644
--- a/keyboards/evolv/info.json
+++ b/keyboards/evolv/info.json
@@ -26,220 +26,221 @@
"layouts": {
"LAYOUT_evolv_ansi": {
"layout": [
- {"x":0, "y":0},
-
- {"x":1.25, "y":0},
- {"x":2.25, "y":0},
- {"x":3.25, "y":0},
- {"x":4.25, "y":0},
-
- {"x":5.5, "y":0},
- {"x":6.5, "y":0},
- {"x":7.5, "y":0},
- {"x":8.5, "y":0},
-
- {"x":9.75, "y":0},
- {"x":10.75, "y":0},
- {"x":11.75, "y":0},
- {"x":12.75, "y":0},
-
- {"x":14, "y":0},
-
- {"x":0, "y":1.25},
- {"x":1, "y":1.25},
- {"x":2, "y":1.25},
- {"x":3, "y":1.25},
- {"x":4, "y":1.25},
- {"x":5, "y":1.25},
- {"x":6, "y":1.25},
- {"x":7, "y":1.25},
- {"x":8, "y":1.25},
- {"x":9, "y":1.25},
- {"x":10, "y":1.25},
- {"x":11, "y":1.25},
- {"x":12, "y":1.25},
- {"x":13, "y":1.25},
- {"x":14, "y":1.25},
-
- {"x":15.25, "y":1.25},
-
- {"x":17.75, "y":1.25},
-
- {"x":0, "y":2.25, "w":1.5},
- {"x":1.5, "y":2.25},
- {"x":2.5, "y":2.25},
- {"x":3.5, "y":2.25},
- {"x":4.5, "y":2.25},
- {"x":5.5, "y":2.25},
- {"x":6.5, "y":2.25},
- {"x":7.5, "y":2.25},
- {"x":8.5, "y":2.25},
- {"x":9.5, "y":2.25},
- {"x":10.5, "y":2.25},
- {"x":11.5, "y":2.25},
- {"x":12.5, "y":2.25},
- {"x":13.5, "y":2.25, "w":1.5},
-
- {"x":15.25, "y":2.25},
-
- {"x":16.75, "y":2.25},
- {"x":17.75, "y":2.25},
- {"x":18.75, "y":2.25},
-
- {"x":0, "y":3.25, "w":1.75},
- {"x":1.75, "y":3.25},
- {"x":2.75, "y":3.25},
- {"x":3.75, "y":3.25},
- {"x":4.75, "y":3.25},
- {"x":5.75, "y":3.25},
- {"x":6.75, "y":3.25},
- {"x":7.75, "y":3.25},
- {"x":8.75, "y":3.25},
- {"x":9.75, "y":3.25},
- {"x":10.75, "y":3.25},
- {"x":11.75, "y":3.25},
- {"x":12.75, "y":3.25, "w":2.25},
-
- {"x":15.25, "y":3.25},
-
- {"x":17.75, "y":3.25},
-
- {"x":0, "y":4.25, "w":2.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":6.25, "y":4.25},
- {"x":7.25, "y":4.25},
- {"x":8.25, "y":4.25},
- {"x":9.25, "y":4.25},
- {"x":10.25, "y":4.25},
- {"x":11.25, "y":4.25},
- {"x":12.25, "y":4.25, "w":1.5},
-
- {"x":14, "y":4.5},
-
- {"x":15.25, "y":4.25},
-
- {"x":0, "y":5.25, "w":1.5},
- {"x":1.5, "y":5.25},
- {"x":2.5, "y":5.25, "w":1.5},
- {"x":4, "y":5.25, "w":6.25},
- {"x":10.25, "y":5.25, "w":1.25},
- {"x":11.5, "y":5.25, "w":1.25},
-
- {"x":13, "y":5.5},
- {"x":14, "y":5.5},
- {"x":15, "y":5.5}
+ {"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": [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": [3, 13], "x": 15.25, "y": 1.25},
+
+ {"matrix": [3, 15], "x": 17.75, "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.25, "y": 2.25},
+
+ {"matrix": [1, 15], "x": 16.75, "y": 2.25},
+ {"matrix": [0, 15], "x": 17.75, "y": 2.25},
+ {"matrix": [2, 15], "x": 18.75, "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.25, "y": 3.25},
+
+ {"matrix": [4, 15], "x": 17.75, "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, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.5},
+
+ {"matrix": [4, 13], "x": 14, "y": 4.5},
+
+ {"matrix": [4, 14], "x": 15.25, "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, 6], "x": 4, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
+
+ {"matrix": [5, 12], "x": 13, "y": 5.5},
+ {"matrix": [5, 13], "x": 14, "y": 5.5},
+ {"matrix": [5, 14], "x": 15, "y": 5.5}
]
},
"LAYOUT_evolv_iso": {
"layout": [
- {"x":0, "y":0},
-
- {"x":1.25, "y":0},
- {"x":2.25, "y":0},
- {"x":3.25, "y":0},
- {"x":4.25, "y":0},
-
- {"x":5.5, "y":0},
- {"x":6.5, "y":0},
- {"x":7.5, "y":0},
- {"x":8.5, "y":0},
-
- {"x":9.75, "y":0},
- {"x":10.75, "y":0},
- {"x":11.75, "y":0},
- {"x":12.75, "y":0},
-
- {"x":14, "y":0},
-
- {"x":0, "y":1.25},
- {"x":1, "y":1.25},
- {"x":2, "y":1.25},
- {"x":3, "y":1.25},
- {"x":4, "y":1.25},
- {"x":5, "y":1.25},
- {"x":6, "y":1.25},
- {"x":7, "y":1.25},
- {"x":8, "y":1.25},
- {"x":9, "y":1.25},
- {"x":10, "y":1.25},
- {"x":11, "y":1.25},
- {"x":12, "y":1.25},
- {"x":13, "y":1.25},
- {"x":14, "y":1.25},
-
- {"x":15.25, "y":1.25},
-
- {"x":17.75, "y":1.25},
-
- {"x":0, "y":2.25, "w":1.5},
- {"x":1.5, "y":2.25},
- {"x":2.5, "y":2.25},
- {"x":3.5, "y":2.25},
- {"x":4.5, "y":2.25},
- {"x":5.5, "y":2.25},
- {"x":6.5, "y":2.25},
- {"x":7.5, "y":2.25},
- {"x":8.5, "y":2.25},
- {"x":9.5, "y":2.25},
- {"x":10.5, "y":2.25},
- {"x":11.5, "y":2.25},
- {"x":12.5, "y":2.25},
- {"x":13.75, "y":2.25, "w":1.25, "h":2},
-
- {"x":15.25, "y":2.25},
-
- {"x":16.75, "y":2.25},
- {"x":17.75, "y":2.25},
- {"x":18.75, "y":2.25},
-
- {"x":0, "y":3.25, "w":1.75},
- {"x":1.75, "y":3.25},
- {"x":2.75, "y":3.25},
- {"x":3.75, "y":3.25},
- {"x":4.75, "y":3.25},
- {"x":5.75, "y":3.25},
- {"x":6.75, "y":3.25},
- {"x":7.75, "y":3.25},
- {"x":8.75, "y":3.25},
- {"x":9.75, "y":3.25},
- {"x":10.75, "y":3.25},
- {"x":11.75, "y":3.25},
- {"x":12.75, "y":3.25},
- {"x":15.25, "y":3.25},
-
- {"x":17.75, "y":3.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":6.25, "y":4.25},
- {"x":7.25, "y":4.25},
- {"x":8.25, "y":4.25},
- {"x":9.25, "y":4.25},
- {"x":10.25, "y":4.25},
- {"x":11.25, "y":4.25},
- {"x":12.25, "y":4.25, "w":1.5},
-
- {"x":14, "y":4.5},
-
- {"x":15.25, "y":4.25},
-
- {"x":0, "y":5.25, "w":1.5},
- {"x":1.5, "y":5.25},
- {"x":2.5, "y":5.25, "w":1.5},
- {"x":4, "y":5.25, "w":6.25},
- {"x":10.25, "y":5.25, "w":1.25},
- {"x":11.5, "y":5.25, "w":1.25},
-
- {"x":13, "y":5.5},
- {"x":14, "y":5.5},
- {"x":15, "y":5.5}
+ {"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": [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": [3, 13], "x": 15.25, "y": 1.25},
+
+ {"matrix": [3, 15], "x": 17.75, "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.75, "y": 2.25, "w": 1.25, "h": 2},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+
+ {"matrix": [1, 15], "x": 16.75, "y": 2.25},
+ {"matrix": [0, 15], "x": 17.75, "y": 2.25},
+ {"matrix": [2, 15], "x": 18.75, "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},
+
+ {"matrix": [3, 14], "x": 15.25, "y": 3.25},
+
+ {"matrix": [4, 15], "x": 17.75, "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, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.5},
+
+ {"matrix": [4, 13], "x": 14, "y": 4.5},
+
+ {"matrix": [4, 14], "x": 15.25, "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, 6], "x": 4, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
+
+ {"matrix": [5, 12], "x": 13, "y": 5.5},
+ {"matrix": [5, 13], "x": 14, "y": 5.5},
+ {"matrix": [5, 14], "x": 15, "y": 5.5}
]
}
}
diff --git a/keyboards/exclusive/e85/hotswap/hotswap.c b/keyboards/exclusive/e85/hotswap/hotswap.c
index db14971dab..a6d50b1f77 100644
--- a/keyboards/exclusive/e85/hotswap/hotswap.c
+++ b/keyboards/exclusive/e85/hotswap/hotswap.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "hotswap.h"
+#include "quantum.h"
void keyboard_pre_init_kb(void) {
setPinOutput(C7);
diff --git a/keyboards/exclusive/e85/hotswap/hotswap.h b/keyboards/exclusive/e85/hotswap/hotswap.h
deleted file mode 100644
index 377dd8ad5a..0000000000
--- a/keyboards/exclusive/e85/hotswap/hotswap.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright 2020 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 ___ KC_NO
-
-#define LAYOUT_ansi_standard( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K68, K67, K65, K64, K63, K66, K62, K61, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K70, K77, K75, K73, K76, K72, K71, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85, K84, K83, K86, K82, K81, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K93, \
- K40, K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA5, KA4, K92, \
- K50, K51, K52, K56, K58, K57, K54, K53, KA6, KA2, KA1 \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
- { K40, KC_NO, K42, K43, K44, K45, K46, K47, K48 }, \
- { K50, K51, K52, K53, K54, KC_NO, K56, K57, K58 }, \
- { KC_NO, K61, K62, K63, K64, K65, K66, K67, K68 }, \
- { K70, K71, K72, K73, KC_NO, K75, K76, K77, K78 }, \
- { KC_NO, K81, K82, K83, K84, K85, K86, K87, K88 }, \
- { KC_NO, KC_NO, K92, K93, KC_NO, K95, KC_NO, K97, K98 }, \
- { KC_NO, KA1, KA2, KC_NO, KA4, KA5, KA6, KA7, KA8 }, \
-}
-
-#define LAYOUT_ansi_tsangan( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K68, K67, K65, K64, K63, K66, K62, K61, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K70, K77, K75, K73, K76, K72, K71, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85, K84, K83, K86, K82, K81, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K93, \
- K40, K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA5, KA4, K92, \
- K50, K51, K52, K56, K57, K54, K53, KA6, KA2, KA1 \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
- { K40, KC_NO, K42, K43, K44, K45, K46, K47, K48 }, \
- { K50, K51, K52, K53, K54, KC_NO, K56, K57, KC_NO }, \
- { KC_NO, K61, K62, K63, K64, K65, K66, K67, K68 }, \
- { K70, K71, K72, K73, KC_NO, K75, K76, K77, K78 }, \
- { KC_NO, K81, K82, K83, K84, K85, K86, K87, K88 }, \
- { KC_NO, KC_NO, K92, K93, KC_NO, K95, KC_NO, K97, K98 }, \
- { KC_NO, KA1, KA2, KC_NO, KA4, KA5, KA6, KA7, KA8 }, \
-}
diff --git a/keyboards/exclusive/e85/hotswap/info.json b/keyboards/exclusive/e85/hotswap/info.json
index 8db1f0fb01..60dc68eaf7 100644
--- a/keyboards/exclusive/e85/hotswap/info.json
+++ b/keyboards/exclusive/e85/hotswap/info.json
@@ -26,186 +26,213 @@
"layouts": {
"LAYOUT_ansi_standard": {
"layout": [
- {"label":"K00 (E6,D0)", "x":0, "y":0},
- {"label":"K01 (E6,D1)", "x":1.25, "y":0},
- {"label":"K02 (E6,D2)", "x":2.25, "y":0},
- {"label":"K03 (E6,D3)", "x":3.25, "y":0},
- {"label":"K04 (E6,D5)", "x":4.25, "y":0},
- {"label":"K05 (E6,D4)", "x":5.5, "y":0},
- {"label":"K06 (E6,D6)", "x":6.5, "y":0},
- {"label":"K07 (E6,D7)", "x":7.5, "y":0},
- {"label":"K08 (E6,B4)", "x":8.5, "y":0},
- {"label":"K68 (F7,B4)", "x":9.75, "y":0},
- {"label":"K67 (F7,D7)", "x":10.75, "y":0},
- {"label":"K65 (F7,D4)", "x":11.75, "y":0},
- {"label":"K64 (F7,D5)", "x":12.75, "y":0},
- {"label":"K63 (F7,D3)", "x":14, "y":0},
- {"label":"K66 (F7,D6)", "x":15.25, "y":0},
- {"label":"K62 (F7,D2)", "x":16.25, "y":0},
- {"label":"K61 (F7,D1)", "x":17.25, "y":0},
- {"label":"K10 (B0,D0)", "x":0, "y":1.5},
- {"label":"K11 (B0,D1)", "x":1, "y":1.5},
- {"label":"K12 (B0,D2)", "x":2, "y":1.5},
- {"label":"K13 (B0,D3)", "x":3, "y":1.5},
- {"label":"K14 (B0,D5)", "x":4, "y":1.5},
- {"label":"K15 (B0,D4)", "x":5, "y":1.5},
- {"label":"K16 (B0,D6)", "x":6, "y":1.5},
- {"label":"K17 (B0,D7)", "x":7, "y":1.5},
- {"label":"K18 (B0,B4)", "x":8, "y":1.5},
- {"label":"K78 (F6,B4)", "x":9, "y":1.5},
- {"label":"K70 (F6,D0)", "x":10, "y":1.5},
- {"label":"K77 (F6,D7)", "x":11, "y":1.5},
- {"label":"K75 (F6,D4)", "x":12, "y":1.5},
- {"label":"K73 (F6,D3)", "x":13, "y":1.5, "w":2},
- {"label":"K76 (F6,D6)", "x":15.25, "y":1.5},
- {"label":"K72 (F6,D2)", "x":16.25, "y":1.5},
- {"label":"K71 (F6,D1)", "x":17.25, "y":1.5},
- {"label":"K20 (B1,D0)", "x":0, "y":2.5, "w":1.5},
- {"label":"K21 (B1,D1)", "x":1.5, "y":2.5},
- {"label":"K22 (B1,D2)", "x":2.5, "y":2.5},
- {"label":"K23 (B1,D3)", "x":3.5, "y":2.5},
- {"label":"K24 (B1,D5)", "x":4.5, "y":2.5},
- {"label":"K25 (B1,D4)", "x":5.5, "y":2.5},
- {"label":"K26 (B1,D6)", "x":6.5, "y":2.5},
- {"label":"K27 (B1,D7)", "x":7.5, "y":2.5},
- {"label":"K28 (B1,B4)", "x":8.5, "y":2.5},
- {"label":"K88 (F5,B4)", "x":9.5, "y":2.5},
- {"label":"K87 (F5,D7)", "x":10.5, "y":2.5},
- {"label":"K85 (F5,D4)", "x":11.5, "y":2.5},
- {"label":"K84 (F5,D5)", "x":12.5, "y":2.5},
- {"label":"K83 (F5,D3)", "x":13.5, "y":2.5, "w":1.5},
- {"label":"K86 (F5,D6)", "x":15.25, "y":2.5},
- {"label":"K82 (F5,D2)", "x":16.25, "y":2.5},
- {"label":"K81 (F5,D1)", "x":17.25, "y":2.5},
- {"label":"K30 (B2,D0)", "x":0, "y":3.5, "w":1.75},
- {"label":"K31 (B2,D1)", "x":1.75, "y":3.5},
- {"label":"K32 (B2,D2)", "x":2.75, "y":3.5},
- {"label":"K33 (B2,D3)", "x":3.75, "y":3.5},
- {"label":"K34 (B2,D5)", "x":4.75, "y":3.5},
- {"label":"K35 (B2,D4)", "x":5.75, "y":3.5},
- {"label":"K36 (B2,D6)", "x":6.75, "y":3.5},
- {"label":"K37 (B2,D7)", "x":7.75, "y":3.5},
- {"label":"K38 (B2,B4)", "x":8.75, "y":3.5},
- {"label":"K98 (F4,B4)", "x":9.75, "y":3.5},
- {"label":"K97 (F4,D7)", "x":10.75, "y":3.5},
- {"label":"K95 (F4,D4)", "x":11.75, "y":3.5},
- {"label":"K93 (F4,D3)", "x":12.75, "y":3.5, "w":2.25},
- {"label":"K40 (B3,D0)", "x":0, "y":4.5, "w":2.25},
- {"label":"K42 (B3,D2)", "x":2.25, "y":4.5},
- {"label":"K43 (B3,D3)", "x":3.25, "y":4.5},
- {"label":"K44 (B3,D5)", "x":4.25, "y":4.5},
- {"label":"K45 (B3,D4)", "x":5.25, "y":4.5},
- {"label":"K46 (B3,D6)", "x":6.25, "y":4.5},
- {"label":"K47 (B3,D7)", "x":7.25, "y":4.5},
- {"label":"K48 (B3,B4)", "x":8.25, "y":4.5},
- {"label":"KA8 (F1,B4)", "x":9.25, "y":4.5},
- {"label":"KA7 (F1,D7)", "x":10.25, "y":4.5},
- {"label":"KA5 (F1,D4)", "x":11.25, "y":4.5},
- {"label":"KA4 (F1,D5)", "x":12.25, "y":4.5, "w":2.75},
- {"label":"K92 (F4,D2)", "x":16.25, "y":4.5},
- {"label":"K50 (B7,D0)", "x":0, "y":5.5, "w":1.25},
- {"label":"K51 (B7,D1)", "x":1.25, "y":5.5, "w":1.25},
- {"label":"K52 (B7,D2)", "x":2.5, "y":5.5, "w":1.25},
- {"label":"K56 (B7,D6)", "x":3.75, "y":5.5, "w":6.25},
- {"label":"K58 (B7,B4)", "x":10, "y":5.5, "w":1.25},
- {"label":"K57 (B7,D7)", "x":11.25, "y":5.5, "w":1.25},
- {"label":"K54 (B7,D5)", "x":12.5, "y":5.5, "w":1.25},
- {"label":"K53 (B7,D3)", "x":13.75, "y":5.5, "w":1.25},
- {"label":"KA6 (F1,D6)", "x":15.25, "y":5.5},
- {"label":"KA2 (F1,D2)", "x":16.25, "y":5.5},
- {"label":"KA1 (F1,D1)", "x":17.25, "y":5.5}
+ {"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": [6, 8], "x": 9.75, "y": 0},
+ {"matrix": [6, 7], "x": 10.75, "y": 0},
+ {"matrix": [6, 5], "x": 11.75, "y": 0},
+ {"matrix": [6, 4], "x": 12.75, "y": 0},
+
+ {"matrix": [6, 3], "x": 14, "y": 0},
+
+ {"matrix": [6, 6], "x": 15.25, "y": 0},
+ {"matrix": [6, 2], "x": 16.25, "y": 0},
+ {"matrix": [6, 1], "x": 17.25, "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": [7, 8], "x": 9, "y": 1.5},
+ {"matrix": [7, 0], "x": 10, "y": 1.5},
+ {"matrix": [7, 7], "x": 11, "y": 1.5},
+ {"matrix": [7, 5], "x": 12, "y": 1.5},
+ {"matrix": [7, 3], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [7, 6], "x": 15.25, "y": 1.5},
+ {"matrix": [7, 2], "x": 16.25, "y": 1.5},
+ {"matrix": [7, 1], "x": 17.25, "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": [8, 8], "x": 9.5, "y": 2.5},
+ {"matrix": [8, 7], "x": 10.5, "y": 2.5},
+ {"matrix": [8, 5], "x": 11.5, "y": 2.5},
+ {"matrix": [8, 4], "x": 12.5, "y": 2.5},
+ {"matrix": [8, 3], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [8, 6], "x": 15.25, "y": 2.5},
+ {"matrix": [8, 2], "x": 16.25, "y": 2.5},
+ {"matrix": [8, 1], "x": 17.25, "y": 2.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": [9, 8], "x": 9.75, "y": 3.5},
+ {"matrix": [9, 7], "x": 10.75, "y": 3.5},
+ {"matrix": [9, 5], "x": 11.75, "y": 3.5},
+ {"matrix": [9, 3], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [10, 8], "x": 9.25, "y": 4.5},
+ {"matrix": [10, 7], "x": 10.25, "y": 4.5},
+ {"matrix": [10, 5], "x": 11.25, "y": 4.5},
+ {"matrix": [10, 4], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"matrix": [9, 2], "x": 16.25, "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, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 8], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 7], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 4], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 3], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [10, 6], "x": 15.25, "y": 5.5},
+ {"matrix": [10, 2], "x": 16.25, "y": 5.5},
+ {"matrix": [10, 1], "x": 17.25, "y": 5.5}
]
},
-
"LAYOUT_ansi_tsangan": {
"layout": [
- {"label":"K00 (E6,D0)", "x":0, "y":0},
- {"label":"K01 (E6,D1)", "x":1.25, "y":0},
- {"label":"K02 (E6,D2)", "x":2.25, "y":0},
- {"label":"K03 (E6,D3)", "x":3.25, "y":0},
- {"label":"K04 (E6,D5)", "x":4.25, "y":0},
- {"label":"K05 (E6,D4)", "x":5.5, "y":0},
- {"label":"K06 (E6,D6)", "x":6.5, "y":0},
- {"label":"K07 (E6,D7)", "x":7.5, "y":0},
- {"label":"K08 (E6,B4)", "x":8.5, "y":0},
- {"label":"K68 (F7,B4)", "x":9.75, "y":0},
- {"label":"K67 (F7,D7)", "x":10.75, "y":0},
- {"label":"K65 (F7,D4)", "x":11.75, "y":0},
- {"label":"K64 (F7,D5)", "x":12.75, "y":0},
- {"label":"K63 (F7,D3)", "x":14, "y":0},
- {"label":"K66 (F7,D6)", "x":15.25, "y":0},
- {"label":"K62 (F7,D2)", "x":16.25, "y":0},
- {"label":"K61 (F7,D1)", "x":17.25, "y":0},
- {"label":"K10 (B0,D0)", "x":0, "y":1.5},
- {"label":"K11 (B0,D1)", "x":1, "y":1.5},
- {"label":"K12 (B0,D2)", "x":2, "y":1.5},
- {"label":"K13 (B0,D3)", "x":3, "y":1.5},
- {"label":"K14 (B0,D5)", "x":4, "y":1.5},
- {"label":"K15 (B0,D4)", "x":5, "y":1.5},
- {"label":"K16 (B0,D6)", "x":6, "y":1.5},
- {"label":"K17 (B0,D7)", "x":7, "y":1.5},
- {"label":"K18 (B0,B4)", "x":8, "y":1.5},
- {"label":"K78 (F6,B4)", "x":9, "y":1.5},
- {"label":"K70 (F6,D0)", "x":10, "y":1.5},
- {"label":"K77 (F6,D7)", "x":11, "y":1.5},
- {"label":"K75 (F6,D4)", "x":12, "y":1.5},
- {"label":"K73 (F6,D3)", "x":13, "y":1.5, "w":2},
- {"label":"K76 (F6,D6)", "x":15.25, "y":1.5},
- {"label":"K72 (F6,D2)", "x":16.25, "y":1.5},
- {"label":"K71 (F6,D1)", "x":17.25, "y":1.5},
- {"label":"K20 (B1,D0)", "x":0, "y":2.5, "w":1.5},
- {"label":"K21 (B1,D1)", "x":1.5, "y":2.5},
- {"label":"K22 (B1,D2)", "x":2.5, "y":2.5},
- {"label":"K23 (B1,D3)", "x":3.5, "y":2.5},
- {"label":"K24 (B1,D5)", "x":4.5, "y":2.5},
- {"label":"K25 (B1,D4)", "x":5.5, "y":2.5},
- {"label":"K26 (B1,D6)", "x":6.5, "y":2.5},
- {"label":"K27 (B1,D7)", "x":7.5, "y":2.5},
- {"label":"K28 (B1,B4)", "x":8.5, "y":2.5},
- {"label":"K88 (F5,B4)", "x":9.5, "y":2.5},
- {"label":"K87 (F5,D7)", "x":10.5, "y":2.5},
- {"label":"K85 (F5,D4)", "x":11.5, "y":2.5},
- {"label":"K84 (F5,D5)", "x":12.5, "y":2.5},
- {"label":"K83 (F5,D3)", "x":13.5, "y":2.5, "w":1.5},
- {"label":"K86 (F5,D6)", "x":15.25, "y":2.5},
- {"label":"K82 (F5,D2)", "x":16.25, "y":2.5},
- {"label":"K81 (F5,D1)", "x":17.25, "y":2.5},
- {"label":"K30 (B2,D0)", "x":0, "y":3.5, "w":1.75},
- {"label":"K31 (B2,D1)", "x":1.75, "y":3.5},
- {"label":"K32 (B2,D2)", "x":2.75, "y":3.5},
- {"label":"K33 (B2,D3)", "x":3.75, "y":3.5},
- {"label":"K34 (B2,D5)", "x":4.75, "y":3.5},
- {"label":"K35 (B2,D4)", "x":5.75, "y":3.5},
- {"label":"K36 (B2,D6)", "x":6.75, "y":3.5},
- {"label":"K37 (B2,D7)", "x":7.75, "y":3.5},
- {"label":"K38 (B2,B4)", "x":8.75, "y":3.5},
- {"label":"K98 (F4,B4)", "x":9.75, "y":3.5},
- {"label":"K97 (F4,D7)", "x":10.75, "y":3.5},
- {"label":"K95 (F4,D4)", "x":11.75, "y":3.5},
- {"label":"K93 (F4,D3)", "x":12.75, "y":3.5, "w":2.25},
- {"label":"K40 (B3,D0)", "x":0, "y":4.5, "w":2.25},
- {"label":"K42 (B3,D2)", "x":2.25, "y":4.5},
- {"label":"K43 (B3,D3)", "x":3.25, "y":4.5},
- {"label":"K44 (B3,D5)", "x":4.25, "y":4.5},
- {"label":"K45 (B3,D4)", "x":5.25, "y":4.5},
- {"label":"K46 (B3,D6)", "x":6.25, "y":4.5},
- {"label":"K47 (B3,D7)", "x":7.25, "y":4.5},
- {"label":"K48 (B3,B4)", "x":8.25, "y":4.5},
- {"label":"KA8 (F1,B4)", "x":9.25, "y":4.5},
- {"label":"KA7 (F1,D7)", "x":10.25, "y":4.5},
- {"label":"KA5 (F1,D4)", "x":11.25, "y":4.5},
- {"label":"KA4 (F1,D5)", "x":12.25, "y":4.5, "w":2.75},
- {"label":"K92 (F4,D2)", "x":16.25, "y":4.5},
- {"label":"K50 (B7,D0)", "x":0, "y":5.5, "w":1.5},
- {"label":"K51 (B7,D1)", "x":1.5, "y":5.5},
- {"label":"K52 (B7,D2)", "x":2.5, "y":5.5, "w":1.5},
- {"label":"K56 (B7,D6)", "x":4, "y":5.5, "w":7},
- {"label":"K57 (B7,D7)", "x":11, "y":5.5, "w":1.5},
- {"label":"K54 (B7,D5)", "x":12.5, "y":5.5},
- {"label":"K53 (B7,D3)", "x":13.5, "y":5.5, "w":1.5},
- {"label":"KA6 (F1,D6)", "x":15.25, "y":5.5},
- {"label":"KA2 (F1,D2)", "x":16.25, "y":5.5},
- {"label":"KA1 (F1,D1)", "x":17.25, "y":5.5}
+ {"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": [6, 8], "x": 9.75, "y": 0},
+ {"matrix": [6, 7], "x": 10.75, "y": 0},
+ {"matrix": [6, 5], "x": 11.75, "y": 0},
+ {"matrix": [6, 4], "x": 12.75, "y": 0},
+
+ {"matrix": [6, 3], "x": 14, "y": 0},
+
+ {"matrix": [6, 6], "x": 15.25, "y": 0},
+ {"matrix": [6, 2], "x": 16.25, "y": 0},
+ {"matrix": [6, 1], "x": 17.25, "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": [7, 8], "x": 9, "y": 1.5},
+ {"matrix": [7, 0], "x": 10, "y": 1.5},
+ {"matrix": [7, 7], "x": 11, "y": 1.5},
+ {"matrix": [7, 5], "x": 12, "y": 1.5},
+ {"matrix": [7, 3], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [7, 6], "x": 15.25, "y": 1.5},
+ {"matrix": [7, 2], "x": 16.25, "y": 1.5},
+ {"matrix": [7, 1], "x": 17.25, "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": [8, 8], "x": 9.5, "y": 2.5},
+ {"matrix": [8, 7], "x": 10.5, "y": 2.5},
+ {"matrix": [8, 5], "x": 11.5, "y": 2.5},
+ {"matrix": [8, 4], "x": 12.5, "y": 2.5},
+ {"matrix": [8, 3], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [8, 6], "x": 15.25, "y": 2.5},
+ {"matrix": [8, 2], "x": 16.25, "y": 2.5},
+ {"matrix": [8, 1], "x": 17.25, "y": 2.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": [9, 8], "x": 9.75, "y": 3.5},
+ {"matrix": [9, 7], "x": 10.75, "y": 3.5},
+ {"matrix": [9, 5], "x": 11.75, "y": 3.5},
+ {"matrix": [9, 3], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [10, 8], "x": 9.25, "y": 4.5},
+ {"matrix": [10, 7], "x": 10.25, "y": 4.5},
+ {"matrix": [10, 5], "x": 11.25, "y": 4.5},
+ {"matrix": [10, 4], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"matrix": [9, 2], "x": 16.25, "y": 4.5},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+ {"matrix": [5, 7], "x": 11, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 4], "x": 12.5, "y": 5.5},
+ {"matrix": [5, 3], "x": 13.5, "y": 5.5, "w": 1.5},
+
+ {"matrix": [10, 6], "x": 15.25, "y": 5.5},
+ {"matrix": [10, 2], "x": 16.25, "y": 5.5},
+ {"matrix": [10, 1], "x": 17.25, "y": 5.5}
]
}
}
diff --git a/keyboards/eyeohdesigns/babyv/babyv.h b/keyboards/eyeohdesigns/babyv/babyv.h
deleted file mode 100644
index 749e16f353..0000000000
--- a/keyboards/eyeohdesigns/babyv/babyv.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright 2020 Eye Oh! Designs
- *
- * 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_1u( \
- 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, k33, k34, k35, k36, k37, k38, 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, KC_NO, KC_NO, k33, k34, k35, k36, k37, k38, KC_NO, KC_NO, k3b } \
- }
-
-#define LAYOUT_2u( \
- 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, k33, k35, k36, k38, 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, KC_NO, KC_NO, k33, KC_NO, k35, k36, KC_NO, k38, KC_NO, KC_NO, k3b } \
- }
-
-#define LAYOUT_1u_2u( \
- 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, k33, k34, k35, k36, k38, 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, KC_NO, KC_NO, k33, k34, k35, k36, KC_NO, k38, KC_NO, KC_NO, k3b } \
- }
-#define LAYOUT_2u_1u( \
- 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, k33, k35, k36, k37, k38, 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, KC_NO, KC_NO, k33, KC_NO, k35, k36, k37, k38, KC_NO, KC_NO, k3b } \
- }
- \ No newline at end of file
diff --git a/keyboards/eyeohdesigns/babyv/info.json b/keyboards/eyeohdesigns/babyv/info.json
index b530951376..96784d0444 100644
--- a/keyboards/eyeohdesigns/babyv/info.json
+++ b/keyboards/eyeohdesigns/babyv/info.json
@@ -22,18 +22,221 @@
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
- "LAYOUT_2u": {
- "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":7, "y":0}, {"label":"U", "x":8, "y":0}, {"label":"I", "x":9, "y":0}, {"label":"O", "x":10, "y":0}, {"label":"P", "x":11, "y":0}, {"label":"Back Space", "x":12, "y":0}, {"label":"Tab", "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":7, "y":1}, {"label":"J", "x":8, "y":1}, {"label":"K", "x":9, "y":1}, {"label":"L", "x":10, "y":1}, {"label":";", "x":11, "y":1}, {"label":"Return", "x":12, "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":7, "y":2}, {"label":"M", "x":8, "y":2}, {"label":",", "x":9, "y":2}, {"label":".", "x":10, "y":2}, {"label":"/", "x":11, "y":2}, {"label":"Shift", "x":12, "y":2}, {"label":"Ctl", "x":0, "y":3}, {"label":"Alt", "x":3, "y":3}, {"x":4, "y":3, "w":2}, {"x":7, "y":3, "w":2}, {"label":"Fn", "x":9, "y":3}, {"label":"OS", "x":12, "y":3}]
+ "LAYOUT_2u": {
+ "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": 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": [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": 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": [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": 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": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 5], "x": 4, "y": 3, "w": 2},
+
+ {"matrix": [3, 6], "x": 7, "y": 3, "w": 2},
+ {"matrix": [3, 8], "x": 9, "y": 3},
+ {"matrix": [3, 11], "x": 12, "y": 3}
+ ]
},
- "LAYOUT_1u": {
- "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":7, "y":0}, {"label":"U", "x":8, "y":0}, {"label":"I", "x":9, "y":0}, {"label":"O", "x":10, "y":0}, {"label":"P", "x":11, "y":0}, {"label":"Back Space", "x":12, "y":0}, {"label":"Tab", "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":7, "y":1}, {"label":"J", "x":8, "y":1}, {"label":"K", "x":9, "y":1}, {"label":"L", "x":10, "y":1}, {"label":";", "x":11, "y":1}, {"label":"Return", "x":12, "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":7, "y":2}, {"label":"M", "x":8, "y":2}, {"label":",", "x":9, "y":2}, {"label":".", "x":10, "y":2}, {"label":"/", "x":11, "y":2}, {"label":"Shift", "x":12, "y":2}, {"label":"Ctl", "x":0, "y":3}, {"label":"Alt", "x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"label":"Fn", "x":9, "y":3}, {"label":"OS", "x":12, "y":3}]
+ "LAYOUT_1u": {
+ "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": 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": [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": 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": [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": 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": [3, 0], "x": 0, "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": 7, "y": 3},
+ {"matrix": [3, 7], "x": 8, "y": 3},
+ {"matrix": [3, 8], "x": 9, "y": 3},
+ {"matrix": [3, 11], "x": 12, "y": 3}
+ ]
},
- "LAYOUT_1u_2u": {
- "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":7, "y":0}, {"label":"U", "x":8, "y":0}, {"label":"I", "x":9, "y":0}, {"label":"O", "x":10, "y":0}, {"label":"P", "x":11, "y":0}, {"label":"Back Space", "x":12, "y":0}, {"label":"Tab", "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":7, "y":1}, {"label":"J", "x":8, "y":1}, {"label":"K", "x":9, "y":1}, {"label":"L", "x":10, "y":1}, {"label":";", "x":11, "y":1}, {"label":"Return", "x":12, "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":7, "y":2}, {"label":"M", "x":8, "y":2}, {"label":",", "x":9, "y":2}, {"label":".", "x":10, "y":2}, {"label":"/", "x":11, "y":2}, {"label":"Shift", "x":12, "y":2}, {"x":0, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3, "w":2}, {"x":9, "y":3}, {"label":"OS", "x":12, "y":3}]
+ "LAYOUT_1u_2u": {
+ "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": 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": [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": 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": [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": 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": [3, 0], "x": 0, "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": 7, "y": 3, "w": 2},
+ {"matrix": [3, 8], "x": 9, "y": 3},
+ {"matrix": [3, 11], "x": 12, "y": 3}
+ ]
},
- "LAYOUT_2u_1u": {
- "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":7, "y":0}, {"label":"U", "x":8, "y":0}, {"label":"I", "x":9, "y":0}, {"label":"O", "x":10, "y":0}, {"label":"P", "x":11, "y":0}, {"label":"Back Space", "x":12, "y":0}, {"label":"Tab", "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":7, "y":1}, {"label":"J", "x":8, "y":1}, {"label":"K", "x":9, "y":1}, {"label":"L", "x":10, "y":1}, {"label":";", "x":11, "y":1}, {"label":"Return", "x":12, "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":7, "y":2}, {"label":"M", "x":8, "y":2}, {"label":",", "x":9, "y":2}, {"label":".", "x":10, "y":2}, {"label":"/", "x":11, "y":2}, {"label":"Shift", "x":12, "y":2}, {"x":0, "y":3}, {"x":3, "y":3}, {"x":4, "y":3, "w":2}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"label":"OS", "x":12, "y":3}]
+ "LAYOUT_2u_1u": {
+ "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": 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": [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": 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": [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": 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": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 5], "x": 4, "y": 3, "w": 2},
+
+ {"matrix": [3, 6], "x": 7, "y": 3},
+ {"matrix": [3, 7], "x": 8, "y": 3},
+ {"matrix": [3, 8], "x": 9, "y": 3},
+ {"matrix": [3, 11], "x": 12, "y": 3}
+ ]
}
-
}
}
diff --git a/keyboards/eyeohdesigns/sprh/info.json b/keyboards/eyeohdesigns/sprh/info.json
index 9d4c9cab64..3ef613f9a9 100644
--- a/keyboards/eyeohdesigns/sprh/info.json
+++ b/keyboards/eyeohdesigns/sprh/info.json
@@ -23,594 +23,602 @@
"layouts": {
"LAYOUT_ac5": {
"layout": [
- {"label":"Mute", "x":0.5, "y":0},
- {"label":"Esc", "x":1.5, "y":0},
- {"label":"1", "x":2.5, "y":0},
- {"label":"2", "x":3.5, "y":0},
- {"label":"3", "x":4.5, "y":0},
- {"label":"4", "x":5.5, "y":0},
- {"label":"5", "x":6.5, "y":0},
- {"label":"6", "x":7.5, "y":0},
- {"label":"7", "x":8.5, "y":0},
- {"label":"8", "x":9.5, "y":0},
- {"label":"9", "x":10.5, "y":0},
- {"label":"0", "x":11.5, "y":0},
- {"label":"_", "x":12.5, "y":0},
- {"label":"+", "x":13.5, "y":0},
- {"label":"Backspace", "x":14.5, "y":0, "w":2},
-
- {"label":"Tab", "x":1, "y":1, "w":1.5},
- {"label":"Q", "x":2.5, "y":1},
- {"label":"W", "x":3.5, "y":1},
- {"label":"E", "x":4.5, "y":1},
- {"label":"R", "x":5.5, "y":1},
- {"label":"T", "x":6.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":"Caps Lock", "x":0.75, "y":2, "w":1.75},
- {"label":"A", "x":2.5, "y":2},
- {"label":"S", "x":3.5, "y":2},
- {"label":"D", "x":4.5, "y":2},
- {"label":"F", "x":5.5, "y":2},
- {"label":"G", "x":6.5, "y":2},
- {"label":"H", "x":7.5, "y":2},
- {"label":"J", "x":8.5, "y":2},
- {"label":"K", "x":9.5, "y":2},
- {"label":"L", "x":10.5, "y":2},
- {"label":";", "x":11.5, "y":2},
- {"label":"'", "x":12.5, "y":2},
- {"label":"Enter", "x":13.5, "y":2, "w":2.25},
-
- {"label":"Shift", "x":0.25, "y":3, "w":2.25},
- {"label":"Z", "x":2.5, "y":3},
- {"label":"X", "x":3.5, "y":3},
- {"label":"C", "x":4.5, "y":3},
- {"label":"V", "x":5.5, "y":3},
- {"label":"B", "x":6.5, "y":3},
- {"label":"N", "x":7.5, "y":3},
- {"label":"M", "x":8.5, "y":3},
- {"label":",", "x":9.5, "y":3},
- {"label":".", "x":10.5, "y":3},
- {"label":"/", "x":11.5, "y":3},
- {"label":"Shift", "x":12.5, "y":3, "w":2.75},
- {"label":"\u2191", "x":15.25, "y":3},
-
- {"label":"Super", "x":0, "y":4, "w":1.25},
- {"label":"Ctrl", "x":1.25, "y":4, "w":1.25},
- {"label":"Alt", "x":3.37, "y":4, "w":1.25},
- {"x":4.62, "y":4, "w":6.25},
- {"label":"Alt", "x":10.87, "y":4, "w":1.25},
- {"label":"Function", "x":12.12, "y":4, "w":1.25},
- {"label":"\u2190", "x":14.25, "y":4},
- {"label":"\u2193", "x":15.25, "y":4},
- {"label":"\u2192", "x":16.25, "y":4}
+ {"matrix": [4, 3], "x": 0.5, "y": 0},
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+ {"matrix": [0, 9], "x": 10.5, "y": 0},
+ {"matrix": [0, 10], "x": 11.5, "y": 0},
+ {"matrix": [0, 11], "x": 12.5, "y": 0},
+ {"matrix": [0, 12], "x": 13.5, "y": 0},
+ {"matrix": [0, 13], "x": 14.5, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 1, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0.75, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 2.5, "y": 2},
+ {"matrix": [2, 2], "x": 3.5, "y": 2},
+ {"matrix": [2, 3], "x": 4.5, "y": 2},
+ {"matrix": [2, 4], "x": 5.5, "y": 2},
+ {"matrix": [2, 5], "x": 6.5, "y": 2},
+ {"matrix": [2, 6], "x": 7.5, "y": 2},
+ {"matrix": [2, 7], "x": 8.5, "y": 2},
+ {"matrix": [2, 8], "x": 9.5, "y": 2},
+ {"matrix": [2, 9], "x": 10.5, "y": 2},
+ {"matrix": [2, 10], "x": 11.5, "y": 2},
+ {"matrix": [2, 11], "x": 12.5, "y": 2},
+ {"matrix": [2, 12], "x": 13.5, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 1], "x": 0.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.5, "y": 3},
+ {"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, "w": 2.75},
+ {"matrix": [3, 13], "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": 3.37, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 4.62, "y": 4, "w": 6.25},
+ {"matrix": [4, 8], "x": 10.87, "y": 4, "w": 1.25},
+ {"matrix": [4, 9], "x": 12.12, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 11], "x": 14.25, "y": 4},
+ {"matrix": [4, 12], "x": 15.25, "y": 4},
+ {"matrix": [4, 13], "x": 16.25, "y": 4}
]
},
"LAYOUT_acs": {
"layout": [
- {"label":"Mute", "x":0.5, "y":0},
- {"label":"Esc", "x":1.5, "y":0},
- {"label":"1", "x":2.5, "y":0},
- {"label":"2", "x":3.5, "y":0},
- {"label":"3", "x":4.5, "y":0},
- {"label":"4", "x":5.5, "y":0},
- {"label":"5", "x":6.5, "y":0},
- {"label":"6", "x":7.5, "y":0},
- {"label":"7", "x":8.5, "y":0},
- {"label":"8", "x":9.5, "y":0},
- {"label":"9", "x":10.5, "y":0},
- {"label":"0", "x":11.5, "y":0},
- {"label":"_", "x":12.5, "y":0},
- {"label":"+", "x":13.5, "y":0},
- {"label":"Backspace", "x":14.5, "y":0, "w":2},
-
- {"label":"Tab", "x":1, "y":1, "w":1.5},
- {"label":"Q", "x":2.5, "y":1},
- {"label":"W", "x":3.5, "y":1},
- {"label":"E", "x":4.5, "y":1},
- {"label":"R", "x":5.5, "y":1},
- {"label":"T", "x":6.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":"Caps Lock", "x":0.75, "y":2, "w":1.75},
- {"label":"A", "x":2.5, "y":2},
- {"label":"S", "x":3.5, "y":2},
- {"label":"D", "x":4.5, "y":2},
- {"label":"F", "x":5.5, "y":2},
- {"label":"G", "x":6.5, "y":2},
- {"label":"H", "x":7.5, "y":2},
- {"label":"J", "x":8.5, "y":2},
- {"label":"K", "x":9.5, "y":2},
- {"label":"L", "x":10.5, "y":2},
- {"label":";", "x":11.5, "y":2},
- {"label":"'", "x":12.5, "y":2},
- {"label":"Enter", "x":13.5, "y":2, "w":2.25},
-
- {"label":"Shift", "x":0.25, "y":3, "w":2.25},
- {"label":"Z", "x":2.5, "y":3},
- {"label":"X", "x":3.5, "y":3},
- {"label":"C", "x":4.5, "y":3},
- {"label":"V", "x":5.5, "y":3},
- {"label":"B", "x":6.5, "y":3},
- {"label":"N", "x":7.5, "y":3},
- {"label":"M", "x":8.5, "y":3},
- {"label":",", "x":9.5, "y":3},
- {"label":".", "x":10.5, "y":3},
- {"label":"/", "x":11.5, "y":3},
- {"label":"Shift", "x":12.5, "y":3, "w":2.75},
- {"label":"\u2191", "x":15.25, "y":3},
-
- {"label":"Super", "x":0, "y":4, "w":1.25},
- {"label":"Ctrl", "x":1.25, "y":4, "w":1.25},
- {"label":"Alt", "x":3.37, "y":4, "w":1.25},
- {"x":4.62, "y":4, "w":2.75},
- {"x":7.37, "y":4, "w":2.25},
- {"x":9.62, "y":4, "w":1.25},
- {"label":"Alt", "x":10.87, "y":4, "w":1.25},
- {"label":"Function", "x":12.12, "y":4, "w":1.25},
- {"label":"\u2190", "x":14.25, "y":4},
- {"label":"\u2193", "x":15.25, "y":4},
- {"label":"\u2192", "x":16.25, "y":4}
+ {"matrix": [4, 3], "x": 0.5, "y": 0},
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+ {"matrix": [0, 9], "x": 10.5, "y": 0},
+ {"matrix": [0, 10], "x": 11.5, "y": 0},
+ {"matrix": [0, 11], "x": 12.5, "y": 0},
+ {"matrix": [0, 12], "x": 13.5, "y": 0},
+ {"matrix": [0, 13], "x": 14.5, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 1, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0.75, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 2.5, "y": 2},
+ {"matrix": [2, 2], "x": 3.5, "y": 2},
+ {"matrix": [2, 3], "x": 4.5, "y": 2},
+ {"matrix": [2, 4], "x": 5.5, "y": 2},
+ {"matrix": [2, 5], "x": 6.5, "y": 2},
+ {"matrix": [2, 6], "x": 7.5, "y": 2},
+ {"matrix": [2, 7], "x": 8.5, "y": 2},
+ {"matrix": [2, 8], "x": 9.5, "y": 2},
+ {"matrix": [2, 9], "x": 10.5, "y": 2},
+ {"matrix": [2, 10], "x": 11.5, "y": 2},
+ {"matrix": [2, 11], "x": 12.5, "y": 2},
+ {"matrix": [2, 12], "x": 13.5, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 1], "x": 0.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.5, "y": 3},
+ {"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, "w": 2.75},
+ {"matrix": [3, 13], "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": 3.37, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 4.62, "y": 4, "w": 2.75},
+ {"matrix": [4, 5], "x": 7.37, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 9.62, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 10.87, "y": 4, "w": 1.25},
+ {"matrix": [4, 9], "x": 12.12, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 11], "x": 14.25, "y": 4},
+ {"matrix": [4, 12], "x": 15.25, "y": 4},
+ {"matrix": [4, 13], "x": 16.25, "y": 4}
]
},
"LAYOUT_ad5": {
"layout": [
- {"label":"Mute", "x":0.5, "y":0},
- {"label":"Esc", "x":1.5, "y":0},
- {"label":"1", "x":2.5, "y":0},
- {"label":"2", "x":3.5, "y":0},
- {"label":"3", "x":4.5, "y":0},
- {"label":"4", "x":5.5, "y":0},
- {"label":"5", "x":6.5, "y":0},
- {"label":"6", "x":7.5, "y":0},
- {"label":"7", "x":8.5, "y":0},
- {"label":"8", "x":9.5, "y":0},
- {"label":"9", "x":10.5, "y":0},
- {"label":"0", "x":11.5, "y":0},
- {"label":"_", "x":12.5, "y":0},
- {"label":"+", "x":13.5, "y":0},
- {"label":"Backspace", "x":14.5, "y":0, "w":2},
-
- {"label":"Tab", "x":1, "y":1, "w":1.5},
- {"label":"Q", "x":2.5, "y":1},
- {"label":"W", "x":3.5, "y":1},
- {"label":"E", "x":4.5, "y":1},
- {"label":"R", "x":5.5, "y":1},
- {"label":"T", "x":6.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":"Caps Lock", "x":0.75, "y":2, "w":1.75},
- {"label":"A", "x":2.5, "y":2},
- {"label":"S", "x":3.5, "y":2},
- {"label":"D", "x":4.5, "y":2},
- {"label":"F", "x":5.5, "y":2},
- {"label":"G", "x":6.5, "y":2},
- {"label":"H", "x":7.5, "y":2},
- {"label":"J", "x":8.5, "y":2},
- {"label":"K", "x":9.5, "y":2},
- {"label":"L", "x":10.5, "y":2},
- {"label":";", "x":11.5, "y":2},
- {"label":"'", "x":12.5, "y":2},
- {"label":"Enter", "x":13.5, "y":2, "w":2.25},
-
- {"label":"Shift", "x":0.25, "y":3, "w":2.25},
- {"label":"Z", "x":2.5, "y":3},
- {"label":"X", "x":3.5, "y":3},
- {"label":"C", "x":4.5, "y":3},
- {"label":"V", "x":5.5, "y":3},
- {"label":"B", "x":6.5, "y":3},
- {"label":"N", "x":7.5, "y":3},
- {"label":"M", "x":8.5, "y":3},
- {"label":",", "x":9.5, "y":3},
- {"label":".", "x":10.5, "y":3},
- {"label":"/", "x":11.5, "y":3},
- {"label":"Shift", "x":12.5, "y":3, "w":1.75},
- {"label":"Fn", "x":14.25, "y":3},
- {"label":"\u2191", "x":15.25, "y":3},
-
- {"label":"Super", "x":0, "y":4, "w":1.25},
- {"label":"Ctrl", "x":1.25, "y":4, "w":1.25},
- {"label":"Alt", "x":3.37, "y":4, "w":1.25},
- {"x":4.62, "y":4, "w":6.25},
- {"label":"Alt", "x":10.87, "y":4, "w":1.25},
- {"label":"Function", "x":12.12, "y":4, "w":1.25},
- {"label":"\u2190", "x":14.25, "y":4},
- {"label":"\u2193", "x":15.25, "y":4},
- {"label":"\u2192", "x":16.25, "y":4}
+ {"matrix": [4, 3], "x": 0.5, "y": 0},
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+ {"matrix": [0, 9], "x": 10.5, "y": 0},
+ {"matrix": [0, 10], "x": 11.5, "y": 0},
+ {"matrix": [0, 11], "x": 12.5, "y": 0},
+ {"matrix": [0, 12], "x": 13.5, "y": 0},
+ {"matrix": [0, 13], "x": 14.5, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 1, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0.75, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 2.5, "y": 2},
+ {"matrix": [2, 2], "x": 3.5, "y": 2},
+ {"matrix": [2, 3], "x": 4.5, "y": 2},
+ {"matrix": [2, 4], "x": 5.5, "y": 2},
+ {"matrix": [2, 5], "x": 6.5, "y": 2},
+ {"matrix": [2, 6], "x": 7.5, "y": 2},
+ {"matrix": [2, 7], "x": 8.5, "y": 2},
+ {"matrix": [2, 8], "x": 9.5, "y": 2},
+ {"matrix": [2, 9], "x": 10.5, "y": 2},
+ {"matrix": [2, 10], "x": 11.5, "y": 2},
+ {"matrix": [2, 11], "x": 12.5, "y": 2},
+ {"matrix": [2, 12], "x": 13.5, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 1], "x": 0.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.5, "y": 3},
+ {"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, "w": 1.75},
+ {"matrix": [4, 10], "x": 14.25, "y": 3},
+ {"matrix": [3, 13], "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": 3.37, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 4.62, "y": 4, "w": 6.25},
+ {"matrix": [4, 8], "x": 10.87, "y": 4, "w": 1.25},
+ {"matrix": [4, 9], "x": 12.12, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 11], "x": 14.25, "y": 4},
+ {"matrix": [4, 12], "x": 15.25, "y": 4},
+ {"matrix": [4, 13], "x": 16.25, "y": 4}
]
},
"LAYOUT_ads": {
"layout": [
- {"label":"Mute", "x":0.5, "y":0},
- {"label":"Esc", "x":1.5, "y":0},
- {"label":"1", "x":2.5, "y":0},
- {"label":"2", "x":3.5, "y":0},
- {"label":"3", "x":4.5, "y":0},
- {"label":"4", "x":5.5, "y":0},
- {"label":"5", "x":6.5, "y":0},
- {"label":"6", "x":7.5, "y":0},
- {"label":"7", "x":8.5, "y":0},
- {"label":"8", "x":9.5, "y":0},
- {"label":"9", "x":10.5, "y":0},
- {"label":"0", "x":11.5, "y":0},
- {"label":"_", "x":12.5, "y":0},
- {"label":"+", "x":13.5, "y":0},
- {"label":"Backspace", "x":14.5, "y":0, "w":2},
-
- {"label":"Tab", "x":1, "y":1, "w":1.5},
- {"label":"Q", "x":2.5, "y":1},
- {"label":"W", "x":3.5, "y":1},
- {"label":"E", "x":4.5, "y":1},
- {"label":"R", "x":5.5, "y":1},
- {"label":"T", "x":6.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":"Caps Lock", "x":0.75, "y":2, "w":1.75},
- {"label":"A", "x":2.5, "y":2},
- {"label":"S", "x":3.5, "y":2},
- {"label":"D", "x":4.5, "y":2},
- {"label":"F", "x":5.5, "y":2},
- {"label":"G", "x":6.5, "y":2},
- {"label":"H", "x":7.5, "y":2},
- {"label":"J", "x":8.5, "y":2},
- {"label":"K", "x":9.5, "y":2},
- {"label":"L", "x":10.5, "y":2},
- {"label":";", "x":11.5, "y":2},
- {"label":"'", "x":12.5, "y":2},
- {"label":"Enter", "x":13.5, "y":2, "w":2.25},
-
- {"label":"Shift", "x":0.25, "y":3, "w":2.25},
- {"label":"Z", "x":2.5, "y":3},
- {"label":"X", "x":3.5, "y":3},
- {"label":"C", "x":4.5, "y":3},
- {"label":"V", "x":5.5, "y":3},
- {"label":"B", "x":6.5, "y":3},
- {"label":"N", "x":7.5, "y":3},
- {"label":"M", "x":8.5, "y":3},
- {"label":",", "x":9.5, "y":3},
- {"label":".", "x":10.5, "y":3},
- {"label":"/", "x":11.5, "y":3},
- {"label":"Shift", "x":12.5, "y":3, "w":1.75},
- {"label":"Fn", "x":14.25, "y":3},
- {"label":"\u2191", "x":15.25, "y":3},
-
- {"label":"Super", "x":0, "y":4, "w":1.25},
- {"label":"Ctrl", "x":1.25, "y":4, "w":1.25},
- {"label":"Alt", "x":3.37, "y":4, "w":1.25},
- {"x":4.62, "y":4, "w":2.75},
- {"x":7.37, "y":4, "w":2.25},
- {"x":9.62, "y":4, "w":1.25},
- {"label":"Alt", "x":10.87, "y":4, "w":1.25},
- {"label":"Function", "x":12.12, "y":4, "w":1.25},
- {"label":"\u2190", "x":14.25, "y":4},
- {"label":"\u2193", "x":15.25, "y":4},
- {"label":"\u2192", "x":16.25, "y":4}
+ {"matrix": [4, 3], "x": 0.5, "y": 0},
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+ {"matrix": [0, 9], "x": 10.5, "y": 0},
+ {"matrix": [0, 10], "x": 11.5, "y": 0},
+ {"matrix": [0, 11], "x": 12.5, "y": 0},
+ {"matrix": [0, 12], "x": 13.5, "y": 0},
+ {"matrix": [0, 13], "x": 14.5, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 1, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0.75, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 2.5, "y": 2},
+ {"matrix": [2, 2], "x": 3.5, "y": 2},
+ {"matrix": [2, 3], "x": 4.5, "y": 2},
+ {"matrix": [2, 4], "x": 5.5, "y": 2},
+ {"matrix": [2, 5], "x": 6.5, "y": 2},
+ {"matrix": [2, 6], "x": 7.5, "y": 2},
+ {"matrix": [2, 7], "x": 8.5, "y": 2},
+ {"matrix": [2, 8], "x": 9.5, "y": 2},
+ {"matrix": [2, 9], "x": 10.5, "y": 2},
+ {"matrix": [2, 10], "x": 11.5, "y": 2},
+ {"matrix": [2, 11], "x": 12.5, "y": 2},
+ {"matrix": [2, 12], "x": 13.5, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 1], "x": 0.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.5, "y": 3},
+ {"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, "w": 1.75},
+ {"matrix": [4, 10], "x": 14.25, "y": 3},
+ {"matrix": [3, 13], "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": 3.37, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 4.62, "y": 4, "w": 2.75},
+ {"matrix": [4, 5], "x": 7.37, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 9.62, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 10.87, "y": 4, "w": 1.25},
+ {"matrix": [4, 9], "x": 12.12, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 11], "x": 14.25, "y": 4},
+ {"matrix": [4, 12], "x": 15.25, "y": 4},
+ {"matrix": [4, 13], "x": 16.25, "y": 4}
]
},
"LAYOUT_bc5": {
"layout": [
- {"label":"Mute", "x":0.5, "y":0},
- {"label":"Esc", "x":1.5, "y":0},
- {"label":"1", "x":2.5, "y":0},
- {"label":"2", "x":3.5, "y":0},
- {"label":"3", "x":4.5, "y":0},
- {"label":"4", "x":5.5, "y":0},
- {"label":"5", "x":6.5, "y":0},
- {"label":"6", "x":7.5, "y":0},
- {"label":"7", "x":8.5, "y":0},
- {"label":"8", "x":9.5, "y":0},
- {"label":"9", "x":10.5, "y":0},
- {"label":"0", "x":11.5, "y":0},
- {"label":"_", "x":12.5, "y":0},
- {"label":"+", "x":13.5, "y":0},
- {"label":"\u2190", "x":14.5, "y":0},
- {"label":"Del", "x":15.5, "y":0},
-
- {"label":"Tab", "x":1, "y":1, "w":1.5},
- {"label":"Q", "x":2.5, "y":1},
- {"label":"W", "x":3.5, "y":1},
- {"label":"E", "x":4.5, "y":1},
- {"label":"R", "x":5.5, "y":1},
- {"label":"T", "x":6.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":"Caps Lock", "x":0.75, "y":2, "w":1.75},
- {"label":"A", "x":2.5, "y":2},
- {"label":"S", "x":3.5, "y":2},
- {"label":"D", "x":4.5, "y":2},
- {"label":"F", "x":5.5, "y":2},
- {"label":"G", "x":6.5, "y":2},
- {"label":"H", "x":7.5, "y":2},
- {"label":"J", "x":8.5, "y":2},
- {"label":"K", "x":9.5, "y":2},
- {"label":"L", "x":10.5, "y":2},
- {"label":";", "x":11.5, "y":2},
- {"label":"'", "x":12.5, "y":2},
- {"label":"Enter", "x":13.5, "y":2, "w":2.25},
-
- {"label":"Shift", "x":0.25, "y":3, "w":2.25},
- {"label":"Z", "x":2.5, "y":3},
- {"label":"X", "x":3.5, "y":3},
- {"label":"C", "x":4.5, "y":3},
- {"label":"V", "x":5.5, "y":3},
- {"label":"B", "x":6.5, "y":3},
- {"label":"N", "x":7.5, "y":3},
- {"label":"M", "x":8.5, "y":3},
- {"label":",", "x":9.5, "y":3},
- {"label":".", "x":10.5, "y":3},
- {"label":"/", "x":11.5, "y":3},
- {"label":"Shift", "x":12.5, "y":3, "w":2.75},
- {"label":"\u2191", "x":15.25, "y":3},
-
- {"label":"Super", "x":0, "y":4, "w":1.25},
- {"label":"Ctrl", "x":1.25, "y":4, "w":1.25},
- {"label":"Alt", "x":3.37, "y":4, "w":1.25},
- {"x":4.62, "y":4, "w":6.25},
- {"label":"Alt", "x":10.87, "y":4, "w":1.25},
- {"label":"Function", "x":12.12, "y":4, "w":1.25},
- {"label":"\u2190", "x":14.25, "y":4},
- {"label":"\u2193", "x":15.25, "y":4},
- {"label":"\u2192", "x":16.25, "y":4}
+ {"matrix": [4, 3], "x": 0.5, "y": 0},
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+ {"matrix": [0, 9], "x": 10.5, "y": 0},
+ {"matrix": [0, 10], "x": 11.5, "y": 0},
+ {"matrix": [0, 11], "x": 12.5, "y": 0},
+ {"matrix": [0, 12], "x": 13.5, "y": 0},
+ {"matrix": [0, 13], "x": 14.5, "y": 0},
+ {"matrix": [2, 13], "x": 15.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 1, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0.75, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 2.5, "y": 2},
+ {"matrix": [2, 2], "x": 3.5, "y": 2},
+ {"matrix": [2, 3], "x": 4.5, "y": 2},
+ {"matrix": [2, 4], "x": 5.5, "y": 2},
+ {"matrix": [2, 5], "x": 6.5, "y": 2},
+ {"matrix": [2, 6], "x": 7.5, "y": 2},
+ {"matrix": [2, 7], "x": 8.5, "y": 2},
+ {"matrix": [2, 8], "x": 9.5, "y": 2},
+ {"matrix": [2, 9], "x": 10.5, "y": 2},
+ {"matrix": [2, 10], "x": 11.5, "y": 2},
+ {"matrix": [2, 11], "x": 12.5, "y": 2},
+ {"matrix": [2, 12], "x": 13.5, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 1], "x": 0.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.5, "y": 3},
+ {"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, "w": 2.75},
+ {"matrix": [3, 13], "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": 3.37, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 4.62, "y": 4, "w": 6.25},
+ {"matrix": [4, 8], "x": 10.87, "y": 4, "w": 1.25},
+ {"matrix": [4, 9], "x": 12.12, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 11], "x": 14.25, "y": 4},
+ {"matrix": [4, 12], "x": 15.25, "y": 4},
+ {"matrix": [4, 13], "x": 16.25, "y": 4}
]
},
"LAYOUT_bcs": {
"layout": [
- {"label":"Mute", "x":0.5, "y":0},
- {"label":"Esc", "x":1.5, "y":0},
- {"label":"1", "x":2.5, "y":0},
- {"label":"2", "x":3.5, "y":0},
- {"label":"3", "x":4.5, "y":0},
- {"label":"4", "x":5.5, "y":0},
- {"label":"5", "x":6.5, "y":0},
- {"label":"6", "x":7.5, "y":0},
- {"label":"7", "x":8.5, "y":0},
- {"label":"8", "x":9.5, "y":0},
- {"label":"9", "x":10.5, "y":0},
- {"label":"0", "x":11.5, "y":0},
- {"label":"_", "x":12.5, "y":0},
- {"label":"+", "x":13.5, "y":0},
- {"label":"\u2190", "x":14.5, "y":0},
- {"label":"Del", "x":15.5, "y":0},
-
- {"label":"Tab", "x":1, "y":1, "w":1.5},
- {"label":"Q", "x":2.5, "y":1},
- {"label":"W", "x":3.5, "y":1},
- {"label":"E", "x":4.5, "y":1},
- {"label":"R", "x":5.5, "y":1},
- {"label":"T", "x":6.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":"Caps Lock", "x":0.75, "y":2, "w":1.75},
- {"label":"A", "x":2.5, "y":2},
- {"label":"S", "x":3.5, "y":2},
- {"label":"D", "x":4.5, "y":2},
- {"label":"F", "x":5.5, "y":2},
- {"label":"G", "x":6.5, "y":2},
- {"label":"H", "x":7.5, "y":2},
- {"label":"J", "x":8.5, "y":2},
- {"label":"K", "x":9.5, "y":2},
- {"label":"L", "x":10.5, "y":2},
- {"label":";", "x":11.5, "y":2},
- {"label":"'", "x":12.5, "y":2},
- {"label":"Enter", "x":13.5, "y":2, "w":2.25},
-
- {"label":"Shift", "x":0.25, "y":3, "w":2.25},
- {"label":"Z", "x":2.5, "y":3},
- {"label":"X", "x":3.5, "y":3},
- {"label":"C", "x":4.5, "y":3},
- {"label":"V", "x":5.5, "y":3},
- {"label":"B", "x":6.5, "y":3},
- {"label":"N", "x":7.5, "y":3},
- {"label":"M", "x":8.5, "y":3},
- {"label":",", "x":9.5, "y":3},
- {"label":".", "x":10.5, "y":3},
- {"label":"/", "x":11.5, "y":3},
- {"label":"Shift", "x":12.5, "y":3, "w":2.75},
- {"label":"\u2191", "x":15.25, "y":3},
-
- {"label":"Super", "x":0, "y":4, "w":1.25},
- {"label":"Ctrl", "x":1.25, "y":4, "w":1.25},
- {"label":"Alt", "x":3.37, "y":4, "w":1.25},
- {"x":4.62, "y":4, "w":2.75},
- {"x":7.37, "y":4, "w":2.25},
- {"x":9.62, "y":4, "w":1.25},
- {"label":"Alt", "x":10.87, "y":4, "w":1.25},
- {"label":"Function", "x":12.12, "y":4, "w":1.25},
- {"label":"\u2190", "x":14.25, "y":4},
- {"label":"\u2193", "x":15.25, "y":4},
- {"label":"\u2192", "x":16.25, "y":4}
+ {"matrix": [4, 3], "x": 0.5, "y": 0},
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+ {"matrix": [0, 9], "x": 10.5, "y": 0},
+ {"matrix": [0, 10], "x": 11.5, "y": 0},
+ {"matrix": [0, 11], "x": 12.5, "y": 0},
+ {"matrix": [0, 12], "x": 13.5, "y": 0},
+ {"matrix": [0, 13], "x": 14.5, "y": 0},
+ {"matrix": [2, 13], "x": 15.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 1, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0.75, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 2.5, "y": 2},
+ {"matrix": [2, 2], "x": 3.5, "y": 2},
+ {"matrix": [2, 3], "x": 4.5, "y": 2},
+ {"matrix": [2, 4], "x": 5.5, "y": 2},
+ {"matrix": [2, 5], "x": 6.5, "y": 2},
+ {"matrix": [2, 6], "x": 7.5, "y": 2},
+ {"matrix": [2, 7], "x": 8.5, "y": 2},
+ {"matrix": [2, 8], "x": 9.5, "y": 2},
+ {"matrix": [2, 9], "x": 10.5, "y": 2},
+ {"matrix": [2, 10], "x": 11.5, "y": 2},
+ {"matrix": [2, 11], "x": 12.5, "y": 2},
+ {"matrix": [2, 12], "x": 13.5, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 1], "x": 0.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.5, "y": 3},
+ {"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, "w": 2.75},
+ {"matrix": [3, 13], "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": 3.37, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 4.62, "y": 4, "w": 2.75},
+ {"matrix": [4, 5], "x": 7.37, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 9.62, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 10.87, "y": 4, "w": 1.25},
+ {"matrix": [4, 9], "x": 12.12, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 11], "x": 14.25, "y": 4},
+ {"matrix": [4, 12], "x": 15.25, "y": 4},
+ {"matrix": [4, 13], "x": 16.25, "y": 4}
]
},
"LAYOUT_bd5": {
"layout": [
- {"label":"Mute", "x":0.5, "y":0},
- {"label":"Esc", "x":1.5, "y":0},
- {"label":"1", "x":2.5, "y":0},
- {"label":"2", "x":3.5, "y":0},
- {"label":"3", "x":4.5, "y":0},
- {"label":"4", "x":5.5, "y":0},
- {"label":"5", "x":6.5, "y":0},
- {"label":"6", "x":7.5, "y":0},
- {"label":"7", "x":8.5, "y":0},
- {"label":"8", "x":9.5, "y":0},
- {"label":"9", "x":10.5, "y":0},
- {"label":"0", "x":11.5, "y":0},
- {"label":"_", "x":12.5, "y":0},
- {"label":"+", "x":13.5, "y":0},
- {"label":"\u2190", "x":14.5, "y":0},
- {"label":"Del", "x":15.5, "y":0},
-
- {"label":"Tab", "x":1, "y":1, "w":1.5},
- {"label":"Q", "x":2.5, "y":1},
- {"label":"W", "x":3.5, "y":1},
- {"label":"E", "x":4.5, "y":1},
- {"label":"R", "x":5.5, "y":1},
- {"label":"T", "x":6.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":"Caps Lock", "x":0.75, "y":2, "w":1.75},
- {"label":"A", "x":2.5, "y":2},
- {"label":"S", "x":3.5, "y":2},
- {"label":"D", "x":4.5, "y":2},
- {"label":"F", "x":5.5, "y":2},
- {"label":"G", "x":6.5, "y":2},
- {"label":"H", "x":7.5, "y":2},
- {"label":"J", "x":8.5, "y":2},
- {"label":"K", "x":9.5, "y":2},
- {"label":"L", "x":10.5, "y":2},
- {"label":";", "x":11.5, "y":2},
- {"label":"'", "x":12.5, "y":2},
- {"label":"Enter", "x":13.5, "y":2, "w":2.25},
-
- {"label":"Shift", "x":0.25, "y":3, "w":2.25},
- {"label":"Z", "x":2.5, "y":3},
- {"label":"X", "x":3.5, "y":3},
- {"label":"C", "x":4.5, "y":3},
- {"label":"V", "x":5.5, "y":3},
- {"label":"B", "x":6.5, "y":3},
- {"label":"N", "x":7.5, "y":3},
- {"label":"M", "x":8.5, "y":3},
- {"label":",", "x":9.5, "y":3},
- {"label":".", "x":10.5, "y":3},
- {"label":"/", "x":11.5, "y":3},
- {"label":"Shift", "x":12.5, "y":3, "w":1.75},
- {"label":"Fn", "x":14.25, "y":3},
- {"label":"\u2191", "x":15.25, "y":3},
-
- {"label":"Super", "x":0, "y":4, "w":1.25},
- {"label":"Ctrl", "x":1.25, "y":4, "w":1.25},
- {"label":"Alt", "x":3.37, "y":4, "w":1.25},
- {"x":4.62, "y":4, "w":6.25},
- {"label":"Alt", "x":10.87, "y":4, "w":1.25},
- {"label":"Function", "x":12.12, "y":4, "w":1.25},
- {"label":"\u2190", "x":14.25, "y":4},
- {"label":"\u2193", "x":15.25, "y":4},
- {"label":"\u2192", "x":16.25, "y":4}
+ {"matrix": [4, 3], "x": 0.5, "y": 0},
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+ {"matrix": [0, 9], "x": 10.5, "y": 0},
+ {"matrix": [0, 10], "x": 11.5, "y": 0},
+ {"matrix": [0, 11], "x": 12.5, "y": 0},
+ {"matrix": [0, 12], "x": 13.5, "y": 0},
+ {"matrix": [0, 13], "x": 14.5, "y": 0},
+ {"matrix": [2, 13], "x": 15.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 1, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0.75, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 2.5, "y": 2},
+ {"matrix": [2, 2], "x": 3.5, "y": 2},
+ {"matrix": [2, 3], "x": 4.5, "y": 2},
+ {"matrix": [2, 4], "x": 5.5, "y": 2},
+ {"matrix": [2, 5], "x": 6.5, "y": 2},
+ {"matrix": [2, 6], "x": 7.5, "y": 2},
+ {"matrix": [2, 7], "x": 8.5, "y": 2},
+ {"matrix": [2, 8], "x": 9.5, "y": 2},
+ {"matrix": [2, 9], "x": 10.5, "y": 2},
+ {"matrix": [2, 10], "x": 11.5, "y": 2},
+ {"matrix": [2, 11], "x": 12.5, "y": 2},
+ {"matrix": [2, 12], "x": 13.5, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 1], "x": 0.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.5, "y": 3},
+ {"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, "w": 1.75},
+ {"matrix": [4, 10], "x": 14.25, "y": 3},
+ {"matrix": [3, 13], "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": 3.37, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 4.62, "y": 4, "w": 6.25},
+ {"matrix": [4, 8], "x": 10.87, "y": 4, "w": 1.25},
+ {"matrix": [4, 9], "x": 12.12, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 11], "x": 14.25, "y": 4},
+ {"matrix": [4, 12], "x": 15.25, "y": 4},
+ {"matrix": [4, 13], "x": 16.25, "y": 4}
]
},
"LAYOUT_bds": {
"layout": [
- {"label":"Mute", "x":0.5, "y":0},
- {"label":"Esc", "x":1.5, "y":0},
- {"label":"1", "x":2.5, "y":0},
- {"label":"2", "x":3.5, "y":0},
- {"label":"3", "x":4.5, "y":0},
- {"label":"4", "x":5.5, "y":0},
- {"label":"5", "x":6.5, "y":0},
- {"label":"6", "x":7.5, "y":0},
- {"label":"7", "x":8.5, "y":0},
- {"label":"8", "x":9.5, "y":0},
- {"label":"9", "x":10.5, "y":0},
- {"label":"0", "x":11.5, "y":0},
- {"label":"_", "x":12.5, "y":0},
- {"label":"+", "x":13.5, "y":0},
- {"label":"\u2190", "x":14.5, "y":0},
- {"label":"Del", "x":15.5, "y":0},
-
- {"label":"Tab", "x":1, "y":1, "w":1.5},
- {"label":"Q", "x":2.5, "y":1},
- {"label":"W", "x":3.5, "y":1},
- {"label":"E", "x":4.5, "y":1},
- {"label":"R", "x":5.5, "y":1},
- {"label":"T", "x":6.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":"Caps Lock", "x":0.75, "y":2, "w":1.75},
- {"label":"A", "x":2.5, "y":2},
- {"label":"S", "x":3.5, "y":2},
- {"label":"D", "x":4.5, "y":2},
- {"label":"F", "x":5.5, "y":2},
- {"label":"G", "x":6.5, "y":2},
- {"label":"H", "x":7.5, "y":2},
- {"label":"J", "x":8.5, "y":2},
- {"label":"K", "x":9.5, "y":2},
- {"label":"L", "x":10.5, "y":2},
- {"label":";", "x":11.5, "y":2},
- {"label":"'", "x":12.5, "y":2},
- {"label":"Enter", "x":13.5, "y":2, "w":2.25},
-
- {"label":"Shift", "x":0.25, "y":3, "w":2.25},
- {"label":"Z", "x":2.5, "y":3},
- {"label":"X", "x":3.5, "y":3},
- {"label":"C", "x":4.5, "y":3},
- {"label":"V", "x":5.5, "y":3},
- {"label":"B", "x":6.5, "y":3},
- {"label":"N", "x":7.5, "y":3},
- {"label":"M", "x":8.5, "y":3},
- {"label":",", "x":9.5, "y":3},
- {"label":".", "x":10.5, "y":3},
- {"label":"/", "x":11.5, "y":3},
- {"label":"Shift", "x":12.5, "y":3, "w":1.75},
- {"label":"Fn", "x":14.25, "y":3},
- {"label":"\u2191", "x":15.25, "y":3},
-
- {"label":"Super", "x":0, "y":4, "w":1.25},
- {"label":"Ctrl", "x":1.25, "y":4, "w":1.25},
- {"label":"Alt", "x":3.37, "y":4, "w":1.25},
- {"x":4.62, "y":4, "w":2.75},
- {"x":7.37, "y":4, "w":2.25},
- {"x":9.62, "y":4, "w":1.25},
- {"label":"Alt", "x":10.87, "y":4, "w":1.25},
- {"label":"Function", "x":12.12, "y":4, "w":1.25},
- {"label":"\u2190", "x":14.25, "y":4},
- {"label":"\u2193", "x":15.25, "y":4},
- {"label":"\u2192", "x":16.25, "y":4}
+ {"matrix": [4, 3], "x": 0.5, "y": 0},
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+ {"matrix": [0, 9], "x": 10.5, "y": 0},
+ {"matrix": [0, 10], "x": 11.5, "y": 0},
+ {"matrix": [0, 11], "x": 12.5, "y": 0},
+ {"matrix": [0, 12], "x": 13.5, "y": 0},
+ {"matrix": [0, 13], "x": 14.5, "y": 0},
+ {"matrix": [2, 13], "x": 15.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 1, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0.75, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 2.5, "y": 2},
+ {"matrix": [2, 2], "x": 3.5, "y": 2},
+ {"matrix": [2, 3], "x": 4.5, "y": 2},
+ {"matrix": [2, 4], "x": 5.5, "y": 2},
+ {"matrix": [2, 5], "x": 6.5, "y": 2},
+ {"matrix": [2, 6], "x": 7.5, "y": 2},
+ {"matrix": [2, 7], "x": 8.5, "y": 2},
+ {"matrix": [2, 8], "x": 9.5, "y": 2},
+ {"matrix": [2, 9], "x": 10.5, "y": 2},
+ {"matrix": [2, 10], "x": 11.5, "y": 2},
+ {"matrix": [2, 11], "x": 12.5, "y": 2},
+ {"matrix": [2, 12], "x": 13.5, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 1], "x": 0.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.5, "y": 3},
+ {"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, "w": 1.75},
+ {"matrix": [4, 10], "x": 14.25, "y": 3},
+ {"matrix": [3, 13], "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": 3.37, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 4.62, "y": 4, "w": 2.75},
+ {"matrix": [4, 5], "x": 7.37, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 9.62, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 10.87, "y": 4, "w": 1.25},
+ {"matrix": [4, 9], "x": 12.12, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 11], "x": 14.25, "y": 4},
+ {"matrix": [4, 12], "x": 15.25, "y": 4},
+ {"matrix": [4, 13], "x": 16.25, "y": 4}
]
}
}
diff --git a/keyboards/eyeohdesigns/sprh/sprh.c b/keyboards/eyeohdesigns/sprh/sprh.c
deleted file mode 100644
index f73b463d79..0000000000
--- a/keyboards/eyeohdesigns/sprh/sprh.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Eye Oh Designs
- *
- * 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 "sprh.h"
diff --git a/keyboards/eyeohdesigns/sprh/sprh.h b/keyboards/eyeohdesigns/sprh/sprh.h
deleted file mode 100644
index 0b895529d2..0000000000
--- a/keyboards/eyeohdesigns/sprh/sprh.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/* Copyright 2021 Eye Oh Designs
- *
- * 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 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_ac5( \
- k43, 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,\
- k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,\
- k40, k41, k42, k45, k48, k49, 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, KC_NO},\
- {KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d},\
- {k40, k41, k42, k43, KC_NO, k45, KC_NO, KC_NO, k48, k49, KC_NO, k4b, k4c, k4d},\
-}
-#define LAYOUT_acs( \
- k43, 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,\
- k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,\
- k40, k41, k42, k44, k45, k46, k48, k49, 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, KC_NO},\
- {KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d},\
- {k40, k41, k42, k43, k44, k45, k46, KC_NO, k48, k49, KC_NO, k4b, k4c, k4d},\
-}
-#define LAYOUT_ad5( \
- k43, 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,\
- k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k4a, k3d,\
- k40, k41, k42, k45, k48, k49, 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, KC_NO},\
- {KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d},\
- {k40, k41, k42, k43, KC_NO, k45, KC_NO, KC_NO, k48, k49, k4a, k4b, k4c, k4d},\
-}
-#define LAYOUT_ads( \
- k43, 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,\
- k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k4a, k3d,\
- k40, k41, k42, k44, k45, k46, k48, k49, 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, KC_NO},\
- {KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d},\
- {k40, k41, k42, k43, k44, k45, k46, KC_NO, k48, k49, k4a, k4b, k4c, k4d},\
-}
-#define LAYOUT_bc5( \
- k43, 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,\
- k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,\
- k40, k41, k42, k45, k48, k49, 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},\
- {KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d},\
- {k40, k41, k42, k43, KC_NO, k45, KC_NO, KC_NO, k48, k49, KC_NO, k4b, k4c, k4d},\
-}
-#define LAYOUT_bcs( \
- k43, 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,\
- k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,\
- k40, k41, k42, k44, k45, k46, k48, k49, 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},\
- {KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d},\
- {k40, k41, k42, k43, k44, k45, k46, KC_NO, k48, k49, KC_NO, k4b, k4c, k4d},\
-}
-#define LAYOUT_bd5( \
- k43, 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,\
- k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k4a, k3d,\
- k40, k41, k42, k45, k48, k49, 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},\
- {KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d},\
- {k40, k41, k42, k43, KC_NO, k45, KC_NO, KC_NO, k48, k49, k4a, k4b, k4c, k4d},\
-}
-#define LAYOUT_bds( \
- k43, 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,\
- k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k4a, k3d,\
- k40, k41, k42, k44, k45, k46, k48, k49, 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},\
- {KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d},\
- {k40, k41, k42, k43, k44, k45, k46, KC_NO, k48, k49, k4a, k4b, k4c, k4d},\
-}
diff --git a/keyboards/eyeohdesigns/theboulevard/info.json b/keyboards/eyeohdesigns/theboulevard/info.json
index f1a09875c5..a4eed41e41 100644
--- a/keyboards/eyeohdesigns/theboulevard/info.json
+++ b/keyboards/eyeohdesigns/theboulevard/info.json
@@ -25,35 +25,664 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_ortho1": {
- "layout": [{"label":"Knob", "x":0, "y":0}, {"x":1.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":0, "y":1.5}, {"label":"ESC", "x":1.5, "y":1.5}, {"label":"Q", "x":2.5, "y":1.5}, {"label":"W", "x":3.5, "y":1.5}, {"label":"E", "x":4.5, "y":1.5}, {"label":"R", "x":5.5, "y":1.5}, {"label":"T", "x":6.5, "y":1.5}, {"label":"Y", "x":7.5, "y":1.5}, {"label":"U", "x":8.5, "y":1.5}, {"label":"I", "x":9.5, "y":1.5}, {"label":"O", "x":10.5, "y":1.5}, {"label":"P", "x":11.5, "y":1.5}, {"label":"BKSPC", "x":12.5, "y":1.5}, {"x":0, "y":2.5}, {"label":"TAB", "x":1.5, "y":2.5}, {"label":"A", "x":2.5, "y":2.5}, {"label":"S", "x":3.5, "y":2.5}, {"label":"D", "x":4.5, "y":2.5}, {"label":"F", "x":5.5, "y":2.5}, {"label":"G", "x":6.5, "y":2.5}, {"label":"H", "x":7.5, "y":2.5}, {"label":"J", "x":8.5, "y":2.5}, {"label":"K", "x":9.5, "y":2.5}, {"label":"L", "x":10.5, "y":2.5}, {"label":";", "x":11.5, "y":2.5}, {"label":"ENTER", "x":12.5, "y":2.5}, {"x":0, "y":3.5}, {"label":"SHIFT", "x":1.5, "y":3.5}, {"label":"Z", "x":2.5, "y":3.5}, {"label":"X", "x":3.5, "y":3.5}, {"label":"C", "x":4.5, "y":3.5}, {"label":"V", "x":5.5, "y":3.5}, {"label":"B", "x":6.5, "y":3.5}, {"label":"N", "x":7.5, "y":3.5}, {"label":"M", "x":8.5, "y":3.5}, {"label":",", "x":9.5, "y":3.5}, {"label":".", "x":10.5, "y":3.5}, {"label":"/", "x":11.5, "y":3.5}, {"label":"SHIFT", "x":12.5, "y":3.5}, {"x":0, "y":4.5}, {"x":1.5, "y":4.5}, {"x":2.5, "y":4.5}, {"x":3.5, "y":4.5}, {"x":4.5, "y":4.5}, {"x":5.5, "y":4.5}, {"x":6.5, "y":4.5, "w":2}, {"x":8.5, "y":4.5}, {"x":9.5, "y":4.5}, {"x":10.5, "y":4.5}, {"x":11.5, "y":4.5}, {"x":12.5, "y":4.5}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.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": [1, 0], "x": 0, "y": 1.5},
+
+ {"matrix": [1, 1], "x": 1.5, "y": 1.5},
+ {"matrix": [1, 2], "x": 2.5, "y": 1.5},
+ {"matrix": [1, 3], "x": 3.5, "y": 1.5},
+ {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+ {"matrix": [1, 5], "x": 5.5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6.5, "y": 1.5},
+ {"matrix": [1, 7], "x": 7.5, "y": 1.5},
+ {"matrix": [1, 8], "x": 8.5, "y": 1.5},
+ {"matrix": [1, 9], "x": 9.5, "y": 1.5},
+ {"matrix": [1, 10], "x": 10.5, "y": 1.5},
+ {"matrix": [1, 11], "x": 11.5, "y": 1.5},
+ {"matrix": [1, 12], "x": 12.5, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.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": [3, 0], "x": 0, "y": 3.5},
+
+ {"matrix": [3, 1], "x": 1.5, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.5, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.5, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.5, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.5, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.5, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.5, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.5, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.5, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.5, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.5, "y": 3.5},
+ {"matrix": [3, 12], "x": 12.5, "y": 3.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4.5},
+ {"matrix": [4, 2], "x": 2.5, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.5, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.5, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.5, "y": 4.5},
+ {"matrix": [4, 7], "x": 6.5, "y": 4.5, "w": 2},
+ {"matrix": [4, 8], "x": 8.5, "y": 4.5},
+ {"matrix": [4, 9], "x": 9.5, "y": 4.5},
+ {"matrix": [4, 10], "x": 10.5, "y": 4.5},
+ {"matrix": [4, 11], "x": 11.5, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4.5}
+ ]
},
"LAYOUT_ortho2": {
- "layout": [{"label":"Knob", "x":0, "y":0}, {"x":1.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":0, "y":1.5}, {"label":"ESC", "x":1.5, "y":1.5}, {"label":"Q", "x":2.5, "y":1.5}, {"label":"W", "x":3.5, "y":1.5}, {"label":"E", "x":4.5, "y":1.5}, {"label":"R", "x":5.5, "y":1.5}, {"label":"T", "x":6.5, "y":1.5}, {"label":"Y", "x":7.5, "y":1.5}, {"label":"U", "x":8.5, "y":1.5}, {"label":"I", "x":9.5, "y":1.5}, {"label":"O", "x":10.5, "y":1.5}, {"label":"P", "x":11.5, "y":1.5}, {"label":"BKSPC", "x":12.5, "y":1.5}, {"x":0, "y":2.5}, {"label":"TAB", "x":1.5, "y":2.5}, {"label":"A", "x":2.5, "y":2.5}, {"label":"S", "x":3.5, "y":2.5}, {"label":"D", "x":4.5, "y":2.5}, {"label":"F", "x":5.5, "y":2.5}, {"label":"G", "x":6.5, "y":2.5}, {"label":"H", "x":7.5, "y":2.5}, {"label":"J", "x":8.5, "y":2.5}, {"label":"K", "x":9.5, "y":2.5}, {"label":"L", "x":10.5, "y":2.5}, {"label":";", "x":11.5, "y":2.5}, {"label":"ENTER", "x":12.5, "y":2.5}, {"x":0, "y":3.5}, {"label":"SHIFT", "x":1.5, "y":3.5}, {"label":"Z", "x":2.5, "y":3.5}, {"label":"X", "x":3.5, "y":3.5}, {"label":"C", "x":4.5, "y":3.5}, {"label":"V", "x":5.5, "y":3.5}, {"label":"B", "x":6.5, "y":3.5}, {"label":"N", "x":7.5, "y":3.5}, {"label":"M", "x":8.5, "y":3.5}, {"label":",", "x":9.5, "y":3.5}, {"label":".", "x":10.5, "y":3.5}, {"label":"/", "x":11.5, "y":3.5}, {"label":"SHIFT", "x":12.5, "y":3.5}, {"x":0, "y":4.5}, {"x":1.5, "y":4.5}, {"x":2.5, "y":4.5}, {"x":3.5, "y":4.5}, {"x":4.5, "y":4.5}, {"x":5.5, "y":4.5, "w":2}, {"x":7.5, "y":4.5, "w":2}, {"x":9.5, "y":4.5}, {"x":10.5, "y":4.5}, {"x":11.5, "y":4.5}, {"x":12.5, "y":4.5}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.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": [1, 0], "x": 0, "y": 1.5},
+
+ {"matrix": [1, 1], "x": 1.5, "y": 1.5},
+ {"matrix": [1, 2], "x": 2.5, "y": 1.5},
+ {"matrix": [1, 3], "x": 3.5, "y": 1.5},
+ {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+ {"matrix": [1, 5], "x": 5.5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6.5, "y": 1.5},
+ {"matrix": [1, 7], "x": 7.5, "y": 1.5},
+ {"matrix": [1, 8], "x": 8.5, "y": 1.5},
+ {"matrix": [1, 9], "x": 9.5, "y": 1.5},
+ {"matrix": [1, 10], "x": 10.5, "y": 1.5},
+ {"matrix": [1, 11], "x": 11.5, "y": 1.5},
+ {"matrix": [1, 12], "x": 12.5, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.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": [3, 0], "x": 0, "y": 3.5},
+
+ {"matrix": [3, 1], "x": 1.5, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.5, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.5, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.5, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.5, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.5, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.5, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.5, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.5, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.5, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.5, "y": 3.5},
+ {"matrix": [3, 12], "x": 12.5, "y": 3.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4.5},
+ {"matrix": [4, 2], "x": 2.5, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.5, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.5, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.5, "y": 4.5, "w": 2},
+ {"matrix": [4, 8], "x": 7.5, "y": 4.5, "w": 2},
+ {"matrix": [4, 9], "x": 9.5, "y": 4.5},
+ {"matrix": [4, 10], "x": 10.5, "y": 4.5},
+ {"matrix": [4, 11], "x": 11.5, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4.5}
+ ]
},
"LAYOUT_ortho3": {
- "layout": [{"label":"Knob", "x":0, "y":0}, {"x":1.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":0, "y":1.5}, {"label":"ESC", "x":1.5, "y":1.5}, {"label":"Q", "x":2.5, "y":1.5}, {"label":"W", "x":3.5, "y":1.5}, {"label":"E", "x":4.5, "y":1.5}, {"label":"R", "x":5.5, "y":1.5}, {"label":"T", "x":6.5, "y":1.5}, {"label":"Y", "x":7.5, "y":1.5}, {"label":"U", "x":8.5, "y":1.5}, {"label":"I", "x":9.5, "y":1.5}, {"label":"O", "x":10.5, "y":1.5}, {"label":"P", "x":11.5, "y":1.5}, {"label":"BKSPC", "x":12.5, "y":1.5}, {"x":0, "y":2.5}, {"label":"TAB", "x":1.5, "y":2.5}, {"label":"A", "x":2.5, "y":2.5}, {"label":"S", "x":3.5, "y":2.5}, {"label":"D", "x":4.5, "y":2.5}, {"label":"F", "x":5.5, "y":2.5}, {"label":"G", "x":6.5, "y":2.5}, {"label":"H", "x":7.5, "y":2.5}, {"label":"J", "x":8.5, "y":2.5}, {"label":"K", "x":9.5, "y":2.5}, {"label":"L", "x":10.5, "y":2.5}, {"label":";", "x":11.5, "y":2.5}, {"label":"ENTER", "x":12.5, "y":2.5}, {"x":0, "y":3.5}, {"label":"SHIFT", "x":1.5, "y":3.5}, {"label":"Z", "x":2.5, "y":3.5}, {"label":"X", "x":3.5, "y":3.5}, {"label":"C", "x":4.5, "y":3.5}, {"label":"V", "x":5.5, "y":3.5}, {"label":"B", "x":6.5, "y":3.5}, {"label":"N", "x":7.5, "y":3.5}, {"label":"M", "x":8.5, "y":3.5}, {"label":",", "x":9.5, "y":3.5}, {"label":".", "x":10.5, "y":3.5}, {"label":"/", "x":11.5, "y":3.5}, {"label":"SHIFT", "x":12.5, "y":3.5}, {"x":0, "y":4.5}, {"x":1.5, "y":4.5, "w":1.25}, {"x":2.75, "y":4.5}, {"x":3.75, "y":4.5, "w":1.25}, {"x":5, "y":4.5, "w":2.75}, {"x":7.75, "y":4.5, "w":2.25}, {"x":10, "y":4.5, "w":1.25}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":1.25}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.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": [1, 0], "x": 0, "y": 1.5},
+
+ {"matrix": [1, 1], "x": 1.5, "y": 1.5},
+ {"matrix": [1, 2], "x": 2.5, "y": 1.5},
+ {"matrix": [1, 3], "x": 3.5, "y": 1.5},
+ {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+ {"matrix": [1, 5], "x": 5.5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6.5, "y": 1.5},
+ {"matrix": [1, 7], "x": 7.5, "y": 1.5},
+ {"matrix": [1, 8], "x": 8.5, "y": 1.5},
+ {"matrix": [1, 9], "x": 9.5, "y": 1.5},
+ {"matrix": [1, 10], "x": 10.5, "y": 1.5},
+ {"matrix": [1, 11], "x": 11.5, "y": 1.5},
+ {"matrix": [1, 12], "x": 12.5, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.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": [3, 0], "x": 0, "y": 3.5},
+
+ {"matrix": [3, 1], "x": 1.5, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.5, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.5, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.5, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.5, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.5, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.5, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.5, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.5, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.5, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.5, "y": 3.5},
+ {"matrix": [3, 12], "x": 12.5, "y": 3.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.75, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 5], "x": 5, "y": 4.5, "w": 2.75},
+ {"matrix": [4, 8], "x": 7.75, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 10], "x": 10, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.25}
+ ]
},
"LAYOUT_ortho4": {
- "layout": [{"label":"Knob", "x":0, "y":0}, {"x":1.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":0, "y":1.5}, {"label":"ESC", "x":1.5, "y":1.5}, {"label":"Q", "x":2.5, "y":1.5}, {"label":"W", "x":3.5, "y":1.5}, {"label":"E", "x":4.5, "y":1.5}, {"label":"R", "x":5.5, "y":1.5}, {"label":"T", "x":6.5, "y":1.5}, {"label":"Y", "x":7.5, "y":1.5}, {"label":"U", "x":8.5, "y":1.5}, {"label":"I", "x":9.5, "y":1.5}, {"label":"O", "x":10.5, "y":1.5}, {"label":"P", "x":11.5, "y":1.5}, {"label":"BKSPC", "x":12.5, "y":1.5}, {"x":0, "y":2.5}, {"label":"TAB", "x":1.5, "y":2.5}, {"label":"A", "x":2.5, "y":2.5}, {"label":"S", "x":3.5, "y":2.5}, {"label":"D", "x":4.5, "y":2.5}, {"label":"F", "x":5.5, "y":2.5}, {"label":"G", "x":6.5, "y":2.5}, {"label":"H", "x":7.5, "y":2.5}, {"label":"J", "x":8.5, "y":2.5}, {"label":"K", "x":9.5, "y":2.5}, {"label":"L", "x":10.5, "y":2.5}, {"label":";", "x":11.5, "y":2.5}, {"label":"ENTER", "x":12.5, "y":2.5}, {"x":0, "y":3.5}, {"label":"SHIFT", "x":1.5, "y":3.5}, {"label":"Z", "x":2.5, "y":3.5}, {"label":"X", "x":3.5, "y":3.5}, {"label":"C", "x":4.5, "y":3.5}, {"label":"V", "x":5.5, "y":3.5}, {"label":"B", "x":6.5, "y":3.5}, {"label":"N", "x":7.5, "y":3.5}, {"label":"M", "x":8.5, "y":3.5}, {"label":",", "x":9.5, "y":3.5}, {"label":".", "x":10.5, "y":3.5}, {"label":"/", "x":11.5, "y":3.5}, {"label":"SHIFT", "x":12.5, "y":3.5}, {"x":0, "y":4.5}, {"x":1.5, "y":4.5, "w":1.25}, {"x":2.75, "y":4.5}, {"x":3.75, "y":4.5, "w":6.25}, {"x":10, "y":4.5, "w":1.25}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":1.25}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.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": [1, 0], "x": 0, "y": 1.5},
+
+ {"matrix": [1, 1], "x": 1.5, "y": 1.5},
+ {"matrix": [1, 2], "x": 2.5, "y": 1.5},
+ {"matrix": [1, 3], "x": 3.5, "y": 1.5},
+ {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+ {"matrix": [1, 5], "x": 5.5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6.5, "y": 1.5},
+ {"matrix": [1, 7], "x": 7.5, "y": 1.5},
+ {"matrix": [1, 8], "x": 8.5, "y": 1.5},
+ {"matrix": [1, 9], "x": 9.5, "y": 1.5},
+ {"matrix": [1, 10], "x": 10.5, "y": 1.5},
+ {"matrix": [1, 11], "x": 11.5, "y": 1.5},
+ {"matrix": [1, 12], "x": 12.5, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.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": [3, 0], "x": 0, "y": 3.5},
+
+ {"matrix": [3, 1], "x": 1.5, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.5, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.5, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.5, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.5, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.5, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.5, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.5, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.5, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.5, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.5, "y": 3.5},
+ {"matrix": [3, 12], "x": 12.5, "y": 3.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4.5},
+ {"matrix": [4, 6], "x": 3.75, "y": 4.5, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.25}
+ ]
},
"LAYOUT_ortho5": {
- "layout": [{"label":"Knob", "x":0, "y":0}, {"x":1.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":0, "y":1.5}, {"label":"ESC", "x":1.5, "y":1.5}, {"label":"Q", "x":2.5, "y":1.5}, {"label":"W", "x":3.5, "y":1.5}, {"label":"E", "x":4.5, "y":1.5}, {"label":"R", "x":5.5, "y":1.5}, {"label":"T", "x":6.5, "y":1.5}, {"label":"Y", "x":7.5, "y":1.5}, {"label":"U", "x":8.5, "y":1.5}, {"label":"I", "x":9.5, "y":1.5}, {"label":"O", "x":10.5, "y":1.5}, {"label":"P", "x":11.5, "y":1.5}, {"label":"BKSPC", "x":12.5, "y":1.5}, {"x":0, "y":2.5}, {"label":"TAB", "x":1.5, "y":2.5}, {"label":"A", "x":2.5, "y":2.5}, {"label":"S", "x":3.5, "y":2.5}, {"label":"D", "x":4.5, "y":2.5}, {"label":"F", "x":5.5, "y":2.5}, {"label":"G", "x":6.5, "y":2.5}, {"label":"H", "x":7.5, "y":2.5}, {"label":"J", "x":8.5, "y":2.5}, {"label":"K", "x":9.5, "y":2.5}, {"label":"L", "x":10.5, "y":2.5}, {"label":";", "x":11.5, "y":2.5}, {"label":"ENTER", "x":12.5, "y":2.5}, {"x":0, "y":3.5}, {"label":"SHIFT", "x":1.5, "y":3.5}, {"label":"Z", "x":2.5, "y":3.5}, {"label":"X", "x":3.5, "y":3.5}, {"label":"C", "x":4.5, "y":3.5}, {"label":"V", "x":5.5, "y":3.5}, {"label":"B", "x":6.5, "y":3.5}, {"label":"N", "x":7.5, "y":3.5}, {"label":"M", "x":8.5, "y":3.5}, {"label":",", "x":9.5, "y":3.5}, {"label":".", "x":10.5, "y":3.5}, {"label":"/", "x":11.5, "y":3.5}, {"label":"SHIFT", "x":12.5, "y":3.5}, {"x":0, "y":4.5}, {"x":1.5, "y":4.5}, {"x":2.5, "y":4.5, "w":1.5}, {"x":4, "y":4.5, "w":7}, {"x":11, "y":4.5, "w":1.5}, {"x":12.5, "y":4.5}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.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": [1, 0], "x": 0, "y": 1.5},
+
+ {"matrix": [1, 1], "x": 1.5, "y": 1.5},
+ {"matrix": [1, 2], "x": 2.5, "y": 1.5},
+ {"matrix": [1, 3], "x": 3.5, "y": 1.5},
+ {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+ {"matrix": [1, 5], "x": 5.5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6.5, "y": 1.5},
+ {"matrix": [1, 7], "x": 7.5, "y": 1.5},
+ {"matrix": [1, 8], "x": 8.5, "y": 1.5},
+ {"matrix": [1, 9], "x": 9.5, "y": 1.5},
+ {"matrix": [1, 10], "x": 10.5, "y": 1.5},
+ {"matrix": [1, 11], "x": 11.5, "y": 1.5},
+ {"matrix": [1, 12], "x": 12.5, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.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": [3, 0], "x": 0, "y": 3.5},
+
+ {"matrix": [3, 1], "x": 1.5, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.5, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.5, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.5, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.5, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.5, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.5, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.5, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.5, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.5, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.5, "y": 3.5},
+ {"matrix": [3, 12], "x": 12.5, "y": 3.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4.5},
+ {"matrix": [4, 2], "x": 2.5, "y": 4.5, "w": 1.5},
+ {"matrix": [4, 7], "x": 4, "y": 4.5, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4.5, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4.5}
+ ]
},
"LAYOUT_stagger1": {
- "layout": [{"label":"Knob", "x":0, "y":0}, {"x":1.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":0, "y":1.5}, {"label":"ESC", "x":1.5, "y":1.5}, {"label":"Q", "x":2.5, "y":1.5}, {"label":"W", "x":3.5, "y":1.5}, {"label":"E", "x":4.5, "y":1.5}, {"label":"R", "x":5.5, "y":1.5}, {"label":"T", "x":6.5, "y":1.5}, {"label":"Y", "x":7.5, "y":1.5}, {"label":"U", "x":8.5, "y":1.5}, {"label":"I", "x":9.5, "y":1.5}, {"label":"O", "x":10.5, "y":1.5}, {"label":"P", "x":11.5, "y":1.5}, {"label":"BKSPC", "x":12.5, "y":1.5}, {"x":0, "y":2.5}, {"label":"TAB", "x":1.5, "y":2.5, "w":1.25}, {"label":"A", "x":2.75, "y":2.5}, {"label":"S", "x":3.75, "y":2.5}, {"label":"D", "x":4.75, "y":2.5}, {"label":"F", "x":5.75, "y":2.5}, {"label":"G", "x":6.75, "y":2.5}, {"label":"H", "x":7.75, "y":2.5}, {"label":"J", "x":8.75, "y":2.5}, {"label":"K", "x":9.75, "y":2.5}, {"label":"L", "x":10.75, "y":2.5}, {"label":"Enter", "x":11.75, "y":2.5, "w":1.75}, {"x":0, "y":3.5}, {"label":"SHIFT", "x":1.5, "y":3.5, "w":1.75}, {"label":"Z", "x":3.25, "y":3.5}, {"label":"X", "x":4.25, "y":3.5}, {"label":"C", "x":5.25, "y":3.5}, {"label":"V", "x":6.25, "y":3.5}, {"label":"B", "x":7.25, "y":3.5}, {"label":"N", "x":8.25, "y":3.5}, {"label":"M", "x":9.25, "y":3.5}, {"label":",", "x":10.25, "y":3.5}, {"label":".", "x":11.25, "y":3.5}, {"label":"Shift", "x":12.25, "y":3.5, "w":1.25}, {"x":0, "y":4.5}, {"x":1.5, "y":4.5}, {"x":2.5, "y":4.5}, {"x":3.5, "y":4.5}, {"x":4.5, "y":4.5}, {"x":5.5, "y":4.5}, {"x":6.5, "y":4.5, "w":2}, {"x":8.5, "y":4.5}, {"x":9.5, "y":4.5}, {"x":10.5, "y":4.5}, {"x":11.5, "y":4.5}, {"x":12.5, "y":4.5}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.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": [1, 0], "x": 0, "y": 1.5},
+
+ {"matrix": [1, 1], "x": 1.5, "y": 1.5},
+ {"matrix": [1, 2], "x": 2.5, "y": 1.5},
+ {"matrix": [1, 3], "x": 3.5, "y": 1.5},
+ {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+ {"matrix": [1, 5], "x": 5.5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6.5, "y": 1.5},
+ {"matrix": [1, 7], "x": 7.5, "y": 1.5},
+ {"matrix": [1, 8], "x": 8.5, "y": 1.5},
+ {"matrix": [1, 9], "x": 9.5, "y": 1.5},
+ {"matrix": [1, 10], "x": 10.5, "y": 1.5},
+ {"matrix": [1, 11], "x": 11.5, "y": 1.5},
+ {"matrix": [1, 12], "x": 12.5, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5},
+
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5, "w": 1.25},
+ {"matrix": [2, 2], "x": 2.75, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.75, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.75, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.75, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.75, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.75, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.75, "y": 2.5},
+ {"matrix": [2, 9], "x": 9.75, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.75, "y": 2.5},
+ {"matrix": [2, 12], "x": 11.75, "y": 2.5, "w": 1.75},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5},
+
+ {"matrix": [3, 1], "x": 1.5, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 3], "x": 3.25, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.25, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.25, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.25, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.25, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.25, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.25, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.25, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.25, "y": 3.5},
+ {"matrix": [3, 12], "x": 12.25, "y": 3.5, "w": 1.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4.5},
+ {"matrix": [4, 2], "x": 2.5, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.5, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.5, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.5, "y": 4.5},
+ {"matrix": [4, 7], "x": 6.5, "y": 4.5, "w": 2},
+ {"matrix": [4, 8], "x": 8.5, "y": 4.5},
+ {"matrix": [4, 9], "x": 9.5, "y": 4.5},
+ {"matrix": [4, 10], "x": 10.5, "y": 4.5},
+ {"matrix": [4, 11], "x": 11.5, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4.5}
+ ]
},
"LAYOUT_stagger2": {
- "layout": [{"label":"Knob", "x":0, "y":0}, {"x":1.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":0, "y":1.5}, {"label":"ESC", "x":1.5, "y":1.5}, {"label":"Q", "x":2.5, "y":1.5}, {"label":"W", "x":3.5, "y":1.5}, {"label":"E", "x":4.5, "y":1.5}, {"label":"R", "x":5.5, "y":1.5}, {"label":"T", "x":6.5, "y":1.5}, {"label":"Y", "x":7.5, "y":1.5}, {"label":"U", "x":8.5, "y":1.5}, {"label":"I", "x":9.5, "y":1.5}, {"label":"O", "x":10.5, "y":1.5}, {"label":"P", "x":11.5, "y":1.5}, {"label":"BKSPC", "x":12.5, "y":1.5}, {"x":0, "y":2.5}, {"label":"TAB", "x":1.5, "y":2.5, "w":1.25}, {"label":"A", "x":2.75, "y":2.5}, {"label":"S", "x":3.75, "y":2.5}, {"label":"D", "x":4.75, "y":2.5}, {"label":"F", "x":5.75, "y":2.5}, {"label":"G", "x":6.75, "y":2.5}, {"label":"H", "x":7.75, "y":2.5}, {"label":"J", "x":8.75, "y":2.5}, {"label":"K", "x":9.75, "y":2.5}, {"label":"L", "x":10.75, "y":2.5}, {"label":"Enter", "x":11.75, "y":2.5, "w":1.75}, {"x":0, "y":3.5}, {"label":"SHIFT", "x":1.5, "y":3.5, "w":1.75}, {"label":"Z", "x":3.25, "y":3.5}, {"label":"X", "x":4.25, "y":3.5}, {"label":"C", "x":5.25, "y":3.5}, {"label":"V", "x":6.25, "y":3.5}, {"label":"B", "x":7.25, "y":3.5}, {"label":"N", "x":8.25, "y":3.5}, {"label":"M", "x":9.25, "y":3.5}, {"label":",", "x":10.25, "y":3.5}, {"label":".", "x":11.25, "y":3.5}, {"label":"Shift", "x":12.25, "y":3.5, "w":1.25}, {"x":0, "y":4.5}, {"x":1.5, "y":4.5}, {"x":2.5, "y":4.5}, {"x":3.5, "y":4.5}, {"x":4.5, "y":4.5}, {"x":5.5, "y":4.5, "w":2}, {"x":7.5, "y":4.5, "w":2}, {"x":9.5, "y":4.5}, {"x":10.5, "y":4.5}, {"x":11.5, "y":4.5}, {"x":12.5, "y":4.5}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.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": [1, 0], "x": 0, "y": 1.5},
+
+ {"matrix": [1, 1], "x": 1.5, "y": 1.5},
+ {"matrix": [1, 2], "x": 2.5, "y": 1.5},
+ {"matrix": [1, 3], "x": 3.5, "y": 1.5},
+ {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+ {"matrix": [1, 5], "x": 5.5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6.5, "y": 1.5},
+ {"matrix": [1, 7], "x": 7.5, "y": 1.5},
+ {"matrix": [1, 8], "x": 8.5, "y": 1.5},
+ {"matrix": [1, 9], "x": 9.5, "y": 1.5},
+ {"matrix": [1, 10], "x": 10.5, "y": 1.5},
+ {"matrix": [1, 11], "x": 11.5, "y": 1.5},
+ {"matrix": [1, 12], "x": 12.5, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5},
+
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5, "w": 1.25},
+ {"matrix": [2, 2], "x": 2.75, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.75, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.75, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.75, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.75, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.75, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.75, "y": 2.5},
+ {"matrix": [2, 9], "x": 9.75, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.75, "y": 2.5},
+ {"matrix": [2, 12], "x": 11.75, "y": 2.5, "w": 1.75},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5},
+
+ {"matrix": [3, 1], "x": 1.5, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 3], "x": 3.25, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.25, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.25, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.25, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.25, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.25, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.25, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.25, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.25, "y": 3.5},
+ {"matrix": [3, 12], "x": 12.25, "y": 3.5, "w": 1.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4.5},
+ {"matrix": [4, 2], "x": 2.5, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.5, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.5, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.5, "y": 4.5, "w": 2},
+ {"matrix": [4, 8], "x": 7.5, "y": 4.5, "w": 2},
+ {"matrix": [4, 9], "x": 9.5, "y": 4.5},
+ {"matrix": [4, 10], "x": 10.5, "y": 4.5},
+ {"matrix": [4, 11], "x": 11.5, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4.5}
+ ]
},
"LAYOUT_stagger3": {
- "layout": [{"label":"Knob", "x":0, "y":0}, {"x":1.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":0, "y":1.5}, {"label":"ESC", "x":1.5, "y":1.5}, {"label":"Q", "x":2.5, "y":1.5}, {"label":"W", "x":3.5, "y":1.5}, {"label":"E", "x":4.5, "y":1.5}, {"label":"R", "x":5.5, "y":1.5}, {"label":"T", "x":6.5, "y":1.5}, {"label":"Y", "x":7.5, "y":1.5}, {"label":"U", "x":8.5, "y":1.5}, {"label":"I", "x":9.5, "y":1.5}, {"label":"O", "x":10.5, "y":1.5}, {"label":"P", "x":11.5, "y":1.5}, {"label":"BKSPC", "x":12.5, "y":1.5}, {"x":0, "y":2.5}, {"label":"TAB", "x":1.5, "y":2.5, "w":1.25}, {"label":"A", "x":2.75, "y":2.5}, {"label":"S", "x":3.75, "y":2.5}, {"label":"D", "x":4.75, "y":2.5}, {"label":"F", "x":5.75, "y":2.5}, {"label":"G", "x":6.75, "y":2.5}, {"label":"H", "x":7.75, "y":2.5}, {"label":"J", "x":8.75, "y":2.5}, {"label":"K", "x":9.75, "y":2.5}, {"label":"L", "x":10.75, "y":2.5}, {"label":"Enter", "x":11.75, "y":2.5, "w":1.75}, {"x":0, "y":3.5}, {"label":"SHIFT", "x":1.5, "y":3.5, "w":1.75}, {"label":"Z", "x":3.25, "y":3.5}, {"label":"X", "x":4.25, "y":3.5}, {"label":"C", "x":5.25, "y":3.5}, {"label":"V", "x":6.25, "y":3.5}, {"label":"B", "x":7.25, "y":3.5}, {"label":"N", "x":8.25, "y":3.5}, {"label":"M", "x":9.25, "y":3.5}, {"label":",", "x":10.25, "y":3.5}, {"label":".", "x":11.25, "y":3.5}, {"label":"Shift", "x":12.25, "y":3.5, "w":1.25}, {"x":0, "y":4.5}, {"x":1.5, "y":4.5, "w":1.25}, {"x":2.75, "y":4.5}, {"x":3.75, "y":4.5, "w":1.25}, {"x":5, "y":4.5, "w":2.75}, {"x":7.75, "y":4.5, "w":2.25}, {"x":10, "y":4.5, "w":1.25}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":1.25}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.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": [1, 0], "x": 0, "y": 1.5},
+
+ {"matrix": [1, 1], "x": 1.5, "y": 1.5},
+ {"matrix": [1, 2], "x": 2.5, "y": 1.5},
+ {"matrix": [1, 3], "x": 3.5, "y": 1.5},
+ {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+ {"matrix": [1, 5], "x": 5.5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6.5, "y": 1.5},
+ {"matrix": [1, 7], "x": 7.5, "y": 1.5},
+ {"matrix": [1, 8], "x": 8.5, "y": 1.5},
+ {"matrix": [1, 9], "x": 9.5, "y": 1.5},
+ {"matrix": [1, 10], "x": 10.5, "y": 1.5},
+ {"matrix": [1, 11], "x": 11.5, "y": 1.5},
+ {"matrix": [1, 12], "x": 12.5, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5},
+
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5, "w": 1.25},
+ {"matrix": [2, 2], "x": 2.75, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.75, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.75, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.75, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.75, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.75, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.75, "y": 2.5},
+ {"matrix": [2, 9], "x": 9.75, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.75, "y": 2.5},
+ {"matrix": [2, 12], "x": 11.75, "y": 2.5, "w": 1.75},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5},
+
+ {"matrix": [3, 1], "x": 1.5, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 3], "x": 3.25, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.25, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.25, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.25, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.25, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.25, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.25, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.25, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.25, "y": 3.5},
+ {"matrix": [3, 12], "x": 12.25, "y": 3.5, "w": 1.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.75, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 5], "x": 5, "y": 4.5, "w": 2.75},
+ {"matrix": [4, 8], "x": 7.75, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 10], "x": 10, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.25}
+ ]
},
"LAYOUT_stagger4": {
- "layout": [{"label":"Knob", "x":0, "y":0}, {"x":1.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":0, "y":1.5}, {"label":"ESC", "x":1.5, "y":1.5}, {"label":"Q", "x":2.5, "y":1.5}, {"label":"W", "x":3.5, "y":1.5}, {"label":"E", "x":4.5, "y":1.5}, {"label":"R", "x":5.5, "y":1.5}, {"label":"T", "x":6.5, "y":1.5}, {"label":"Y", "x":7.5, "y":1.5}, {"label":"U", "x":8.5, "y":1.5}, {"label":"I", "x":9.5, "y":1.5}, {"label":"O", "x":10.5, "y":1.5}, {"label":"P", "x":11.5, "y":1.5}, {"label":"BKSPC", "x":12.5, "y":1.5}, {"x":0, "y":2.5}, {"label":"TAB", "x":1.5, "y":2.5, "w":1.25}, {"label":"A", "x":2.75, "y":2.5}, {"label":"S", "x":3.75, "y":2.5}, {"label":"D", "x":4.75, "y":2.5}, {"label":"F", "x":5.75, "y":2.5}, {"label":"G", "x":6.75, "y":2.5}, {"label":"H", "x":7.75, "y":2.5}, {"label":"J", "x":8.75, "y":2.5}, {"label":"K", "x":9.75, "y":2.5}, {"label":"L", "x":10.75, "y":2.5}, {"label":"Enter", "x":11.75, "y":2.5, "w":1.75}, {"x":0, "y":3.5}, {"label":"SHIFT", "x":1.5, "y":3.5, "w":1.75}, {"label":"Z", "x":3.25, "y":3.5}, {"label":"X", "x":4.25, "y":3.5}, {"label":"C", "x":5.25, "y":3.5}, {"label":"V", "x":6.25, "y":3.5}, {"label":"B", "x":7.25, "y":3.5}, {"label":"N", "x":8.25, "y":3.5}, {"label":"M", "x":9.25, "y":3.5}, {"label":",", "x":10.25, "y":3.5}, {"label":".", "x":11.25, "y":3.5}, {"label":"Shift", "x":12.25, "y":3.5, "w":1.25}, {"x":0, "y":4.5}, {"x":1.5, "y":4.5, "w":1.25}, {"x":2.75, "y":4.5}, {"x":3.75, "y":4.5, "w":6.25}, {"x":10, "y":4.5, "w":1.25}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":1.25}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.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": [1, 0], "x": 0, "y": 1.5},
+
+ {"matrix": [1, 1], "x": 1.5, "y": 1.5},
+ {"matrix": [1, 2], "x": 2.5, "y": 1.5},
+ {"matrix": [1, 3], "x": 3.5, "y": 1.5},
+ {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+ {"matrix": [1, 5], "x": 5.5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6.5, "y": 1.5},
+ {"matrix": [1, 7], "x": 7.5, "y": 1.5},
+ {"matrix": [1, 8], "x": 8.5, "y": 1.5},
+ {"matrix": [1, 9], "x": 9.5, "y": 1.5},
+ {"matrix": [1, 10], "x": 10.5, "y": 1.5},
+ {"matrix": [1, 11], "x": 11.5, "y": 1.5},
+ {"matrix": [1, 12], "x": 12.5, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5},
+
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5, "w": 1.25},
+ {"matrix": [2, 2], "x": 2.75, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.75, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.75, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.75, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.75, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.75, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.75, "y": 2.5},
+ {"matrix": [2, 9], "x": 9.75, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.75, "y": 2.5},
+ {"matrix": [2, 12], "x": 11.75, "y": 2.5, "w": 1.75},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5},
+
+ {"matrix": [3, 1], "x": 1.5, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 3], "x": 3.25, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.25, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.25, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.25, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.25, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.25, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.25, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.25, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.25, "y": 3.5},
+ {"matrix": [3, 12], "x": 12.25, "y": 3.5, "w": 1.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4.5},
+ {"matrix": [4, 6], "x": 3.75, "y": 4.5, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.25}
+ ]
},
"LAYOUT_stagger5": {
- "layout": [{"label":"Knob", "x":0, "y":0}, {"x":1.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":0, "y":1.5}, {"label":"ESC", "x":1.5, "y":1.5}, {"label":"Q", "x":2.5, "y":1.5}, {"label":"W", "x":3.5, "y":1.5}, {"label":"E", "x":4.5, "y":1.5}, {"label":"R", "x":5.5, "y":1.5}, {"label":"T", "x":6.5, "y":1.5}, {"label":"Y", "x":7.5, "y":1.5}, {"label":"U", "x":8.5, "y":1.5}, {"label":"I", "x":9.5, "y":1.5}, {"label":"O", "x":10.5, "y":1.5}, {"label":"P", "x":11.5, "y":1.5}, {"label":"BKSPC", "x":12.5, "y":1.5}, {"x":0, "y":2.5}, {"label":"TAB", "x":1.5, "y":2.5, "w":1.25}, {"label":"A", "x":2.75, "y":2.5}, {"label":"S", "x":3.75, "y":2.5}, {"label":"D", "x":4.75, "y":2.5}, {"label":"F", "x":5.75, "y":2.5}, {"label":"G", "x":6.75, "y":2.5}, {"label":"H", "x":7.75, "y":2.5}, {"label":"J", "x":8.75, "y":2.5}, {"label":"K", "x":9.75, "y":2.5}, {"label":"L", "x":10.75, "y":2.5}, {"label":"Enter", "x":11.75, "y":2.5, "w":1.75}, {"x":0, "y":3.5}, {"label":"SHIFT", "x":1.5, "y":3.5, "w":1.75}, {"label":"Z", "x":3.25, "y":3.5}, {"label":"X", "x":4.25, "y":3.5}, {"label":"C", "x":5.25, "y":3.5}, {"label":"V", "x":6.25, "y":3.5}, {"label":"B", "x":7.25, "y":3.5}, {"label":"N", "x":8.25, "y":3.5}, {"label":"M", "x":9.25, "y":3.5}, {"label":",", "x":10.25, "y":3.5}, {"label":".", "x":11.25, "y":3.5}, {"label":"Shift", "x":12.25, "y":3.5, "w":1.25}, {"x":0, "y":4.5}, {"x":1.5, "y":4.5}, {"x":2.5, "y":4.5, "w":1.5}, {"x":4, "y":4.5, "w":7}, {"x":11, "y":4.5, "w":1.5}, {"x":12.5, "y":4.5}]
- }
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.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": [1, 0], "x": 0, "y": 1.5},
+
+ {"matrix": [1, 1], "x": 1.5, "y": 1.5},
+ {"matrix": [1, 2], "x": 2.5, "y": 1.5},
+ {"matrix": [1, 3], "x": 3.5, "y": 1.5},
+ {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+ {"matrix": [1, 5], "x": 5.5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6.5, "y": 1.5},
+ {"matrix": [1, 7], "x": 7.5, "y": 1.5},
+ {"matrix": [1, 8], "x": 8.5, "y": 1.5},
+ {"matrix": [1, 9], "x": 9.5, "y": 1.5},
+ {"matrix": [1, 10], "x": 10.5, "y": 1.5},
+ {"matrix": [1, 11], "x": 11.5, "y": 1.5},
+ {"matrix": [1, 12], "x": 12.5, "y": 1.5},
+ {"matrix": [2, 0], "x": 0, "y": 2.5},
+
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5, "w": 1.25},
+ {"matrix": [2, 2], "x": 2.75, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.75, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.75, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.75, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.75, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.75, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.75, "y": 2.5},
+ {"matrix": [2, 9], "x": 9.75, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.75, "y": 2.5},
+ {"matrix": [2, 12], "x": 11.75, "y": 2.5, "w": 1.75},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5},
+
+ {"matrix": [3, 1], "x": 1.5, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 3], "x": 3.25, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.25, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.25, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.25, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.25, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.25, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.25, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.25, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.25, "y": 3.5},
+ {"matrix": [3, 12], "x": 12.25, "y": 3.5, "w": 1.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4.5},
+ {"matrix": [4, 2], "x": 2.5, "y": 4.5, "w": 1.5},
+ {"matrix": [4, 7], "x": 4, "y": 4.5, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4.5, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4.5}
+ ]
+ }
}
} \ No newline at end of file
diff --git a/keyboards/eyeohdesigns/theboulevard/theboulevard.c b/keyboards/eyeohdesigns/theboulevard/theboulevard.c
deleted file mode 100644
index 5671425698..0000000000
--- a/keyboards/eyeohdesigns/theboulevard/theboulevard.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 eye oh designs
- *
- * 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 "theboulevard.h"
diff --git a/keyboards/eyeohdesigns/theboulevard/theboulevard.h b/keyboards/eyeohdesigns/theboulevard/theboulevard.h
deleted file mode 100644
index 30b5b2bedf..0000000000
--- a/keyboards/eyeohdesigns/theboulevard/theboulevard.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/* Copyright 2021 eye oh designs
- *
- * 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_ortho1( \
- k00, k01, k0a, k0b, k0c, \
- 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, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \
- k40, k41, k42, k43, k44, k45, k47, k48, k49, k4a, k4b, k4c \
-) \
-{ \
- { k00, k01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k0a, k0b, k0c },\
- { 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 },\
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c }, \
- { k40, k41, k42, k43, k44, k45, KC_NO, k47, k48, k49, k4a, k4b, k4c }\
-}
-
-#define LAYOUT_ortho2( \
- k00, k01, k0a, k0b, k0c, \
- 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, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \
- k40, k41, k42, k43, k44, k45, k48, k49, k4a, k4b, k4c \
-) \
-{ \
- { k00, k01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k0a, k0b, k0c },\
- { 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 },\
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c }, \
- { k40, k41, k42, k43, k44, k45, KC_NO, KC_NO, k48, k49, k4a, k4b, k4c }\
-}
-
-#define LAYOUT_ortho3( \
- k00, k01, k0a, k0b, k0c, \
- 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, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \
- k40, k41, k42, k43, k45, k48, k4a, k4b, k4c \
-) \
-{ \
- { k00, k01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k0a, k0b, k0c },\
- { 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 },\
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c }, \
- { k40, k41, k42, k43, KC_NO, k45, KC_NO, KC_NO, k48, KC_NO, k4a, k4b, k4c }\
-}
-
-#define LAYOUT_ortho4( \
- k00, k01, k0a, k0b, k0c, \
- 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, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \
- k40, k41, k42, k46, k4a, k4b, k4c \
-) \
-{ \
- { k00, k01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k0a, k0b, k0c },\
- { 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 },\
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c }, \
- { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4a, k4b, k4c }\
-}
-
-#define LAYOUT_ortho5( \
- k00, k01, k0a, k0b, k0c, \
- 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, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \
- k40, k41, k42, k47, k4b, k4c \
-) \
-{ \
- { k00, k01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k0a, k0b, k0c },\
- { 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 },\
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c }, \
- { k40, k41, k42, KC_NO, KC_NO, KC_NO, KC_NO, k47, KC_NO, KC_NO, KC_NO, k4b, k4c }\
-}
-
-#define LAYOUT_stagger1( \
- k00, k01, k0a, k0b, k0c, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2c, \
- k30, k31, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \
- k40, k41, k42, k43, k44, k45, k47, k48, k49, k4a, k4b, k4c \
-) \
-{ \
- { k00, k01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k0a, k0b, k0c },\
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c },\
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, KC_NO, k2c },\
- { k30, k31, KC_NO, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c }, \
- { k40, k41, k42, k43, k44, k45, KC_NO, k47, k48, k49, k4a, k4b, k4c }\
-}
-
-#define LAYOUT_stagger2( \
- k00, k01, k0a, k0b, k0c, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2c, \
- k30, k31, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \
- k40, k41, k42, k43, k44, k45, k48, k49, k4a, k4b, k4c \
-) \
-{ \
- { k00, k01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k0a, k0b, k0c },\
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c },\
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, KC_NO, k2c },\
- { k30, k31, KC_NO, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c }, \
- { k40, k41, k42, k43, k44, k45, KC_NO, KC_NO, k48, k49, k4a, k4b, k4c }\
-}
-
-#define LAYOUT_stagger3( \
- k00, k01, k0a, k0b, k0c, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2c, \
- k30, k31, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \
- k40, k41, k42, k43, k45, k48, k4a, k4b, k4c \
-) \
-{ \
- { k00, k01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k0a, k0b, k0c },\
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c },\
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, KC_NO, k2c },\
- { k30, k31, KC_NO, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c }, \
- { k40, k41, k42, k43, KC_NO, k45, KC_NO, KC_NO, k48, KC_NO, k4a, k4b, k4c }\
-}
-
-#define LAYOUT_stagger4( \
- k00, k01, k0a, k0b, k0c, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2c, \
- k30, k31, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \
- k40, k41, k42, k46, k4a, k4b, k4c \
-) \
-{ \
- { k00, k01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k0a, k0b, k0c },\
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c },\
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, KC_NO, k2c },\
- { k30, k31, KC_NO, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c }, \
- { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4a, k4b, k4c }\
-}
-
-#define LAYOUT_stagger5( \
- k00, k01, k0a, k0b, k0c, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2c, \
- k30, k31, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \
- k40, k41, k42, k47, k4b, k4c \
-) \
-{ \
- { k00, k01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k0a, k0b, k0c },\
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c },\
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, KC_NO, k2c },\
- { k30, k31, KC_NO, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c }, \
- { k40, k41, k42, KC_NO, KC_NO, KC_NO, KC_NO, k47, KC_NO, KC_NO, KC_NO, k4b, k4c }\
-}
diff --git a/keyboards/flehrad/numbrero/info.json b/keyboards/flehrad/numbrero/info.json
index 192fa793e0..9f86df14d9 100644
--- a/keyboards/flehrad/numbrero/info.json
+++ b/keyboards/flehrad/numbrero/info.json
@@ -22,55 +22,63 @@
"layouts": {
"LAYOUT_numpad": {
"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":"K10", "x":0, "y":1, "h":1.5},
- {"label":"K11", "x":1, "y":1},
- {"label":"K12", "x":2, "y":1},
- {"label":"K13", "x":3, "y":1},
- {"label":"K20", "x":0, "y":2.5},
- {"label":"K21", "x":1, "y":2},
- {"label":"K22", "x":2, "y":2},
- {"label":"K23", "x":3, "y":2},
- {"label":"K14", "x":4, "y":1, "h":2},
- {"label":"K30", "x":0, "y":3.5, "h":1.5},
- {"label":"K31", "x":1, "y":3},
- {"label":"K32", "x":2, "y":3},
- {"label":"K33", "x":3, "y":3},
- {"label":"K41", "x":1, "y":4, "w":2},
- {"label":"K43", "x":3, "y":4},
- {"label":"K34", "x":4, "y":3, "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": [1, 0], "x": 0, "y": 1, "h": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [1, 4], "x": 4, "y": 1, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "h": 1.5},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+
+ {"matrix": [4, 1], "x": 1, "y": 4, "w": 2},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [3, 4], "x": 4, "y": 3, "h": 2}
]
},
"LAYOUT_ortho": {
"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":"K10", "x":0, "y":1, "h":1.5},
- {"label":"K11", "x":1, "y":1},
- {"label":"K12", "x":2, "y":1},
- {"label":"K13", "x":3, "y":1},
- {"label":"K14", "x":4, "y":1},
- {"label":"K20", "x":0, "y":2.5},
- {"label":"K21", "x":1, "y":2},
- {"label":"K22", "x":2, "y":2},
- {"label":"K23", "x":3, "y":2},
- {"label":"K24", "x":4, "y":2},
- {"label":"K30", "x":0, "y":3.5, "h":1.5},
- {"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":"K41", "x":1, "y":4},
- {"label":"K42", "x":2, "y":4},
- {"label":"K43", "x":3, "y":4},
- {"label":"K44", "x":4, "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": [1, 0], "x": 0, "y": 1, "h": 1.5},
+ {"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": [2, 0], "x": 0, "y": 2.5},
+ {"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": [3, 0], "x": 0, "y": 3.5, "h": 1.5},
+ {"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": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4}
]
}
}
diff --git a/keyboards/flehrad/numbrero/numbrero.h b/keyboards/flehrad/numbrero/numbrero.h
deleted file mode 100644
index e4de28bf96..0000000000
--- a/keyboards/flehrad/numbrero/numbrero.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_numpad( \
- K00, K01, K02, K03, K04, \
- K10, K11, K12, K13, \
- K20, K21, K22, K23, K14, \
- K30, K31, K32, K33, \
- K41, K43, K34 \
-) { \
- { K00, K01, K02, K03, K04 }, \
- { K10, K11, K12, K13, K14 }, \
- { K20, K21, K22, K23, KC_NO }, \
- { K30, K31, K32, K33, K34 }, \
- { KC_NO, K41, KC_NO, K43, KC_NO } \
-}
-#define LAYOUT_ortho(\
- K00, K01, K02, K03, K04, \
- K10, K11, K12, K13, K14, \
- K20, K21, K22, K23, K24, \
- K30, K31, K32, K33, K34, \
- K41, K42, K43, K44 \
-){ \
- { K00, K01, K02, K03, K04 }, \
- { K10, K11, K12, K13, K14 }, \
- { K20, K21, K22, K23, K24 }, \
- { K30, K31, K32, K33, K34 }, \
- { KC_NO, K41, K42, K43, K44 } \
-}
diff --git a/keyboards/gboards/butterstick/butterstick.c b/keyboards/gboards/butterstick/butterstick.c
index 3bcbcbe8b4..e19edc69ac 100644
--- a/keyboards/gboards/butterstick/butterstick.c
+++ b/keyboards/gboards/butterstick/butterstick.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 "butterstick.h"
+#include "quantum.h"
void matrix_scan_kb(void) {
#ifdef DEBUG_MATRIX
diff --git a/keyboards/gboards/butterstick/butterstick.h b/keyboards/gboards/butterstick/butterstick.h
deleted file mode 100644
index f97488c3f5..0000000000
--- a/keyboards/gboards/butterstick/butterstick.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_butter( \
- k09, k08, k07, k06, k05, k04, k03, k02, k01, k00, \
- k19, k18, k17, k16, k15, k14, k13, k12, k11, k10 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09}, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19}, \
-}
diff --git a/keyboards/gboards/butterstick/info.json b/keyboards/gboards/butterstick/info.json
index 465cd940a1..d2fc3d3f40 100644
--- a/keyboards/gboards/butterstick/info.json
+++ b/keyboards/gboards/butterstick/info.json
@@ -18,27 +18,27 @@
"layouts": {
"LAYOUT_butter": {
"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},
+ {"matrix": [0, 9], "x": 0, "y": 0},
+ {"matrix": [0, 8], "x": 1, "y": 0},
+ {"matrix": [0, 7], "x": 2, "y": 0},
+ {"matrix": [0, 6], "x": 3, "y": 0},
+ {"matrix": [0, 5], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+ {"matrix": [0, 3], "x": 6, "y": 0},
+ {"matrix": [0, 2], "x": 7, "y": 0},
+ {"matrix": [0, 1], "x": 8, "y": 0},
+ {"matrix": [0, 0], "x": 9, "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}
+ {"matrix": [1, 9], "x": 0, "y": 1},
+ {"matrix": [1, 8], "x": 1, "y": 1},
+ {"matrix": [1, 7], "x": 2, "y": 1},
+ {"matrix": [1, 6], "x": 3, "y": 1},
+ {"matrix": [1, 5], "x": 4, "y": 1},
+ {"matrix": [1, 4], "x": 5, "y": 1},
+ {"matrix": [1, 3], "x": 6, "y": 1},
+ {"matrix": [1, 2], "x": 7, "y": 1},
+ {"matrix": [1, 1], "x": 8, "y": 1},
+ {"matrix": [1, 0], "x": 9, "y": 1}
]
}
}
diff --git a/keyboards/gboards/butterstick/sten.h b/keyboards/gboards/butterstick/sten.h
index 39740ac3d3..84c54c9e2e 100644
--- a/keyboards/gboards/butterstick/sten.h
+++ b/keyboards/gboards/butterstick/sten.h
@@ -7,7 +7,7 @@
#pragma once
-#include "butterstick.h"
+#include QMK_KEYBOARD_H
#include "mousekey.h"
#include "keymap_steno.h"
#include "wait.h"
diff --git a/keyboards/gorthage_truck/gorthage_truck.c b/keyboards/gorthage_truck/gorthage_truck.c
deleted file mode 100644
index c6f75d7270..0000000000
--- a/keyboards/gorthage_truck/gorthage_truck.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 s8erdude
- *
- * 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 "gorthage_truck.h"
diff --git a/keyboards/gorthage_truck/gorthage_truck.h b/keyboards/gorthage_truck/gorthage_truck.h
deleted file mode 100644
index ed0ff9d228..0000000000
--- a/keyboards/gorthage_truck/gorthage_truck.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2021 s8erdude
- *
- * 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.
- */
-#define LAYOUT_3u( \
- k00, k01, k02, k03, k04, k05, k06, k07, k40, k41, k42, k43, k44, k45, k46, k47, k48, \
- k10, k11, k12, k13, k14, k15, k16, k17, k50, k51, k52, k53, k54, k56, k57, k58, \
- k20, k21, k22, k23, k24, k25, k26, k27, k60, k61, k62, k63, k64, k65, k66, k67, k68, \
- k30, k31, k32, k34, k70, k71, k73, k74, k75, k76, k77, k78 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, XXX }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, XXX }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, XXX }, \
- { k30, k31, k32, XXX, k34, XXX, XXX, XXX, XXX }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
- { k50, k51, k52, k53, k54, XXX, k56, k57, k58 }, \
- { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \
- { k70, k71, XXX, k73, k74, k75, k76, k77, k78 } \
-}
-
-#define LAYOUT_7u( \
- k00, k01, k02, k03, k04, k05, k06, k07, k40, k41, k42, k43, k44, k45, k46, k47, k48, \
- k10, k11, k12, k13, k14, k15, k16, k17, k50, k51, k52, k53, k54, k56, k57, k58, \
- k20, k21, k22, k23, k24, k25, k26, k27, k60, k61, k62, k63, k64, k65, k66, k67, k68, \
- k30, k31, k32, k37, k73, k74, k75, k76, k77, k78 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, XXX }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, XXX }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, XXX }, \
- { k30, k31, k32, XXX, XXX, XXX, XXX, k37, XXX }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
- { k50, k51, k52, k53, k54, XXX, k56, k57, k58 }, \
- { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \
- { XXX, XXX, XXX, k73, k74, k75, k76, k77, k78 } \
-}
-
-#define LAYOUT_10u( \
- k00, k01, k02, k03, k04, k05, k06, k07, k40, k41, k42, k43, k44, k45, k46, k47, k48, \
- k10, k11, k12, k13, k14, k15, k16, k17, k50, k51, k52, k53, k54, k56, k57, k58, \
- k20, k21, k22, k23, k24, k25, k26, k27, k60, k61, k62, k63, k64, k65, k66, k67, k68, \
- k30, k36, k73, k74, k75, k76, k77, k78 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, XXX }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, XXX }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, XXX }, \
- { k30, XXX, XXX, XXX, XXX, XXX, k36, XXX, XXX }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
- { k50, k51, k52, k53, k54, XXX, k56, k57, k58 }, \
- { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \
- { XXX, XXX, XXX, k73, k74, k75, k76, k77, k78 } \
-}
diff --git a/keyboards/gorthage_truck/info.json b/keyboards/gorthage_truck/info.json
index 7f40f6583f..688a8fc575 100644
--- a/keyboards/gorthage_truck/info.json
+++ b/keyboards/gorthage_truck/info.json
@@ -28,203 +28,224 @@
"layouts": {
"LAYOUT_3u": {
"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},
- {"label":"]}", "x":12, "y":0},
- {"label":"Play", "x":13.5, "y":0.5},
- {"label":"7", "x":15, "y":0},
- {"label":"8", "x":16, "y":0},
- {"label":"9", "x":17, "y":0},
-
- {"label":"Caps Lock", "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":6, "y":1},
- {"label":"J", "x":7, "y":1},
- {"label":"K", "x":8, "y":1},
- {"label":"L", "x":9, "y":1},
- {"label":";:", "x":10, "y":1},
- {"label":"'\"", "x":11, "y":1},
- {"label":"\\|", "x":12, "y":1},
- {"label":"4", "x":15, "y":1},
- {"label":"5", "x":16, "y":1},
- {"label":"6", "x":17, "y":1},
-
- {"label":"-_", "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":6, "y":2},
- {"label":"M", "x":7, "y":2},
- {"label":",<", "x":8, "y":2},
- {"label":".>", "x":9, "y":2},
- {"label":"/?", "x":10, "y":2},
- {"label":"Shift", "x":11, "y":2},
- {"label":"Backspace", "x":12, "y":2},
- {"label":"\u2191", "x":13.5, "y":2.5},
- {"label":"1", "x":15, "y":2},
- {"label":"2", "x":16, "y":2},
- {"label":"3", "x":17, "y":2},
-
- {"label":"Ctrl", "x":0, "y":3, "w":1.25},
- {"label":"Alt", "x":1.25, "y":3, "w":1.25},
- {"label":"GUI", "x":2.5, "y":3},
- {"label":"Space", "x":3.5, "y":3, "w":3},
- {"label":"Enter", "x":6.5, "y":3, "w":3},
- {"label":"GUI", "x":9.5, "y":3, "w":1.25},
- {"label":"Alt", "x":10.75, "y":3, "w":1.25},
- {"label":"\u2190", "x":12.5, "y":3.5},
- {"label":"\u2193", "x":13.5, "y":3.5},
- {"label":"\u2192", "x":14.5, "y":3.5},
- {"label":"0", "x":16, "y":3},
- {"label":".", "x":17, "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": [4, 0], "x": 8, "y": 0},
+ {"matrix": [4, 1], "x": 9, "y": 0},
+ {"matrix": [4, 2], "x": 10, "y": 0},
+ {"matrix": [4, 3], "x": 11, "y": 0},
+ {"matrix": [4, 4], "x": 12, "y": 0},
+
+ {"matrix": [4, 5], "x": 13.5, "y": 0.5},
+
+ {"matrix": [4, 6], "x": 15, "y": 0},
+ {"matrix": [4, 7], "x": 16, "y": 0},
+ {"matrix": [4, 8], "x": 17, "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": [5, 0], "x": 8, "y": 1},
+ {"matrix": [5, 1], "x": 9, "y": 1},
+ {"matrix": [5, 2], "x": 10, "y": 1},
+ {"matrix": [5, 3], "x": 11, "y": 1},
+ {"matrix": [5, 4], "x": 12, "y": 1},
+
+ {"matrix": [5, 6], "x": 15, "y": 1},
+ {"matrix": [5, 7], "x": 16, "y": 1},
+ {"matrix": [5, 8], "x": 17, "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": [6, 0], "x": 8, "y": 2},
+ {"matrix": [6, 1], "x": 9, "y": 2},
+ {"matrix": [6, 2], "x": 10, "y": 2},
+ {"matrix": [6, 3], "x": 11, "y": 2},
+ {"matrix": [6, 4], "x": 12, "y": 2},
+
+ {"matrix": [6, 5], "x": 13.5, "y": 2.5},
+
+ {"matrix": [6, 6], "x": 15, "y": 2},
+ {"matrix": [6, 7], "x": 16, "y": 2},
+ {"matrix": [6, 8], "x": 17, "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},
+ {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 3},
+ {"matrix": [7, 0], "x": 6.5, "y": 3, "w": 3},
+ {"matrix": [7, 1], "x": 9.5, "y": 3, "w": 1.25},
+ {"matrix": [7, 3], "x": 10.75, "y": 3, "w": 1.25},
+
+ {"matrix": [7, 4], "x": 12.5, "y": 3.5},
+ {"matrix": [7, 5], "x": 13.5, "y": 3.5},
+ {"matrix": [7, 6], "x": 14.5, "y": 3.5},
+
+ {"matrix": [7, 7], "x": 16, "y": 3},
+ {"matrix": [7, 8], "x": 17, "y": 3}
]
},
"LAYOUT_7u": {
"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},
- {"label":"]}", "x":12, "y":0},
- {"label":"Play", "x":13.5, "y":0.5},
- {"label":"7", "x":15, "y":0},
- {"label":"8", "x":16, "y":0},
- {"label":"9", "x":17, "y":0},
-
- {"label":"Caps Lock", "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":6, "y":1},
- {"label":"J", "x":7, "y":1},
- {"label":"K", "x":8, "y":1},
- {"label":"L", "x":9, "y":1},
- {"label":";:", "x":10, "y":1},
- {"label":"'\"", "x":11, "y":1},
- {"label":"\\|", "x":12, "y":1},
- {"label":"4", "x":15, "y":1},
- {"label":"5", "x":16, "y":1},
- {"label":"6", "x":17, "y":1},
-
- {"label":"-_", "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":6, "y":2},
- {"label":"M", "x":7, "y":2},
- {"label":",<", "x":8, "y":2},
- {"label":".>", "x":9, "y":2},
- {"label":"/?", "x":10, "y":2},
- {"label":"Shift", "x":11, "y":2},
- {"label":"Backspace", "x":12, "y":2},
- {"label":"\u2191", "x":13.5, "y":2.5},
- {"label":"1", "x":15, "y":2},
- {"label":"2", "x":16, "y":2},
- {"label":"3", "x":17, "y":2},
-
- {"label":"Ctrl", "x":0, "y":3, "w":1.25},
- {"label":"Alt", "x":1.25, "y":3, "w":1.25},
- {"label":"GUI", "x":2.5, "y":3, "w":1.25},
- {"label":"Space", "x":3.75, "y":3, "w":7},
- {"label":"GUI", "x":10.75, "y":3, "w":1.25},
- {"label":"\u2190", "x":12.5, "y":3.5},
- {"label":"\u2193", "x":13.5, "y":3.5},
- {"label":"\u2192", "x":14.5, "y":3.5},
- {"label":"0", "x":16, "y":3},
- {"label":".", "x":17, "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": [4, 0], "x": 8, "y": 0},
+ {"matrix": [4, 1], "x": 9, "y": 0},
+ {"matrix": [4, 2], "x": 10, "y": 0},
+ {"matrix": [4, 3], "x": 11, "y": 0},
+ {"matrix": [4, 4], "x": 12, "y": 0},
+
+ {"matrix": [4, 5], "x": 13.5, "y": 0.5},
+
+ {"matrix": [4, 6], "x": 15, "y": 0},
+ {"matrix": [4, 7], "x": 16, "y": 0},
+ {"matrix": [4, 8], "x": 17, "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": [5, 0], "x": 8, "y": 1},
+ {"matrix": [5, 1], "x": 9, "y": 1},
+ {"matrix": [5, 2], "x": 10, "y": 1},
+ {"matrix": [5, 3], "x": 11, "y": 1},
+ {"matrix": [5, 4], "x": 12, "y": 1},
+
+ {"matrix": [5, 6], "x": 15, "y": 1},
+ {"matrix": [5, 7], "x": 16, "y": 1},
+ {"matrix": [5, 8], "x": 17, "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": [6, 0], "x": 8, "y": 2},
+ {"matrix": [6, 1], "x": 9, "y": 2},
+ {"matrix": [6, 2], "x": 10, "y": 2},
+ {"matrix": [6, 3], "x": 11, "y": 2},
+ {"matrix": [6, 4], "x": 12, "y": 2},
+
+ {"matrix": [6, 5], "x": 13.5, "y": 2.5},
+
+ {"matrix": [6, 6], "x": 15, "y": 2},
+ {"matrix": [6, 7], "x": 16, "y": 2},
+ {"matrix": [6, 8], "x": 17, "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, 7], "x": 3.75, "y": 3, "w": 7},
+ {"matrix": [7, 3], "x": 10.75, "y": 3, "w": 1.25},
+
+ {"matrix": [7, 4], "x": 12.5, "y": 3.5},
+ {"matrix": [7, 5], "x": 13.5, "y": 3.5},
+ {"matrix": [7, 6], "x": 14.5, "y": 3.5},
+
+ {"matrix": [7, 7], "x": 16, "y": 3},
+ {"matrix": [7, 8], "x": 17, "y": 3}
]
},
"LAYOUT_10u": {
"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},
- {"label":"]}", "x":12, "y":0},
- {"label":"Play", "x":13.5, "y":0.5},
- {"label":"7", "x":15, "y":0},
- {"label":"8", "x":16, "y":0},
- {"label":"9", "x":17, "y":0},
-
- {"label":"Caps Lock", "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":6, "y":1},
- {"label":"J", "x":7, "y":1},
- {"label":"K", "x":8, "y":1},
- {"label":"L", "x":9, "y":1},
- {"label":";:", "x":10, "y":1},
- {"label":"'\"", "x":11, "y":1},
- {"label":"\\|", "x":12, "y":1},
- {"label":"4", "x":15, "y":1},
- {"label":"5", "x":16, "y":1},
- {"label":"6", "x":17, "y":1},
-
- {"label":"-_", "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":6, "y":2},
- {"label":"M", "x":7, "y":2},
- {"label":",<", "x":8, "y":2},
- {"label":".>", "x":9, "y":2},
- {"label":"/?", "x":10, "y":2},
- {"label":"Shift", "x":11, "y":2},
- {"label":"Backspace", "x":12, "y":2},
- {"label":"\u2191", "x":13.5, "y":2.5},
- {"label":"1", "x":15, "y":2},
- {"label":"2", "x":16, "y":2},
- {"label":"3", "x":17, "y":2},
-
- {"label":"Ctrl", "x":0, "y":3},
- {"label":"Space", "x":1, "y":3, "w":10},
- {"label":"GUI", "x":11, "y":3},
- {"label":"\u2190", "x":12.5, "y":3.5},
- {"label":"\u2193", "x":13.5, "y":3.5},
- {"label":"\u2192", "x":14.5, "y":3.5},
- {"label":"0", "x":16, "y":3},
- {"label":".", "x":17, "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": [4, 0], "x": 8, "y": 0},
+ {"matrix": [4, 1], "x": 9, "y": 0},
+ {"matrix": [4, 2], "x": 10, "y": 0},
+ {"matrix": [4, 3], "x": 11, "y": 0},
+ {"matrix": [4, 4], "x": 12, "y": 0},
+
+ {"matrix": [4, 5], "x": 13.5, "y": 0.5},
+
+ {"matrix": [4, 6], "x": 15, "y": 0},
+ {"matrix": [4, 7], "x": 16, "y": 0},
+ {"matrix": [4, 8], "x": 17, "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": [5, 0], "x": 8, "y": 1},
+ {"matrix": [5, 1], "x": 9, "y": 1},
+ {"matrix": [5, 2], "x": 10, "y": 1},
+ {"matrix": [5, 3], "x": 11, "y": 1},
+ {"matrix": [5, 4], "x": 12, "y": 1},
+
+ {"matrix": [5, 6], "x": 15, "y": 1},
+ {"matrix": [5, 7], "x": 16, "y": 1},
+ {"matrix": [5, 8], "x": 17, "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": [6, 0], "x": 8, "y": 2},
+ {"matrix": [6, 1], "x": 9, "y": 2},
+ {"matrix": [6, 2], "x": 10, "y": 2},
+ {"matrix": [6, 3], "x": 11, "y": 2},
+ {"matrix": [6, 4], "x": 12, "y": 2},
+
+ {"matrix": [6, 5], "x": 13.5, "y": 2.5},
+
+ {"matrix": [6, 6], "x": 15, "y": 2},
+ {"matrix": [6, 7], "x": 16, "y": 2},
+ {"matrix": [6, 8], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 6], "x": 1, "y": 3, "w": 10},
+ {"matrix": [7, 3], "x": 11, "y": 3},
+
+ {"matrix": [7, 4], "x": 12.5, "y": 3.5},
+ {"matrix": [7, 5], "x": 13.5, "y": 3.5},
+ {"matrix": [7, 6], "x": 14.5, "y": 3.5},
+
+ {"matrix": [7, 7], "x": 16, "y": 3},
+ {"matrix": [7, 8], "x": 17, "y": 3}
]
}
}
diff --git a/keyboards/handwired/aranck/aranck.h b/keyboards/handwired/aranck/aranck.h
deleted file mode 100644
index df887c2c56..0000000000
--- a/keyboards/handwired/aranck/aranck.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2019 Arda Kilicdagi
- *
- * 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 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_planck_mit(\
- 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 \
-) \
-{ \
- { 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, k35, k36, k37, k38, k39, k3a } \
-}
diff --git a/keyboards/handwired/aranck/info.json b/keyboards/handwired/aranck/info.json
index 7d2ea6124b..d7bf45b884 100644
--- a/keyboards/handwired/aranck/info.json
+++ b/keyboards/handwired/aranck/info.json
@@ -19,53 +19,56 @@
"layouts": {
"LAYOUT_planck_mit": {
"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": 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": [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, 6], "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}
]
}
}
diff --git a/keyboards/handwired/concertina/64key/64key.h b/keyboards/handwired/concertina/64key/64key.h
deleted file mode 100644
index a9e557fc78..0000000000
--- a/keyboards/handwired/concertina/64key/64key.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright 2020-2021 Viktor Eikman
- *
- * 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 matrix is constructed for ease of soldering and for density.
- * The nomenclature is <side><cluster>_<column><row>.
- *
- * L: Left hand.
- * R: Right hand.
- * T: Thumb cluster.
- * M: Main cluster.
- *
- * Numbers increase going to the right and away from the user on the
- * right-hand side of the keyboard, looking directly at each of the two
- * key clusters (main and thumb), one by one.
- * This coordinate system is mirrored for the left-hand side.
- */
-
-#define LAYOUT_64key( \
- LT_32, LT_22, LT_12, RT_12, RT_22, RT_32, \
- LT_31, LT_21, LT_11, LT_01, RT_01, RT_11, RT_21, RT_31, \
- LT_20, LT_10, LT_00, RT_00, RT_10, RT_20, \
- \
- LM_34, LM_24, LM_14, LM_04, RM_04, RM_14, RM_24, RM_34, \
- LM_53, LM_43, LM_33, LM_23, LM_13, LM_03, RM_03, RM_13, RM_23, RM_33, RM_43, RM_53, \
- LM_52, LM_42, LM_32, LM_22, LM_12, LM_02, RM_02, RM_12, RM_22, RM_32, RM_42, RM_52, \
- LM_51, LM_41, LM_31, LM_21, LM_11, RM_11, RM_21, RM_31, RM_41, RM_51, \
- LM_20, RM_20 \
- ) \
- { \
- { LT_00, LT_10, LT_20, LT_31, LM_20, LM_31, LM_41, LM_51 }, \
- { LT_01, LT_11, LT_21, LM_11, LM_21, LM_32, LM_42, LM_52 }, \
- { LT_12, LT_22, LT_32, LM_12, LM_22, LM_33, LM_43, LM_53 }, \
- { LM_02, LM_03, LM_04, LM_13, LM_23, LM_14, LM_24, LM_34 }, \
- { RT_00, RT_10, RT_20, RT_31, RM_20, RM_31, RM_41, RM_51 }, \
- { RT_01, RT_11, RT_21, RM_11, RM_21, RM_32, RM_42, RM_52 }, \
- { RT_12, RT_22, RT_32, RM_12, RM_22, RM_33, RM_43, RM_53 }, \
- { RM_02, RM_03, RM_04, RM_13, RM_23, RM_14, RM_24, RM_34 }, \
- }
diff --git a/keyboards/handwired/concertina/64key/info.json b/keyboards/handwired/concertina/64key/info.json
index 0e4542af9d..1bca5a6fa4 100644
--- a/keyboards/handwired/concertina/64key/info.json
+++ b/keyboards/handwired/concertina/64key/info.json
@@ -21,29 +21,85 @@
"layouts": {
"LAYOUT_64key": {
"layout": [
- {"x":2.5, "y":0.4}, {"x":3.5, "y":0}, {"x":4.5, "y":0.3},
- {"x":8.5, "y":0.3}, {"x":9.5, "y":0}, {"x":10.5, "y":0.4},
+ {"matrix": [2, 2], "x": 2.5, "y": 0.4},
+ {"matrix": [2, 1], "x": 3.5, "y": 0},
+ {"matrix": [2, 0], "x": 4.5, "y": 0.3},
- {"x":2.5, "y":1.4}, {"x":3.5, "y":1}, {"x":4.5, "y":1.3}, {"x":5.5, "y":0.9},
- {"x":7.5, "y":0.9}, {"x":8.5, "y":1.3}, {"x":9.5, "y":1}, {"x":10.5, "y":1.4},
+ {"matrix": [6, 0], "x": 8.5, "y": 0.3},
+ {"matrix": [6, 1], "x": 9.5, "y": 0},
+ {"matrix": [6, 2], "x": 10.5, "y": 0.4},
- {"x":3.5, "y":2}, {"x":4.5, "y":2.3}, {"x":5.5, "y":1.9},
- {"x":7.5, "y":1.9}, {"x":8.5, "y":2.3}, {"x":9.5, "y":2},
+ {"matrix": [0, 3], "x": 2.5, "y": 1.4},
+ {"matrix": [1, 2], "x": 3.5, "y": 1},
+ {"matrix": [1, 1], "x": 4.5, "y": 1.3},
+ {"matrix": [1, 0], "x": 5.5, "y": 0.9},
- {"x":2, "y":4}, {"x":3, "y":3.8}, {"x":4, "y":4}, {"x":5, "y":4.3},
- {"x":8, "y":4.3}, {"x":9, "y":4}, {"x":10, "y":3.8}, {"x":11, "y":4},
+ {"matrix": [5, 0], "x": 7.5, "y": 0.9},
+ {"matrix": [5, 1], "x": 8.5, "y": 1.3},
+ {"matrix": [5, 2], "x": 9.5, "y": 1},
+ {"matrix": [4, 3], "x": 10.5, "y": 1.4},
- {"x":0, "y":5}, {"x":1, "y":5}, {"x":2, "y":5}, {"x":3, "y":4.8}, {"x":4, "y":5}, {"x":5, "y":5.3},
- {"x":8, "y":5.3}, {"x":9, "y":5}, {"x":10, "y":4.8}, {"x":11, "y":5}, {"x":12, "y":5}, {"x":13, "y":5},
+ {"matrix": [0, 2], "x": 3.5, "y": 2},
+ {"matrix": [0, 1], "x": 4.5, "y": 2.3},
+ {"matrix": [0, 0], "x": 5.5, "y": 1.9},
- {"x":0, "y":6}, {"x":1, "y":6}, {"x":2, "y":6}, {"x":3, "y":5.8}, {"x":4, "y":6}, {"x":5, "y":6.3},
- {"x":8, "y":6.3}, {"x":9, "y":6}, {"x":10, "y":5.8}, {"x":11, "y":6}, {"x":12, "y":6}, {"x":13, "y":6},
+ {"matrix": [4, 0], "x": 7.5, "y": 1.9},
+ {"matrix": [4, 1], "x": 8.5, "y": 2.3},
+ {"matrix": [4, 2], "x": 9.5, "y": 2},
- {"x":0, "y":7}, {"x":1, "y":7}, {"x":2, "y":7}, {"x":3, "y":6.8}, {"x":4, "y":7},
- {"x":9, "y":7}, {"x":10, "y":6.8}, {"x":11, "y":7}, {"x":12, "y":7}, {"x":13, "y":7},
+ {"matrix": [3, 7], "x": 2, "y": 4},
+ {"matrix": [3, 6], "x": 3, "y": 3.8},
+ {"matrix": [3, 5], "x": 4, "y": 4},
+ {"matrix": [3, 2], "x": 5, "y": 4.3},
- {"x":3, "y":7.8},
- {"x":10, "y":7.8}
+ {"matrix": [7, 2], "x": 8, "y": 4.3},
+ {"matrix": [7, 5], "x": 9, "y": 4},
+ {"matrix": [7, 6], "x": 10, "y": 3.8},
+ {"matrix": [7, 7], "x": 11, "y": 4},
+
+ {"matrix": [2, 7], "x": 0, "y": 5},
+ {"matrix": [2, 6], "x": 1, "y": 5},
+ {"matrix": [2, 5], "x": 2, "y": 5},
+ {"matrix": [3, 4], "x": 3, "y": 4.8},
+ {"matrix": [3, 3], "x": 4, "y": 5},
+ {"matrix": [3, 1], "x": 5, "y": 5.3},
+
+ {"matrix": [7, 1], "x": 8, "y": 5.3},
+ {"matrix": [7, 3], "x": 9, "y": 5},
+ {"matrix": [7, 4], "x": 10, "y": 4.8},
+ {"matrix": [6, 5], "x": 11, "y": 5},
+ {"matrix": [6, 6], "x": 12, "y": 5},
+ {"matrix": [6, 7], "x": 13, "y": 5},
+
+ {"matrix": [1, 7], "x": 0, "y": 6},
+ {"matrix": [1, 6], "x": 1, "y": 6},
+ {"matrix": [1, 5], "x": 2, "y": 6},
+ {"matrix": [2, 4], "x": 3, "y": 5.8},
+ {"matrix": [2, 3], "x": 4, "y": 6},
+ {"matrix": [3, 0], "x": 5, "y": 6.3},
+
+ {"matrix": [7, 0], "x": 8, "y": 6.3},
+ {"matrix": [6, 3], "x": 9, "y": 6},
+ {"matrix": [6, 4], "x": 10, "y": 5.8},
+ {"matrix": [5, 5], "x": 11, "y": 6},
+ {"matrix": [5, 6], "x": 12, "y": 6},
+ {"matrix": [5, 7], "x": 13, "y": 6},
+
+ {"matrix": [0, 7], "x": 0, "y": 7},
+ {"matrix": [0, 6], "x": 1, "y": 7},
+ {"matrix": [0, 5], "x": 2, "y": 7},
+ {"matrix": [1, 4], "x": 3, "y": 6.8},
+ {"matrix": [1, 3], "x": 4, "y": 7},
+
+ {"matrix": [5, 3], "x": 9, "y": 7},
+ {"matrix": [5, 4], "x": 10, "y": 6.8},
+ {"matrix": [4, 5], "x": 11, "y": 7},
+ {"matrix": [4, 6], "x": 12, "y": 7},
+ {"matrix": [4, 7], "x": 13, "y": 7},
+
+ {"matrix": [0, 4], "x": 3, "y": 7.8},
+
+ {"matrix": [4, 4], "x": 10, "y": 7.8}
]
}
}
diff --git a/keyboards/handwired/curiosity/curiosity.h b/keyboards/handwired/curiosity/curiosity.h
deleted file mode 100644
index a79bfa6633..0000000000
--- a/keyboards/handwired/curiosity/curiosity.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2020 Spaceman
- *
- * 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_small_mods( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k3b, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k3a, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k39, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38 \
-) { \
- { 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 }, \
-}
-#define LAYOUT_large_mods( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k3b, \
- 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 \
-) { \
- { 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, KC_NO, KC_NO, k3b }, \
-}
diff --git a/keyboards/handwired/curiosity/info.json b/keyboards/handwired/curiosity/info.json
index a9a22fc39c..37f66a8029 100644
--- a/keyboards/handwired/curiosity/info.json
+++ b/keyboards/handwired/curiosity/info.json
@@ -18,18 +18,110 @@
"layouts": {
"LAYOUT_small_mods": {
"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, "w":1.5},
- {"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.25},
- {"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":0.75, "y":3, "w":1.25}, {"x":2, "y":3, "w":1.25}, {"x":3.25, "y":3, "w":1.25}, {"x":4.5, "y":3, "w":2}, {"x":6.5, "y":3, "w":2.25}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "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": [3, 11], "x": 12, "y": 0, "w": 1.5},
+
+ {"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": [3, 10], "x": 12.25, "y": 1, "w": 1.25},
+
+ {"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": [3, 9], "x": 12.5, "y": 2},
+
+ {"matrix": [3, 0], "x": 0.75, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25},
+ {"matrix": [3, 2], "x": 3.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 3], "x": 4.5, "y": 3, "w": 2},
+ {"matrix": [3, 4], "x": 6.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 5], "x": 8.75, "y": 3},
+ {"matrix": [3, 6], "x": 9.75, "y": 3},
+ {"matrix": [3, 7], "x": 10.75, "y": 3},
+ {"matrix": [3, 8], "x": 11.75, "y": 3}
]
- },
+ },
"LAYOUT_large_mods": {
"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, "w":1.5},
- {"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":2.25},
- {"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, "w":2},
- {"x":0.75, "y":3, "w":1.25}, {"x":2, "y":3, "w":1.25}, {"x":3.25, "y":3, "w":1.25}, {"x":4.5, "y":3, "w":2}, {"x":6.5, "y":3, "w":2.25}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "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": [3, 11], "x": 12, "y": 0, "w": 1.5},
+
+ {"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": 2.25},
+
+ {"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, "w": 2},
+
+ {"matrix": [3, 0], "x": 0.75, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25},
+ {"matrix": [3, 2], "x": 3.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 3], "x": 4.5, "y": 3, "w": 2},
+ {"matrix": [3, 4], "x": 6.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 5], "x": 8.75, "y": 3},
+ {"matrix": [3, 6], "x": 9.75, "y": 3},
+ {"matrix": [3, 7], "x": 10.75, "y": 3},
+ {"matrix": [3, 8], "x": 11.75, "y": 3}
]
}
}
diff --git a/keyboards/handwired/dactyl/dactyl.h b/keyboards/handwired/dactyl/dactyl.h
index b901b67673..575fcf7c01 100644
--- a/keyboards/handwired/dactyl/dactyl.h
+++ b/keyboards/handwired/dactyl/dactyl.h
@@ -23,32 +23,3 @@ extern bool i2c_initialized;
void init_dactyl(void);
void init_expander(void);
-
-#define XXX KC_NO
-
-#define LAYOUT_dactyl( \
- k00, k01, k02, k03, k04, k05, \
- k10, k11, k12, k13, k14, k15, \
- k20, k21, k22, k23, k24, k25, \
- k30, k31, k32, k33, k34, k35, \
- k40, k41, k42, k43, k44, \
- k55, k50, \
- k54, \
- k53, k52, k51, \
-\
- k06, k07, k08, k09, k0A, k0B, \
- k16, k17, k18, k19, k1A, k1B, \
- k26, k27, k28, k29, k2A, k2B, \
- k36, k37, k38, k39, k3A, k3B, \
- k47, k48, k49, k4A, k4B, \
- k5B, k56, \
- k57, \
- k5A, k59, k58 \
-) { \
- { 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, XXX, XXX, k47, k48, k49, k4A, k4B }, \
- { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B } \
-}
diff --git a/keyboards/handwired/dactyl/info.json b/keyboards/handwired/dactyl/info.json
index 3883c165ee..8297e609a1 100644
--- a/keyboards/handwired/dactyl/info.json
+++ b/keyboards/handwired/dactyl/info.json
@@ -13,7 +13,94 @@
"debounce": 15,
"layouts": {
"LAYOUT_dactyl": {
- "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":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k13", "x":3, "y":1}, {"label":"k14", "x":4, "y":1}, {"label":"k15", "x":5, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}, {"label":"k23", "x":3, "y":2}, {"label":"k24", "x":4, "y":2}, {"label":"k25", "x":5, "y":2}, {"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":"k40", "x":0, "y":4}, {"label":"k41", "x":1, "y":4}, {"label":"k42", "x":2, "y":4}, {"label":"k43", "x":3, "y":4}, {"label":"k44", "x":4, "y":4}, {"label":"k55", "x":6, "y":5}, {"label":"k50", "x":7, "y":5}, {"label":"k54", "x":7, "y":6}, {"label":"k53", "x":5, "y":6, "h":2}, {"label":"k52", "x":6, "y":6, "h":2}, {"label":"k51", "x":7, "y":7}, {"label":"k06", "x":11, "y":0}, {"label":"k07", "x":12, "y":0}, {"label":"k08", "x":13, "y":0}, {"label":"k09", "x":14, "y":0}, {"label":"k0A", "x":15, "y":0}, {"label":"k0B", "x":16, "y":0}, {"label":"k16", "x":11, "y":1}, {"label":"k17", "x":12, "y":1}, {"label":"k18", "x":13, "y":1}, {"label":"k19", "x":14, "y":1}, {"label":"k1A", "x":15, "y":1}, {"label":"k1B", "x":16, "y":1}, {"label":"k26", "x":11, "y":2}, {"label":"k27", "x":12, "y":2}, {"label":"k28", "x":13, "y":2}, {"label":"k29", "x":14, "y":2}, {"label":"k2A", "x":15, "y":2}, {"label":"k2B", "x":16, "y":2}, {"label":"k36", "x":11, "y":3}, {"label":"k37", "x":12, "y":3}, {"label":"k38", "x":13, "y":3}, {"label":"k39", "x":14, "y":3}, {"label":"k3A", "x":15, "y":3}, {"label":"k3B", "x":16, "y":3}, {"label":"k47", "x":12, "y":4}, {"label":"k48", "x":13, "y":4}, {"label":"k49", "x":14, "y":4}, {"label":"k4A", "x":15, "y":4}, {"label":"k4B", "x":16, "y":4}, {"label":"k5B", "x":9, "y":5}, {"label":"k56", "x":10, "y":5}, {"label":"k57", "x":9, "y":6}, {"label":"k5A", "x":9, "y":7}, {"label":"k59", "x":10, "y":6, "h":2}, {"label":"k58", "x":11, "y":6, "h":2}]
+ "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": [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": [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": [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": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+
+ {"matrix": [5, 5], "x": 6, "y": 5},
+ {"matrix": [5, 0], "x": 7, "y": 5},
+
+ {"matrix": [5, 4], "x": 7, "y": 6},
+ {"matrix": [5, 3], "x": 5, "y": 6, "h": 2},
+ {"matrix": [5, 2], "x": 6, "y": 6, "h": 2},
+
+ {"matrix": [5, 1], "x": 7, "y": 7},
+
+ {"matrix": [0, 6], "x": 11, "y": 0},
+ {"matrix": [0, 7], "x": 12, "y": 0},
+ {"matrix": [0, 8], "x": 13, "y": 0},
+ {"matrix": [0, 9], "x": 14, "y": 0},
+ {"matrix": [0, 10], "x": 15, "y": 0},
+ {"matrix": [0, 11], "x": 16, "y": 0},
+
+ {"matrix": [1, 6], "x": 11, "y": 1},
+ {"matrix": [1, 7], "x": 12, "y": 1},
+ {"matrix": [1, 8], "x": 13, "y": 1},
+ {"matrix": [1, 9], "x": 14, "y": 1},
+ {"matrix": [1, 10], "x": 15, "y": 1},
+ {"matrix": [1, 11], "x": 16, "y": 1},
+
+ {"matrix": [2, 6], "x": 11, "y": 2},
+ {"matrix": [2, 7], "x": 12, "y": 2},
+ {"matrix": [2, 8], "x": 13, "y": 2},
+ {"matrix": [2, 9], "x": 14, "y": 2},
+ {"matrix": [2, 10], "x": 15, "y": 2},
+ {"matrix": [2, 11], "x": 16, "y": 2},
+
+ {"matrix": [3, 6], "x": 11, "y": 3},
+ {"matrix": [3, 7], "x": 12, "y": 3},
+ {"matrix": [3, 8], "x": 13, "y": 3},
+ {"matrix": [3, 9], "x": 14, "y": 3},
+ {"matrix": [3, 10], "x": 15, "y": 3},
+ {"matrix": [3, 11], "x": 16, "y": 3},
+
+ {"matrix": [4, 7], "x": 12, "y": 4},
+ {"matrix": [4, 8], "x": 13, "y": 4},
+ {"matrix": [4, 9], "x": 14, "y": 4},
+ {"matrix": [4, 10], "x": 15, "y": 4},
+ {"matrix": [4, 11], "x": 16, "y": 4},
+
+ {"matrix": [5, 11], "x": 9, "y": 5},
+ {"matrix": [5, 6], "x": 10, "y": 5},
+
+ {"matrix": [5, 7], "x": 9, "y": 6},
+
+ {"matrix": [5, 10], "x": 9, "y": 7},
+
+ {"matrix": [5, 9], "x": 10, "y": 6, "h": 2},
+ {"matrix": [5, 8], "x": 11, "y": 6, "h": 2}
+ ]
}
}
}
diff --git a/keyboards/handwired/dactyl_manuform/5x6/5x6.h b/keyboards/handwired/dactyl_manuform/5x6/5x6.h
deleted file mode 100644
index ebc959ddf1..0000000000
--- a/keyboards/handwired/dactyl_manuform/5x6/5x6.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_5x6( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
- L42, L43, R42, R43, \
- L44, L45, R40, R41, \
- L54, L55, R50, R51, \
- L52, L53, R52, R53 \
-) { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L30, L31, L32, L33, L34, L35 }, \
- { XXX, XXX, L42, L43, L44, L45 }, \
- { XXX, XXX, L52, L53, L54, L55 }, \
-\
- { R00, R01, R02, R03, R04, R05 }, \
- { R10, R11, R12, R13, R14, R15 }, \
- { R20, R21, R22, R23, R24, R25 }, \
- { R30, R31, R32, R33, R34, R35 }, \
- { R40, R41, R42, R43, XXX, XXX }, \
- { R50, R51, R52, R53, XXX, XXX } \
-}
diff --git a/keyboards/handwired/dactyl_manuform/5x6/info.json b/keyboards/handwired/dactyl_manuform/5x6/info.json
index f5d6f8177d..89c2c800c6 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x6/info.json
@@ -24,85 +24,85 @@
"layouts": {
"LAYOUT_5x6": {
"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},
+ {"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},
- {"x": 11, "y": 0},
- {"x": 12, "y": 0},
- {"x": 13, "y": 0},
- {"x": 14, "y": 0},
- {"x": 15, "y": 0},
- {"x": 16, "y": 0},
+ {"matrix": [6, 0], "x": 11, "y": 0},
+ {"matrix": [6, 1], "x": 12, "y": 0},
+ {"matrix": [6, 2], "x": 13, "y": 0},
+ {"matrix": [6, 3], "x": 14, "y": 0},
+ {"matrix": [6, 4], "x": 15, "y": 0},
+ {"matrix": [6, 5], "x": 16, "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},
+ {"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},
- {"x": 11, "y": 1},
- {"x": 12, "y": 1},
- {"x": 13, "y": 1},
- {"x": 14, "y": 1},
- {"x": 15, "y": 1},
- {"x": 16, "y": 1},
+ {"matrix": [7, 0], "x": 11, "y": 1},
+ {"matrix": [7, 1], "x": 12, "y": 1},
+ {"matrix": [7, 2], "x": 13, "y": 1},
+ {"matrix": [7, 3], "x": 14, "y": 1},
+ {"matrix": [7, 4], "x": 15, "y": 1},
+ {"matrix": [7, 5], "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},
+ {"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},
- {"x": 11, "y": 2},
- {"x": 12, "y": 2},
- {"x": 13, "y": 2},
- {"x": 14, "y": 2},
- {"x": 15, "y": 2},
- {"x": 16, "y": 2},
+ {"matrix": [8, 0], "x": 11, "y": 2},
+ {"matrix": [8, 1], "x": 12, "y": 2},
+ {"matrix": [8, 2], "x": 13, "y": 2},
+ {"matrix": [8, 3], "x": 14, "y": 2},
+ {"matrix": [8, 4], "x": 15, "y": 2},
+ {"matrix": [8, 5], "x": 16, "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},
+ {"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},
- {"x": 11, "y": 3},
- {"x": 12, "y": 3},
- {"x": 13, "y": 3},
- {"x": 14, "y": 3},
- {"x": 15, "y": 3},
- {"x": 16, "y": 3},
+ {"matrix": [9, 0], "x": 11, "y": 3},
+ {"matrix": [9, 1], "x": 12, "y": 3},
+ {"matrix": [9, 2], "x": 13, "y": 3},
+ {"matrix": [9, 3], "x": 14, "y": 3},
+ {"matrix": [9, 4], "x": 15, "y": 3},
+ {"matrix": [9, 5], "x": 16, "y": 3},
- {"x": 2, "y": 4},
- {"x": 3, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
- {"x": 13, "y": 4},
- {"x": 14, "y": 4},
+ {"matrix": [10, 2], "x": 13, "y": 4},
+ {"matrix": [10, 3], "x": 14, "y": 4},
- {"x": 4, "y": 5},
- {"x": 5, "y": 5},
+ {"matrix": [4, 4], "x": 4, "y": 5},
+ {"matrix": [4, 5], "x": 5, "y": 5},
- {"x": 11, "y": 5},
- {"x": 12, "y": 5},
+ {"matrix": [10, 0], "x": 11, "y": 5},
+ {"matrix": [10, 1], "x": 12, "y": 5},
- {"x": 6, "y": 6},
- {"x": 7, "y": 6},
+ {"matrix": [5, 4], "x": 6, "y": 6},
+ {"matrix": [5, 5], "x": 7, "y": 6},
- {"x": 9, "y": 6},
- {"x": 10, "y": 6},
+ {"matrix": [11, 0], "x": 9, "y": 6},
+ {"matrix": [11, 1], "x": 10, "y": 6},
- {"x": 6, "y": 7},
- {"x": 7, "y": 7},
+ {"matrix": [5, 2], "x": 6, "y": 7},
+ {"matrix": [5, 3], "x": 7, "y": 7},
- {"x": 9, "y": 7},
- {"x": 10, "y": 7}
+ {"matrix": [11, 2], "x": 9, "y": 7},
+ {"matrix": [11, 3], "x": 10, "y": 7}
]
}
}
diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/5x6_2_5.h b/keyboards/handwired/dactyl_manuform/5x6_2_5/5x6_2_5.h
deleted file mode 100644
index 7191119fd9..0000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_2_5/5x6_2_5.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2021 Jan Christoph Ebersbach
- *
- * 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_5x6_2_5( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
- L40, L41, L42, L43, L44, L55, L53, R52, R50, R41, R42, R43, R44, R45, \
- L54, L52, R53, R51 \
-) { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L30, L31, L32, L33, L34, L35 }, \
- { L40, L41, L42, L43, L44, XXX }, \
- { XXX, XXX, L52, L53, L54, L55 }, \
-\
- { R00, R01, R02, R03, R04, R05 }, \
- { R10, R11, R12, R13, R14, R15 }, \
- { R20, R21, R22, R23, R24, R25 }, \
- { R30, R31, R32, R33, R34, R35 }, \
- { XXX, R41, R42, R43, R44, R45 }, \
- { R50, R51, R52, R53, XXX, XXX } \
-}
diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json b/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json
index aaf843b177..e9aba3fa18 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json
@@ -24,85 +24,83 @@
"layouts": {
"LAYOUT_5x6_2_5": {
"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},
+ {"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},
- {"x": 11, "y": 0},
- {"x": 12, "y": 0},
- {"x": 13, "y": 0},
- {"x": 14, "y": 0},
- {"x": 15, "y": 0},
- {"x": 16, "y": 0},
+ {"matrix": [6, 0], "x": 11, "y": 0},
+ {"matrix": [6, 1], "x": 12, "y": 0},
+ {"matrix": [6, 2], "x": 13, "y": 0},
+ {"matrix": [6, 3], "x": 14, "y": 0},
+ {"matrix": [6, 4], "x": 15, "y": 0},
+ {"matrix": [6, 5], "x": 16, "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},
+ {"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},
- {"x": 11, "y": 1},
- {"x": 12, "y": 1},
- {"x": 13, "y": 1},
- {"x": 14, "y": 1},
- {"x": 15, "y": 1},
- {"x": 16, "y": 1},
+ {"matrix": [7, 0], "x": 11, "y": 1},
+ {"matrix": [7, 1], "x": 12, "y": 1},
+ {"matrix": [7, 2], "x": 13, "y": 1},
+ {"matrix": [7, 3], "x": 14, "y": 1},
+ {"matrix": [7, 4], "x": 15, "y": 1},
+ {"matrix": [7, 5], "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},
+ {"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},
- {"x": 11, "y": 2},
- {"x": 12, "y": 2},
- {"x": 13, "y": 2},
- {"x": 14, "y": 2},
- {"x": 15, "y": 2},
- {"x": 16, "y": 2},
+ {"matrix": [8, 0], "x": 11, "y": 2},
+ {"matrix": [8, 1], "x": 12, "y": 2},
+ {"matrix": [8, 2], "x": 13, "y": 2},
+ {"matrix": [8, 3], "x": 14, "y": 2},
+ {"matrix": [8, 4], "x": 15, "y": 2},
+ {"matrix": [8, 5], "x": 16, "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},
+ {"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},
- {"x": 11, "y": 3},
- {"x": 12, "y": 3},
- {"x": 13, "y": 3},
- {"x": 14, "y": 3},
- {"x": 15, "y": 3},
- {"x": 16, "y": 3},
+ {"matrix": [9, 0], "x": 11, "y": 3},
+ {"matrix": [9, 1], "x": 12, "y": 3},
+ {"matrix": [9, 2], "x": 13, "y": 3},
+ {"matrix": [9, 3], "x": 14, "y": 3},
+ {"matrix": [9, 4], "x": 15, "y": 3},
+ {"matrix": [9, 5], "x": 16, "y": 3},
- {"x": 0, "y": 4},
- {"x": 1, "y": 4},
- {"x": 2, "y": 4},
- {"x": 3, "y": 4},
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 5, "y": 4},
+ {"matrix": [5, 5], "x": 6, "y": 4},
+ {"matrix": [5, 3], "x": 7, "y": 4},
- {"x": 5, "y": 4},
- {"x": 6, "y": 4},
- {"x": 7, "y": 4},
+ {"matrix": [11, 2], "x": 9, "y": 4},
+ {"matrix": [11, 0], "x": 10, "y": 4},
+ {"matrix": [10, 1], "x": 11, "y": 4},
+ {"matrix": [10, 2], "x": 13, "y": 4},
+ {"matrix": [10, 3], "x": 14, "y": 4},
+ {"matrix": [10, 4], "x": 15, "y": 4},
+ {"matrix": [10, 5], "x": 16, "y": 4},
- {"x": 9, "y": 4},
- {"x": 10, "y": 4},
- {"x": 11, "y": 4},
+ {"matrix": [5, 4], "x": 6, "y": 5},
+ {"matrix": [5, 2], "x": 7, "y": 5},
- {"x": 13, "y":4},
- {"x": 14, "y":4},
- {"x": 15, "y":4},
- {"x": 16, "y":4},
-
- {"x": 6, "y": 5},
- {"x": 7, "y": 5},
-
- {"x": 9, "y": 5},
- {"x": 10, "y": 5}
+ {"matrix": [11, 3], "x": 9, "y": 5},
+ {"matrix": [11, 1], "x": 10, "y": 5}
]
}
}
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h b/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h
deleted file mode 100644
index 3179426585..0000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_5x6_5( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
- L42, L43, L44, L55, L53, R52, R50, R41, R42, R43, \
- L54, L52, R53, R51 \
-) { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L30, L31, L32, L33, L34, L35 }, \
- { XXX, XXX, L42, L43, L44, XXX }, \
- { XXX, XXX, L52, L53, L54, L55 }, \
-\
- { R00, R01, R02, R03, R04, R05 }, \
- { R10, R11, R12, R13, R14, R15 }, \
- { R20, R21, R22, R23, R24, R25 }, \
- { R30, R31, R32, R33, R34, R35 }, \
- { XXX, R41, R42, R43, XXX, XXX }, \
- { R50, R51, R52, R53, XXX, XXX } \
-}
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/info.json b/keyboards/handwired/dactyl_manuform/5x6_5/info.json
index 7494e0ecf4..e60286d166 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_5/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x6_5/info.json
@@ -24,81 +24,79 @@
"layouts": {
"LAYOUT_5x6_5": {
"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},
+ {"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},
- {"x": 11, "y": 0},
- {"x": 12, "y": 0},
- {"x": 13, "y": 0},
- {"x": 14, "y": 0},
- {"x": 15, "y": 0},
- {"x": 16, "y": 0},
+ {"matrix": [6, 0], "x": 11, "y": 0},
+ {"matrix": [6, 1], "x": 12, "y": 0},
+ {"matrix": [6, 2], "x": 13, "y": 0},
+ {"matrix": [6, 3], "x": 14, "y": 0},
+ {"matrix": [6, 4], "x": 15, "y": 0},
+ {"matrix": [6, 5], "x": 16, "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},
+ {"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},
- {"x": 11, "y": 1},
- {"x": 12, "y": 1},
- {"x": 13, "y": 1},
- {"x": 14, "y": 1},
- {"x": 15, "y": 1},
- {"x": 16, "y": 1},
+ {"matrix": [7, 0], "x": 11, "y": 1},
+ {"matrix": [7, 1], "x": 12, "y": 1},
+ {"matrix": [7, 2], "x": 13, "y": 1},
+ {"matrix": [7, 3], "x": 14, "y": 1},
+ {"matrix": [7, 4], "x": 15, "y": 1},
+ {"matrix": [7, 5], "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},
+ {"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},
- {"x": 11, "y": 2},
- {"x": 12, "y": 2},
- {"x": 13, "y": 2},
- {"x": 14, "y": 2},
- {"x": 15, "y": 2},
- {"x": 16, "y": 2},
+ {"matrix": [8, 0], "x": 11, "y": 2},
+ {"matrix": [8, 1], "x": 12, "y": 2},
+ {"matrix": [8, 2], "x": 13, "y": 2},
+ {"matrix": [8, 3], "x": 14, "y": 2},
+ {"matrix": [8, 4], "x": 15, "y": 2},
+ {"matrix": [8, 5], "x": 16, "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},
+ {"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},
- {"x": 11, "y": 3},
- {"x": 12, "y": 3},
- {"x": 13, "y": 3},
- {"x": 14, "y": 3},
- {"x": 15, "y": 3},
- {"x": 16, "y": 3},
+ {"matrix": [9, 0], "x": 11, "y": 3},
+ {"matrix": [9, 1], "x": 12, "y": 3},
+ {"matrix": [9, 2], "x": 13, "y": 3},
+ {"matrix": [9, 3], "x": 14, "y": 3},
+ {"matrix": [9, 4], "x": 15, "y": 3},
+ {"matrix": [9, 5], "x": 16, "y": 3},
- {"x": 2, "y": 4},
- {"x": 3, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 5, "y": 4},
+ {"matrix": [5, 5], "x": 6, "y": 4},
+ {"matrix": [5, 3], "x": 7, "y": 4},
- {"x": 5, "y": 4},
- {"x": 6, "y": 4},
- {"x": 7, "y": 4},
+ {"matrix": [11, 2], "x": 9, "y": 4},
+ {"matrix": [11, 0], "x": 10, "y": 4},
+ {"matrix": [10, 1], "x": 11, "y": 4},
+ {"matrix": [10, 2], "x": 13, "y": 4},
+ {"matrix": [10, 3], "x": 14, "y": 4},
- {"x": 9, "y": 4},
- {"x": 10, "y": 4},
- {"x": 11, "y": 4},
+ {"matrix": [5, 4], "x": 6, "y": 5},
+ {"matrix": [5, 2], "x": 7, "y": 5},
- {"x": 13, "y": 4},
- {"x": 14, "y": 4},
-
- {"x": 6, "y": 5},
- {"x": 7, "y": 5},
-
- {"x": 9, "y": 5},
- {"x": 10, "y": 5}
+ {"matrix": [11, 3], "x": 9, "y": 5},
+ {"matrix": [11, 1], "x": 10, "y": 5}
]
}
}
diff --git a/keyboards/handwired/dactyl_manuform/5x7/5x7.h b/keyboards/handwired/dactyl_manuform/5x7/5x7.h
deleted file mode 100644
index 7cd2597a1f..0000000000
--- a/keyboards/handwired/dactyl_manuform/5x7/5x7.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_5x7( \
- L11, L12, L13, L14, L15, L16, L17, \
- L21, L22, L23, L24, L25, L26, L27, \
- L31, L32, L33, L34, L35, L36, L37, \
- L41, L42, L43, L44, L45, L46, \
- L51, L52, L53, L54, \
- L55, L56, \
- L65, L66, \
- L63, L64, \
- R11, R12, R13, R14, R15, R16, R17, \
- R21, R22, R23, R24, R25, R26, R27, \
- R31, R32, R33, R34, R35, R36, R37, \
- R42, R43, R44, R45, R46, R47, \
- R54, R55, R56, R57, \
- R52, R53, \
- R62, R63, \
- R64, R65 \
-) { \
- { L11, L12, L13, L14, L15, L16, L17 }, \
- { L21, L22, L23, L24, L25, L26, L27 }, \
- { L31, L32, L33, L34, L35, L36, L37 }, \
- { L41, L42, L43, L44, L45, L46, XXX }, \
- { L51, L52, L53, L54, L55, L56, XXX }, \
- { XXX, XXX, L63, L64, L65, L66, XXX }, \
- { R11, R12, R13, R14, R15, R16, R17 }, \
- { R21, R22, R23, R24, R25, R26, R27 }, \
- { R31, R32, R33, R34, R35, R36, R37 }, \
- { XXX, R42, R43, R44, R45, R46, R47 }, \
- { XXX, R52, R53, R54, R55, R56, R57 }, \
- { XXX, R62, R63, R64, R65, XXX, XXX } \
-}
diff --git a/keyboards/handwired/dactyl_manuform/5x7/info.json b/keyboards/handwired/dactyl_manuform/5x7/info.json
index e5c3b5af86..b166df22a0 100644
--- a/keyboards/handwired/dactyl_manuform/5x7/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x7/info.json
@@ -24,95 +24,95 @@
"layouts": {
"LAYOUT_5x7": {
"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},
+ {"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},
- {"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},
+ {"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},
- {"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},
+ {"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},
- {"x": 0, "y": 3},
- {"x": 1, "y": 3},
- {"x": 2, "y": 3},
- {"x": 3, "y": 3},
- {"x": 4, "y": 3},
- {"x": 5, "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},
- {"x": 0, "y": 4},
- {"x": 1, "y": 4},
- {"x": 2, "y": 4},
- {"x": 3, "y": 4},
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
- {"x": 4, "y": 5},
- {"x": 5, "y": 5},
+ {"matrix": [4, 4], "x": 4, "y": 5},
+ {"matrix": [4, 5], "x": 5, "y": 5},
- {"x": 6, "y": 6},
- {"x": 7, "y": 6},
+ {"matrix": [5, 4], "x": 6, "y": 6},
+ {"matrix": [5, 5], "x": 7, "y": 6},
- {"x": 6, "y": 7},
- {"x": 7, "y": 7},
+ {"matrix": [5, 2], "x": 6, "y": 7},
+ {"matrix": [5, 3], "x": 7, "y": 7},
- {"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},
+ {"matrix": [6, 0], "x": 10, "y": 0},
+ {"matrix": [6, 1], "x": 11, "y": 0},
+ {"matrix": [6, 2], "x": 12, "y": 0},
+ {"matrix": [6, 3], "x": 13, "y": 0},
+ {"matrix": [6, 4], "x": 14, "y": 0},
+ {"matrix": [6, 5], "x": 15, "y": 0},
+ {"matrix": [6, 6], "x": 16, "y": 0},
- {"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},
+ {"matrix": [7, 0], "x": 10, "y": 1},
+ {"matrix": [7, 1], "x": 11, "y": 1},
+ {"matrix": [7, 2], "x": 12, "y": 1},
+ {"matrix": [7, 3], "x": 13, "y": 1},
+ {"matrix": [7, 4], "x": 14, "y": 1},
+ {"matrix": [7, 5], "x": 15, "y": 1},
+ {"matrix": [7, 6], "x": 16, "y": 1},
- {"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},
+ {"matrix": [8, 0], "x": 10, "y": 2},
+ {"matrix": [8, 1], "x": 11, "y": 2},
+ {"matrix": [8, 2], "x": 12, "y": 2},
+ {"matrix": [8, 3], "x": 13, "y": 2},
+ {"matrix": [8, 4], "x": 14, "y": 2},
+ {"matrix": [8, 5], "x": 15, "y": 2},
+ {"matrix": [8, 6], "x": 16, "y": 2},
- {"x": 11, "y": 3},
- {"x": 12, "y": 3},
- {"x": 13, "y": 3},
- {"x": 14, "y": 3},
- {"x": 15, "y": 3},
- {"x": 16, "y": 3},
+ {"matrix": [9, 1], "x": 11, "y": 3},
+ {"matrix": [9, 2], "x": 12, "y": 3},
+ {"matrix": [9, 3], "x": 13, "y": 3},
+ {"matrix": [9, 4], "x": 14, "y": 3},
+ {"matrix": [9, 5], "x": 15, "y": 3},
+ {"matrix": [9, 6], "x": 16, "y": 3},
- {"x": 13, "y": 4},
- {"x": 14, "y": 4},
- {"x": 15, "y": 4},
- {"x": 16, "y": 4},
+ {"matrix": [10, 3], "x": 13, "y": 4},
+ {"matrix": [10, 4], "x": 14, "y": 4},
+ {"matrix": [10, 5], "x": 15, "y": 4},
+ {"matrix": [10, 6], "x": 16, "y": 4},
- {"x": 11, "y": 5},
- {"x": 12, "y": 5},
+ {"matrix": [10, 1], "x": 11, "y": 5},
+ {"matrix": [10, 2], "x": 12, "y": 5},
- {"x": 9, "y": 6},
- {"x": 10, "y": 6},
+ {"matrix": [11, 1], "x": 9, "y": 6},
+ {"matrix": [11, 2], "x": 10, "y": 6},
- {"x":9, "y":7},
- {"x":10, "y":7}
+ {"matrix": [11, 3], "x": 9, "y": 7},
+ {"matrix": [11, 4], "x": 10, "y": 7}
]
}
}
diff --git a/keyboards/handwired/dactyl_manuform/6x6/6x6.h b/keyboards/handwired/dactyl_manuform/6x6/6x6.h
deleted file mode 100644
index 657d057787..0000000000
--- a/keyboards/handwired/dactyl_manuform/6x6/6x6.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_6x6( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
- L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45, \
- L52, L53, R52, R53, \
- L54, L55, R50, R51, \
- L64, L65, R60, R61, \
- L62, L63, R62, R63 \
-) { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L30, L31, L32, L33, L34, L35 }, \
- { L40, L41, L42, L43, L44, L45 }, \
- { XXX, XXX, L52, L53, L54, L55 }, \
- { XXX, XXX, L62, L63, L64, L65 }, \
-\
- { R00, R01, R02, R03, R04, R05 }, \
- { R10, R11, R12, R13, R14, R15 }, \
- { R20, R21, R22, R23, R24, R25 }, \
- { R30, R31, R32, R33, R34, R35 }, \
- { R40, R41, R42, R43, R44, R45 }, \
- { R50, R51, R52, R53, XXX, XXX }, \
- { R60, R61, R62, R63, XXX, XXX } \
-}
-
-
-#define LAYOUT_6x6_5_thumb( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
- L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45, \
- L52, L53, R52, R53, \
- L54, R51, \
- L64, L65, R60, R61, \
- L62, L63, R62, R63 \
-) { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L30, L31, L32, L33, L34, L35 }, \
- { L40, L41, L42, L43, L44, L45 }, \
- { XXX, XXX, L52, L53, L54, XXX }, \
- { XXX, XXX, L62, L63, L64, L65 }, \
-\
- { R00, R01, R02, R03, R04, R05 }, \
- { R10, R11, R12, R13, R14, R15 }, \
- { R20, R21, R22, R23, R24, R25 }, \
- { R30, R31, R32, R33, R34, R35 }, \
- { R40, R41, R42, R43, R44, R45 }, \
- { XXX, R51, R52, R53, XXX, XXX }, \
- { R60, R61, R62, R63, XXX, XXX } \
-}
diff --git a/keyboards/handwired/dactyl_manuform/6x6/info.json b/keyboards/handwired/dactyl_manuform/6x6/info.json
index bfc65baf18..080e4e1942 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6/info.json
@@ -11,194 +11,194 @@
"layouts": {
"LAYOUT_6x6": {
"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, "y": 0},
- {"x": 12, "y": 0},
- {"x": 13, "y": 0},
- {"x": 14, "y": 0},
- {"x": 15, "y": 0},
- {"x": 16, "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": 0, "y": 3},
- {"x": 1, "y": 3},
- {"x": 2, "y": 3},
- {"x": 3, "y": 3},
- {"x": 4, "y": 3},
- {"x": 5, "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": 0, "y": 4},
- {"x": 1, "y": 4},
- {"x": 2, "y": 4},
- {"x": 3, "y": 4},
- {"x": 4, "y": 4},
- {"x": 5, "y": 4},
-
- {"x": 11, "y": 4},
- {"x": 12, "y": 4},
- {"x": 13, "y": 4},
- {"x": 14, "y": 4},
- {"x": 15, "y": 4},
- {"x": 16, "y": 4},
-
- {"x": 2, "y": 5},
- {"x": 3, "y": 5},
-
- {"x": 13, "y": 5},
- {"x": 14, "y": 5},
-
- {"x": 4, "y": 6},
- {"x": 5, "y": 6},
-
- {"x": 11, "y": 6},
- {"x": 12, "y": 6},
-
- {"x": 6, "y": 7},
- {"x": 7, "y": 7},
-
- {"x": 9, "y": 7},
- {"x": 10, "y": 7},
-
- {"x": 6, "y": 8},
- {"x": 7, "y": 8},
-
- {"x": 9, "y": 8},
- {"x": 10, "y": 8}
+ {"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": [7, 0], "x": 11, "y": 0},
+ {"matrix": [7, 1], "x": 12, "y": 0},
+ {"matrix": [7, 2], "x": 13, "y": 0},
+ {"matrix": [7, 3], "x": 14, "y": 0},
+ {"matrix": [7, 4], "x": 15, "y": 0},
+ {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 1},
+ {"matrix": [8, 1], "x": 12, "y": 1},
+ {"matrix": [8, 2], "x": 13, "y": 1},
+ {"matrix": [8, 3], "x": 14, "y": 1},
+ {"matrix": [8, 4], "x": 15, "y": 1},
+ {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 2},
+ {"matrix": [9, 1], "x": 12, "y": 2},
+ {"matrix": [9, 2], "x": 13, "y": 2},
+ {"matrix": [9, 3], "x": 14, "y": 2},
+ {"matrix": [9, 4], "x": 15, "y": 2},
+ {"matrix": [9, 5], "x": 16, "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": [10, 0], "x": 11, "y": 3},
+ {"matrix": [10, 1], "x": 12, "y": 3},
+ {"matrix": [10, 2], "x": 13, "y": 3},
+ {"matrix": [10, 3], "x": 14, "y": 3},
+ {"matrix": [10, 4], "x": 15, "y": 3},
+ {"matrix": [10, 5], "x": 16, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+
+ {"matrix": [11, 0], "x": 11, "y": 4},
+ {"matrix": [11, 1], "x": 12, "y": 4},
+ {"matrix": [11, 2], "x": 13, "y": 4},
+ {"matrix": [11, 3], "x": 14, "y": 4},
+ {"matrix": [11, 4], "x": 15, "y": 4},
+ {"matrix": [11, 5], "x": 16, "y": 4},
+
+ {"matrix": [5, 2], "x": 2, "y": 5},
+ {"matrix": [5, 3], "x": 3, "y": 5},
+
+ {"matrix": [12, 2], "x": 13, "y": 5},
+ {"matrix": [12, 3], "x": 14, "y": 5},
+
+ {"matrix": [5, 4], "x": 4, "y": 6},
+ {"matrix": [5, 5], "x": 5, "y": 6},
+
+ {"matrix": [12, 0], "x": 11, "y": 6},
+ {"matrix": [12, 1], "x": 12, "y": 6},
+
+ {"matrix": [6, 4], "x": 6, "y": 7},
+ {"matrix": [6, 5], "x": 7, "y": 7},
+
+ {"matrix": [13, 0], "x": 9, "y": 7},
+ {"matrix": [13, 1], "x": 10, "y": 7},
+
+ {"matrix": [6, 2], "x": 6, "y": 8},
+ {"matrix": [6, 3], "x": 7, "y": 8},
+
+ {"matrix": [13, 2], "x": 9, "y": 8},
+ {"matrix": [13, 3], "x": 10, "y": 8}
]
},
-
"LAYOUT_6x6_5_thumb": {
"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, "y": 0},
- {"x": 12, "y": 0},
- {"x": 13, "y": 0},
- {"x": 14, "y": 0},
- {"x": 15, "y": 0},
- {"x": 16, "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": 0, "y": 3},
- {"x": 1, "y": 3},
- {"x": 2, "y": 3},
- {"x": 3, "y": 3},
- {"x": 4, "y": 3},
- {"x": 5, "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": 0, "y": 4},
- {"x": 1, "y": 4},
- {"x": 2, "y": 4},
- {"x": 3, "y": 4},
- {"x": 4, "y": 4},
- {"x": 5, "y": 4},
-
- {"x": 11, "y": 4},
- {"x": 12, "y": 4},
- {"x": 13, "y": 4},
- {"x": 14, "y": 4},
- {"x": 15, "y": 4},
- {"x": 16, "y": 4},
-
- {"x": 2, "y": 5},
- {"x": 3, "y": 5},
-
- {"x": 13, "y": 5},
- {"x": 14, "y": 5},
-
- {"x": 4, "y": 6},
- {"x": 12, "y": 6},
-
- {"x": 6, "y": 7},
- {"x": 7, "y": 7},
-
- {"x": 9, "y": 7},
- {"x": 10, "y": 7},
-
- {"x": 6, "y": 8},
- {"x": 7, "y": 8},
-
- {"x": 9, "y": 8},
- {"x": 10, "y": 8}
+ {"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": [7, 0], "x": 11, "y": 0},
+ {"matrix": [7, 1], "x": 12, "y": 0},
+ {"matrix": [7, 2], "x": 13, "y": 0},
+ {"matrix": [7, 3], "x": 14, "y": 0},
+ {"matrix": [7, 4], "x": 15, "y": 0},
+ {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 1},
+ {"matrix": [8, 1], "x": 12, "y": 1},
+ {"matrix": [8, 2], "x": 13, "y": 1},
+ {"matrix": [8, 3], "x": 14, "y": 1},
+ {"matrix": [8, 4], "x": 15, "y": 1},
+ {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 2},
+ {"matrix": [9, 1], "x": 12, "y": 2},
+ {"matrix": [9, 2], "x": 13, "y": 2},
+ {"matrix": [9, 3], "x": 14, "y": 2},
+ {"matrix": [9, 4], "x": 15, "y": 2},
+ {"matrix": [9, 5], "x": 16, "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": [10, 0], "x": 11, "y": 3},
+ {"matrix": [10, 1], "x": 12, "y": 3},
+ {"matrix": [10, 2], "x": 13, "y": 3},
+ {"matrix": [10, 3], "x": 14, "y": 3},
+ {"matrix": [10, 4], "x": 15, "y": 3},
+ {"matrix": [10, 5], "x": 16, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+
+ {"matrix": [11, 0], "x": 11, "y": 4},
+ {"matrix": [11, 1], "x": 12, "y": 4},
+ {"matrix": [11, 2], "x": 13, "y": 4},
+ {"matrix": [11, 3], "x": 14, "y": 4},
+ {"matrix": [11, 4], "x": 15, "y": 4},
+ {"matrix": [11, 5], "x": 16, "y": 4},
+
+ {"matrix": [5, 2], "x": 2, "y": 5},
+ {"matrix": [5, 3], "x": 3, "y": 5},
+
+ {"matrix": [12, 2], "x": 13, "y": 5},
+ {"matrix": [12, 3], "x": 14, "y": 5},
+
+ {"matrix": [5, 4], "x": 4, "y": 6},
+
+ {"matrix": [12, 1], "x": 12, "y": 6},
+
+ {"matrix": [6, 4], "x": 6, "y": 7},
+ {"matrix": [6, 5], "x": 7, "y": 7},
+
+ {"matrix": [13, 0], "x": 9, "y": 7},
+ {"matrix": [13, 1], "x": 10, "y": 7},
+
+ {"matrix": [6, 2], "x": 6, "y": 8},
+ {"matrix": [6, 3], "x": 7, "y": 8},
+
+ {"matrix": [13, 2], "x": 9, "y": 8},
+ {"matrix": [13, 3], "x": 10, "y": 8}
]
}
}
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.h b/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.h
deleted file mode 100644
index 74cb474a5b..0000000000
--- a/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2012 Jun Wako <wakojun@gmail.com>
-// Copyright 2021 Dmitriy Kuminov (@dmik)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_6x6_4( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
- L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45, \
- L50, L51, L52, L53, R52, R53, R54, R55, \
- L54, L55, R50, R51, \
- L64, L65, R60, R61, \
- L62, L63, R62, R63 \
-) { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L30, L31, L32, L33, L34, L35 }, \
- { L40, L41, L42, L43, L44, L45 }, \
- { L50, L51, L52, L53, L54, L55 }, \
- { XXX, XXX, L62, L63, L64, L65 }, \
-\
- { R00, R01, R02, R03, R04, R05 }, \
- { R10, R11, R12, R13, R14, R15 }, \
- { R20, R21, R22, R23, R24, R25 }, \
- { R30, R31, R32, R33, R34, R35 }, \
- { R40, R41, R42, R43, R44, R45 }, \
- { R50, R51, R52, R53, R54, R55 }, \
- { R60, R61, R62, R63, XXX, XXX } \
-}
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/info.json b/keyboards/handwired/dactyl_manuform/6x6_4/info.json
index 2d5dbd2351..567057cf08 100644
--- a/keyboards/handwired/dactyl_manuform/6x6_4/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/info.json
@@ -24,103 +24,103 @@
"layouts": {
"LAYOUT_6x6_4": {
"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, "y": 0},
- {"x": 12, "y": 0},
- {"x": 13, "y": 0},
- {"x": 14, "y": 0},
- {"x": 15, "y": 0},
- {"x": 16, "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": 0, "y": 3},
- {"x": 1, "y": 3},
- {"x": 2, "y": 3},
- {"x": 3, "y": 3},
- {"x": 4, "y": 3},
- {"x": 5, "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": 0, "y": 4},
- {"x": 1, "y": 4},
- {"x": 2, "y": 4},
- {"x": 3, "y": 4},
- {"x": 4, "y": 4},
- {"x": 5, "y": 4},
-
- {"x": 11, "y": 4},
- {"x": 12, "y": 4},
- {"x": 13, "y": 4},
- {"x": 14, "y": 4},
- {"x": 15, "y": 4},
- {"x": 16, "y": 4},
-
- {"x": 0, "y": 5},
- {"x": 1, "y": 5},
- {"x": 2, "y": 5},
- {"x": 3, "y": 5},
-
- {"x": 13, "y": 5},
- {"x": 14, "y": 5},
- {"x": 15, "y": 5},
- {"x": 16, "y": 5},
-
- {"x": 4, "y": 6},
- {"x": 5, "y": 6},
-
- {"x": 11, "y": 6},
- {"x": 12, "y": 6},
-
- {"x": 6, "y": 7},
- {"x": 7, "y": 7},
-
- {"x": 9, "y": 7},
- {"x": 10, "y": 7},
-
- {"x": 6, "y": 8},
- {"x": 7, "y": 8},
-
- {"x": 9, "y": 8},
- {"x": 10, "y": 8}
+ {"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": [7, 0], "x": 11, "y": 0},
+ {"matrix": [7, 1], "x": 12, "y": 0},
+ {"matrix": [7, 2], "x": 13, "y": 0},
+ {"matrix": [7, 3], "x": 14, "y": 0},
+ {"matrix": [7, 4], "x": 15, "y": 0},
+ {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 1},
+ {"matrix": [8, 1], "x": 12, "y": 1},
+ {"matrix": [8, 2], "x": 13, "y": 1},
+ {"matrix": [8, 3], "x": 14, "y": 1},
+ {"matrix": [8, 4], "x": 15, "y": 1},
+ {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 2},
+ {"matrix": [9, 1], "x": 12, "y": 2},
+ {"matrix": [9, 2], "x": 13, "y": 2},
+ {"matrix": [9, 3], "x": 14, "y": 2},
+ {"matrix": [9, 4], "x": 15, "y": 2},
+ {"matrix": [9, 5], "x": 16, "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": [10, 0], "x": 11, "y": 3},
+ {"matrix": [10, 1], "x": 12, "y": 3},
+ {"matrix": [10, 2], "x": 13, "y": 3},
+ {"matrix": [10, 3], "x": 14, "y": 3},
+ {"matrix": [10, 4], "x": 15, "y": 3},
+ {"matrix": [10, 5], "x": 16, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+
+ {"matrix": [11, 0], "x": 11, "y": 4},
+ {"matrix": [11, 1], "x": 12, "y": 4},
+ {"matrix": [11, 2], "x": 13, "y": 4},
+ {"matrix": [11, 3], "x": 14, "y": 4},
+ {"matrix": [11, 4], "x": 15, "y": 4},
+ {"matrix": [11, 5], "x": 16, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5},
+ {"matrix": [5, 1], "x": 1, "y": 5},
+ {"matrix": [5, 2], "x": 2, "y": 5},
+ {"matrix": [5, 3], "x": 3, "y": 5},
+
+ {"matrix": [12, 2], "x": 13, "y": 5},
+ {"matrix": [12, 3], "x": 14, "y": 5},
+ {"matrix": [12, 4], "x": 15, "y": 5},
+ {"matrix": [12, 5], "x": 16, "y": 5},
+
+ {"matrix": [5, 4], "x": 4, "y": 6},
+ {"matrix": [5, 5], "x": 5, "y": 6},
+
+ {"matrix": [12, 0], "x": 11, "y": 6},
+ {"matrix": [12, 1], "x": 12, "y": 6},
+
+ {"matrix": [6, 4], "x": 6, "y": 7},
+ {"matrix": [6, 5], "x": 7, "y": 7},
+
+ {"matrix": [13, 0], "x": 9, "y": 7},
+ {"matrix": [13, 1], "x": 10, "y": 7},
+
+ {"matrix": [6, 2], "x": 6, "y": 8},
+ {"matrix": [6, 3], "x": 7, "y": 8},
+
+ {"matrix": [13, 2], "x": 9, "y": 8},
+ {"matrix": [13, 3], "x": 10, "y": 8}
]
}
}
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.h b/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.h
deleted file mode 100644
index 1adb7d4696..0000000000
--- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2012 Jun Wako <wakojun@gmail.com>
-// Copyright 2021 Dmitriy Kuminov (@dmik)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_6x6_kinesis( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
- L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45, \
- L50, L51, L52, L53, R52, R53, R54, R55, \
- L54, L55, R50, R51, \
- L64, L65, R60, R61, \
- L62, L63, R62, R63 \
-) { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L30, L31, L32, L33, L34, L35 }, \
- { L40, L41, L42, L43, L44, L45 }, \
- { L50, L51, L52, L53, L54, L55 }, \
- { XXX, XXX, L62, L63, L64, L65 }, \
-\
- { R00, R01, R02, R03, R04, R05 }, \
- { R10, R11, R12, R13, R14, R15 }, \
- { R20, R21, R22, R23, R24, R25 }, \
- { R30, R31, R32, R33, R34, R35 }, \
- { R40, R41, R42, R43, R44, R45 }, \
- { R50, R51, R52, R53, R54, R55 }, \
- { R60, R61, R62, R63, XXX, XXX } \
-}
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json b/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json
index 9bf6f6f8bd..8f14c5049e 100644
--- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json
@@ -24,103 +24,103 @@
"layouts": {
"LAYOUT_6x6_kinesis": {
"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, "y": 0},
- {"x": 12, "y": 0},
- {"x": 13, "y": 0},
- {"x": 14, "y": 0},
- {"x": 15, "y": 0},
- {"x": 16, "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": 0, "y": 3},
- {"x": 1, "y": 3},
- {"x": 2, "y": 3},
- {"x": 3, "y": 3},
- {"x": 4, "y": 3},
- {"x": 5, "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": 0, "y": 4},
- {"x": 1, "y": 4},
- {"x": 2, "y": 4},
- {"x": 3, "y": 4},
- {"x": 4, "y": 4},
- {"x": 5, "y": 4},
-
- {"x": 11, "y": 4},
- {"x": 12, "y": 4},
- {"x": 13, "y": 4},
- {"x": 14, "y": 4},
- {"x": 15, "y": 4},
- {"x": 16, "y": 4},
-
- {"x": 1, "y": 5},
- {"x": 2, "y": 5},
- {"x": 3, "y": 5},
- {"x": 4, "y": 5},
-
- {"x": 12, "y": 5},
- {"x": 13, "y": 5},
- {"x": 14, "y": 5},
- {"x": 15, "y": 5},
-
- {"x": 5, "y": 7, "h": 2},
- {"x": 6, "y": 7, "h": 2},
-
- {"x": 10, "y": 7, "h": 2},
- {"x": 11, "y": 7, "h": 2},
-
- {"x": 6, "y": 6},
- {"x": 7, "y": 6},
-
- {"x": 9, "y": 6},
- {"x": 10, "y": 6},
-
- {"x": 7, "y": 8},
- {"x": 7, "y": 7},
-
- {"x": 9, "y": 7},
- {"x": 9, "y": 8}
+ {"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": [7, 0], "x": 11, "y": 0},
+ {"matrix": [7, 1], "x": 12, "y": 0},
+ {"matrix": [7, 2], "x": 13, "y": 0},
+ {"matrix": [7, 3], "x": 14, "y": 0},
+ {"matrix": [7, 4], "x": 15, "y": 0},
+ {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 1},
+ {"matrix": [8, 1], "x": 12, "y": 1},
+ {"matrix": [8, 2], "x": 13, "y": 1},
+ {"matrix": [8, 3], "x": 14, "y": 1},
+ {"matrix": [8, 4], "x": 15, "y": 1},
+ {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 2},
+ {"matrix": [9, 1], "x": 12, "y": 2},
+ {"matrix": [9, 2], "x": 13, "y": 2},
+ {"matrix": [9, 3], "x": 14, "y": 2},
+ {"matrix": [9, 4], "x": 15, "y": 2},
+ {"matrix": [9, 5], "x": 16, "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": [10, 0], "x": 11, "y": 3},
+ {"matrix": [10, 1], "x": 12, "y": 3},
+ {"matrix": [10, 2], "x": 13, "y": 3},
+ {"matrix": [10, 3], "x": 14, "y": 3},
+ {"matrix": [10, 4], "x": 15, "y": 3},
+ {"matrix": [10, 5], "x": 16, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+
+ {"matrix": [11, 0], "x": 11, "y": 4},
+ {"matrix": [11, 1], "x": 12, "y": 4},
+ {"matrix": [11, 2], "x": 13, "y": 4},
+ {"matrix": [11, 3], "x": 14, "y": 4},
+ {"matrix": [11, 4], "x": 15, "y": 4},
+ {"matrix": [11, 5], "x": 16, "y": 4},
+
+ {"matrix": [5, 0], "x": 1, "y": 5},
+ {"matrix": [5, 1], "x": 2, "y": 5},
+ {"matrix": [5, 2], "x": 3, "y": 5},
+ {"matrix": [5, 3], "x": 4, "y": 5},
+
+ {"matrix": [12, 2], "x": 12, "y": 5},
+ {"matrix": [12, 3], "x": 13, "y": 5},
+ {"matrix": [12, 4], "x": 14, "y": 5},
+ {"matrix": [12, 5], "x": 15, "y": 5},
+
+ {"matrix": [5, 4], "x": 5, "y": 7, "h": 2},
+ {"matrix": [5, 5], "x": 6, "y": 7, "h": 2},
+
+ {"matrix": [12, 0], "x": 10, "y": 7, "h": 2},
+ {"matrix": [12, 1], "x": 11, "y": 7, "h": 2},
+
+ {"matrix": [6, 4], "x": 6, "y": 6},
+ {"matrix": [6, 5], "x": 7, "y": 6},
+
+ {"matrix": [13, 0], "x": 9, "y": 6},
+ {"matrix": [13, 1], "x": 10, "y": 6},
+
+ {"matrix": [6, 2], "x": 7, "y": 8},
+ {"matrix": [6, 3], "x": 7, "y": 7},
+
+ {"matrix": [13, 2], "x": 9, "y": 7},
+ {"matrix": [13, 3], "x": 9, "y": 8}
]
}
}
diff --git a/keyboards/handwired/dactyl_manuform/6x7/6x7.h b/keyboards/handwired/dactyl_manuform/6x7/6x7.h
deleted file mode 100644
index bd66c309fc..0000000000
--- a/keyboards/handwired/dactyl_manuform/6x7/6x7.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2022 Matthew Dews (@matthew-dews)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_6x7( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
- 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, \
- L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46, \
- L52, L53, R52, R53, \
- L54, L55, R50, R51, \
- L64, L65, R60, R61, \
- L62, L63, R62, R63 \
-) { \
- { L00, L01, L02, L03, L04, L05, L06 }, \
- { L10, L11, L12, L13, L14, L15, L16 }, \
- { L20, L21, L22, L23, L24, L25, L26 }, \
- { L30, L31, L32, L33, L34, L35, L36 }, \
- { L40, L41, L42, L43, L44, L45, L46 }, \
- { XXX, XXX, XXX, L52, L53, L54, L55 }, \
- { XXX, XXX, XXX, L62, L63, L64, L65 }, \
-\
- { R00, R01, R02, R03, R04, R05, R06 }, \
- { R10, R11, R12, R13, R14, R15, R16 }, \
- { R20, R21, R22, R23, R24, R25, R26 }, \
- { R30, R31, R32, R33, R34, R35, R36 }, \
- { R40, R41, R42, R43, R44, R45, R46 }, \
- { R50, R51, R52, R53, XXX, XXX, XXX }, \
- { R60, R61, R62, R63, XXX, XXX, XXX } \
-}
diff --git a/keyboards/handwired/dactyl_manuform/6x7/info.json b/keyboards/handwired/dactyl_manuform/6x7/info.json
index b289804d36..ea983da9c8 100644
--- a/keyboards/handwired/dactyl_manuform/6x7/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x7/info.json
@@ -24,109 +24,109 @@
"layouts": {
"LAYOUT_6x7": {
"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": 12, "y": 0},
- {"x": 13, "y": 0},
- {"x": 14, "y": 0},
- {"x": 15, "y": 0},
- {"x": 16, "y": 0},
- {"x": 17, "y": 0},
- {"x": 18, "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": 12, "y": 1},
- {"x": 13, "y": 1},
- {"x": 14, "y": 1},
- {"x": 15, "y": 1},
- {"x": 16, "y": 1},
- {"x": 17, "y": 1},
- {"x": 18, "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": 12, "y": 2},
- {"x": 13, "y": 2},
- {"x": 14, "y": 2},
- {"x": 15, "y": 2},
- {"x": 16, "y": 2},
- {"x": 17, "y": 2},
- {"x": 18, "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": 12, "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": 0, "y": 4},
- {"x": 1, "y": 4},
- {"x": 2, "y": 4},
- {"x": 3, "y": 4},
- {"x": 4, "y": 4},
- {"x": 5, "y": 4},
- {"x": 6, "y": 4},
-
- {"x": 12, "y": 4},
- {"x": 13, "y": 4},
- {"x": 14, "y": 4},
- {"x": 15, "y": 4},
- {"x": 16, "y": 4},
- {"x": 17, "y": 4},
- {"x": 18, "y": 4},
-
- {"x": 3, "y": 5},
- {"x": 4, "y": 5},
-
- {"x": 14, "y": 5},
- {"x": 15, "y": 5},
-
- {"x": 5, "y": 6},
- {"x": 6, "y": 6},
-
- {"x": 12, "y": 6},
- {"x": 13, "y": 6},
-
- {"x": 7, "y": 7},
- {"x": 8, "y": 7},
-
- {"x": 10, "y": 7},
- {"x": 11, "y": 7},
-
- {"x": 7, "y": 8},
- {"x": 8, "y": 8},
-
- {"x": 10, "y": 8},
- {"x": 11, "y": 8}
+ {"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": [7, 0], "x": 12, "y": 0},
+ {"matrix": [7, 1], "x": 13, "y": 0},
+ {"matrix": [7, 2], "x": 14, "y": 0},
+ {"matrix": [7, 3], "x": 15, "y": 0},
+ {"matrix": [7, 4], "x": 16, "y": 0},
+ {"matrix": [7, 5], "x": 17, "y": 0},
+ {"matrix": [7, 6], "x": 18, "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": [8, 0], "x": 12, "y": 1},
+ {"matrix": [8, 1], "x": 13, "y": 1},
+ {"matrix": [8, 2], "x": 14, "y": 1},
+ {"matrix": [8, 3], "x": 15, "y": 1},
+ {"matrix": [8, 4], "x": 16, "y": 1},
+ {"matrix": [8, 5], "x": 17, "y": 1},
+ {"matrix": [8, 6], "x": 18, "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": [9, 0], "x": 12, "y": 2},
+ {"matrix": [9, 1], "x": 13, "y": 2},
+ {"matrix": [9, 2], "x": 14, "y": 2},
+ {"matrix": [9, 3], "x": 15, "y": 2},
+ {"matrix": [9, 4], "x": 16, "y": 2},
+ {"matrix": [9, 5], "x": 17, "y": 2},
+ {"matrix": [9, 6], "x": 18, "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": [10, 0], "x": 12, "y": 3},
+ {"matrix": [10, 1], "x": 13, "y": 3},
+ {"matrix": [10, 2], "x": 14, "y": 3},
+ {"matrix": [10, 3], "x": 15, "y": 3},
+ {"matrix": [10, 4], "x": 16, "y": 3},
+ {"matrix": [10, 5], "x": 17, "y": 3},
+ {"matrix": [10, 6], "x": 18, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+ {"matrix": [4, 6], "x": 6, "y": 4},
+
+ {"matrix": [11, 0], "x": 12, "y": 4},
+ {"matrix": [11, 1], "x": 13, "y": 4},
+ {"matrix": [11, 2], "x": 14, "y": 4},
+ {"matrix": [11, 3], "x": 15, "y": 4},
+ {"matrix": [11, 4], "x": 16, "y": 4},
+ {"matrix": [11, 5], "x": 17, "y": 4},
+ {"matrix": [11, 6], "x": 18, "y": 4},
+
+ {"matrix": [5, 3], "x": 3, "y": 5},
+ {"matrix": [5, 4], "x": 4, "y": 5},
+
+ {"matrix": [12, 2], "x": 14, "y": 5},
+ {"matrix": [12, 3], "x": 15, "y": 5},
+
+ {"matrix": [5, 5], "x": 5, "y": 6},
+ {"matrix": [5, 6], "x": 6, "y": 6},
+
+ {"matrix": [12, 0], "x": 12, "y": 6},
+ {"matrix": [12, 1], "x": 13, "y": 6},
+
+ {"matrix": [6, 5], "x": 7, "y": 7},
+ {"matrix": [6, 6], "x": 8, "y": 7},
+
+ {"matrix": [13, 0], "x": 10, "y": 7},
+ {"matrix": [13, 1], "x": 11, "y": 7},
+
+ {"matrix": [6, 3], "x": 7, "y": 8},
+ {"matrix": [6, 4], "x": 8, "y": 8},
+
+ {"matrix": [13, 2], "x": 10, "y": 8},
+ {"matrix": [13, 3], "x": 11, "y": 8}
]
}
}
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/62key.h b/keyboards/handwired/dactyl_manuform/dmote/62key/62key.h
deleted file mode 100644
index 673164b424..0000000000
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/62key.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// This uses the same coordinate system as the program that defines
-// the case model, but not the same coordinates.
-// Numbers increase going to the right and away from the user on the
-// right-hand side of the keyboard. This is mirrored for the
-// left-hand side.
-// The matrix is constructed for ease of soldering, with the columns
-// of the thumb cluster extending along the sides of the finger
-// cluster so that everything can be contained in a 6x6 pattern.
-
-#define LAYOUT_62key( \
- LA_20, LA_10, LF_35, LF_25, LF_15, LF_05, \
- LF_55, LF_45, LF_34, LF_24, LF_14, LF_04, \
- LF_54, LF_44, LF_33, LF_23, LF_13, LF_03, \
- LF_53, LF_43, LF_32, LF_22, LF_12, \
- LF_21, LT_21, LT_22, \
- LT_10, LT_11, LT_12, \
- LT_01, LT_02, \
-\
- RF_05, RF_15, RF_25, RF_35, RA_10, RA_20, \
- RF_04, RF_14, RF_24, RF_34, RF_45, RF_55, \
- RF_03, RF_13, RF_23, RF_33, RF_44, RF_54, \
- RF_12, RF_22, RF_32, RF_43, RF_53, \
- RT_22, RT_21, RF_21, \
- RT_12, RT_11, RT_10, \
- RT_02, RT_01 \
-) { \
- { LA_20, LA_10, LF_35, LF_25, LF_15, LF_05 }, \
- { LF_55, LF_45, LF_34, LF_24, LF_14, LF_04 }, \
- { LF_54, LF_44, LF_33, LF_23, LF_13, LF_03 }, \
- { LF_53, LF_43, LF_32, LF_22, LF_12, LT_22 }, \
- { KC_NO, KC_NO, LT_21, LF_21, LT_11, LT_12 }, \
- { KC_NO, KC_NO, LT_10, KC_NO, LT_01, LT_02 }, \
-\
- { RA_20, RA_10, RF_35, RF_25, RF_15, RF_05 }, \
- { RF_55, RF_45, RF_34, RF_24, RF_14, RF_04 }, \
- { RF_54, RF_44, RF_33, RF_23, RF_13, RF_03 }, \
- { RF_53, RF_43, RF_32, RF_22, RF_12, RT_22 }, \
- { KC_NO, KC_NO, RT_21, RF_21, RT_11, RT_12 }, \
- { KC_NO, KC_NO, RT_10, KC_NO, RT_01, RT_02 } \
-}
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/info.json b/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
index 4d50af4668..c2a818bde2 100644
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
+++ b/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
@@ -25,81 +25,83 @@
"layouts": {
"LAYOUT_62key": {
"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},
+ {"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},
- {"x": 0, "y": 1},
- {"x": 1, "y": 1},
- {"x": 2, "y": 1},
- {"x": 3, "y": 1},
- {"x": 4, "y": 1},
- {"x": 5, "y": 1},
+ {"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},
- {"x": 0, "y": 2},
- {"x": 1, "y": 2},
- {"x": 2, "y": 2},
- {"x": 3, "y": 2},
- {"x": 4, "y": 2},
- {"x": 5, "y": 2},
+ {"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},
- {"x": 0, "y": 3},
- {"x": 1, "y": 3},
- {"x": 2, "y": 3},
- {"x": 3, "y": 3},
- {"x": 4, "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},
- {"x": 3, "y": 4},
- {"x": 4.5, "y": 4.5},
- {"x": 5.5, "y": 4.5},
+ {"matrix": [4, 3], "x": 3, "y": 4},
- {"x": 4, "y": 5.5},
- {"x": 5, "y": 5.5},
- {"x": 6, "y": 5.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4.5},
+ {"matrix": [3, 5], "x": 5.5, "y": 4.5},
- {"x": 4.5, "y": 6.5},
- {"x": 5.5, "y": 6.5},
+ {"matrix": [5, 2], "x": 4, "y": 5.5},
+ {"matrix": [4, 4], "x": 5, "y": 5.5},
+ {"matrix": [4, 5], "x": 6, "y": 5.5},
- {"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": [5, 4], "x": 4.5, "y": 6.5},
+ {"matrix": [5, 5], "x": 5.5, "y": 6.5},
- {"x": 9, "y": 1},
- {"x": 10, "y": 1},
- {"x": 11, "y": 1},
- {"x": 12, "y": 1},
- {"x": 13, "y": 1},
- {"x": 14, "y": 1},
+ {"matrix": [6, 5], "x": 9, "y": 0},
+ {"matrix": [6, 4], "x": 10, "y": 0},
+ {"matrix": [6, 3], "x": 11, "y": 0},
+ {"matrix": [6, 2], "x": 12, "y": 0},
+ {"matrix": [6, 1], "x": 13, "y": 0},
+ {"matrix": [6, 0], "x": 14, "y": 0},
- {"x": 9, "y": 2},
- {"x": 10, "y": 2},
- {"x": 11, "y": 2},
- {"x": 12, "y": 2},
- {"x": 13, "y": 2},
- {"x": 14, "y": 2},
+ {"matrix": [7, 5], "x": 9, "y": 1},
+ {"matrix": [7, 4], "x": 10, "y": 1},
+ {"matrix": [7, 3], "x": 11, "y": 1},
+ {"matrix": [7, 2], "x": 12, "y": 1},
+ {"matrix": [7, 1], "x": 13, "y": 1},
+ {"matrix": [7, 0], "x": 14, "y": 1},
- {"x": 10, "y": 3},
- {"x": 11, "y": 3},
- {"x": 12, "y": 3},
- {"x": 13, "y": 3},
- {"x": 14, "y": 3},
+ {"matrix": [8, 5], "x": 9, "y": 2},
+ {"matrix": [8, 4], "x": 10, "y": 2},
+ {"matrix": [8, 3], "x": 11, "y": 2},
+ {"matrix": [8, 2], "x": 12, "y": 2},
+ {"matrix": [8, 1], "x": 13, "y": 2},
+ {"matrix": [8, 0], "x": 14, "y": 2},
- {"x": 8.5, "y": 4.5},
- {"x": 9.5, "y": 4.5},
- {"x": 11, "y": 4},
+ {"matrix": [9, 4], "x": 10, "y": 3},
+ {"matrix": [9, 3], "x": 11, "y": 3},
+ {"matrix": [9, 2], "x": 12, "y": 3},
+ {"matrix": [9, 1], "x": 13, "y": 3},
+ {"matrix": [9, 0], "x": 14, "y": 3},
- {"x": 8, "y": 5.5},
- {"x": 9, "y": 5.5},
- {"x": 10, "y": 5.5},
+ {"matrix": [9, 5], "x": 8.5, "y": 4.5},
+ {"matrix": [10, 2], "x": 9.5, "y": 4.5},
- {"x": 8.5, "y": 6.5},
- {"x": 9.5, "y": 6.5}
+ {"matrix": [10, 3], "x": 11, "y": 4},
+
+ {"matrix": [10, 5], "x": 8, "y": 5.5},
+ {"matrix": [10, 4], "x": 9, "y": 5.5},
+ {"matrix": [11, 2], "x": 10, "y": 5.5},
+
+ {"matrix": [11, 5], "x": 8.5, "y": 6.5},
+ {"matrix": [11, 4], "x": 9.5, "y": 6.5}
]
}
}
diff --git a/keyboards/handwired/dactyl_promicro/dactyl_promicro.h b/keyboards/handwired/dactyl_promicro/dactyl_promicro.h
deleted file mode 100644
index 3692a85187..0000000000
--- a/keyboards/handwired/dactyl_promicro/dactyl_promicro.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_6x6(\
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
- L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45, \
- L55, L51, L52, R53, R54, R50, \
- L53, R52, \
- L54, R51 \
- )\
- {\
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L30, L31, L32, L33, L34, L35 }, \
- { L40, L41, L42, L43, L44, L45 }, \
- { KC_NO, L51, L52, L53, L54, L55 }, \
-\
- { R00, R01, R02, R03, R04, R05 }, \
- { R10, R11, R12, R13, R14, R15 }, \
- { R20, R21, R22, R23, R24, R25 }, \
- { R30, R31, R32, R33, R34, R35 }, \
- { R40, R41, R42, R43, R44, R45 }, \
- { R50, R51, R52, R53, R54, KC_NO } \
-}
diff --git a/keyboards/handwired/dactyl_promicro/info.json b/keyboards/handwired/dactyl_promicro/info.json
index 10b7d4364a..5f0b4f85a2 100644
--- a/keyboards/handwired/dactyl_promicro/info.json
+++ b/keyboards/handwired/dactyl_promicro/info.json
@@ -24,76 +24,89 @@
"layouts": {
"LAYOUT_6x6": {
"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":"R00", "x":11, "y":0},
- {"label":"R01", "x":12, "y":0},
- {"label":"R02", "x":13, "y":0},
- {"label":"R03", "x":14, "y":0},
- {"label":"R04", "x":15, "y":0},
- {"label":"R05", "x":16, "y":0},
- {"label":"L10", "x":0, "y":1},
- {"label":"L11", "x":1, "y":1},
- {"label":"L12", "x":2, "y":1},
- {"label":"L13", "x":3, "y":1},
- {"label":"L14", "x":4, "y":1},
- {"label":"L15", "x":5, "y":1},
- {"label":"R10", "x":11, "y":1},
- {"label":"R11", "x":12, "y":1},
- {"label":"R12", "x":13, "y":1},
- {"label":"R13", "x":14, "y":1},
- {"label":"R14", "x":15, "y":1},
- {"label":"R15", "x":16, "y":1},
- {"label":"L20", "x":0, "y":2},
- {"label":"L21", "x":1, "y":2},
- {"label":"L22", "x":2, "y":2},
- {"label":"L23", "x":3, "y":2},
- {"label":"L24", "x":4, "y":2},
- {"label":"L25", "x":5, "y":2},
- {"label":"R20", "x":11, "y":2},
- {"label":"R21", "x":12, "y":2},
- {"label":"R22", "x":13, "y":2},
- {"label":"R23", "x":14, "y":2},
- {"label":"R24", "x":15, "y":2},
- {"label":"R25", "x":16, "y":2},
- {"label":"L30", "x":0, "y":3},
- {"label":"L31", "x":1, "y":3},
- {"label":"L32", "x":2, "y":3},
- {"label":"L33", "x":3, "y":3},
- {"label":"L34", "x":4, "y":3},
- {"label":"L35", "x":5, "y":3},
- {"label":"R30", "x":11, "y":3},
- {"label":"R31", "x":12, "y":3},
- {"label":"R32", "x":13, "y":3},
- {"label":"R33", "x":14, "y":3},
- {"label":"R34", "x":15, "y":3},
- {"label":"R35", "x":16, "y":3},
- {"label":"L40", "x":0, "y":4},
- {"label":"L41", "x":1, "y":4},
- {"label":"L42", "x":2, "y":4},
- {"label":"L43", "x":3, "y":4},
- {"label":"L44", "x":4, "y":4},
- {"label":"L45", "x":5, "y":6, "h":2},
- {"label":"R40", "x":11, "y":6, "h":2 },
- {"label":"R41", "x":12, "y":4},
- {"label":"R42", "x":13, "y":4},
- {"label":"R43", "x":14, "y":4},
- {"label":"R44", "x":15, "y":4},
- {"label":"R45", "x":16, "y":4},
- {"label":"L55", "x":6, "y":6, "h":2 },
- {"label":"L51", "x":6, "y":5},
- {"label":"L52", "x":7, "y":5},
- {"label":"R53", "x":9, "y":5},
- {"label":"R54", "x":10, "y":5},
- {"label":"R50", "x":10, "y":6, "h":2 },
- {"label":"L53", "x":7, "y":6},
- {"label":"R52", "x":9, "y":6},
- {"label":"L54", "x":7, "y":7},
- {"label":"R51", "x":9, "y":7}
+ {"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": [6, 0], "x": 11, "y": 0},
+ {"matrix": [6, 1], "x": 12, "y": 0},
+ {"matrix": [6, 2], "x": 13, "y": 0},
+ {"matrix": [6, 3], "x": 14, "y": 0},
+ {"matrix": [6, 4], "x": 15, "y": 0},
+ {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 1},
+ {"matrix": [7, 1], "x": 12, "y": 1},
+ {"matrix": [7, 2], "x": 13, "y": 1},
+ {"matrix": [7, 3], "x": 14, "y": 1},
+ {"matrix": [7, 4], "x": 15, "y": 1},
+ {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 2},
+ {"matrix": [8, 1], "x": 12, "y": 2},
+ {"matrix": [8, 2], "x": 13, "y": 2},
+ {"matrix": [8, 3], "x": 14, "y": 2},
+ {"matrix": [8, 4], "x": 15, "y": 2},
+ {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 3},
+ {"matrix": [9, 1], "x": 12, "y": 3},
+ {"matrix": [9, 2], "x": 13, "y": 3},
+ {"matrix": [9, 3], "x": 14, "y": 3},
+ {"matrix": [9, 4], "x": 15, "y": 3},
+ {"matrix": [9, 5], "x": 16, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 6, "h": 2},
+
+ {"matrix": [10, 0], "x": 11, "y": 6, "h": 2},
+ {"matrix": [10, 1], "x": 12, "y": 4},
+ {"matrix": [10, 2], "x": 13, "y": 4},
+ {"matrix": [10, 3], "x": 14, "y": 4},
+ {"matrix": [10, 4], "x": 15, "y": 4},
+ {"matrix": [10, 5], "x": 16, "y": 4},
+
+ {"matrix": [5, 5], "x": 6, "y": 6, "h": 2},
+ {"matrix": [5, 1], "x": 6, "y": 5},
+ {"matrix": [5, 2], "x": 7, "y": 5},
+
+ {"matrix": [11, 3], "x": 9, "y": 5},
+ {"matrix": [11, 4], "x": 10, "y": 5},
+ {"matrix": [11, 0], "x": 10, "y": 6, "h": 2},
+
+ {"matrix": [5, 3], "x": 7, "y": 6},
+ {"matrix": [11, 2], "x": 9, "y": 6},
+
+ {"matrix": [5, 4], "x": 7, "y": 7},
+ {"matrix": [11, 1], "x": 9, "y": 7}
]
}
}
diff --git a/keyboards/handwired/dactyl_rah/dactyl_rah.h b/keyboards/handwired/dactyl_rah/dactyl_rah.h
deleted file mode 100644
index 27302d3e23..0000000000
--- a/keyboards/handwired/dactyl_rah/dactyl_rah.h
+++ /dev/null
@@ -1,44 +0,0 @@
- /* Copyright 2020 Ralph Azucena <ralphie02@live.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_6x6(\
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
- L40, L41, L42, L43, L44, R41, R42, R43, R44, R45, \
- L55, L54, R51, R50, \
- L53, R52, \
- L50, L51, L52, R53, R54, R55 \
- )\
- {\
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L30, L31, L32, L33, L34, L35 }, \
- { L40, L41, L42, L43, L44, KC_NO }, \
- { L50, L51, L52, L53, L54, L55 }, \
- \
- { R00, R01, R02, R03, R04, R05 }, \
- { R10, R11, R12, R13, R14, R15 }, \
- { R20, R21, R22, R23, R24, R25 }, \
- { R30, R31, R32, R33, R34, R35 }, \
- { KC_NO, R41, R42, R43, R44, R45 }, \
- { R50, R51, R52, R53, R54, R55 } \
-}
diff --git a/keyboards/handwired/dactyl_rah/info.json b/keyboards/handwired/dactyl_rah/info.json
index f683a05eda..9234536a23 100644
--- a/keyboards/handwired/dactyl_rah/info.json
+++ b/keyboards/handwired/dactyl_rah/info.json
@@ -19,79 +19,94 @@
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
- "LAYOUT_6x6": {
- "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":"R00", "x":11, "y":0},
- {"label":"R01", "x":12, "y":0},
- {"label":"R02", "x":13, "y":0},
- {"label":"R03", "x":14, "y":0},
- {"label":"R04", "x":15, "y":0},
- {"label":"R05", "x":16, "y":0},
- {"label":"L10", "x":0, "y":1},
- {"label":"L11", "x":1, "y":1},
- {"label":"L12", "x":2, "y":1},
- {"label":"L13", "x":3, "y":1},
- {"label":"L14", "x":4, "y":1},
- {"label":"L15", "x":5, "y":1},
- {"label":"R10", "x":11, "y":1},
- {"label":"R11", "x":12, "y":1},
- {"label":"R12", "x":13, "y":1},
- {"label":"R13", "x":14, "y":1},
- {"label":"R14", "x":15, "y":1},
- {"label":"R15", "x":16, "y":1},
- {"label":"L20", "x":0, "y":2},
- {"label":"L21", "x":1, "y":2},
- {"label":"L22", "x":2, "y":2},
- {"label":"L23", "x":3, "y":2},
- {"label":"L24", "x":4, "y":2},
- {"label":"L25", "x":5, "y":2},
- {"label":"R20", "x":11, "y":2},
- {"label":"R21", "x":12, "y":2},
- {"label":"R22", "x":13, "y":2},
- {"label":"R23", "x":14, "y":2},
- {"label":"R24", "x":15, "y":2},
- {"label":"R25", "x":16, "y":2},
- {"label":"L30", "x":0, "y":3},
- {"label":"L31", "x":1, "y":3},
- {"label":"L32", "x":2, "y":3},
- {"label":"L33", "x":3, "y":3},
- {"label":"L34", "x":4, "y":3},
- {"label":"L35", "x":5, "y":3},
- {"label":"R30", "x":11, "y":3},
- {"label":"R31", "x":12, "y":3},
- {"label":"R32", "x":13, "y":3},
- {"label":"R33", "x":14, "y":3},
- {"label":"R34", "x":15, "y":3},
- {"label":"R35", "x":16, "y":3},
- {"label":"L40", "x":0, "y":4},
- {"label":"L41", "x":1, "y":4},
- {"label":"L42", "x":2, "y":4},
- {"label":"L43", "x":3, "y":4},
- {"label":"L44", "x":4, "y":4},
- {"label":"R41", "x":12, "y":4},
- {"label":"R42", "x":13, "y":4},
- {"label":"R43", "x":14, "y":4},
- {"label":"R44", "x":15, "y":4},
- {"label":"R45", "x":16, "y":4},
- {"label":"L55", "x":6, "y":5},
- {"label":"L54", "x":7, "y":5},
- {"label":"R51", "x":9, "y":5},
- {"label":"R50", "x":10, "y":5},
- {"label":"L53", "x":7, "y":6},
- {"label":"R52", "x":9, "y":6},
- {"label":"L50", "x":5, "y":7, "h":2},
- {"label":"L51", "x":6, "y":7, "h":2},
- {"label":"L52", "x":7, "y":7},
- {"label":"R53", "x":9, "y":7},
- {"label":"R54", "x":10, "y":7, "h":2},
- {"label":"R55", "x":11, "y":7, "h":2}
- ]
- }
+ "LAYOUT_6x6": {
+ "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": [6, 0], "x": 11, "y": 0},
+ {"matrix": [6, 1], "x": 12, "y": 0},
+ {"matrix": [6, 2], "x": 13, "y": 0},
+ {"matrix": [6, 3], "x": 14, "y": 0},
+ {"matrix": [6, 4], "x": 15, "y": 0},
+ {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 1},
+ {"matrix": [7, 1], "x": 12, "y": 1},
+ {"matrix": [7, 2], "x": 13, "y": 1},
+ {"matrix": [7, 3], "x": 14, "y": 1},
+ {"matrix": [7, 4], "x": 15, "y": 1},
+ {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 2},
+ {"matrix": [8, 1], "x": 12, "y": 2},
+ {"matrix": [8, 2], "x": 13, "y": 2},
+ {"matrix": [8, 3], "x": 14, "y": 2},
+ {"matrix": [8, 4], "x": 15, "y": 2},
+ {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 3},
+ {"matrix": [9, 1], "x": 12, "y": 3},
+ {"matrix": [9, 2], "x": 13, "y": 3},
+ {"matrix": [9, 3], "x": 14, "y": 3},
+ {"matrix": [9, 4], "x": 15, "y": 3},
+ {"matrix": [9, 5], "x": 16, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+
+ {"matrix": [10, 1], "x": 12, "y": 4},
+ {"matrix": [10, 2], "x": 13, "y": 4},
+ {"matrix": [10, 3], "x": 14, "y": 4},
+ {"matrix": [10, 4], "x": 15, "y": 4},
+ {"matrix": [10, 5], "x": 16, "y": 4},
+
+ {"matrix": [5, 5], "x": 6, "y": 5},
+ {"matrix": [5, 4], "x": 7, "y": 5},
+
+ {"matrix": [11, 1], "x": 9, "y": 5},
+ {"matrix": [11, 0], "x": 10, "y": 5},
+
+ {"matrix": [5, 3], "x": 7, "y": 6},
+
+ {"matrix": [11, 2], "x": 9, "y": 6},
+
+ {"matrix": [5, 0], "x": 5, "y": 7, "h": 2},
+ {"matrix": [5, 1], "x": 6, "y": 7, "h": 2},
+ {"matrix": [5, 2], "x": 7, "y": 7},
+
+ {"matrix": [11, 3], "x": 9, "y": 7},
+ {"matrix": [11, 4], "x": 10, "y": 7, "h": 2},
+ {"matrix": [11, 5], "x": 11, "y": 7, "h": 2}
+ ]
+ }
}
}
diff --git a/keyboards/handwired/heisenberg/heisenberg.h b/keyboards/handwired/heisenberg/heisenberg.h
deleted file mode 100644
index df887c2c56..0000000000
--- a/keyboards/handwired/heisenberg/heisenberg.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2019 Arda Kilicdagi
- *
- * 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 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_planck_mit(\
- 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 \
-) \
-{ \
- { 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, k35, k36, k37, k38, k39, k3a } \
-}
diff --git a/keyboards/handwired/heisenberg/info.json b/keyboards/handwired/heisenberg/info.json
index e92e0f7b4b..5b3e000fba 100644
--- a/keyboards/handwired/heisenberg/info.json
+++ b/keyboards/handwired/heisenberg/info.json
@@ -19,57 +19,60 @@
"processor": "atmega32u4",
"bootloader": "caterina",
"community_layouts": ["planck_mit"],
- "layouts": {
- "LAYOUT_planck_mit": {
- "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": 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 }
- ]
+ "layouts": {
+ "LAYOUT_planck_mit": {
+ "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": [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, 6], "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}
+ ]
+ }
}
- }
}
diff --git a/keyboards/handwired/pterodactyl/info.json b/keyboards/handwired/pterodactyl/info.json
index ac0c498da7..213b7aa53b 100644
--- a/keyboards/handwired/pterodactyl/info.json
+++ b/keyboards/handwired/pterodactyl/info.json
@@ -14,90 +14,91 @@
"layouts": {
"LAYOUT_pterodactyl": {
"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},
+ {"matrix": [0, 11], "x": 0, "y": 0},
+ {"matrix": [0, 10], "x": 1, "y": 0},
+ {"matrix": [0, 9], "x": 2, "y": 0},
+ {"matrix": [0, 8], "x": 3, "y": 0},
+ {"matrix": [0, 7], "x": 4, "y": 0},
+ {"matrix": [0, 6], "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":16, "y":0},
+ {"matrix": [0, 5], "x": 11, "y": 0},
+ {"matrix": [0, 4], "x": 12, "y": 0},
+ {"matrix": [0, 3], "x": 13, "y": 0},
+ {"matrix": [0, 2], "x": 14, "y": 0},
+ {"matrix": [0, 1], "x": 15, "y": 0},
+ {"matrix": [0, 0], "x": 16, "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},
+ {"matrix": [1, 11], "x": 0, "y": 1},
+ {"matrix": [1, 10], "x": 1, "y": 1},
+ {"matrix": [1, 9], "x": 2, "y": 1},
+ {"matrix": [1, 8], "x": 3, "y": 1},
+ {"matrix": [1, 7], "x": 4, "y": 1},
+ {"matrix": [1, 6], "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},
+ {"matrix": [1, 5], "x": 11, "y": 1},
+ {"matrix": [1, 4], "x": 12, "y": 1},
+ {"matrix": [1, 3], "x": 13, "y": 1},
+ {"matrix": [1, 2], "x": 14, "y": 1},
+ {"matrix": [1, 1], "x": 15, "y": 1},
+ {"matrix": [1, 0], "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},
+ {"matrix": [2, 11], "x": 0, "y": 2},
+ {"matrix": [2, 10], "x": 1, "y": 2},
+ {"matrix": [2, 9], "x": 2, "y": 2},
+ {"matrix": [2, 8], "x": 3, "y": 2},
+ {"matrix": [2, 7], "x": 4, "y": 2},
+ {"matrix": [2, 6], "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},
+ {"matrix": [2, 5], "x": 11, "y": 2},
+ {"matrix": [2, 4], "x": 12, "y": 2},
+ {"matrix": [2, 3], "x": 13, "y": 2},
+ {"matrix": [2, 2], "x": 14, "y": 2},
+ {"matrix": [2, 1], "x": 15, "y": 2},
+ {"matrix": [2, 0], "x": 16, "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},
+ {"matrix": [3, 11], "x": 0, "y": 3},
+ {"matrix": [3, 10], "x": 1, "y": 3},
+ {"matrix": [3, 9], "x": 2, "y": 3},
+ {"matrix": [3, 8], "x": 3, "y": 3},
+ {"matrix": [3, 7], "x": 4, "y": 3},
+ {"matrix": [3, 6], "x": 5, "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},
+ {"matrix": [3, 5], "x": 11, "y": 3},
+ {"matrix": [3, 4], "x": 12, "y": 3},
+ {"matrix": [3, 3], "x": 13, "y": 3},
+ {"matrix": [3, 2], "x": 14, "y": 3},
+ {"matrix": [3, 1], "x": 15, "y": 3},
+ {"matrix": [3, 0], "x": 16, "y": 3},
- {"x":0, "y":4},
- {"x":1, "y":4},
- {"x":2, "y":4},
- {"x":3, "y":4},
- {"x":4, "y":4},
+ {"matrix": [4, 11], "x": 0, "y": 4},
+ {"matrix": [4, 10], "x": 1, "y": 4},
+ {"matrix": [4, 9], "x": 2, "y": 4},
+ {"matrix": [4, 8], "x": 3, "y": 4},
+ {"matrix": [4, 7], "x": 4, "y": 4},
- {"x":12, "y":4},
- {"x":13, "y":4},
- {"x":14, "y":4},
- {"x":15, "y":4},
- {"x":16, "y":4},
+ {"matrix": [4, 4], "x": 12, "y": 4},
+ {"matrix": [4, 3], "x": 13, "y": 4},
+ {"matrix": [4, 2], "x": 14, "y": 4},
+ {"matrix": [4, 1], "x": 15, "y": 4},
+ {"matrix": [4, 0], "x": 16, "y": 4},
- {"x":6, "y":5},
- {"x":7, "y":5},
+ {"matrix": [5, 11], "x": 6, "y": 5},
+ {"matrix": [5, 10], "x": 7, "y": 5},
- {"x":9, "y":5},
- {"x":10, "y":5},
+ {"matrix": [5, 1], "x": 9, "y": 5},
+ {"matrix": [5, 0], "x": 10, "y": 5},
- {"x":7, "y":6},
- {"x":9, "y":6},
+ {"matrix": [5, 9], "x": 7, "y": 6},
- {"x":5, "y":6, "h":2},
- {"x":6, "y":6, "h":2},
- {"x":7, "y":7},
+ {"matrix": [5, 2], "x": 9, "y": 6},
- {"x":9, "y":7},
- {"x":10, "y":6, "h":2},
- {"x":11, "y":6, "h":2}
+ {"matrix": [4, 6], "x": 5, "y": 6, "h": 2},
+ {"matrix": [5, 7], "x": 6, "y": 6, "h": 2},
+ {"matrix": [5, 8], "x": 7, "y": 7},
+
+ {"matrix": [5, 3], "x": 9, "y": 7},
+ {"matrix": [5, 4], "x": 10, "y": 6, "h": 2},
+ {"matrix": [4, 5], "x": 11, "y": 6, "h": 2}
]
}
}
diff --git a/keyboards/handwired/pterodactyl/matrix.c b/keyboards/handwired/pterodactyl/matrix.c
index c12cf5a322..bc98bdd634 100644
--- a/keyboards/handwired/pterodactyl/matrix.c
+++ b/keyboards/handwired/pterodactyl/matrix.c
@@ -24,7 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "debug.h"
#include "util.h"
#include "matrix.h"
-#include "pterodactyl.h"
#include "i2c_master.h"
#include "timer.h"
diff --git a/keyboards/handwired/pterodactyl/pterodactyl.c b/keyboards/handwired/pterodactyl/pterodactyl.c
index f379569f5a..33f7d4c11a 100644
--- a/keyboards/handwired/pterodactyl/pterodactyl.c
+++ b/keyboards/handwired/pterodactyl/pterodactyl.c
@@ -1,4 +1,4 @@
-#include "pterodactyl.h"
+#include "quantum.h"
#ifdef SWAP_HANDS_ENABLE
__attribute__ ((weak))
diff --git a/keyboards/handwired/pterodactyl/pterodactyl.h b/keyboards/handwired/pterodactyl/pterodactyl.h
deleted file mode 100644
index 7bdc3bc63d..0000000000
--- a/keyboards/handwired/pterodactyl/pterodactyl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-#include <stdint.h>
-#include <stdbool.h>
-#include "i2c_master.h"
-
-/*
- * LEFT HAND: LINES 38-45
- * RIGHT HAND: LINES 47-54
- */
-#define LAYOUT_pterodactyl( \
- \
- 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, k47,k48,k49,k4A,k4B, \
- k55,k50, k5B,k56, \
- k54, k57, \
- k53, k52,k51, k5A,k59,k58 ) \
- \
- /* matrix positions */ \
- { \
- { k0B, k0A, k09, k08, k07, k06, k05, k04, k03, k02, k01, k00 }, \
- { k1B, k1A, k19, k18, k17, k16, k15, k14, k13, k12, k11, k10 }, \
- { k2B, k2A, k29, k28, k27, k26, k25, k24, k23, k22, k21, k20 }, \
- { k3B, k3A, k39, k38, k37, k36, k35, k34, k33, k32, k31, k30 }, \
- { k4B, k4A, k49, k48, k47, k58, k53, k44, k43, k42, k41, k40 }, \
- { k56, k5B, k57, k5A, k59, KC_NO, KC_NO, k52, k51, k54, k50, k55 }, \
- }
- /* for future comers:
- * the weird ass ordering here is because the dactyl/ergo/etc are wired for the
- * chip to be in the right side, mine is not built that way.
- * that last line is not obvious but its due to the way my columns are wired
- * and are different than the dactyl guide.
- * this is to compensate for my build.
- */
diff --git a/keyboards/handwired/skakunm_dactyl/info.json b/keyboards/handwired/skakunm_dactyl/info.json
index 468dbf8494..d36024c67c 100644
--- a/keyboards/handwired/skakunm_dactyl/info.json
+++ b/keyboards/handwired/skakunm_dactyl/info.json
@@ -21,46 +21,54 @@
"layouts": {
"LAYOUT_3x5_5": {
"layout": [
- {"label":"L10", "x":0, "y":0},
- {"label":"L11", "x":1, "y":0},
- {"label":"L12", "x":2, "y":0},
- {"label":"L13", "x":3, "y":0},
- {"label":"L14", "x":4, "y":0},
- {"label":"R13", "x":9, "y":0},
- {"label":"R13", "x":10, "y":0},
- {"label":"R12", "x":11, "y":0},
- {"label":"R11", "x":12, "y":0},
- {"label":"R10", "x":13, "y":0},
- {"label":"L20", "x":0, "y":1},
- {"label":"L21", "x":1, "y":1},
- {"label":"L22", "x":2, "y":1},
- {"label":"L23", "x":3, "y":1},
- {"label":"L24", "x":4, "y":1},
- {"label":"R23", "x":9, "y":1},
- {"label":"R23", "x":10, "y":1},
- {"label":"R22", "x":11, "y":1},
- {"label":"R21", "x":12, "y":1},
- {"label":"R20", "x":13, "y":1},
- {"label":"L30", "x":0, "y":2},
- {"label":"L31", "x":1, "y":2},
- {"label":"L32", "x":2, "y":2},
- {"label":"L33", "x":3, "y":2},
- {"label":"L34", "x":4, "y":2},
- {"label":"R33", "x":9, "y":2},
- {"label":"R33", "x":10, "y":2},
- {"label":"R32", "x":11, "y":2},
- {"label":"R31", "x":12, "y":2},
- {"label":"R30", "x":13, "y":2},
- {"label":"L00", "x":4, "y":3},
- {"label":"L01", "x":5, "y":3},
- {"label":"R01", "x":8, "y":3},
- {"label":"R00", "x":9, "y":3},
- {"label":"L02", "x":4, "y":4},
- {"label":"L03", "x":5, "y":4},
- {"label":"L04", "x":6, "y":4},
- {"label":"R04", "x":7, "y":4},
- {"label":"R03", "x":8, "y":4},
- {"label":"R02", "x":9, "y":4}
+ {"matrix": [2, 4], "x": 0, "y": 0},
+ {"matrix": [2, 3], "x": 1, "y": 0},
+ {"matrix": [2, 2], "x": 2, "y": 0},
+ {"matrix": [2, 1], "x": 3, "y": 0},
+ {"matrix": [2, 0], "x": 4, "y": 0},
+
+ {"matrix": [6, 0], "x": 9, "y": 0},
+ {"matrix": [6, 1], "x": 10, "y": 0},
+ {"matrix": [6, 2], "x": 11, "y": 0},
+ {"matrix": [6, 3], "x": 12, "y": 0},
+ {"matrix": [6, 4], "x": 13, "y": 0},
+
+ {"matrix": [1, 4], "x": 0, "y": 1},
+ {"matrix": [1, 3], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 0], "x": 4, "y": 1},
+
+ {"matrix": [5, 0], "x": 9, "y": 1},
+ {"matrix": [5, 1], "x": 10, "y": 1},
+ {"matrix": [5, 2], "x": 11, "y": 1},
+ {"matrix": [5, 3], "x": 12, "y": 1},
+ {"matrix": [5, 4], "x": 13, "y": 1},
+
+ {"matrix": [0, 4], "x": 0, "y": 2},
+ {"matrix": [0, 3], "x": 1, "y": 2},
+ {"matrix": [0, 2], "x": 2, "y": 2},
+ {"matrix": [0, 1], "x": 3, "y": 2},
+ {"matrix": [0, 0], "x": 4, "y": 2},
+
+ {"matrix": [4, 0], "x": 9, "y": 2},
+ {"matrix": [4, 1], "x": 10, "y": 2},
+ {"matrix": [4, 2], "x": 11, "y": 2},
+ {"matrix": [4, 3], "x": 12, "y": 2},
+ {"matrix": [4, 4], "x": 13, "y": 2},
+
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 3], "x": 5, "y": 3},
+
+ {"matrix": [7, 3], "x": 8, "y": 3},
+ {"matrix": [7, 4], "x": 9, "y": 3},
+
+ {"matrix": [3, 0], "x": 4, "y": 4},
+ {"matrix": [3, 1], "x": 5, "y": 4},
+ {"matrix": [3, 2], "x": 6, "y": 4},
+ {"matrix": [7, 2], "x": 7, "y": 4},
+ {"matrix": [7, 1], "x": 8, "y": 4},
+ {"matrix": [7, 0], "x": 9, "y": 4}
]
}
}
diff --git a/keyboards/handwired/skakunm_dactyl/skakunm_dactyl.h b/keyboards/handwired/skakunm_dactyl/skakunm_dactyl.h
deleted file mode 100644
index fa08dd3bb0..0000000000
--- a/keyboards/handwired/skakunm_dactyl/skakunm_dactyl.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2022 Marko Skakun <skakun.marko@gmail.com>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_3x5_5(\
- L10, L11, L12, L13, L14, R14, R13, R12, R11, R10, \
- L20, L21, L22, L23, L24, R24, R23, R22, R21, R20, \
- L30, L31, L32, L33, L34, R34, R33, R32, R31, R30, \
- L00, L01, R01, R00, \
- L04, L03, L02, R02, R03, R04 \
- )\
- {\
- { L34, L33, L32, L31, L30 }, \
- { L24, L23, L22, L21, L20 }, \
- { L14, L13, L12, L11, L10 }, \
- { L04, L03, L02, L01, L00 }, \
-\
- { R34, R33, R32, R31, R30 }, \
- { R24, R23, R22, R21, R20 }, \
- { R14, R13, R12, R11, R10 }, \
- { R04, R03, R02, R01, R00 }, \
-}
diff --git a/keyboards/handwired/steamvan/rev1/info.json b/keyboards/handwired/steamvan/rev1/info.json
index 054f1845ff..b76753f19f 100644
--- a/keyboards/handwired/steamvan/rev1/info.json
+++ b/keyboards/handwired/steamvan/rev1/info.json
@@ -25,20 +25,213 @@
"bootloader": "stm32-dfu",
"board": "QMK_PROTON_C",
"layouts": {
- "LAYOUT_standard": {
- "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_standard": {
+ "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, 3], "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, 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, 3], "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, 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, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3, "w": 2.25},
+ {"matrix": [3, 6], "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, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3, "w": 2.25},
+ {"matrix": [3, 6], "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/handwired/steamvan/rev1/rev1.h b/keyboards/handwired/steamvan/rev1/rev1.h
deleted file mode 100644
index 1cb72277ff..0000000000
--- a/keyboards/handwired/steamvan/rev1/rev1.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright 2019 Jack Humbert <jmdaly@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"
-
-// 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_standard( \
- 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, K33, K34, K36, 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, KC_NO, K33, K34, KC_NO, K36, KC_NO, 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, K33, K34, K36, 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, KC_NO, K33, K34, KC_NO, K36, KC_NO, 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, K33, K34, K36, 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, K36, KC_NO, 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, K33, K34, K36, 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, K36, KC_NO, K38, K39, K3A, K3B } \
-}
-
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/4x6_right.c b/keyboards/handwired/tractyl_manuform/4x6_right/4x6_right.c
index 7ea4d97472..298060bcb4 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/4x6_right.c
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/4x6_right.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "4x6_right.h"
+#include "tractyl_manuform.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/4x6_right.h b/keyboards/handwired/tractyl_manuform/4x6_right/4x6_right.h
deleted file mode 100644
index ee06096909..0000000000
--- a/keyboards/handwired/tractyl_manuform/4x6_right/4x6_right.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.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 "tractyl_manuform.h"
-
-#define ___ KC_NO
-
-// clang-format off
-#define LAYOUT_4x6_right(\
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L32, L33, R32, R33, \
- L34, L35, R31, \
- L44, L45, R41, \
- L42, L43, R42, R43 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { ___, ___, L32, L33, L34, L35 }, \
- { ___, ___, L42, L43, L44, L45 }, \
- \
- { R00, R01, R02, R03, R04, R05 }, \
- { R10, R11, R12, R13, R14, R15 }, \
- { R20, R21, R22, R23, R24, R25 }, \
- { ___, R31, R32, R33, ___, ___ }, \
- { ___, R41, R42, R43, ___, ___ } \
-}
-// clang-format on
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/info.json b/keyboards/handwired/tractyl_manuform/4x6_right/info.json
index 4d0f97fb42..0a3a77c91d 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/info.json
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/info.json
@@ -28,56 +28,69 @@
"layouts": {
"LAYOUT_4x6_right": {
"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":"R00", "x":11, "y":0},
- {"label":"R01", "x":12, "y":0},
- {"label":"R02", "x":13, "y":0},
- {"label":"R03", "x":14, "y":0},
- {"label":"R04", "x":15, "y":0},
- {"label":"R05", "x":16, "y":0},
- {"label":"L10", "x":0, "y":1},
- {"label":"L11", "x":1, "y":1},
- {"label":"L12", "x":2, "y":1},
- {"label":"L13", "x":3, "y":1},
- {"label":"L14", "x":4, "y":1},
- {"label":"L15", "x":5, "y":1},
- {"label":"R10", "x":11, "y":1},
- {"label":"R11", "x":12, "y":1},
- {"label":"R12", "x":13, "y":1},
- {"label":"R13", "x":14, "y":1},
- {"label":"R14", "x":15, "y":1},
- {"label":"R15", "x":16, "y":1},
- {"label":"L20", "x":0, "y":2},
- {"label":"L21", "x":1, "y":2},
- {"label":"L22", "x":2, "y":2},
- {"label":"L23", "x":3, "y":2},
- {"label":"L24", "x":4, "y":2},
- {"label":"L25", "x":5, "y":2},
- {"label":"R20", "x":11, "y":2},
- {"label":"R21", "x":12, "y":2},
- {"label":"R22", "x":13, "y":2},
- {"label":"R23", "x":14, "y":2},
- {"label":"R24", "x":15, "y":2},
- {"label":"R25", "x":16, "y":2},
- {"label":"L32", "x":2, "y":3},
- {"label":"L33", "x":3, "y":3},
- {"label":"R32", "x":13, "y":3},
- {"label":"R33", "x":14, "y":3},
- {"label":"L34", "x":4, "y":4},
- {"label":"L35", "x":5, "y":4},
- {"label":"R31", "x":12, "y":4},
- {"label":"L44", "x":6, "y":5},
- {"label":"L45", "x":7, "y":5},
- {"label":"R41", "x":10, "y":5},
- {"label":"L42", "x":6, "y":6},
- {"label":"L43", "x":7, "y":6},
- {"label":"R42", "x":9, "y":6},
- {"label":"R43", "x":10, "y":6}
+ {"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": [5, 0], "x": 11, "y": 0},
+ {"matrix": [5, 1], "x": 12, "y": 0},
+ {"matrix": [5, 2], "x": 13, "y": 0},
+ {"matrix": [5, 3], "x": 14, "y": 0},
+ {"matrix": [5, 4], "x": 15, "y": 0},
+ {"matrix": [5, 5], "x": 16, "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": [6, 0], "x": 11, "y": 1},
+ {"matrix": [6, 1], "x": 12, "y": 1},
+ {"matrix": [6, 2], "x": 13, "y": 1},
+ {"matrix": [6, 3], "x": 14, "y": 1},
+ {"matrix": [6, 4], "x": 15, "y": 1},
+ {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 2},
+ {"matrix": [7, 1], "x": 12, "y": 2},
+ {"matrix": [7, 2], "x": 13, "y": 2},
+ {"matrix": [7, 3], "x": 14, "y": 2},
+ {"matrix": [7, 4], "x": 15, "y": 2},
+ {"matrix": [7, 5], "x": 16, "y": 2},
+
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+
+ {"matrix": [8, 2], "x": 13, "y": 3},
+ {"matrix": [8, 3], "x": 14, "y": 3},
+
+ {"matrix": [3, 4], "x": 4, "y": 4},
+ {"matrix": [3, 5], "x": 5, "y": 4},
+
+ {"matrix": [8, 1], "x": 12, "y": 4},
+
+ {"matrix": [4, 4], "x": 6, "y": 5},
+ {"matrix": [4, 5], "x": 7, "y": 5},
+
+ {"matrix": [9, 1], "x": 10, "y": 5},
+
+ {"matrix": [4, 2], "x": 6, "y": 6},
+ {"matrix": [4, 3], "x": 7, "y": 6},
+
+ {"matrix": [9, 2], "x": 9, "y": 6},
+ {"matrix": [9, 3], "x": 10, "y": 6}
]
}
}
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.c b/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.c
index af9cbda49d..0fc79cddb0 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.c
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "5x6_right.h"
+#include "tractyl_manuform.h"
#ifdef SWAP_HANDS_ENABLE
const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.h b/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.h
deleted file mode 100644
index bec356066a..0000000000
--- a/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.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 "tractyl_manuform.h"
-
-#define ___ KC_NO
-
-// clang-format off
-#define LAYOUT_5x6_right(\
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
- L42, L43, R42, R43, \
- L44, L45, R41, \
- L54, L55, R51, \
- L52, L53, R52, R53 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L30, L31, L32, L33, L34, L35 }, \
- { ___, ___, L42, L43, L44, L45 }, \
- { ___, ___, L52, L53, L54, L55 }, \
- \
- { R00, R01, R02, R03, R04, R05 }, \
- { R10, R11, R12, R13, R14, R15 }, \
- { R20, R21, R22, R23, R24, R25 }, \
- { R30, R31, R32, R33, R34, R35 }, \
- { ___, R41, R42, R43, ___, ___ }, \
- { ___, R51, R52, R53, ___, ___ } \
-}
-// clang-format on
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c
index b073cb3c60..10986fd25f 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "5x6_right.h"
+#include "quantum.h"
void keyboard_pre_init_sub(void) { setPinInputHigh(A0); }
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/info.json
index 1ea3e6ab8b..eaaf00bbbd 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/info.json
@@ -12,68 +12,83 @@
"layouts": {
"LAYOUT_5x6_right": {
"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":"R00", "x":11, "y":0},
- {"label":"R01", "x":12, "y":0},
- {"label":"R02", "x":13, "y":0},
- {"label":"R03", "x":14, "y":0},
- {"label":"R04", "x":15, "y":0},
- {"label":"R05", "x":16, "y":0},
- {"label":"L10", "x":0, "y":1},
- {"label":"L11", "x":1, "y":1},
- {"label":"L12", "x":2, "y":1},
- {"label":"L13", "x":3, "y":1},
- {"label":"L14", "x":4, "y":1},
- {"label":"L15", "x":5, "y":1},
- {"label":"R10", "x":11, "y":1},
- {"label":"R11", "x":12, "y":1},
- {"label":"R12", "x":13, "y":1},
- {"label":"R13", "x":14, "y":1},
- {"label":"R14", "x":15, "y":1},
- {"label":"R15", "x":16, "y":1},
- {"label":"L20", "x":0, "y":2},
- {"label":"L21", "x":1, "y":2},
- {"label":"L22", "x":2, "y":2},
- {"label":"L23", "x":3, "y":2},
- {"label":"L24", "x":4, "y":2},
- {"label":"L25", "x":5, "y":2},
- {"label":"R20", "x":11, "y":2},
- {"label":"R21", "x":12, "y":2},
- {"label":"R22", "x":13, "y":2},
- {"label":"R23", "x":14, "y":2},
- {"label":"R24", "x":15, "y":2},
- {"label":"R25", "x":16, "y":2},
- {"label":"L30", "x":0, "y":3},
- {"label":"L31", "x":1, "y":3},
- {"label":"L32", "x":2, "y":3},
- {"label":"L33", "x":3, "y":3},
- {"label":"L34", "x":4, "y":3},
- {"label":"L35", "x":5, "y":3},
- {"label":"R30", "x":11, "y":3},
- {"label":"R31", "x":12, "y":3},
- {"label":"R32", "x":13, "y":3},
- {"label":"R33", "x":14, "y":3},
- {"label":"R34", "x":15, "y":3},
- {"label":"R35", "x":16, "y":3},
- {"label":"L42", "x":2, "y":4},
- {"label":"L43", "x":3, "y":4},
- {"label":"R42", "x":13, "y":4},
- {"label":"R43", "x":14, "y":4},
- {"label":"L44", "x":4, "y":5},
- {"label":"L45", "x":5, "y":5},
- {"label":"R41", "x":12, "y":5},
- {"label":"L54", "x":6, "y":6},
- {"label":"L55", "x":7, "y":6},
- {"label":"R51", "x":10, "y":6},
- {"label":"L52", "x":6, "y":7},
- {"label":"L53", "x":7, "y":7},
- {"label":"R52", "x":9, "y":7},
- {"label":"R53", "x":10, "y":7}
+ {"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": [6, 0], "x": 11, "y": 0},
+ {"matrix": [6, 1], "x": 12, "y": 0},
+ {"matrix": [6, 2], "x": 13, "y": 0},
+ {"matrix": [6, 3], "x": 14, "y": 0},
+ {"matrix": [6, 4], "x": 15, "y": 0},
+ {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 1},
+ {"matrix": [7, 1], "x": 12, "y": 1},
+ {"matrix": [7, 2], "x": 13, "y": 1},
+ {"matrix": [7, 3], "x": 14, "y": 1},
+ {"matrix": [7, 4], "x": 15, "y": 1},
+ {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 2},
+ {"matrix": [8, 1], "x": 12, "y": 2},
+ {"matrix": [8, 2], "x": 13, "y": 2},
+ {"matrix": [8, 3], "x": 14, "y": 2},
+ {"matrix": [8, 4], "x": 15, "y": 2},
+ {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 3},
+ {"matrix": [9, 1], "x": 12, "y": 3},
+ {"matrix": [9, 2], "x": 13, "y": 3},
+ {"matrix": [9, 3], "x": 14, "y": 3},
+ {"matrix": [9, 4], "x": 15, "y": 3},
+ {"matrix": [9, 5], "x": 16, "y": 3},
+
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+
+ {"matrix": [10, 2], "x": 13, "y": 4},
+ {"matrix": [10, 3], "x": 14, "y": 4},
+
+ {"matrix": [4, 4], "x": 4, "y": 5},
+ {"matrix": [4, 5], "x": 5, "y": 5},
+
+ {"matrix": [10, 1], "x": 12, "y": 5},
+
+ {"matrix": [5, 4], "x": 6, "y": 6},
+ {"matrix": [5, 5], "x": 7, "y": 6},
+
+ {"matrix": [11, 1], "x": 10, "y": 6},
+
+ {"matrix": [5, 2], "x": 6, "y": 7},
+ {"matrix": [5, 3], "x": 7, "y": 7},
+
+ {"matrix": [11, 2], "x": 9, "y": 7},
+ {"matrix": [11, 3], "x": 10, "y": 7}
]
}
}
diff --git a/keyboards/handwired/tractyl_manuform/tractyl_manuform.h b/keyboards/handwired/tractyl_manuform/tractyl_manuform.h
index 14e95b8a3d..48020c89bd 100644
--- a/keyboards/handwired/tractyl_manuform/tractyl_manuform.h
+++ b/keyboards/handwired/tractyl_manuform/tractyl_manuform.h
@@ -18,12 +18,6 @@
#include "quantum.h"
-#if defined(KEYBOARD_handwired_tractyl_manuform_5x6_right)
-# include "5x6_right.h"
-#elif defined(KEYBOARD_handwired_tractyl_manuform_4x6_right)
-# include "4x6_right.h"
-#endif
-
enum charybdis_keycodes {
POINTER_DEFAULT_DPI_FORWARD = QK_KB_0,
POINTER_DEFAULT_DPI_REVERSE,
diff --git a/keyboards/handwired/twig/twig50/info.json b/keyboards/handwired/twig/twig50/info.json
index a6a6c2e1a3..9ed5c92d46 100644
--- a/keyboards/handwired/twig/twig50/info.json
+++ b/keyboards/handwired/twig/twig50/info.json
@@ -18,12 +18,62 @@
"board": "QMK_PROTON_C",
"debounce": 8,
"layouts": {
- "LAYOUT_diag_4x14": {
- "layout": [
-{"x":0, "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}, {"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":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":13, "y":2},
-{"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "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":13, "y":3}]
- }
+ "LAYOUT_diag_4x14": {
+ "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, "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},
+ {"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": [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": [2, 13], "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, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "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, 13], "x": 13, "y": 3}
+ ]
+ }
}
- }
+}
diff --git a/keyboards/handwired/twig/twig50/twig50.h b/keyboards/handwired/twig/twig50/twig50.h
deleted file mode 100644
index 771f13e051..0000000000
--- a/keyboards/handwired/twig/twig50/twig50.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2022 Takeshi Noda (nodatk@gmail.com)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT_diag_4x14( \
- K00, 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, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K31, K32, K34, K35, K37, K38, K39, K3A, K3B, K3D \
-) { \
- { K00, ___, 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 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D }, \
- { K30, K31, K32, ___, K34, K35, ___, K37, K38, K39, K3A, K3B, ___, K3D } \
-}
diff --git a/keyboards/hhkb/jp/info.json b/keyboards/hhkb/jp/info.json
index cc05d105bf..589cf98dde 100644
--- a/keyboards/hhkb/jp/info.json
+++ b/keyboards/hhkb/jp/info.json
@@ -13,75 +13,81 @@
"layouts": {
"LAYOUT_jp": {
"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": "BS", "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": "Enter", "x": 13.75, "y": 1, "w": 1.25, "h": 2 },
- { "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": "Shift", "x": 0, "y": 3, "w": 2 },
- { "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": "_", "x": 12, "y": 3 },
- { "label": "\u2191", "x": 13, "y": 3 },
- { "label": "Shift", "x": 14, "y": 3 },
- { "label": "Fn", "x": 0, "y": 4 },
- { "label": "HH", "x": 1.25, "y": 4 },
- { "label": "\u2662", "x": 2.25, "y": 4 },
- { "label": "", "x": 3.25, "y": 4 },
- { "label": "NN", "x": 4.25, "y": 4 },
- { "x": 5.25, "y": 4, "w": 2.5 },
- { "label": "\u25cc", "x": 7.75, "y": 4 },
- { "label": "Kana", "x": 8.75, "y": 4 },
- { "label": "", "x": 9.75, "y": 4 },
- { "label": "Fn", "x": 10.75, "y": 4 },
- { "label": "\u2190", "x": 12, "y": 4 },
- { "label": "\u2193", "x": 13, "y": 4 },
- { "label": "\u2192", "x": 14, "y": 4 }
+ {"matrix": [0, 2], "x": 0, "y": 0},
+ {"matrix": [3, 2], "x": 1, "y": 0},
+ {"matrix": [6, 2], "x": 2, "y": 0},
+ {"matrix": [2, 2], "x": 3, "y": 0},
+ {"matrix": [1, 2], "x": 4, "y": 0},
+ {"matrix": [5, 2], "x": 5, "y": 0},
+ {"matrix": [7, 2], "x": 6, "y": 0},
+ {"matrix": [10, 2], "x": 7, "y": 0},
+ {"matrix": [9, 2], "x": 8, "y": 0},
+ {"matrix": [8, 2], "x": 9, "y": 0},
+ {"matrix": [11, 2], "x": 10, "y": 0},
+ {"matrix": [14, 2], "x": 11, "y": 0},
+ {"matrix": [15, 2], "x": 12, "y": 0},
+ {"matrix": [13, 2], "x": 13, "y": 0},
+ {"matrix": [12, 2], "x": 14, "y": 0},
+
+ {"matrix": [0, 3], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [6, 3], "x": 1.5, "y": 1},
+ {"matrix": [2, 3], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [5, 3], "x": 4.5, "y": 1},
+ {"matrix": [7, 3], "x": 5.5, "y": 1},
+ {"matrix": [10, 3], "x": 6.5, "y": 1},
+ {"matrix": [9, 3], "x": 7.5, "y": 1},
+ {"matrix": [8, 3], "x": 8.5, "y": 1},
+ {"matrix": [11, 3], "x": 9.5, "y": 1},
+ {"matrix": [14, 3], "x": 10.5, "y": 1},
+ {"matrix": [15, 3], "x": 11.5, "y": 1},
+ {"matrix": [13, 3], "x": 12.5, "y": 1},
+ {"matrix": [0, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [6, 6], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 6], "x": 1.75, "y": 2},
+ {"matrix": [1, 6], "x": 2.75, "y": 2},
+ {"matrix": [5, 6], "x": 3.75, "y": 2},
+ {"matrix": [7, 6], "x": 4.75, "y": 2},
+ {"matrix": [10, 6], "x": 5.75, "y": 2},
+ {"matrix": [9, 6], "x": 6.75, "y": 2},
+ {"matrix": [8, 6], "x": 7.75, "y": 2},
+ {"matrix": [11, 6], "x": 8.75, "y": 2},
+ {"matrix": [14, 6], "x": 9.75, "y": 2},
+ {"matrix": [15, 6], "x": 10.75, "y": 2},
+ {"matrix": [13, 6], "x": 11.75, "y": 2},
+ {"matrix": [12, 6], "x": 12.75, "y": 2},
+
+ {"matrix": [0, 5], "x": 0, "y": 3, "w": 2},
+ {"matrix": [6, 5], "x": 2, "y": 3},
+ {"matrix": [2, 5], "x": 3, "y": 3},
+ {"matrix": [1, 5], "x": 4, "y": 3},
+ {"matrix": [5, 5], "x": 5, "y": 3},
+ {"matrix": [7, 5], "x": 6, "y": 3},
+ {"matrix": [10, 5], "x": 7, "y": 3},
+ {"matrix": [9, 5], "x": 8, "y": 3},
+ {"matrix": [8, 5], "x": 9, "y": 3},
+ {"matrix": [11, 5], "x": 10, "y": 3},
+ {"matrix": [14, 5], "x": 11, "y": 3},
+ {"matrix": [15, 5], "x": 12, "y": 3},
+ {"matrix": [13, 5], "x": 13, "y": 3},
+ {"matrix": [12, 5], "x": 14, "y": 3},
+
+ {"matrix": [0, 4], "x": 0, "y": 4},
+
+ {"matrix": [3, 4], "x": 1.25, "y": 4},
+ {"matrix": [6, 4], "x": 2.25, "y": 4},
+ {"matrix": [2, 4], "x": 3.25, "y": 4},
+ {"matrix": [1, 4], "x": 4.25, "y": 4},
+ {"matrix": [7, 4], "x": 5.25, "y": 4, "w": 2.5},
+ {"matrix": [9, 4], "x": 7.75, "y": 4},
+ {"matrix": [8, 4], "x": 8.75, "y": 4},
+ {"matrix": [11, 4], "x": 9.75, "y": 4},
+ {"matrix": [14, 4], "x": 10.75, "y": 4},
+
+ {"matrix": [15, 4], "x": 12, "y": 4},
+ {"matrix": [13, 4], "x": 13, "y": 4},
+ {"matrix": [12, 4], "x": 14, "y": 4}
]
}
}
diff --git a/keyboards/hhkb/jp/jp.h b/keyboards/hhkb/jp/jp.h
deleted file mode 100644
index b243e5546c..0000000000
--- a/keyboards/hhkb/jp/jp.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_jp( \
- K02, K32, K62, K22, K12, K52, K72, KA2, K92, K82, KB2, KE2, KF2, KD2, KC2, \
- K03, K63, K23, K13, K53, K73, KA3, K93, K83, KB3, KE3, KF3, KD3, \
- K06, K66, K26, K16, K56, K76, KA6, K96, K86, KB6, KE6, KF6, KD6, KC6, \
- K05, K65, K25, K15, K55, K75, KA5, K95, K85, KB5, KE5, KF5, KD5, KC5, \
- K04, K34, K64, K24, K14, K74, K94, K84, KB4, KE4, KF4, KD4, KC4) \
-{ \
- { KC_NO, KC_NO, K02, K03, K04, K05, K06, KC_NO }, \
- { KC_NO, KC_NO, K12, K13, K14, K15, K16, KC_NO }, \
- { KC_NO, KC_NO, K22, K23, K24, K25, K26, KC_NO }, \
- { KC_NO, KC_NO, K32, KC_NO, K34, 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, K52, K53, KC_NO, K55, K56, KC_NO }, \
- { KC_NO, KC_NO, K62, K63, K64, K65, K66, KC_NO }, \
- { KC_NO, KC_NO, K72, K73, K74, K75, K76, KC_NO }, \
- { KC_NO, KC_NO, K82, K83, K84, K85, K86, KC_NO }, \
- { KC_NO, KC_NO, K92, K93, K94, K95, K96, KC_NO }, \
- { KC_NO, KC_NO, KA2, KA3, KC_NO, KA5, KA6, KC_NO }, \
- { KC_NO, KC_NO, KB2, KB3, KB4, KB5, KB6, KC_NO }, \
- { KC_NO, KC_NO, KC2, KC_NO, KC4, KC5, KC6, KC_NO }, \
- { KC_NO, KC_NO, KD2, KD3, KD4, KD5, KD6, KC_NO }, \
- { KC_NO, KC_NO, KE2, KE3, KE4, KE5, KE6, KC_NO }, \
- { KC_NO, KC_NO, KF2, KF3, KF4, KF5, KF6, KC_NO } \
-}
diff --git a/keyboards/io_mini1800/info.json b/keyboards/io_mini1800/info.json
index 270da1ea50..94400c2907 100644
--- a/keyboards/io_mini1800/info.json
+++ b/keyboards/io_mini1800/info.json
@@ -23,189 +23,207 @@
"layouts": {
"LAYOUT_625u": {
"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":"Ins", "x":15.25, "y":0},
- {"label":"Home", "x":16.25, "y":0},
- {"label":"Num Lock", "x":17.5, "y":0},
- {"label":"/", "x":18.5, "y":0},
- {"label":"*", "x":19.5, "y":0},
- {"label":"-", "x":20.5, "y":0},
-
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"Q", "x":1.5, "y":1},
- {"label":"W", "x":2.5, "y":1},
- {"label":"E", "x":3.5, "y":1},
- {"label":"R", "x":4.5, "y":1},
- {"label":"T", "x":5.5, "y":1},
- {"label":"Y", "x":6.5, "y":1},
- {"label":"U", "x":7.5, "y":1},
- {"label":"I", "x":8.5, "y":1},
- {"label":"O", "x":9.5, "y":1},
- {"label":"P", "x":10.5, "y":1},
- {"label":"{", "x":11.5, "y":1},
- {"label":"}", "x":12.5, "y":1},
- {"label":"|", "x":13.5, "y":1, "w":1.5},
- {"label":"End", "x":15.25, "y":1},
- {"label":"Del", "x":16.25, "y":1},
- {"label":"7", "x":17.5, "y":1},
- {"label":"8", "x":18.5, "y":1},
- {"label":"9", "x":19.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":"Enter", "x":12.75, "y":2, "w":2.25},
- {"label":"4", "x":17.5, "y":2},
- {"label":"5", "x":18.5, "y":2},
- {"label":"6", "x":19.5, "y":2},
- {"label":"+", "x":20.5, "y":1, "h":2},
-
- {"label":"Shift", "x":0, "y":3, "w":2.25},
- {"label":"Z", "x":2.25, "y":3},
- {"label":"X", "x":3.25, "y":3},
- {"label":"C", "x":4.25, "y":3},
- {"label":"V", "x":5.25, "y":3},
- {"label":"B", "x":6.25, "y":3},
- {"label":"N", "x":7.25, "y":3},
- {"label":"M", "x":8.25, "y":3},
- {"label":"<", "x":9.25, "y":3},
- {"label":">", "x":10.25, "y":3},
- {"label":"?", "x":11.25, "y":3},
- {"label":"Shift", "x":12.25, "y":3, "w":2.75},
- {"label":"Up", "x":15.75, "y":3.5},
- {"label":"1", "x":17.5, "y":3},
- {"label":"2", "x":18.5, "y":3},
- {"label":"3", "x":19.5, "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.5},
- {"label":"Win", "x":11.5, "y":4, "w":1.25},
- {"label":"Fn", "x":12.75, "y":4, "w":1.25},
- {"label":"Left", "x":14.75, "y":4.5},
- {"label":"Down", "x":15.75, "y":4.5},
- {"label":"Right", "x":16.75, "y":4.5},
- {"label":"0", "x":18.5, "y":4},
- {"label":".", "x":19.5, "y":4},
- {"label":"Enter", "x":20.5, "y":3, "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": 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": [5, 9], "x": 10, "y": 0},
+ {"matrix": [5, 8], "x": 11, "y": 0},
+ {"matrix": [5, 7], "x": 12, "y": 0},
+ {"matrix": [5, 6], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [5, 5], "x": 15.25, "y": 0},
+ {"matrix": [5, 4], "x": 16.25, "y": 0},
+
+ {"matrix": [5, 3], "x": 17.5, "y": 0},
+ {"matrix": [5, 2], "x": 18.5, "y": 0},
+ {"matrix": [5, 1], "x": 19.5, "y": 0},
+ {"matrix": [5, 0], "x": 20.5, "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": [6, 9], "x": 10.5, "y": 1},
+ {"matrix": [6, 8], "x": 11.5, "y": 1},
+ {"matrix": [6, 7], "x": 12.5, "y": 1},
+ {"matrix": [6, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [6, 5], "x": 15.25, "y": 1},
+ {"matrix": [6, 4], "x": 16.25, "y": 1},
+
+ {"matrix": [6, 3], "x": 17.5, "y": 1},
+ {"matrix": [6, 2], "x": 18.5, "y": 1},
+ {"matrix": [6, 1], "x": 19.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": [7, 9], "x": 10.75, "y": 2},
+ {"matrix": [7, 8], "x": 11.75, "y": 2},
+ {"matrix": [7, 7], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [7, 3], "x": 17.5, "y": 2},
+ {"matrix": [7, 2], "x": 18.5, "y": 2},
+ {"matrix": [7, 1], "x": 19.5, "y": 2},
+ {"matrix": [7, 0], "x": 20.5, "y": 1, "h": 2},
+
+ {"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": [8, 9], "x": 11.25, "y": 3},
+ {"matrix": [8, 8], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [8, 5], "x": 15.75, "y": 3.5},
+
+ {"matrix": [8, 3], "x": 17.5, "y": 3},
+ {"matrix": [8, 2], "x": 18.5, "y": 3},
+ {"matrix": [8, 1], "x": 19.5, "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.5},
+ {"matrix": [9, 9], "x": 11.5, "y": 4, "w": 1.25},
+ {"matrix": [9, 8], "x": 12.75, "y": 4, "w": 1.25},
+
+ {"matrix": [9, 6], "x": 14.75, "y": 4.5},
+ {"matrix": [9, 5], "x": 15.75, "y": 4.5},
+ {"matrix": [9, 4], "x": 16.75, "y": 4.5},
+
+ {"matrix": [9, 2], "x": 18.5, "y": 4},
+ {"matrix": [9, 1], "x": 19.5, "y": 4},
+ {"matrix": [9, 0], "x": 20.5, "y": 3, "h": 2}
]
},
"LAYOUT_2x3u": {
"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":"Ins", "x":15.25, "y":0},
- {"label":"Home", "x":16.25, "y":0},
- {"label":"Num Lock", "x":17.5, "y":0},
- {"label":"/", "x":18.5, "y":0},
- {"label":"*", "x":19.5, "y":0},
- {"label":"-", "x":20.5, "y":0},
-
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"Q", "x":1.5, "y":1},
- {"label":"W", "x":2.5, "y":1},
- {"label":"E", "x":3.5, "y":1},
- {"label":"R", "x":4.5, "y":1},
- {"label":"T", "x":5.5, "y":1},
- {"label":"Y", "x":6.5, "y":1},
- {"label":"U", "x":7.5, "y":1},
- {"label":"I", "x":8.5, "y":1},
- {"label":"O", "x":9.5, "y":1},
- {"label":"P", "x":10.5, "y":1},
- {"label":"{", "x":11.5, "y":1},
- {"label":"}", "x":12.5, "y":1},
- {"label":"|", "x":13.5, "y":1, "w":1.5},
- {"label":"End", "x":15.25, "y":1},
- {"label":"Del", "x":16.25, "y":1},
- {"label":"7", "x":17.5, "y":1},
- {"label":"8", "x":18.5, "y":1},
- {"label":"9", "x":19.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":"Enter", "x":12.75, "y":2, "w":2.25},
- {"label":"4", "x":17.5, "y":2},
- {"label":"5", "x":18.5, "y":2},
- {"label":"6", "x":19.5, "y":2},
- {"label":"+", "x":20.5, "y":1, "h":2},
-
- {"label":"Shift", "x":0, "y":3, "w":2.25},
- {"label":"Z", "x":2.25, "y":3},
- {"label":"X", "x":3.25, "y":3},
- {"label":"C", "x":4.25, "y":3},
- {"label":"V", "x":5.25, "y":3},
- {"label":"B", "x":6.25, "y":3},
- {"label":"N", "x":7.25, "y":3},
- {"label":"M", "x":8.25, "y":3},
- {"label":"<", "x":9.25, "y":3},
- {"label":">", "x":10.25, "y":3},
- {"label":"?", "x":11.25, "y":3},
- {"label":"Shift", "x":12.25, "y":3, "w":2.75},
- {"label":"Up", "x":15.75, "y":3.5},
- {"label":"1", "x":17.5, "y":3},
- {"label":"2", "x":18.5, "y":3},
- {"label":"3", "x":19.5, "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":3},
- {"x":6.75, "y":4, "w":3},
- {"label":"Alt", "x":9.75, "y":4, "w":1.5},
- {"label":"Win", "x":11.25, "y":4, "w":1.5},
- {"label":"Fn", "x":12.75, "y":4, "w":1.25},
- {"label":"Left", "x":14.75, "y":4.5},
- {"label":"Down", "x":15.75, "y":4.5},
- {"label":"Right", "x":16.75, "y":4.5},
- {"label":"0", "x":18.5, "y":4},
- {"label":".", "x":19.5, "y":4},
- {"label":"Enter", "x":20.5, "y":3, "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": 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": [5, 9], "x": 10, "y": 0},
+ {"matrix": [5, 8], "x": 11, "y": 0},
+ {"matrix": [5, 7], "x": 12, "y": 0},
+ {"matrix": [5, 6], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [5, 5], "x": 15.25, "y": 0},
+ {"matrix": [5, 4], "x": 16.25, "y": 0},
+
+ {"matrix": [5, 3], "x": 17.5, "y": 0},
+ {"matrix": [5, 2], "x": 18.5, "y": 0},
+ {"matrix": [5, 1], "x": 19.5, "y": 0},
+ {"matrix": [5, 0], "x": 20.5, "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": [6, 9], "x": 10.5, "y": 1},
+ {"matrix": [6, 8], "x": 11.5, "y": 1},
+ {"matrix": [6, 7], "x": 12.5, "y": 1},
+ {"matrix": [6, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [6, 5], "x": 15.25, "y": 1},
+ {"matrix": [6, 4], "x": 16.25, "y": 1},
+
+ {"matrix": [6, 3], "x": 17.5, "y": 1},
+ {"matrix": [6, 2], "x": 18.5, "y": 1},
+ {"matrix": [6, 1], "x": 19.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": [7, 9], "x": 10.75, "y": 2},
+ {"matrix": [7, 8], "x": 11.75, "y": 2},
+ {"matrix": [7, 7], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [7, 3], "x": 17.5, "y": 2},
+ {"matrix": [7, 2], "x": 18.5, "y": 2},
+ {"matrix": [7, 1], "x": 19.5, "y": 2},
+ {"matrix": [7, 0], "x": 20.5, "y": 1, "h": 2},
+
+ {"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": [8, 9], "x": 11.25, "y": 3},
+ {"matrix": [8, 8], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [8, 5], "x": 15.75, "y": 3.5},
+
+ {"matrix": [8, 3], "x": 17.5, "y": 3},
+ {"matrix": [8, 2], "x": 18.5, "y": 3},
+ {"matrix": [8, 1], "x": 19.5, "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": 3},
+ {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 3},
+ {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.5},
+ {"matrix": [9, 9], "x": 11.25, "y": 4, "w": 1.5},
+ {"matrix": [9, 8], "x": 12.75, "y": 4, "w": 1.25},
+
+ {"matrix": [9, 6], "x": 14.75, "y": 4.5},
+ {"matrix": [9, 5], "x": 15.75, "y": 4.5},
+ {"matrix": [9, 4], "x": 16.75, "y": 4.5},
+
+ {"matrix": [9, 2], "x": 18.5, "y": 4},
+ {"matrix": [9, 1], "x": 19.5, "y": 4},
+ {"matrix": [9, 0], "x": 20.5, "y": 3, "h": 2}
]
}
}
diff --git a/keyboards/io_mini1800/io_mini1800.c b/keyboards/io_mini1800/io_mini1800.c
deleted file mode 100644
index 7f148a3927..0000000000
--- a/keyboards/io_mini1800/io_mini1800.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 s8erdude (@jpuerto96)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "io_mini1800.h"
diff --git a/keyboards/io_mini1800/io_mini1800.h b/keyboards/io_mini1800/io_mini1800.h
deleted file mode 100644
index 634592d62c..0000000000
--- a/keyboards/io_mini1800/io_mini1800.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2022 s8erdude (@jpuerto96)
-// 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_2x3u( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k59, k58, k57, k56, k55, k54, k53, k52, k51, k50, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k69, k68, k67, k66, k65, k64, k63, k62, k61, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k79, k78, k77, k73, k72, k71, k70, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k89, k88, k85, k83, k82, k81, \
- k40, k41, k42, k43, k46, k49, k99, k98, k96, k95, k94, k92, k91, k90 \
-) { \
- { 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, KC_NO, KC_NO, k46, KC_NO, KC_NO, k49 }, \
- { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 }, \
- { KC_NO, k61, k62, k63, k64, k65, k66, k67, k68, k69 }, \
- { k70, k71, k72, k73, KC_NO, KC_NO, KC_NO, k77, k78, k79 }, \
- { KC_NO, k81, k82, k83, KC_NO, k85, KC_NO, KC_NO, k88, k89 }, \
- { k90, k91, k92, KC_NO, k94, k95, k96, KC_NO, k98, k99 } \
-}
-
-#define LAYOUT_625u( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k59, k58, k57, k56, k55, k54, k53, k52, k51, k50, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k69, k68, k67, k66, k65, k64, k63, k62, k61, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k79, k78, k77, k73, k72, k71, k70, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k89, k88, k85, k83, k82, k81, \
- k40, k41, k42, k45, k49, k99, k98, k96, k95, k94, k92, k91, k90 \
-) { \
- { 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, KC_NO, KC_NO, k45, KC_NO, KC_NO, KC_NO, k49 }, \
- { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 }, \
- { KC_NO, k61, k62, k63, k64, k65, k66, k67, k68, k69 }, \
- { k70, k71, k72, k73, KC_NO, KC_NO, KC_NO, k77, k78, k79 }, \
- { KC_NO, k81, k82, k83, KC_NO, k85, KC_NO, KC_NO, k88, k89 }, \
- { k90, k91, k92, KC_NO, k94, k95, k96, KC_NO, k98, k99 } \
-}
diff --git a/keyboards/jacky_studio/bear_65/rev2/info.json b/keyboards/jacky_studio/bear_65/rev2/info.json
index c6565255ed..6ee4f53c22 100644
--- a/keyboards/jacky_studio/bear_65/rev2/info.json
+++ b/keyboards/jacky_studio/bear_65/rev2/info.json
@@ -35,308 +35,353 @@
"layouts": {
"LAYOUT_wk_full": {
"layout": [
- {"label":"Esc", "x":0.5, "y":0},
- {"label":"~", "x":1.75, "y":0},
- {"label":"!", "x":2.75, "y":0},
- {"label":"@", "x":3.75, "y":0},
- {"label":"#", "x":4.75, "y":0},
- {"label":"$", "x":5.75, "y":0},
- {"label":"%", "x":6.75, "y":0},
- {"label":"^", "x":7.75, "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":"_", "x":15.25, "y":0},
- {"label":"+", "x":16.25, "y":0},
- {"label":"|", "x":17.25, "y":0},
- {"label":"~", "x":18.25, "y":0},
- {"label":"Del", "x":19.75, "y":0},
-
- {"label":"PgUp", "x":0.25, "y":1},
- {"label":"Tab", "x":1.75, "y":1, "w":1.5},
- {"label":"Q", "x":3.25, "y":1},
- {"label":"W", "x":4.25, "y":1},
- {"label":"E", "x":5.25, "y":1},
- {"label":"R", "x":6.25, "y":1},
- {"label":"T", "x":7.25, "y":1},
- {"label":"Y", "x":10.75, "y":1},
- {"label":"U", "x":11.75, "y":1},
- {"label":"I", "x":12.75, "y":1},
- {"label":"O", "x":13.75, "y":1},
- {"label":"P", "x":14.75, "y":1},
- {"label":"{", "x":15.75, "y":1},
- {"label":"}", "x":16.75, "y":1},
- {"label":"Backspace", "x":17.75, "y":1, "w":1.5},
-
- {"label":"PgDn", "x":0, "y":2},
- {"label":"Caps Lock", "x":1.75, "y":2, "w":1.75},
- {"label":"A", "x":3.5, "y":2},
- {"label":"S", "x":4.5, "y":2},
- {"label":"D", "x":5.5, "y":2},
- {"label":"F", "x":6.5, "y":2},
- {"label":"G", "x":7.5, "y":2},
- {"label":"H", "x":11, "y":2},
- {"label":"J", "x":12, "y":2},
- {"label":"K", "x":13, "y":2},
- {"label":"L", "x":14, "y":2},
- {"label":":", "x":15, "y":2},
- {"label":"\"", "x":16, "y":2},
- {"label":"Enter", "x":17, "y":2, "w":2.25},
-
- {"label":"Shift", "x":1.75, "y":3, "w":2.25},
- {"label":"Z", "x":4, "y":3},
- {"label":"X", "x":5, "y":3},
- {"label":"C", "x":6, "y":3},
- {"label":"V", "x":7, "y":3},
- {"label":"B", "x":8, "y":3},
- {"label":"B", "x":10.5, "y":3},
- {"label":"N", "x":11.5, "y":3},
- {"label":"M", "x":12.5, "y":3},
- {"label":"<", "x":13.5, "y":3},
- {"label":">", "x":14.5, "y":3},
- {"label":"?", "x":15.5, "y":3},
- {"label":"Shift", "x":16.5, "y":3, "w":1.75},
- {"label":"Up", "x":18.25, "y":3},
-
- {"label":"Ctrl", "x":1.75, "y":4, "w":1.25},
- {"label":"Super", "x":3, "y":4},
- {"label":"Alt", "x":4, "y":4, "w":1.25},
- {"x":5.25, "y":4, "w":2.25},
- {"label":"Fn", "x":8.25, "y":4},
- {"x":11, "y":4, "w":2.75},
- {"label":"Alt", "x":13.75, "y":4, "w":1.25},
- {"label":"Ctrl", "x":15, "y":4},
- {"label":"Left", "x":17.25, "y":4},
- {"label":"Down", "x":18.25, "y":4},
- {"label":"Right", "x":19.25, "y":4}]
+ {"matrix": [3, 1], "x": 0.5, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.75, "y": 0},
+ {"matrix": [0, 1], "x": 2.75, "y": 0},
+ {"matrix": [0, 2], "x": 3.75, "y": 0},
+ {"matrix": [0, 3], "x": 4.75, "y": 0},
+ {"matrix": [0, 4], "x": 5.75, "y": 0},
+ {"matrix": [0, 5], "x": 6.75, "y": 0},
+ {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+ {"matrix": [0, 7], "x": 11.25, "y": 0},
+ {"matrix": [0, 8], "x": 12.25, "y": 0},
+ {"matrix": [0, 9], "x": 13.25, "y": 0},
+ {"matrix": [0, 10], "x": 14.25, "y": 0},
+ {"matrix": [0, 11], "x": 15.25, "y": 0},
+ {"matrix": [0, 12], "x": 16.25, "y": 0},
+ {"matrix": [0, 13], "x": 17.25, "y": 0},
+ {"matrix": [0, 14], "x": 18.25, "y": 0},
+
+ {"matrix": [4, 14], "x": 19.75, "y": 0},
+
+ {"matrix": [1, 14], "x": 0.25, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3.25, "y": 1},
+ {"matrix": [1, 2], "x": 4.25, "y": 1},
+ {"matrix": [1, 3], "x": 5.25, "y": 1},
+ {"matrix": [1, 4], "x": 6.25, "y": 1},
+ {"matrix": [1, 5], "x": 7.25, "y": 1},
+
+ {"matrix": [1, 6], "x": 10.75, "y": 1},
+ {"matrix": [1, 7], "x": 11.75, "y": 1},
+ {"matrix": [1, 8], "x": 12.75, "y": 1},
+ {"matrix": [1, 9], "x": 13.75, "y": 1},
+ {"matrix": [1, 10], "x": 14.75, "y": 1},
+ {"matrix": [1, 11], "x": 15.75, "y": 1},
+ {"matrix": [1, 12], "x": 16.75, "y": 1},
+ {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.5, "y": 2},
+ {"matrix": [2, 2], "x": 4.5, "y": 2},
+ {"matrix": [2, 3], "x": 5.5, "y": 2},
+ {"matrix": [2, 4], "x": 6.5, "y": 2},
+ {"matrix": [2, 5], "x": 7.5, "y": 2},
+
+ {"matrix": [2, 6], "x": 11, "y": 2},
+ {"matrix": [2, 7], "x": 12, "y": 2},
+ {"matrix": [2, 8], "x": 13, "y": 2},
+ {"matrix": [2, 9], "x": 14, "y": 2},
+ {"matrix": [2, 10], "x": 15, "y": 2},
+ {"matrix": [2, 11], "x": 16, "y": 2},
+ {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 4, "y": 3},
+ {"matrix": [3, 3], "x": 5, "y": 3},
+ {"matrix": [3, 4], "x": 6, "y": 3},
+ {"matrix": [3, 5], "x": 7, "y": 3},
+ {"matrix": [3, 6], "x": 8, "y": 3},
+
+ {"matrix": [3, 7], "x": 10.5, "y": 3},
+ {"matrix": [3, 8], "x": 11.5, "y": 3},
+ {"matrix": [3, 9], "x": 12.5, "y": 3},
+ {"matrix": [3, 10], "x": 13.5, "y": 3},
+ {"matrix": [3, 11], "x": 14.5, "y": 3},
+ {"matrix": [3, 12], "x": 15.5, "y": 3},
+ {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 18.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 3, "y": 4},
+ {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8.25, "y": 4},
+
+ {"matrix": [4, 8], "x": 11, "y": 4, "w": 2.75},
+ {"matrix": [4, 9], "x": 13.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 15, "y": 4},
+
+ {"matrix": [4, 11], "x": 17.25, "y": 4},
+ {"matrix": [4, 12], "x": 18.25, "y": 4},
+ {"matrix": [4, 13], "x": 19.25, "y": 4}
+ ]
},
"LAYOUT_wkl_full": {
"layout": [
- {"label":"Esc", "x":0.5, "y":0},
- {"label":"~", "x":1.75, "y":0},
- {"label":"!", "x":2.75, "y":0},
- {"label":"@", "x":3.75, "y":0},
- {"label":"#", "x":4.75, "y":0},
- {"label":"$", "x":5.75, "y":0},
- {"label":"%", "x":6.75, "y":0},
- {"label":"^", "x":7.75, "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":"_", "x":15.25, "y":0},
- {"label":"+", "x":16.25, "y":0},
- {"label":"|", "x":17.25, "y":0},
- {"label":"~", "x":18.25, "y":0},
- {"label":"Del", "x":19.75, "y":0},
-
- {"label":"PgUp", "x":0.25, "y":1},
- {"label":"Tab", "x":1.75, "y":1, "w":1.5},
- {"label":"Q", "x":3.25, "y":1},
- {"label":"W", "x":4.25, "y":1},
- {"label":"E", "x":5.25, "y":1},
- {"label":"R", "x":6.25, "y":1},
- {"label":"T", "x":7.25, "y":1},
- {"label":"Y", "x":10.75, "y":1},
- {"label":"U", "x":11.75, "y":1},
- {"label":"I", "x":12.75, "y":1},
- {"label":"O", "x":13.75, "y":1},
- {"label":"P", "x":14.75, "y":1},
- {"label":"{", "x":15.75, "y":1},
- {"label":"}", "x":16.75, "y":1},
- {"label":"Backspace", "x":17.75, "y":1, "w":1.5},
-
- {"label":"PgDn", "x":0, "y":2},
- {"label":"Caps Lock", "x":1.75, "y":2, "w":1.75},
- {"label":"A", "x":3.5, "y":2},
- {"label":"S", "x":4.5, "y":2},
- {"label":"D", "x":5.5, "y":2},
- {"label":"F", "x":6.5, "y":2},
- {"label":"G", "x":7.5, "y":2},
- {"label":"H", "x":11, "y":2},
- {"label":"J", "x":12, "y":2},
- {"label":"K", "x":13, "y":2},
- {"label":"L", "x":14, "y":2},
- {"label":":", "x":15, "y":2},
- {"label":"\"", "x":16, "y":2},
- {"label":"Enter", "x":17, "y":2, "w":2.25},
-
- {"label":"Shift", "x":1.75, "y":3, "w":2.25},
- {"label":"Z", "x":4, "y":3},
- {"label":"X", "x":5, "y":3},
- {"label":"C", "x":6, "y":3},
- {"label":"V", "x":7, "y":3},
- {"label":"B", "x":8, "y":3},
- {"label":"B", "x":10.5, "y":3},
- {"label":"N", "x":11.5, "y":3},
- {"label":"M", "x":12.5, "y":3},
- {"label":"<", "x":13.5, "y":3},
- {"label":">", "x":14.5, "y":3},
- {"label":"?", "x":15.5, "y":3},
- {"label":"Shift", "x":16.5, "y":3, "w":1.75},
- {"label":"Up", "x":18.25, "y":3},
-
- {"label":"Ctrl", "x":1.75, "y":4, "w":1.25},
- {"label":"Alt", "x":3, "y":4},
- {"x":5.25, "y":4, "w":2.25},
- {"label":"Fn", "x":8.25, "y":4},
- {"x":11, "y":4, "w":2.75},
- {"label":"Alt", "x":13.75, "y":4, "w":1.25},
- {"label":"Left", "x":17.25, "y":4},
- {"label":"Down", "x":18.25, "y":4},
- {"label":"Right", "x":19.25, "y":4}]
+ {"matrix": [3, 1], "x": 0.5, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.75, "y": 0},
+ {"matrix": [0, 1], "x": 2.75, "y": 0},
+ {"matrix": [0, 2], "x": 3.75, "y": 0},
+ {"matrix": [0, 3], "x": 4.75, "y": 0},
+ {"matrix": [0, 4], "x": 5.75, "y": 0},
+ {"matrix": [0, 5], "x": 6.75, "y": 0},
+ {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+ {"matrix": [0, 7], "x": 11.25, "y": 0},
+ {"matrix": [0, 8], "x": 12.25, "y": 0},
+ {"matrix": [0, 9], "x": 13.25, "y": 0},
+ {"matrix": [0, 10], "x": 14.25, "y": 0},
+ {"matrix": [0, 11], "x": 15.25, "y": 0},
+ {"matrix": [0, 12], "x": 16.25, "y": 0},
+ {"matrix": [0, 13], "x": 17.25, "y": 0},
+ {"matrix": [0, 14], "x": 18.25, "y": 0},
+
+ {"matrix": [4, 14], "x": 19.75, "y": 0},
+
+ {"matrix": [1, 14], "x": 0.25, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3.25, "y": 1},
+ {"matrix": [1, 2], "x": 4.25, "y": 1},
+ {"matrix": [1, 3], "x": 5.25, "y": 1},
+ {"matrix": [1, 4], "x": 6.25, "y": 1},
+ {"matrix": [1, 5], "x": 7.25, "y": 1},
+
+ {"matrix": [1, 6], "x": 10.75, "y": 1},
+ {"matrix": [1, 7], "x": 11.75, "y": 1},
+ {"matrix": [1, 8], "x": 12.75, "y": 1},
+ {"matrix": [1, 9], "x": 13.75, "y": 1},
+ {"matrix": [1, 10], "x": 14.75, "y": 1},
+ {"matrix": [1, 11], "x": 15.75, "y": 1},
+ {"matrix": [1, 12], "x": 16.75, "y": 1},
+ {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.5, "y": 2},
+ {"matrix": [2, 2], "x": 4.5, "y": 2},
+ {"matrix": [2, 3], "x": 5.5, "y": 2},
+ {"matrix": [2, 4], "x": 6.5, "y": 2},
+ {"matrix": [2, 5], "x": 7.5, "y": 2},
+
+ {"matrix": [2, 6], "x": 11, "y": 2},
+ {"matrix": [2, 7], "x": 12, "y": 2},
+ {"matrix": [2, 8], "x": 13, "y": 2},
+ {"matrix": [2, 9], "x": 14, "y": 2},
+ {"matrix": [2, 10], "x": 15, "y": 2},
+ {"matrix": [2, 11], "x": 16, "y": 2},
+ {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 4, "y": 3},
+ {"matrix": [3, 3], "x": 5, "y": 3},
+ {"matrix": [3, 4], "x": 6, "y": 3},
+ {"matrix": [3, 5], "x": 7, "y": 3},
+ {"matrix": [3, 6], "x": 8, "y": 3},
+
+ {"matrix": [3, 7], "x": 10.5, "y": 3},
+ {"matrix": [3, 8], "x": 11.5, "y": 3},
+ {"matrix": [3, 9], "x": 12.5, "y": 3},
+ {"matrix": [3, 10], "x": 13.5, "y": 3},
+ {"matrix": [3, 11], "x": 14.5, "y": 3},
+ {"matrix": [3, 12], "x": 15.5, "y": 3},
+ {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 18.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8.25, "y": 4},
+
+ {"matrix": [4, 8], "x": 11, "y": 4, "w": 2.75},
+ {"matrix": [4, 9], "x": 13.75, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 11], "x": 17.25, "y": 4},
+ {"matrix": [4, 12], "x": 18.25, "y": 4},
+ {"matrix": [4, 13], "x": 19.25, "y": 4}
+ ]
},
"LAYOUT_wk_bs": {
"layout": [
- {"label":"Esc", "x":0.5, "y":0},
- {"label":"~", "x":1.75, "y":0},
- {"label":"!", "x":2.75, "y":0},
- {"label":"@", "x":3.75, "y":0},
- {"label":"#", "x":4.75, "y":0},
- {"label":"$", "x":5.75, "y":0},
- {"label":"%", "x":6.75, "y":0},
- {"label":"^", "x":7.75, "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":"_", "x":15.25, "y":0},
- {"label":"+", "x":16.25, "y":0},
- {"label":"Back Space", "x":17.25, "y":0},
- {"label":"Del", "x":19.75, "y":0},
-
- {"label":"PgUp", "x":0.25, "y":1},
- {"label":"Tab", "x":1.75, "y":1, "w":1.5},
- {"label":"Q", "x":3.25, "y":1},
- {"label":"W", "x":4.25, "y":1},
- {"label":"E", "x":5.25, "y":1},
- {"label":"R", "x":6.25, "y":1},
- {"label":"T", "x":7.25, "y":1},
- {"label":"Y", "x":10.75, "y":1},
- {"label":"U", "x":11.75, "y":1},
- {"label":"I", "x":12.75, "y":1},
- {"label":"O", "x":13.75, "y":1},
- {"label":"P", "x":14.75, "y":1},
- {"label":"{", "x":15.75, "y":1},
- {"label":"}", "x":16.75, "y":1},
- {"label":"|", "x":17.75, "y":1, "w":1.5},
-
- {"label":"PgDn", "x":0, "y":2},
- {"label":"Caps Lock", "x":1.75, "y":2, "w":1.75},
- {"label":"A", "x":3.5, "y":2},
- {"label":"S", "x":4.5, "y":2},
- {"label":"D", "x":5.5, "y":2},
- {"label":"F", "x":6.5, "y":2},
- {"label":"G", "x":7.5, "y":2},
- {"label":"H", "x":11, "y":2},
- {"label":"J", "x":12, "y":2},
- {"label":"K", "x":13, "y":2},
- {"label":"L", "x":14, "y":2},
- {"label":":", "x":15, "y":2},
- {"label":"\"", "x":16, "y":2},
- {"label":"Enter", "x":17, "y":2, "w":2.25},
-
- {"label":"Shift", "x":1.75, "y":3, "w":2.25},
- {"label":"Z", "x":4, "y":3},
- {"label":"X", "x":5, "y":3},
- {"label":"C", "x":6, "y":3},
- {"label":"V", "x":7, "y":3},
- {"label":"B", "x":8, "y":3},
- {"label":"B", "x":10.5, "y":3},
- {"label":"N", "x":11.5, "y":3},
- {"label":"M", "x":12.5, "y":3},
- {"label":"<", "x":13.5, "y":3},
- {"label":">", "x":14.5, "y":3},
- {"label":"?", "x":15.5, "y":3},
- {"label":"Shift", "x":16.5, "y":3, "w":1.75},
- {"label":"Up", "x":18.25, "y":3},
-
- {"label":"Ctrl", "x":1.75, "y":4, "w":1.25},
- {"label":"Super", "x":3, "y":4},
- {"label":"Alt", "x":4, "y":4, "w":1.25},
- {"x":5.25, "y":4, "w":2.25},
- {"label":"Fn", "x":8.25, "y":4},
- {"x":11, "y":4, "w":2.75},
- {"label":"Alt", "x":13.75, "y":4, "w":1.25},
- {"label":"Ctrl", "x":15, "y":4},
- {"label":"Left", "x":17.25, "y":4},
- {"label":"Down", "x":18.25, "y":4},
- {"label":"Right", "x":19.25, "y":4}]
+ {"matrix": [3, 1], "x": 0.5, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.75, "y": 0},
+ {"matrix": [0, 1], "x": 2.75, "y": 0},
+ {"matrix": [0, 2], "x": 3.75, "y": 0},
+ {"matrix": [0, 3], "x": 4.75, "y": 0},
+ {"matrix": [0, 4], "x": 5.75, "y": 0},
+ {"matrix": [0, 5], "x": 6.75, "y": 0},
+ {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+ {"matrix": [0, 7], "x": 11.25, "y": 0},
+ {"matrix": [0, 8], "x": 12.25, "y": 0},
+ {"matrix": [0, 9], "x": 13.25, "y": 0},
+ {"matrix": [0, 10], "x": 14.25, "y": 0},
+ {"matrix": [0, 11], "x": 15.25, "y": 0},
+ {"matrix": [0, 12], "x": 16.25, "y": 0},
+ {"matrix": [0, 13], "x": 17.25, "y": 0},
+
+ {"matrix": [4, 14], "x": 19.75, "y": 0},
+
+ {"matrix": [1, 14], "x": 0.25, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3.25, "y": 1},
+ {"matrix": [1, 2], "x": 4.25, "y": 1},
+ {"matrix": [1, 3], "x": 5.25, "y": 1},
+ {"matrix": [1, 4], "x": 6.25, "y": 1},
+ {"matrix": [1, 5], "x": 7.25, "y": 1},
+
+ {"matrix": [1, 6], "x": 10.75, "y": 1},
+ {"matrix": [1, 7], "x": 11.75, "y": 1},
+ {"matrix": [1, 8], "x": 12.75, "y": 1},
+ {"matrix": [1, 9], "x": 13.75, "y": 1},
+ {"matrix": [1, 10], "x": 14.75, "y": 1},
+ {"matrix": [1, 11], "x": 15.75, "y": 1},
+ {"matrix": [1, 12], "x": 16.75, "y": 1},
+ {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.5, "y": 2},
+ {"matrix": [2, 2], "x": 4.5, "y": 2},
+ {"matrix": [2, 3], "x": 5.5, "y": 2},
+ {"matrix": [2, 4], "x": 6.5, "y": 2},
+ {"matrix": [2, 5], "x": 7.5, "y": 2},
+
+ {"matrix": [2, 6], "x": 11, "y": 2},
+ {"matrix": [2, 7], "x": 12, "y": 2},
+ {"matrix": [2, 8], "x": 13, "y": 2},
+ {"matrix": [2, 9], "x": 14, "y": 2},
+ {"matrix": [2, 10], "x": 15, "y": 2},
+ {"matrix": [2, 11], "x": 16, "y": 2},
+ {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 4, "y": 3},
+ {"matrix": [3, 3], "x": 5, "y": 3},
+ {"matrix": [3, 4], "x": 6, "y": 3},
+ {"matrix": [3, 5], "x": 7, "y": 3},
+ {"matrix": [3, 6], "x": 8, "y": 3},
+
+ {"matrix": [3, 7], "x": 10.5, "y": 3},
+ {"matrix": [3, 8], "x": 11.5, "y": 3},
+ {"matrix": [3, 9], "x": 12.5, "y": 3},
+ {"matrix": [3, 10], "x": 13.5, "y": 3},
+ {"matrix": [3, 11], "x": 14.5, "y": 3},
+ {"matrix": [3, 12], "x": 15.5, "y": 3},
+ {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 18.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 3, "y": 4},
+ {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8.25, "y": 4},
+
+ {"matrix": [4, 8], "x": 11, "y": 4, "w": 2.75},
+ {"matrix": [4, 9], "x": 13.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 15, "y": 4},
+
+ {"matrix": [4, 11], "x": 17.25, "y": 4},
+ {"matrix": [4, 12], "x": 18.25, "y": 4},
+ {"matrix": [4, 13], "x": 19.25, "y": 4}
+ ]
},
"LAYOUT_wkl_bs": {
"layout": [
- {"label":"Esc", "x":0.5, "y":0},
- {"label":"~", "x":1.75, "y":0},
- {"label":"!", "x":2.75, "y":0},
- {"label":"@", "x":3.75, "y":0},
- {"label":"#", "x":4.75, "y":0},
- {"label":"$", "x":5.75, "y":0},
- {"label":"%", "x":6.75, "y":0},
- {"label":"^", "x":7.75, "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":"_", "x":15.25, "y":0},
- {"label":"+", "x":16.25, "y":0},
- {"label":"Back Space", "x":17.25, "y":0},
- {"label":"Del", "x":19.75, "y":0},
-
- {"label":"PgUp", "x":0.25, "y":1},
- {"label":"Tab", "x":1.75, "y":1, "w":1.5},
- {"label":"Q", "x":3.25, "y":1},
- {"label":"W", "x":4.25, "y":1},
- {"label":"E", "x":5.25, "y":1},
- {"label":"R", "x":6.25, "y":1},
- {"label":"T", "x":7.25, "y":1},
- {"label":"Y", "x":10.75, "y":1},
- {"label":"U", "x":11.75, "y":1},
- {"label":"I", "x":12.75, "y":1},
- {"label":"O", "x":13.75, "y":1},
- {"label":"P", "x":14.75, "y":1},
- {"label":"{", "x":15.75, "y":1},
- {"label":"}", "x":16.75, "y":1},
- {"label":"|", "x":17.75, "y":1, "w":1.5},
-
- {"label":"PgDn", "x":0, "y":2},
- {"label":"Caps Lock", "x":1.75, "y":2, "w":1.75},
- {"label":"A", "x":3.5, "y":2},
- {"label":"S", "x":4.5, "y":2},
- {"label":"D", "x":5.5, "y":2},
- {"label":"F", "x":6.5, "y":2},
- {"label":"G", "x":7.5, "y":2},
- {"label":"H", "x":11, "y":2},
- {"label":"J", "x":12, "y":2},
- {"label":"K", "x":13, "y":2},
- {"label":"L", "x":14, "y":2},
- {"label":":", "x":15, "y":2},
- {"label":"\"", "x":16, "y":2},
- {"label":"Enter", "x":17, "y":2, "w":2.25},
-
- {"label":"Shift", "x":1.75, "y":3, "w":2.25},
- {"label":"Z", "x":4, "y":3},
- {"label":"X", "x":5, "y":3},
- {"label":"C", "x":6, "y":3},
- {"label":"V", "x":7, "y":3},
- {"label":"B", "x":8, "y":3},
- {"label":"B", "x":10.5, "y":3}, {"label":"N", "x":11.5, "y":3},
- {"label":"M", "x":12.5, "y":3},
- {"label":"<", "x":13.5, "y":3},
- {"label":">", "x":14.5, "y":3},
- {"label":"?", "x":15.5, "y":3},
- {"label":"Shift", "x":16.5, "y":3, "w":1.75},
- {"label":"Up", "x":18.25, "y":3},
-
- {"label":"Ctrl", "x":1.75, "y":4, "w":1.5},
- {"label":"Alt", "x":4.75, "y":4, "w":1.25},
- {"x":6, "y":4, "w":2.25},
- {"label":"Win", "x":8.25, "y":4},
- {"x":10.5, "y":4, "w":2.75},
- {"label":"Alt", "x":13.25, "y":4, "w":1.5},
- {"label":"Left", "x":17.25, "y":4},
- {"label":"Down", "x":18.25, "y":4},
- {"label":"Right", "x":19.25, "y":4}]
+ {"matrix": [3, 1], "x": 0.5, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.75, "y": 0},
+ {"matrix": [0, 1], "x": 2.75, "y": 0},
+ {"matrix": [0, 2], "x": 3.75, "y": 0},
+ {"matrix": [0, 3], "x": 4.75, "y": 0},
+ {"matrix": [0, 4], "x": 5.75, "y": 0},
+ {"matrix": [0, 5], "x": 6.75, "y": 0},
+ {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+ {"matrix": [0, 7], "x": 11.25, "y": 0},
+ {"matrix": [0, 8], "x": 12.25, "y": 0},
+ {"matrix": [0, 9], "x": 13.25, "y": 0},
+ {"matrix": [0, 10], "x": 14.25, "y": 0},
+ {"matrix": [0, 11], "x": 15.25, "y": 0},
+ {"matrix": [0, 12], "x": 16.25, "y": 0},
+ {"matrix": [0, 13], "x": 17.25, "y": 0},
+
+ {"matrix": [4, 14], "x": 19.75, "y": 0},
+
+ {"matrix": [1, 14], "x": 0.25, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3.25, "y": 1},
+ {"matrix": [1, 2], "x": 4.25, "y": 1},
+ {"matrix": [1, 3], "x": 5.25, "y": 1},
+ {"matrix": [1, 4], "x": 6.25, "y": 1},
+ {"matrix": [1, 5], "x": 7.25, "y": 1},
+
+ {"matrix": [1, 6], "x": 10.75, "y": 1},
+ {"matrix": [1, 7], "x": 11.75, "y": 1},
+ {"matrix": [1, 8], "x": 12.75, "y": 1},
+ {"matrix": [1, 9], "x": 13.75, "y": 1},
+ {"matrix": [1, 10], "x": 14.75, "y": 1},
+ {"matrix": [1, 11], "x": 15.75, "y": 1},
+ {"matrix": [1, 12], "x": 16.75, "y": 1},
+ {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.5, "y": 2},
+ {"matrix": [2, 2], "x": 4.5, "y": 2},
+ {"matrix": [2, 3], "x": 5.5, "y": 2},
+ {"matrix": [2, 4], "x": 6.5, "y": 2},
+ {"matrix": [2, 5], "x": 7.5, "y": 2},
+
+ {"matrix": [2, 6], "x": 11, "y": 2},
+ {"matrix": [2, 7], "x": 12, "y": 2},
+ {"matrix": [2, 8], "x": 13, "y": 2},
+ {"matrix": [2, 9], "x": 14, "y": 2},
+ {"matrix": [2, 10], "x": 15, "y": 2},
+ {"matrix": [2, 11], "x": 16, "y": 2},
+ {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 4, "y": 3},
+ {"matrix": [3, 3], "x": 5, "y": 3},
+ {"matrix": [3, 4], "x": 6, "y": 3},
+ {"matrix": [3, 5], "x": 7, "y": 3},
+ {"matrix": [3, 6], "x": 8, "y": 3},
+
+ {"matrix": [3, 7], "x": 10.5, "y": 3},
+ {"matrix": [3, 8], "x": 11.5, "y": 3},
+ {"matrix": [3, 9], "x": 12.5, "y": 3},
+ {"matrix": [3, 10], "x": 13.5, "y": 3},
+ {"matrix": [3, 11], "x": 14.5, "y": 3},
+ {"matrix": [3, 12], "x": 15.5, "y": 3},
+ {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 18.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.5},
+ {"matrix": [4, 3], "x": 4.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8.25, "y": 4},
+
+ {"matrix": [4, 8], "x": 10.5, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 13.25, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 11], "x": 17.25, "y": 4},
+ {"matrix": [4, 12], "x": 18.25, "y": 4},
+ {"matrix": [4, 13], "x": 19.25, "y": 4}
+ ]
}
}
}
diff --git a/keyboards/jacky_studio/bear_65/rev2/rev2.h b/keyboards/jacky_studio/bear_65/rev2/rev2.h
deleted file mode 100644
index 61f5a9d6fe..0000000000
--- a/keyboards/jacky_studio/bear_65/rev2/rev2.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Copyright 2020 MudkipMao
- *
- * 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_wk_full( \
- K31, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
- K1E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K2E, 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, K3E, \
- K40, K41, K43, K45, K46, 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, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, KC_NO, K43, KC_NO, K45, K46, KC_NO, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
-}
-
-#define LAYOUT_wkl_full( \
- K31, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
- K1E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K2E, 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, K3E, \
- K40, K43, K45, K46, K48, K49, 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, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, KC_NO, K43, KC_NO, K45, K46, KC_NO, K48, K49, KC_NO, K4B, K4C, K4D, K4E }, \
-}
-
-#define LAYOUT_wk_bs( \
- K31, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K4E, \
- K1E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K2E, 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, K3E, \
- K40, K41, K43, K45, K46, K48, K49, K4A, K4B, K4C, K4D \
-) { \
- { K00, K01, 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, KC_NO, K2D, K2E }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, KC_NO, K43, KC_NO, K45, K46, KC_NO, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
-}
-
-#define LAYOUT_wkl_bs( \
- K31, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K4E, \
- K1E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K2E, 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, K3E, \
- K40, K43, K45, K46, K48, K4A, K4B, K4C, K4D \
-) { \
- { K00, K01, 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, KC_NO, K2D, K2E }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, KC_NO, K43, KC_NO, K45, K46, KC_NO, K48, KC_NO, K4A, K4B, K4C, K4D, K4E }, \
-}
-
diff --git a/keyboards/jacky_studio/s7_elephant/rev1/info.json b/keyboards/jacky_studio/s7_elephant/rev1/info.json
index e024b49bdb..3af975eb5c 100644
--- a/keyboards/jacky_studio/s7_elephant/rev1/info.json
+++ b/keyboards/jacky_studio/s7_elephant/rev1/info.json
@@ -21,2311 +21,2593 @@
"layouts": {
"LAYOUT_ansi": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "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":"Backspace", "x":15, "y":0, "w":2},
- {"label":"Home", "x":17, "y":0},
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":2, "y":1, "w":1.5},
- {"label":"Q", "x":3.5, "y":1},
- {"label":"W", "x":4.5, "y":1},
- {"label":"E", "x":5.5, "y":1},
- {"label":"R", "x":6.5, "y":1},
- {"label":"T", "x":7.5, "y":1},
- {"label":"Y", "x":8.5, "y":1},
- {"label":"U", "x":9.5, "y":1},
- {"label":"I", "x":10.5, "y":1},
- {"label":"O", "x":11.5, "y":1},
- {"label":"P", "x":12.5, "y":1},
- {"label":"{", "x":13.5, "y":1},
- {"label":"}", "x":14.5, "y":1},
- {"label":"|", "x":15.5, "y":1, "w":1.5},
- {"label":"End", "x":17, "y":1},
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":2, "y":2, "w":1.75},
- {"label":"A", "x":3.75, "y":2},
- {"label":"S", "x":4.75, "y":2},
- {"label":"D", "x":5.75, "y":2},
- {"label":"F", "x":6.75, "y":2},
- {"label":"G", "x":7.75, "y":2},
- {"label":"H", "x":8.75, "y":2},
- {"label":"J", "x":9.75, "y":2},
- {"label":"K", "x":10.75, "y":2},
- {"label":"L", "x":11.75, "y":2},
- {"label":":", "x":12.75, "y":2},
- {"label":"\"", "x":13.75, "y":2},
- {"label":"Enter", "x":14.75, "y":2, "w":2.25},
- {"label":"Ins", "x":17, "y":2},
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":2, "y":3, "w":2.25},
- {"label":"Z", "x":4.25, "y":3},
- {"label":"X", "x":5.25, "y":3},
- {"label":"C", "x":6.25, "y":3},
- {"label":"V", "x":7.25, "y":3},
- {"label":"B", "x":8.25, "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.25, "y":3},
- {"label":"Shift", "x":14.25, "y":3, "w":1.75},
- {"label":"Up", "x":16, "y":3},
- {"label":"Del", "x":17, "y":3},
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":2, "y":4, "w":1.25},
- {"label":"Win", "x":3.25, "y":4, "w":1.25},
- {"label":"Alt", "x":4.5, "y":4, "w":1.25},
- {"x":5.75, "y":4, "w":6.25},
- {"label":"Fn", "x":12, "y":4, "w":1.5},
- {"label":"Ctrl", "x":13.5, "y":4, "w":1.5},
- {"label":"Left", "x":15, "y":4},
- {"label":"Down", "x":16, "y":4},
- {"label":"Right", "x":17, "y":4}
+ {"matrix": [0, 0], "x": 0, "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},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0, "w": 2},
+ {"matrix": [0, 15], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 2, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1},
+ {"matrix": [1, 14], "x": 15.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 15], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75},
+ {"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},
+ {"matrix": [2, 12], "x": 13.75, "y": 2},
+ {"matrix": [2, 13], "x": 14.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 15], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 2.25},
+ {"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},
+ {"matrix": [3, 12], "x": 13.25, "y": 3},
+ {"matrix": [3, 13], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16, "y": 3},
+ {"matrix": [3, 15], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 5.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 12, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 15, "y": 4},
+ {"matrix": [4, 14], "x": 16, "y": 4},
+ {"matrix": [4, 15], "x": 17, "y": 4}
]
},
"LAYOUT_ansi_small_lshift": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "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":"Backspace", "x":15, "y":0, "w":2},
- {"label":"Home", "x":17, "y":0},
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":2, "y":1, "w":1.5},
- {"label":"Q", "x":3.5, "y":1},
- {"label":"W", "x":4.5, "y":1},
- {"label":"E", "x":5.5, "y":1},
- {"label":"R", "x":6.5, "y":1},
- {"label":"T", "x":7.5, "y":1},
- {"label":"Y", "x":8.5, "y":1},
- {"label":"U", "x":9.5, "y":1},
- {"label":"I", "x":10.5, "y":1},
- {"label":"O", "x":11.5, "y":1},
- {"label":"P", "x":12.5, "y":1},
- {"label":"{", "x":13.5, "y":1},
- {"label":"}", "x":14.5, "y":1},
- {"label":"|", "x":15.5, "y":1, "w":1.5},
- {"label":"End", "x":17, "y":1},
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":2, "y":2, "w":1.75},
- {"label":"A", "x":3.75, "y":2},
- {"label":"S", "x":4.75, "y":2},
- {"label":"D", "x":5.75, "y":2},
- {"label":"F", "x":6.75, "y":2},
- {"label":"G", "x":7.75, "y":2},
- {"label":"H", "x":8.75, "y":2},
- {"label":"J", "x":9.75, "y":2},
- {"label":"K", "x":10.75, "y":2},
- {"label":"L", "x":11.75, "y":2},
- {"label":":", "x":12.75, "y":2},
- {"label":"\"", "x":13.75, "y":2},
- {"label":"Enter", "x":14.75, "y":2, "w":2.25},
- {"label":"Ins", "x":17, "y":2},
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":2, "y":3, "w":1.25},
- {"x":3.25, "y":3},
- {"label":"Z", "x":4.25, "y":3},
- {"label":"X", "x":5.25, "y":3},
- {"label":"C", "x":6.25, "y":3},
- {"label":"V", "x":7.25, "y":3},
- {"label":"B", "x":8.25, "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.25, "y":3},
- {"label":"Shift", "x":14.25, "y":3, "w":1.75},
- {"label":"Up", "x":16, "y":3},
- {"label":"Del", "x":17, "y":3},
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":2, "y":4, "w":1.25},
- {"label":"Win", "x":3.25, "y":4, "w":1.25},
- {"label":"Alt", "x":4.5, "y":4, "w":1.25},
- {"x":5.75, "y":4, "w":6.25},
- {"label":"Fn", "x":12, "y":4, "w":1.5},
- {"label":"Ctrl", "x":13.5, "y":4, "w":1.5},
- {"label":"Left", "x":15, "y":4},
- {"label":"Down", "x":16, "y":4},
- {"label":"Right", "x":17, "y":4}
+ {"matrix": [0, 0], "x": 0, "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},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0, "w": 2},
+ {"matrix": [0, 15], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 2, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1},
+ {"matrix": [1, 14], "x": 15.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 15], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75},
+ {"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},
+ {"matrix": [2, 12], "x": 13.75, "y": 2},
+ {"matrix": [2, 13], "x": 14.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 15], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25},
+ {"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},
+ {"matrix": [3, 12], "x": 13.25, "y": 3},
+ {"matrix": [3, 13], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16, "y": 3},
+ {"matrix": [3, 15], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 5.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 12, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 15, "y": 4},
+ {"matrix": [4, 14], "x": 16, "y": 4},
+ {"matrix": [4, 15], "x": 17, "y": 4}
]
},
"LAYOUT_ansi_small_bspc": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "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":"Backspace", "x":15, "y":0},
- {"x":16, "y":0},
- {"label":"Home", "x":17, "y":0},
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":2, "y":1, "w":1.5},
- {"label":"Q", "x":3.5, "y":1},
- {"label":"W", "x":4.5, "y":1},
- {"label":"E", "x":5.5, "y":1},
- {"label":"R", "x":6.5, "y":1},
- {"label":"T", "x":7.5, "y":1},
- {"label":"Y", "x":8.5, "y":1},
- {"label":"U", "x":9.5, "y":1},
- {"label":"I", "x":10.5, "y":1},
- {"label":"O", "x":11.5, "y":1},
- {"label":"P", "x":12.5, "y":1},
- {"label":"{", "x":13.5, "y":1},
- {"label":"}", "x":14.5, "y":1},
- {"label":"|", "x":15.5, "y":1, "w":1.5},
- {"label":"End", "x":17, "y":1},
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":2, "y":2, "w":1.75},
- {"label":"A", "x":3.75, "y":2},
- {"label":"S", "x":4.75, "y":2},
- {"label":"D", "x":5.75, "y":2},
- {"label":"F", "x":6.75, "y":2},
- {"label":"G", "x":7.75, "y":2},
- {"label":"H", "x":8.75, "y":2},
- {"label":"J", "x":9.75, "y":2},
- {"label":"K", "x":10.75, "y":2},
- {"label":"L", "x":11.75, "y":2},
- {"label":":", "x":12.75, "y":2},
- {"label":"\"", "x":13.75, "y":2},
- {"label":"Enter", "x":14.75, "y":2, "w":2.25},
- {"label":"Ins", "x":17, "y":2},
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":2, "y":3, "w":2.25},
- {"label":"Z", "x":4.25, "y":3},
- {"label":"X", "x":5.25, "y":3},
- {"label":"C", "x":6.25, "y":3},
- {"label":"V", "x":7.25, "y":3},
- {"label":"B", "x":8.25, "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.25, "y":3},
- {"label":"Shift", "x":14.25, "y":3, "w":1.75},
- {"label":"Up", "x":16, "y":3},
- {"label":"Del", "x":17, "y":3},
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":2, "y":4, "w":1.25},
- {"label":"Win", "x":3.25, "y":4, "w":1.25},
- {"label":"Alt", "x":4.5, "y":4, "w":1.25},
- {"x":5.75, "y":4, "w":6.25},
- {"label":"Fn", "x":12, "y":4, "w":1.5},
- {"label":"Ctrl", "x":13.5, "y":4, "w":1.5},
- {"label":"Left", "x":15, "y":4},
- {"label":"Down", "x":16, "y":4},
- {"label":"Right", "x":17, "y":4}
+ {"matrix": [0, 0], "x": 0, "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},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0},
+ {"matrix": [2, 14], "x": 16, "y": 0},
+ {"matrix": [0, 15], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 2, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1},
+ {"matrix": [1, 14], "x": 15.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 15], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75},
+ {"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},
+ {"matrix": [2, 12], "x": 13.75, "y": 2},
+ {"matrix": [2, 13], "x": 14.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 15], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 2.25},
+ {"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},
+ {"matrix": [3, 12], "x": 13.25, "y": 3},
+ {"matrix": [3, 13], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16, "y": 3},
+ {"matrix": [3, 15], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 5.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 12, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 15, "y": 4},
+ {"matrix": [4, 14], "x": 16, "y": 4},
+ {"matrix": [4, 15], "x": 17, "y": 4}
]
},
"LAYOUT_ansi_small_lshift_small_bspc": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "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":"Backspace", "x":15, "y":0},
- {"x":16, "y":0},
- {"label":"Home", "x":17, "y":0},
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":2, "y":1, "w":1.5},
- {"label":"Q", "x":3.5, "y":1},
- {"label":"W", "x":4.5, "y":1},
- {"label":"E", "x":5.5, "y":1},
- {"label":"R", "x":6.5, "y":1},
- {"label":"T", "x":7.5, "y":1},
- {"label":"Y", "x":8.5, "y":1},
- {"label":"U", "x":9.5, "y":1},
- {"label":"I", "x":10.5, "y":1},
- {"label":"O", "x":11.5, "y":1},
- {"label":"P", "x":12.5, "y":1},
- {"label":"{", "x":13.5, "y":1},
- {"label":"}", "x":14.5, "y":1},
- {"label":"|", "x":15.5, "y":1, "w":1.5},
- {"label":"End", "x":17, "y":1},
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":2, "y":2, "w":1.75},
- {"label":"A", "x":3.75, "y":2},
- {"label":"S", "x":4.75, "y":2},
- {"label":"D", "x":5.75, "y":2},
- {"label":"F", "x":6.75, "y":2},
- {"label":"G", "x":7.75, "y":2},
- {"label":"H", "x":8.75, "y":2},
- {"label":"J", "x":9.75, "y":2},
- {"label":"K", "x":10.75, "y":2},
- {"label":"L", "x":11.75, "y":2},
- {"label":":", "x":12.75, "y":2},
- {"label":"\"", "x":13.75, "y":2},
- {"label":"Enter", "x":14.75, "y":2, "w":2.25},
- {"label":"Ins", "x":17, "y":2},
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":2, "y":3, "w":1.25},
- {"x":3.25, "y":3},
- {"label":"Z", "x":4.25, "y":3},
- {"label":"X", "x":5.25, "y":3},
- {"label":"C", "x":6.25, "y":3},
- {"label":"V", "x":7.25, "y":3},
- {"label":"B", "x":8.25, "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.25, "y":3},
- {"label":"Shift", "x":14.25, "y":3, "w":1.75},
- {"label":"Up", "x":16, "y":3},
- {"label":"Del", "x":17, "y":3},
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":2, "y":4, "w":1.25},
- {"label":"Win", "x":3.25, "y":4, "w":1.25},
- {"label":"Alt", "x":4.5, "y":4, "w":1.25},
- {"x":5.75, "y":4, "w":6.25},
- {"label":"Fn", "x":12, "y":4, "w":1.5},
- {"label":"Ctrl", "x":13.5, "y":4, "w":1.5},
- {"label":"Left", "x":15, "y":4},
- {"label":"Down", "x":16, "y":4},
- {"label":"Right", "x":17, "y":4}
+ {"matrix": [0, 0], "x": 0, "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},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0},
+ {"matrix": [2, 14], "x": 16, "y": 0},
+ {"matrix": [0, 15], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 2, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1},
+ {"matrix": [1, 14], "x": 15.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 15], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75},
+ {"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},
+ {"matrix": [2, 12], "x": 13.75, "y": 2},
+ {"matrix": [2, 13], "x": 14.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 15], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25},
+ {"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},
+ {"matrix": [3, 12], "x": 13.25, "y": 3},
+ {"matrix": [3, 13], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16, "y": 3},
+ {"matrix": [3, 15], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 5.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 12, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 15, "y": 4},
+ {"matrix": [4, 14], "x": 16, "y": 4},
+ {"matrix": [4, 15], "x": 17, "y": 4}
]
},
"LAYOUT_ansi_1u": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "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":"Backspace", "x":15, "y":0, "w":2},
- {"label":"Home", "x":17, "y":0},
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":2, "y":1, "w":1.5},
- {"label":"Q", "x":3.5, "y":1},
- {"label":"W", "x":4.5, "y":1},
- {"label":"E", "x":5.5, "y":1},
- {"label":"R", "x":6.5, "y":1},
- {"label":"T", "x":7.5, "y":1},
- {"label":"Y", "x":8.5, "y":1},
- {"label":"U", "x":9.5, "y":1},
- {"label":"I", "x":10.5, "y":1},
- {"label":"O", "x":11.5, "y":1},
- {"label":"P", "x":12.5, "y":1},
- {"label":"{", "x":13.5, "y":1},
- {"label":"}", "x":14.5, "y":1},
- {"label":"|", "x":15.5, "y":1, "w":1.5},
- {"label":"End", "x":17, "y":1},
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":2, "y":2, "w":1.75},
- {"label":"A", "x":3.75, "y":2},
- {"label":"S", "x":4.75, "y":2},
- {"label":"D", "x":5.75, "y":2},
- {"label":"F", "x":6.75, "y":2},
- {"label":"G", "x":7.75, "y":2},
- {"label":"H", "x":8.75, "y":2},
- {"label":"J", "x":9.75, "y":2},
- {"label":"K", "x":10.75, "y":2},
- {"label":"L", "x":11.75, "y":2},
- {"label":":", "x":12.75, "y":2},
- {"label":"\"", "x":13.75, "y":2},
- {"label":"Enter", "x":14.75, "y":2, "w":2.25},
- {"label":"Ins", "x":17, "y":2},
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":2, "y":3, "w":2.25},
- {"label":"Z", "x":4.25, "y":3},
- {"label":"X", "x":5.25, "y":3},
- {"label":"C", "x":6.25, "y":3},
- {"label":"V", "x":7.25, "y":3},
- {"label":"B", "x":8.25, "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.25, "y":3},
- {"label":"Shift", "x":14.25, "y":3, "w":1.75},
- {"label":"Up", "x":16, "y":3},
- {"label":"Del", "x":17, "y":3},
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":2, "y":4, "w":1.25},
- {"label":"Win", "x":3.25, "y":4, "w":1.25},
- {"label":"Alt", "x":4.5, "y":4, "w":1.25},
- {"x":5.75, "y":4, "w":6.25},
- {"label":"Fn", "x":12, "y":4},
- {"label":"Alt", "x":13, "y":4},
- {"label":"Ctrl", "x":14, "y":4},
- {"label":"Left", "x":15, "y":4},
- {"label":"Down", "x":16, "y":4},
- {"label":"Right", "x":17, "y":4}
+ {"matrix": [0, 0], "x": 0, "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},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0, "w": 2},
+ {"matrix": [0, 15], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 2, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1},
+ {"matrix": [1, 14], "x": 15.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 15], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75},
+ {"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},
+ {"matrix": [2, 12], "x": 13.75, "y": 2},
+ {"matrix": [2, 13], "x": 14.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 15], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 2.25},
+ {"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},
+ {"matrix": [3, 12], "x": 13.25, "y": 3},
+ {"matrix": [3, 13], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16, "y": 3},
+ {"matrix": [3, 15], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 5.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 12, "y": 4},
+ {"matrix": [4, 11], "x": 13, "y": 4},
+ {"matrix": [4, 12], "x": 14, "y": 4},
+ {"matrix": [4, 13], "x": 15, "y": 4},
+ {"matrix": [4, 14], "x": 16, "y": 4},
+ {"matrix": [4, 15], "x": 17, "y": 4}
]
},
"LAYOUT_ansi_1u_small_lshift": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "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":"Backspace", "x":15, "y":0, "w":2},
- {"label":"Home", "x":17, "y":0},
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":2, "y":1, "w":1.5},
- {"label":"Q", "x":3.5, "y":1},
- {"label":"W", "x":4.5, "y":1},
- {"label":"E", "x":5.5, "y":1},
- {"label":"R", "x":6.5, "y":1},
- {"label":"T", "x":7.5, "y":1},
- {"label":"Y", "x":8.5, "y":1},
- {"label":"U", "x":9.5, "y":1},
- {"label":"I", "x":10.5, "y":1},
- {"label":"O", "x":11.5, "y":1},
- {"label":"P", "x":12.5, "y":1},
- {"label":"{", "x":13.5, "y":1},
- {"label":"}", "x":14.5, "y":1},
- {"label":"|", "x":15.5, "y":1, "w":1.5},
- {"label":"End", "x":17, "y":1},
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":2, "y":2, "w":1.75},
- {"label":"A", "x":3.75, "y":2},
- {"label":"S", "x":4.75, "y":2},
- {"label":"D", "x":5.75, "y":2},
- {"label":"F", "x":6.75, "y":2},
- {"label":"G", "x":7.75, "y":2},
- {"label":"H", "x":8.75, "y":2},
- {"label":"J", "x":9.75, "y":2},
- {"label":"K", "x":10.75, "y":2},
- {"label":"L", "x":11.75, "y":2},
- {"label":":", "x":12.75, "y":2},
- {"label":"\"", "x":13.75, "y":2},
- {"label":"Enter", "x":14.75, "y":2, "w":2.25},
- {"label":"Ins", "x":17, "y":2},
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":2, "y":3, "w":1.25},
- {"x":3.25, "y":3},
- {"label":"Z", "x":4.25, "y":3},
- {"label":"X", "x":5.25, "y":3},
- {"label":"C", "x":6.25, "y":3},
- {"label":"V", "x":7.25, "y":3},
- {"label":"B", "x":8.25, "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.25, "y":3},
- {"label":"Shift", "x":14.25, "y":3, "w":1.75},
- {"label":"Up", "x":16, "y":3},
- {"label":"Del", "x":17, "y":3},
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":2, "y":4, "w":1.25},
- {"label":"Win", "x":3.25, "y":4, "w":1.25},
- {"label":"Alt", "x":4.5, "y":4, "w":1.25},
- {"x":5.75, "y":4, "w":6.25},
- {"label":"Fn", "x":12, "y":4},
- {"label":"Alt", "x":13, "y":4},
- {"label":"Ctrl", "x":14, "y":4},
- {"label":"Left", "x":15, "y":4},
- {"label":"Down", "x":16, "y":4},
- {"label":"Right", "x":17, "y":4}
+ {"matrix": [0, 0], "x": 0, "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},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0, "w": 2},
+ {"matrix": [0, 15], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 2, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1},
+ {"matrix": [1, 14], "x": 15.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 15], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75},
+ {"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},
+ {"matrix": [2, 12], "x": 13.75, "y": 2},
+ {"matrix": [2, 13], "x": 14.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 15], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25},
+ {"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},
+ {"matrix": [3, 12], "x": 13.25, "y": 3},
+ {"matrix": [3, 13], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16, "y": 3},
+ {"matrix": [3, 15], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 5.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 12, "y": 4},
+ {"matrix": [4, 11], "x": 13, "y": 4},
+ {"matrix": [4, 12], "x": 14, "y": 4},
+ {"matrix": [4, 13], "x": 15, "y": 4},
+ {"matrix": [4, 14], "x": 16, "y": 4},
+ {"matrix": [4, 15], "x": 17, "y": 4}
]
},
"LAYOUT_ansi_1u_small_bspc": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "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":"Backspace", "x":15, "y":0},
- {"x":16, "y":0},
- {"label":"Home", "x":17, "y":0},
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":2, "y":1, "w":1.5},
- {"label":"Q", "x":3.5, "y":1},
- {"label":"W", "x":4.5, "y":1},
- {"label":"E", "x":5.5, "y":1},
- {"label":"R", "x":6.5, "y":1},
- {"label":"T", "x":7.5, "y":1},
- {"label":"Y", "x":8.5, "y":1},
- {"label":"U", "x":9.5, "y":1},
- {"label":"I", "x":10.5, "y":1},
- {"label":"O", "x":11.5, "y":1},
- {"label":"P", "x":12.5, "y":1},
- {"label":"{", "x":13.5, "y":1},
- {"label":"}", "x":14.5, "y":1},
- {"label":"|", "x":15.5, "y":1, "w":1.5},
- {"label":"End", "x":17, "y":1},
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":2, "y":2, "w":1.75},
- {"label":"A", "x":3.75, "y":2},
- {"label":"S", "x":4.75, "y":2},
- {"label":"D", "x":5.75, "y":2},
- {"label":"F", "x":6.75, "y":2},
- {"label":"G", "x":7.75, "y":2},
- {"label":"H", "x":8.75, "y":2},
- {"label":"J", "x":9.75, "y":2},
- {"label":"K", "x":10.75, "y":2},
- {"label":"L", "x":11.75, "y":2},
- {"label":":", "x":12.75, "y":2},
- {"label":"\"", "x":13.75, "y":2},
- {"label":"Enter", "x":14.75, "y":2, "w":2.25},
- {"label":"Ins", "x":17, "y":2},
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":2, "y":3, "w":2.25},
- {"label":"Z", "x":4.25, "y":3},
- {"label":"X", "x":5.25, "y":3},
- {"label":"C", "x":6.25, "y":3},
- {"label":"V", "x":7.25, "y":3},
- {"label":"B", "x":8.25, "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.25, "y":3},
- {"label":"Shift", "x":14.25, "y":3, "w":1.75},
- {"label":"Up", "x":16, "y":3},
- {"label":"Del", "x":17, "y":3},
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":2, "y":4, "w":1.25},
- {"label":"Win", "x":3.25, "y":4, "w":1.25},
- {"label":"Alt", "x":4.5, "y":4, "w":1.25},
- {"x":5.75, "y":4, "w":6.25},
- {"label":"Fn", "x":12, "y":4},
- {"label":"Alt", "x":13, "y":4},
- {"label":"Ctrl", "x":14, "y":4},
- {"label":"Left", "x":15, "y":4},
- {"label":"Down", "x":16, "y":4},
- {"label":"Right", "x":17, "y":4}
+ {"matrix": [0, 0], "x": 0, "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},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0},
+ {"matrix": [2, 14], "x": 16, "y": 0},
+ {"matrix": [0, 15], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 2, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1},
+ {"matrix": [1, 14], "x": 15.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 15], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75},
+ {"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},
+ {"matrix": [2, 12], "x": 13.75, "y": 2},
+ {"matrix": [2, 13], "x": 14.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 15], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 2.25},
+ {"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},
+ {"matrix": [3, 12], "x": 13.25, "y": 3},
+ {"matrix": [3, 13], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16, "y": 3},
+ {"matrix": [3, 15], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 5.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 12, "y": 4},
+ {"matrix": [4, 11], "x": 13, "y": 4},
+ {"matrix": [4, 12], "x": 14, "y": 4},
+ {"matrix": [4, 13], "x": 15, "y": 4},
+ {"matrix": [4, 14], "x": 16, "y": 4},
+ {"matrix": [4, 15], "x": 17, "y": 4}
]
},
"LAYOUT_ansi_1u_small_lshift_small_bspc": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "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":"Backspace", "x":15, "y":0},
- {"x":16, "y":0},
- {"label":"Home", "x":17, "y":0},
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":2, "y":1, "w":1.5},
- {"label":"Q", "x":3.5, "y":1},
- {"label":"W", "x":4.5, "y":1},
- {"label":"E", "x":5.5, "y":1},
- {"label":"R", "x":6.5, "y":1},
- {"label":"T", "x":7.5, "y":1},
- {"label":"Y", "x":8.5, "y":1},
- {"label":"U", "x":9.5, "y":1},
- {"label":"I", "x":10.5, "y":1},
- {"label":"O", "x":11.5, "y":1},
- {"label":"P", "x":12.5, "y":1},
- {"label":"{", "x":13.5, "y":1},
- {"label":"}", "x":14.5, "y":1},
- {"label":"|", "x":15.5, "y":1, "w":1.5},
- {"label":"End", "x":17, "y":1},
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":2, "y":2, "w":1.75},
- {"label":"A", "x":3.75, "y":2},
- {"label":"S", "x":4.75, "y":2},
- {"label":"D", "x":5.75, "y":2},
- {"label":"F", "x":6.75, "y":2},
- {"label":"G", "x":7.75, "y":2},
- {"label":"H", "x":8.75, "y":2},
- {"label":"J", "x":9.75, "y":2},
- {"label":"K", "x":10.75, "y":2},
- {"label":"L", "x":11.75, "y":2},
- {"label":":", "x":12.75, "y":2},
- {"label":"\"", "x":13.75, "y":2},
- {"label":"Enter", "x":14.75, "y":2, "w":2.25},
- {"label":"Ins", "x":17, "y":2},
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":2, "y":3, "w":1.25},
- {"x":3.25, "y":3},
- {"label":"Z", "x":4.25, "y":3},
- {"label":"X", "x":5.25, "y":3},
- {"label":"C", "x":6.25, "y":3},
- {"label":"V", "x":7.25, "y":3},
- {"label":"B", "x":8.25, "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.25, "y":3},
- {"label":"Shift", "x":14.25, "y":3, "w":1.75},
- {"label":"Up", "x":16, "y":3},
- {"label":"Del", "x":17, "y":3},
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":2, "y":4, "w":1.25},
- {"label":"Win", "x":3.25, "y":4, "w":1.25},
- {"label":"Alt", "x":4.5, "y":4, "w":1.25},
- {"x":5.75, "y":4, "w":6.25},
- {"label":"Fn", "x":12, "y":4},
- {"label":"Alt", "x":13, "y":4},
- {"label":"Ctrl", "x":14, "y":4},
- {"label":"Left", "x":15, "y":4},
- {"label":"Down", "x":16, "y":4},
- {"label":"Right", "x":17, "y":4}
+ {"matrix": [0, 0], "x": 0, "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},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0},
+ {"matrix": [2, 14], "x": 16, "y": 0},
+ {"matrix": [0, 15], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 2, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1},
+ {"matrix": [1, 14], "x": 15.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 15], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75},
+ {"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},
+ {"matrix": [2, 12], "x": 13.75, "y": 2},
+ {"matrix": [2, 13], "x": 14.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 15], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25},
+ {"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},
+ {"matrix": [3, 12], "x": 13.25, "y": 3},
+ {"matrix": [3, 13], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16, "y": 3},
+ {"matrix": [3, 15], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 5.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 12, "y": 4},
+ {"matrix": [4, 11], "x": 13, "y": 4},
+ {"matrix": [4, 12], "x": 14, "y": 4},
+ {"matrix": [4, 13], "x": 15, "y": 4},
+ {"matrix": [4, 14], "x": 16, "y": 4},
+ {"matrix": [4, 15], "x": 17, "y": 4}
]
},
"LAYOUT_ansi_7u": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "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":"Backspace", "x":15, "y":0, "w":2},
- {"label":"Home", "x":17, "y":0},
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":2, "y":1, "w":1.5},
- {"label":"Q", "x":3.5, "y":1},
- {"label":"W", "x":4.5, "y":1},
- {"label":"E", "x":5.5, "y":1},
- {"label":"R", "x":6.5, "y":1},
- {"label":"T", "x":7.5, "y":1},
- {"label":"Y", "x":8.5, "y":1},
- {"label":"U", "x":9.5, "y":1},
- {"label":"I", "x":10.5, "y":1},
- {"label":"O", "x":11.5, "y":1},
- {"label":"P", "x":12.5, "y":1},
- {"label":"{", "x":13.5, "y":1},
- {"label":"}", "x":14.5, "y":1},
- {"label":"|", "x":15.5, "y":1, "w":1.5},
- {"label":"End", "x":17, "y":1},
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":2, "y":2, "w":1.75},
- {"label":"A", "x":3.75, "y":2},
- {"label":"S", "x":4.75, "y":2},
- {"label":"D", "x":5.75, "y":2},
- {"label":"F", "x":6.75, "y":2},
- {"label":"G", "x":7.75, "y":2},
- {"label":"H", "x":8.75, "y":2},
- {"label":"J", "x":9.75, "y":2},
- {"label":"K", "x":10.75, "y":2},
- {"label":"L", "x":11.75, "y":2},
- {"label":":", "x":12.75, "y":2},
- {"label":"\"", "x":13.75, "y":2},
- {"label":"Enter", "x":14.75, "y":2, "w":2.25},
- {"label":"Ins", "x":17, "y":2},
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":2, "y":3, "w":2.25},
- {"label":"Z", "x":4.25, "y":3},
- {"label":"X", "x":5.25, "y":3},
- {"label":"C", "x":6.25, "y":3},
- {"label":"V", "x":7.25, "y":3},
- {"label":"B", "x":8.25, "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.25, "y":3},
- {"label":"Shift", "x":14.25, "y":3, "w":1.75},
- {"label":"Up", "x":16, "y":3},
- {"label":"Del", "x":17, "y":3},
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":2, "y":4, "w":1.5},
- {"label":"Win", "x":3.5, "y":4, "w":1.5},
- {"x":5, "y":4, "w":7},
- {"label":"Fn", "x":12, "y":4, "w":1.5},
- {"label":"Ctrl", "x":13.5, "y":4, "w":1.5},
- {"label":"Left", "x":15, "y":4},
- {"label":"Down", "x":16, "y":4},
- {"label":"Right", "x":17, "y":4}
+ {"matrix": [0, 0], "x": 0, "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},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0, "w": 2},
+ {"matrix": [0, 15], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 2, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1},
+ {"matrix": [1, 14], "x": 15.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 15], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75},
+ {"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},
+ {"matrix": [2, 12], "x": 13.75, "y": 2},
+ {"matrix": [2, 13], "x": 14.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 15], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 2.25},
+ {"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},
+ {"matrix": [3, 12], "x": 13.25, "y": 3},
+ {"matrix": [3, 13], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16, "y": 3},
+ {"matrix": [3, 15], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 3.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 5, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 12, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 15, "y": 4},
+ {"matrix": [4, 14], "x": 16, "y": 4},
+ {"matrix": [4, 15], "x": 17, "y": 4}
]
},
"LAYOUT_ansi_7u_small_lshift": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "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":"Backspace", "x":15, "y":0, "w":2},
- {"label":"Home", "x":17, "y":0},
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":2, "y":1, "w":1.5},
- {"label":"Q", "x":3.5, "y":1},
- {"label":"W", "x":4.5, "y":1},
- {"label":"E", "x":5.5, "y":1},
- {"label":"R", "x":6.5, "y":1},
- {"label":"T", "x":7.5, "y":1},
- {"label":"Y", "x":8.5, "y":1},
- {"label":"U", "x":9.5, "y":1},
- {"label":"I", "x":10.5, "y":1},
- {"label":"O", "x":11.5, "y":1},
- {"label":"P", "x":12.5, "y":1},
- {"label":"{", "x":13.5, "y":1},
- {"label":"}", "x":14.5, "y":1},
- {"label":"|", "x":15.5, "y":1, "w":1.5},
- {"label":"End", "x":17, "y":1},
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":2, "y":2, "w":1.75},
- {"label":"A", "x":3.75, "y":2},
- {"label":"S", "x":4.75, "y":2},
- {"label":"D", "x":5.75, "y":2},
- {"label":"F", "x":6.75, "y":2},
- {"label":"G", "x":7.75, "y":2},
- {"label":"H", "x":8.75, "y":2},
- {"label":"J", "x":9.75, "y":2},
- {"label":"K", "x":10.75, "y":2},
- {"label":"L", "x":11.75, "y":2},
- {"label":":", "x":12.75, "y":2},
- {"label":"\"", "x":13.75, "y":2},
- {"label":"Enter", "x":14.75, "y":2, "w":2.25},
- {"label":"Ins", "x":17, "y":2},
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":2, "y":3, "w":1.25},
- {"x":3.25, "y":3},
- {"label":"Z", "x":4.25, "y":3},
- {"label":"X", "x":5.25, "y":3},
- {"label":"C", "x":6.25, "y":3},
- {"label":"V", "x":7.25, "y":3},
- {"label":"B", "x":8.25, "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.25, "y":3},
- {"label":"Shift", "x":14.25, "y":3, "w":1.75},
- {"label":"Up", "x":16, "y":3},
- {"label":"Del", "x":17, "y":3},
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":2, "y":4, "w":1.5},
- {"label":"Win", "x":3.5, "y":4, "w":1.5},
- {"x":5, "y":4, "w":7},
- {"label":"Fn", "x":12, "y":4, "w":1.5},
- {"label":"Ctrl", "x":13.5, "y":4, "w":1.5},
- {"label":"Left", "x":15, "y":4},
- {"label":"Down", "x":16, "y":4},
- {"label":"Right", "x":17, "y":4}
+ {"matrix": [0, 0], "x": 0, "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},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0, "w": 2},
+ {"matrix": [0, 15], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 2, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1},
+ {"matrix": [1, 14], "x": 15.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 15], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75},
+ {"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},
+ {"matrix": [2, 12], "x": 13.75, "y": 2},
+ {"matrix": [2, 13], "x": 14.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 15], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25},
+ {"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},
+ {"matrix": [3, 12], "x": 13.25, "y": 3},
+ {"matrix": [3, 13], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16, "y": 3},
+ {"matrix": [3, 15], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 3.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 5, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 12, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 15, "y": 4},
+ {"matrix": [4, 14], "x": 16, "y": 4},
+ {"matrix": [4, 15], "x": 17, "y": 4}
]
},
"LAYOUT_ansi_7u_small_bspc": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "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":"Backspace", "x":15, "y":0},
- {"x":16, "y":0},
- {"label":"Home", "x":17, "y":0},
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":2, "y":1, "w":1.5},
- {"label":"Q", "x":3.5, "y":1},
- {"label":"W", "x":4.5, "y":1},
- {"label":"E", "x":5.5, "y":1},
- {"label":"R", "x":6.5, "y":1},
- {"label":"T", "x":7.5, "y":1},
- {"label":"Y", "x":8.5, "y":1},
- {"label":"U", "x":9.5, "y":1},
- {"label":"I", "x":10.5, "y":1},
- {"label":"O", "x":11.5, "y":1},
- {"label":"P", "x":12.5, "y":1},
- {"label":"{", "x":13.5, "y":1},
- {"label":"}", "x":14.5, "y":1},
- {"label":"|", "x":15.5, "y":1, "w":1.5},
- {"label":"End", "x":17, "y":1},
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":2, "y":2, "w":1.75},
- {"label":"A", "x":3.75, "y":2},
- {"label":"S", "x":4.75, "y":2},
- {"label":"D", "x":5.75, "y":2},
- {"label":"F", "x":6.75, "y":2},
- {"label":"G", "x":7.75, "y":2},
- {"label":"H", "x":8.75, "y":2},
- {"label":"J", "x":9.75, "y":2},
- {"label":"K", "x":10.75, "y":2},
- {"label":"L", "x":11.75, "y":2},
- {"label":":", "x":12.75, "y":2},
- {"label":"\"", "x":13.75, "y":2},
- {"label":"Enter", "x":14.75, "y":2, "w":2.25},
- {"label":"Ins", "x":17, "y":2},
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":2, "y":3, "w":2.25},
- {"label":"Z", "x":4.25, "y":3},
- {"label":"X", "x":5.25, "y":3},
- {"label":"C", "x":6.25, "y":3},
- {"label":"V", "x":7.25, "y":3},
- {"label":"B", "x":8.25, "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.25, "y":3},
- {"label":"Shift", "x":14.25, "y":3, "w":1.75},
- {"label":"Up", "x":16, "y":3},
- {"label":"Del", "x":17, "y":3},
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":2, "y":4, "w":1.5},
- {"label":"Win", "x":3.5, "y":4, "w":1.5},
- {"x":5, "y":4, "w":7},
- {"label":"Fn", "x":12, "y":4, "w":1.5},
- {"label":"Ctrl", "x":13.5, "y":4, "w":1.5},
- {"label":"Left", "x":15, "y":4},
- {"label":"Down", "x":16, "y":4},
- {"label":"Right", "x":17, "y":4}
+ {"matrix": [0, 0], "x": 0, "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},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0},
+ {"matrix": [2, 14], "x": 16, "y": 0},
+ {"matrix": [0, 15], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 2, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1},
+ {"matrix": [1, 14], "x": 15.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 15], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75},
+ {"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},
+ {"matrix": [2, 12], "x": 13.75, "y": 2},
+ {"matrix": [2, 13], "x": 14.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 15], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 2.25},
+ {"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},
+ {"matrix": [3, 12], "x": 13.25, "y": 3},
+ {"matrix": [3, 13], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16, "y": 3},
+ {"matrix": [3, 15], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 3.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 5, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 12, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 15, "y": 4},
+ {"matrix": [4, 14], "x": 16, "y": 4},
+ {"matrix": [4, 15], "x": 17, "y": 4}
]
},
"LAYOUT_ansi_7u_small_lshift_small_bspc": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "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":"Backspace", "x":15, "y":0},
- {"x":16, "y":0},
- {"label":"Home", "x":17, "y":0},
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":2, "y":1, "w":1.5},
- {"label":"Q", "x":3.5, "y":1},
- {"label":"W", "x":4.5, "y":1},
- {"label":"E", "x":5.5, "y":1},
- {"label":"R", "x":6.5, "y":1},
- {"label":"T", "x":7.5, "y":1},
- {"label":"Y", "x":8.5, "y":1},
- {"label":"U", "x":9.5, "y":1},
- {"label":"I", "x":10.5, "y":1},
- {"label":"O", "x":11.5, "y":1},
- {"label":"P", "x":12.5, "y":1},
- {"label":"{", "x":13.5, "y":1},
- {"label":"}", "x":14.5, "y":1},
- {"label":"|", "x":15.5, "y":1, "w":1.5},
- {"label":"End", "x":17, "y":1},
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":2, "y":2, "w":1.75},
- {"label":"A", "x":3.75, "y":2},
- {"label":"S", "x":4.75, "y":2},
- {"label":"D", "x":5.75, "y":2},
- {"label":"F", "x":6.75, "y":2},
- {"label":"G", "x":7.75, "y":2},
- {"label":"H", "x":8.75, "y":2},
- {"label":"J", "x":9.75, "y":2},
- {"label":"K", "x":10.75, "y":2},
- {"label":"L", "x":11.75, "y":2},
- {"label":":", "x":12.75, "y":2},
- {"label":"\"", "x":13.75, "y":2},
- {"label":"Enter", "x":14.75, "y":2, "w":2.25},
- {"label":"Ins", "x":17, "y":2},
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":2, "y":3, "w":1.25},
- {"x":3.25, "y":3},
- {"label":"Z", "x":4.25, "y":3},
- {"label":"X", "x":5.25, "y":3},
- {"label":"C", "x":6.25, "y":3},
- {"label":"V", "x":7.25, "y":3},
- {"label":"B", "x":8.25, "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.25, "y":3},
- {"label":"Shift", "x":14.25, "y":3, "w":1.75},
- {"label":"Up", "x":16, "y":3},
- {"label":"Del", "x":17, "y":3},
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":2, "y":4, "w":1.5},
- {"label":"Win", "x":3.5, "y":4, "w":1.5},
- {"x":5, "y":4, "w":7},
- {"label":"Fn", "x":12, "y":4, "w":1.5},
- {"label":"Ctrl", "x":13.5, "y":4, "w":1.5},
- {"label":"Left", "x":15, "y":4},
- {"label":"Down", "x":16, "y":4},
- {"label":"Right", "x":17, "y":4}
+ {"matrix": [0, 0], "x": 0, "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},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0},
+ {"matrix": [2, 14], "x": 16, "y": 0},
+ {"matrix": [0, 15], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 2, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1},
+ {"matrix": [1, 14], "x": 15.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 15], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75},
+ {"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},
+ {"matrix": [2, 12], "x": 13.75, "y": 2},
+ {"matrix": [2, 13], "x": 14.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 15], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25},
+ {"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},
+ {"matrix": [3, 12], "x": 13.25, "y": 3},
+ {"matrix": [3, 13], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16, "y": 3},
+ {"matrix": [3, 15], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 3.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 5, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 12, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 15, "y": 4},
+ {"matrix": [4, 14], "x": 16, "y": 4},
+ {"matrix": [4, 15], "x": 17, "y": 4}
]
},
"LAYOUT_ansi_blocker": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "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":"Backspace", "x":15, "y":0, "w":2},
- {"label":"Home", "x":17, "y":0},
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":2, "y":1, "w":1.5},
- {"label":"Q", "x":3.5, "y":1},
- {"label":"W", "x":4.5, "y":1},
- {"label":"E", "x":5.5, "y":1},
- {"label":"R", "x":6.5, "y":1},
- {"label":"T", "x":7.5, "y":1},
- {"label":"Y", "x":8.5, "y":1},
- {"label":"U", "x":9.5, "y":1},
- {"label":"I", "x":10.5, "y":1},
- {"label":"O", "x":11.5, "y":1},
- {"label":"P", "x":12.5, "y":1},
- {"label":"{", "x":13.5, "y":1},
- {"label":"}", "x":14.5, "y":1},
- {"label":"|", "x":15.5, "y":1, "w":1.5},
- {"label":"End", "x":17, "y":1},
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":2, "y":2, "w":1.75},
- {"label":"A", "x":3.75, "y":2},
- {"label":"S", "x":4.75, "y":2},
- {"label":"D", "x":5.75, "y":2},
- {"label":"F", "x":6.75, "y":2},
- {"label":"G", "x":7.75, "y":2},
- {"label":"H", "x":8.75, "y":2},
- {"label":"J", "x":9.75, "y":2},
- {"label":"K", "x":10.75, "y":2},
- {"label":"L", "x":11.75, "y":2},
- {"label":":", "x":12.75, "y":2},
- {"label":"\"", "x":13.75, "y":2},
- {"label":"Enter", "x":14.75, "y":2, "w":2.25},
- {"label":"Ins", "x":17, "y":2},
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":2, "y":3, "w":2.25},
- {"label":"Z", "x":4.25, "y":3},
- {"label":"X", "x":5.25, "y":3},
- {"label":"C", "x":6.25, "y":3},
- {"label":"V", "x":7.25, "y":3},
- {"label":"B", "x":8.25, "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.25, "y":3},
- {"label":"Shift", "x":14.25, "y":3, "w":1.75},
- {"label":"Up", "x":16, "y":3},
- {"label":"Del", "x":17, "y":3},
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":2, "y":4, "w":1.25},
- {"label":"Win", "x":3.25, "y":4, "w":1.25},
- {"label":"Alt", "x":4.5, "y":4, "w":1.25},
- {"x":5.75, "y":4, "w":6.25},
- {"label":"Fn", "x":12, "y":4, "w":1.25},
- {"label":"Ctrl", "x":13.25, "y":4, "w":1.25},
- {"label":"Left", "x":15, "y":4},
- {"label":"Down", "x":16, "y":4},
- {"label":"Right", "x":17, "y":4}
+ {"matrix": [0, 0], "x": 0, "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},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0, "w": 2},
+ {"matrix": [0, 15], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 2, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1},
+ {"matrix": [1, 14], "x": 15.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 15], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75},
+ {"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},
+ {"matrix": [2, 12], "x": 13.75, "y": 2},
+ {"matrix": [2, 13], "x": 14.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 15], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 2.25},
+ {"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},
+ {"matrix": [3, 12], "x": 13.25, "y": 3},
+ {"matrix": [3, 13], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16, "y": 3},
+ {"matrix": [3, 15], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 5.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 12, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 13.25, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 13], "x": 15, "y": 4},
+ {"matrix": [4, 14], "x": 16, "y": 4},
+ {"matrix": [4, 15], "x": 17, "y": 4}
]
},
"LAYOUT_ansi_blocker_small_lshift": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "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":"Backspace", "x":15, "y":0, "w":2},
- {"label":"Home", "x":17, "y":0},
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":2, "y":1, "w":1.5},
- {"label":"Q", "x":3.5, "y":1},
- {"label":"W", "x":4.5, "y":1},
- {"label":"E", "x":5.5, "y":1},
- {"label":"R", "x":6.5, "y":1},
- {"label":"T", "x":7.5, "y":1},
- {"label":"Y", "x":8.5, "y":1},
- {"label":"U", "x":9.5, "y":1},
- {"label":"I", "x":10.5, "y":1},
- {"label":"O", "x":11.5, "y":1},
- {"label":"P", "x":12.5, "y":1},
- {"label":"{", "x":13.5, "y":1},
- {"label":"}", "x":14.5, "y":1},
- {"label":"|", "x":15.5, "y":1, "w":1.5},
- {"label":"End", "x":17, "y":1},
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":2, "y":2, "w":1.75},
- {"label":"A", "x":3.75, "y":2},
- {"label":"S", "x":4.75, "y":2},
- {"label":"D", "x":5.75, "y":2},
- {"label":"F", "x":6.75, "y":2},
- {"label":"G", "x":7.75, "y":2},
- {"label":"H", "x":8.75, "y":2},
- {"label":"J", "x":9.75, "y":2},
- {"label":"K", "x":10.75, "y":2},
- {"label":"L", "x":11.75, "y":2},
- {"label":":", "x":12.75, "y":2},
- {"label":"\"", "x":13.75, "y":2},
- {"label":"Enter", "x":14.75, "y":2, "w":2.25},
- {"label":"Ins", "x":17, "y":2},
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":2, "y":3, "w":1.25},
- {"x":3.25, "y":3},
- {"label":"Z", "x":4.25, "y":3},
- {"label":"X", "x":5.25, "y":3},
- {"label":"C", "x":6.25, "y":3},
- {"label":"V", "x":7.25, "y":3},
- {"label":"B", "x":8.25, "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.25, "y":3},
- {"label":"Shift", "x":14.25, "y":3, "w":1.75},
- {"label":"Up", "x":16, "y":3},
- {"label":"Del", "x":17, "y":3},
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":2, "y":4, "w":1.25},
- {"label":"Win", "x":3.25, "y":4, "w":1.25},
- {"label":"Alt", "x":4.5, "y":4, "w":1.25},
- {"x":5.75, "y":4, "w":6.25},
- {"label":"Fn", "x":12, "y":4, "w":1.25},
- {"label":"Ctrl", "x":13.25, "y":4, "w":1.25},
- {"label":"Left", "x":15, "y":4},
- {"label":"Down", "x":16, "y":4},
- {"label":"Right", "x":17, "y":4}
+ {"matrix": [0, 0], "x": 0, "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},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0, "w": 2},
+ {"matrix": [0, 15], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 2, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1},
+ {"matrix": [1, 14], "x": 15.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 15], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75},
+ {"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},
+ {"matrix": [2, 12], "x": 13.75, "y": 2},
+ {"matrix": [2, 13], "x": 14.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 15], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25},
+ {"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},
+ {"matrix": [3, 12], "x": 13.25, "y": 3},
+ {"matrix": [3, 13], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16, "y": 3},
+ {"matrix": [3, 15], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 5.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 12, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 13.25, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 13], "x": 15, "y": 4},
+ {"matrix": [4, 14], "x": 16, "y": 4},
+ {"matrix": [4, 15], "x": 17, "y": 4}
]
},
"LAYOUT_ansi_blocker_small_bspc": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "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":"Backspace", "x":15, "y":0},
- {"x":16, "y":0},
- {"label":"Home", "x":17, "y":0},
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":2, "y":1, "w":1.5},
- {"label":"Q", "x":3.5, "y":1},
- {"label":"W", "x":4.5, "y":1},
- {"label":"E", "x":5.5, "y":1},
- {"label":"R", "x":6.5, "y":1},
- {"label":"T", "x":7.5, "y":1},
- {"label":"Y", "x":8.5, "y":1},
- {"label":"U", "x":9.5, "y":1},
- {"label":"I", "x":10.5, "y":1},
- {"label":"O", "x":11.5, "y":1},
- {"label":"P", "x":12.5, "y":1},
- {"label":"{", "x":13.5, "y":1},
- {"label":"}", "x":14.5, "y":1},
- {"label":"|", "x":15.5, "y":1, "w":1.5},
- {"label":"End", "x":17, "y":1},
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":2, "y":2, "w":1.75},
- {"label":"A", "x":3.75, "y":2},
- {"label":"S", "x":4.75, "y":2},
- {"label":"D", "x":5.75, "y":2},
- {"label":"F", "x":6.75, "y":2},
- {"label":"G", "x":7.75, "y":2},
- {"label":"H", "x":8.75, "y":2},
- {"label":"J", "x":9.75, "y":2},
- {"label":"K", "x":10.75, "y":2},
- {"label":"L", "x":11.75, "y":2},
- {"label":":", "x":12.75, "y":2},
- {"label":"\"", "x":13.75, "y":2},
- {"label":"Enter", "x":14.75, "y":2, "w":2.25},
- {"label":"Ins", "x":17, "y":2},
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":2, "y":3, "w":2.25},
- {"label":"Z", "x":4.25, "y":3},
- {"label":"X", "x":5.25, "y":3},
- {"label":"C", "x":6.25, "y":3},
- {"label":"V", "x":7.25, "y":3},
- {"label":"B", "x":8.25, "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.25, "y":3},
- {"label":"Shift", "x":14.25, "y":3, "w":1.75},
- {"label":"Up", "x":16, "y":3},
- {"label":"Del", "x":17, "y":3},
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":2, "y":4, "w":1.25},
- {"label":"Win", "x":3.25, "y":4, "w":1.25},
- {"label":"Alt", "x":4.5, "y":4, "w":1.25},
- {"x":5.75, "y":4, "w":6.25},
- {"label":"Fn", "x":12, "y":4, "w":1.25},
- {"label":"Ctrl", "x":13.25, "y":4, "w":1.25},
- {"label":"Left", "x":15, "y":4},
- {"label":"Down", "x":16, "y":4},
- {"label":"Right", "x":17, "y":4}
+ {"matrix": [0, 0], "x": 0, "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},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0},
+ {"matrix": [2, 14], "x": 16, "y": 0},
+ {"matrix": [0, 15], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 2, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1},
+ {"matrix": [1, 14], "x": 15.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 15], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75},
+ {"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},
+ {"matrix": [2, 12], "x": 13.75, "y": 2},
+ {"matrix": [2, 13], "x": 14.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 15], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 2.25},
+ {"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},
+ {"matrix": [3, 12], "x": 13.25, "y": 3},
+ {"matrix": [3, 13], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16, "y": 3},
+ {"matrix": [3, 15], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 5.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 12, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 13.25, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 13], "x": 15, "y": 4},
+ {"matrix": [4, 14], "x": 16, "y": 4},
+ {"matrix": [4, 15], "x": 17, "y": 4}
]
},
"LAYOUT_ansi_blocker_small_lshift_small_bspc": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "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":"Backspace", "x":15, "y":0},
- {"x":16, "y":0},
- {"label":"Home", "x":17, "y":0},
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":2, "y":1, "w":1.5},
- {"label":"Q", "x":3.5, "y":1},
- {"label":"W", "x":4.5, "y":1},
- {"label":"E", "x":5.5, "y":1},
- {"label":"R", "x":6.5, "y":1},
- {"label":"T", "x":7.5, "y":1},
- {"label":"Y", "x":8.5, "y":1},
- {"label":"U", "x":9.5, "y":1},
- {"label":"I", "x":10.5, "y":1},
- {"label":"O", "x":11.5, "y":1},
- {"label":"P", "x":12.5, "y":1},
- {"label":"{", "x":13.5, "y":1},
- {"label":"}", "x":14.5, "y":1},
- {"label":"|", "x":15.5, "y":1, "w":1.5},
- {"label":"End", "x":17, "y":1},
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":2, "y":2, "w":1.75},
- {"label":"A", "x":3.75, "y":2},
- {"label":"S", "x":4.75, "y":2},
- {"label":"D", "x":5.75, "y":2},
- {"label":"F", "x":6.75, "y":2},
- {"label":"G", "x":7.75, "y":2},
- {"label":"H", "x":8.75, "y":2},
- {"label":"J", "x":9.75, "y":2},
- {"label":"K", "x":10.75, "y":2},
- {"label":"L", "x":11.75, "y":2},
- {"label":":", "x":12.75, "y":2},
- {"label":"\"", "x":13.75, "y":2},
- {"label":"Enter", "x":14.75, "y":2, "w":2.25},
- {"label":"Ins", "x":17, "y":2},
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":2, "y":3, "w":1.25},
- {"x":3.25, "y":3},
- {"label":"Z", "x":4.25, "y":3},
- {"label":"X", "x":5.25, "y":3},
- {"label":"C", "x":6.25, "y":3},
- {"label":"V", "x":7.25, "y":3},
- {"label":"B", "x":8.25, "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.25, "y":3},
- {"label":"Shift", "x":14.25, "y":3, "w":1.75},
- {"label":"Up", "x":16, "y":3},
- {"label":"Del", "x":17, "y":3},
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":2, "y":4, "w":1.25},
- {"label":"Win", "x":3.25, "y":4, "w":1.25},
- {"label":"Alt", "x":4.5, "y":4, "w":1.25},
- {"x":5.75, "y":4, "w":6.25},
- {"label":"Fn", "x":12, "y":4, "w":1.25},
- {"label":"Ctrl", "x":13.25, "y":4, "w":1.25},
- {"label":"Left", "x":15, "y":4},
- {"label":"Down", "x":16, "y":4},
- {"label":"Right", "x":17, "y":4}
+ {"matrix": [0, 0], "x": 0, "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},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0},
+ {"matrix": [2, 14], "x": 16, "y": 0},
+ {"matrix": [0, 15], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 2, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1},
+ {"matrix": [1, 14], "x": 15.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 15], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75},
+ {"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},
+ {"matrix": [2, 12], "x": 13.75, "y": 2},
+ {"matrix": [2, 13], "x": 14.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 15], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25},
+ {"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},
+ {"matrix": [3, 12], "x": 13.25, "y": 3},
+ {"matrix": [3, 13], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16, "y": 3},
+ {"matrix": [3, 15], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 5.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 12, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 13.25, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 13], "x": 15, "y": 4},
+ {"matrix": [4, 14], "x": 16, "y": 4},
+ {"matrix": [4, 15], "x": 17, "y": 4}
]
},
"LAYOUT_ansi_blocker_7u": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "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":"Backspace", "x":15, "y":0, "w":2},
- {"label":"Home", "x":17, "y":0},
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":2, "y":1, "w":1.5},
- {"label":"Q", "x":3.5, "y":1},
- {"label":"W", "x":4.5, "y":1},
- {"label":"E", "x":5.5, "y":1},
- {"label":"R", "x":6.5, "y":1},
- {"label":"T", "x":7.5, "y":1},
- {"label":"Y", "x":8.5, "y":1},
- {"label":"U", "x":9.5, "y":1},
- {"label":"I", "x":10.5, "y":1},
- {"label":"O", "x":11.5, "y":1},
- {"label":"P", "x":12.5, "y":1},
- {"label":"{", "x":13.5, "y":1},
- {"label":"}", "x":14.5, "y":1},
- {"label":"|", "x":15.5, "y":1, "w":1.5},
- {"label":"End", "x":17, "y":1},
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":2, "y":2, "w":1.75},
- {"label":"A", "x":3.75, "y":2},
- {"label":"S", "x":4.75, "y":2},
- {"label":"D", "x":5.75, "y":2},
- {"label":"F", "x":6.75, "y":2},
- {"label":"G", "x":7.75, "y":2},
- {"label":"H", "x":8.75, "y":2},
- {"label":"J", "x":9.75, "y":2},
- {"label":"K", "x":10.75, "y":2},
- {"label":"L", "x":11.75, "y":2},
- {"label":":", "x":12.75, "y":2},
- {"label":"\"", "x":13.75, "y":2},
- {"label":"Enter", "x":14.75, "y":2, "w":2.25},
- {"label":"Ins", "x":17, "y":2},
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":2, "y":3, "w":2.25},
- {"label":"Z", "x":4.25, "y":3},
- {"label":"X", "x":5.25, "y":3},
- {"label":"C", "x":6.25, "y":3},
- {"label":"V", "x":7.25, "y":3},
- {"label":"B", "x":8.25, "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.25, "y":3},
- {"label":"Shift", "x":14.25, "y":3, "w":1.75},
- {"label":"Up", "x":16, "y":3},
- {"label":"Del", "x":17, "y":3},
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":2, "y":4, "w":1.5},
- {"label":"Win", "x":3.5, "y":4},
- {"label":"Alt", "x":4.5, "y":4, "w":1.5},
- {"label":"Space", "x":6, "y":4, "w":7},
- {"label":"Fn", "x":13, "y":4, "w":1.5},
- {"label":"Left", "x":15, "y":4},
- {"label":"Down", "x":16, "y":4},
- {"label":"Right", "x":17, "y":4}
+ {"matrix": [0, 0], "x": 0, "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},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0, "w": 2},
+ {"matrix": [0, 15], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 2, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1},
+ {"matrix": [1, 14], "x": 15.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 15], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75},
+ {"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},
+ {"matrix": [2, 12], "x": 13.75, "y": 2},
+ {"matrix": [2, 13], "x": 14.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 15], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 2.25},
+ {"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},
+ {"matrix": [3, 12], "x": 13.25, "y": 3},
+ {"matrix": [3, 13], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16, "y": 3},
+ {"matrix": [3, 15], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 3.5, "y": 4},
+ {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 6, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 13, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 13], "x": 15, "y": 4},
+ {"matrix": [4, 14], "x": 16, "y": 4},
+ {"matrix": [4, 15], "x": 17, "y": 4}
]
},
"LAYOUT_ansi_blocker_7u_small_lshift": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "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":"Backspace", "x":15, "y":0, "w":2},
- {"label":"Home", "x":17, "y":0},
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":2, "y":1, "w":1.5},
- {"label":"Q", "x":3.5, "y":1},
- {"label":"W", "x":4.5, "y":1},
- {"label":"E", "x":5.5, "y":1},
- {"label":"R", "x":6.5, "y":1},
- {"label":"T", "x":7.5, "y":1},
- {"label":"Y", "x":8.5, "y":1},
- {"label":"U", "x":9.5, "y":1},
- {"label":"I", "x":10.5, "y":1},
- {"label":"O", "x":11.5, "y":1},
- {"label":"P", "x":12.5, "y":1},
- {"label":"{", "x":13.5, "y":1},
- {"label":"}", "x":14.5, "y":1},
- {"label":"|", "x":15.5, "y":1, "w":1.5},
- {"label":"End", "x":17, "y":1},
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":2, "y":2, "w":1.75},
- {"label":"A", "x":3.75, "y":2},
- {"label":"S", "x":4.75, "y":2},
- {"label":"D", "x":5.75, "y":2},
- {"label":"F", "x":6.75, "y":2},
- {"label":"G", "x":7.75, "y":2},
- {"label":"H", "x":8.75, "y":2},
- {"label":"J", "x":9.75, "y":2},
- {"label":"K", "x":10.75, "y":2},
- {"label":"L", "x":11.75, "y":2},
- {"label":":", "x":12.75, "y":2},
- {"label":"\"", "x":13.75, "y":2},
- {"label":"Enter", "x":14.75, "y":2, "w":2.25},
- {"label":"Ins", "x":17, "y":2},
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":2, "y":3, "w":1.25},
- {"x":3.25, "y":3},
- {"label":"Z", "x":4.25, "y":3},
- {"label":"X", "x":5.25, "y":3},
- {"label":"C", "x":6.25, "y":3},
- {"label":"V", "x":7.25, "y":3},
- {"label":"B", "x":8.25, "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.25, "y":3},
- {"label":"Shift", "x":14.25, "y":3, "w":1.75},
- {"label":"Up", "x":16, "y":3},
- {"label":"Del", "x":17, "y":3},
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":2, "y":4, "w":1.5},
- {"label":"Win", "x":3.5, "y":4},
- {"label":"Alt", "x":4.5, "y":4, "w":1.5},
- {"label":"Space", "x":6, "y":4, "w":7},
- {"label":"Fn", "x":13, "y":4, "w":1.5},
- {"label":"Left", "x":15, "y":4},
- {"label":"Down", "x":16, "y":4},
- {"label":"Right", "x":17, "y":4}
+ {"matrix": [0, 0], "x": 0, "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},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0, "w": 2},
+ {"matrix": [0, 15], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 2, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1},
+ {"matrix": [1, 14], "x": 15.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 15], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75},
+ {"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},
+ {"matrix": [2, 12], "x": 13.75, "y": 2},
+ {"matrix": [2, 13], "x": 14.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 15], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25},
+ {"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},
+ {"matrix": [3, 12], "x": 13.25, "y": 3},
+ {"matrix": [3, 13], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16, "y": 3},
+ {"matrix": [3, 15], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 3.5, "y": 4},
+ {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 6, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 13, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 13], "x": 15, "y": 4},
+ {"matrix": [4, 14], "x": 16, "y": 4},
+ {"matrix": [4, 15], "x": 17, "y": 4}
]
},
"LAYOUT_ansi_blocker_7u_small_bspc": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "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":"Backspace", "x":15, "y":0},
- {"x":16, "y":0},
- {"label":"Home", "x":17, "y":0},
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":2, "y":1, "w":1.5},
- {"label":"Q", "x":3.5, "y":1},
- {"label":"W", "x":4.5, "y":1},
- {"label":"E", "x":5.5, "y":1},
- {"label":"R", "x":6.5, "y":1},
- {"label":"T", "x":7.5, "y":1},
- {"label":"Y", "x":8.5, "y":1},
- {"label":"U", "x":9.5, "y":1},
- {"label":"I", "x":10.5, "y":1},
- {"label":"O", "x":11.5, "y":1},
- {"label":"P", "x":12.5, "y":1},
- {"label":"{", "x":13.5, "y":1},
- {"label":"}", "x":14.5, "y":1},
- {"label":"|", "x":15.5, "y":1, "w":1.5},
- {"label":"End", "x":17, "y":1},
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":2, "y":2, "w":1.75},
- {"label":"A", "x":3.75, "y":2},
- {"label":"S", "x":4.75, "y":2},
- {"label":"D", "x":5.75, "y":2},
- {"label":"F", "x":6.75, "y":2},
- {"label":"G", "x":7.75, "y":2},
- {"label":"H", "x":8.75, "y":2},
- {"label":"J", "x":9.75, "y":2},
- {"label":"K", "x":10.75, "y":2},
- {"label":"L", "x":11.75, "y":2},
- {"label":":", "x":12.75, "y":2},
- {"label":"\"", "x":13.75, "y":2},
- {"label":"Enter", "x":14.75, "y":2, "w":2.25},
- {"label":"Ins", "x":17, "y":2},
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":2, "y":3, "w":2.25},
- {"label":"Z", "x":4.25, "y":3},
- {"label":"X", "x":5.25, "y":3},
- {"label":"C", "x":6.25, "y":3},
- {"label":"V", "x":7.25, "y":3},
- {"label":"B", "x":8.25, "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.25, "y":3},
- {"label":"Shift", "x":14.25, "y":3, "w":1.75},
- {"label":"Up", "x":16, "y":3},
- {"label":"Del", "x":17, "y":3},
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":2, "y":4, "w":1.5},
- {"label":"Win", "x":3.5, "y":4},
- {"label":"Alt", "x":4.5, "y":4, "w":1.5},
- {"label":"Space", "x":6, "y":4, "w":7},
- {"label":"Fn", "x":13, "y":4, "w":1.5},
- {"label":"Left", "x":15, "y":4},
- {"label":"Down", "x":16, "y":4},
- {"label":"Right", "x":17, "y":4}
+ {"matrix": [0, 0], "x": 0, "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},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0},
+ {"matrix": [2, 14], "x": 16, "y": 0},
+ {"matrix": [0, 15], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 2, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1},
+ {"matrix": [1, 14], "x": 15.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 15], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75},
+ {"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},
+ {"matrix": [2, 12], "x": 13.75, "y": 2},
+ {"matrix": [2, 13], "x": 14.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 15], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 2.25},
+ {"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},
+ {"matrix": [3, 12], "x": 13.25, "y": 3},
+ {"matrix": [3, 13], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16, "y": 3},
+ {"matrix": [3, 15], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 3.5, "y": 4},
+ {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 6, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 13, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 13], "x": 15, "y": 4},
+ {"matrix": [4, 14], "x": 16, "y": 4},
+ {"matrix": [4, 15], "x": 17, "y": 4}
]
},
"LAYOUT_ansi_blocker_7u_small_lshift_small_bspc": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "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":"Backspace", "x":15, "y":0},
- {"x":16, "y":0},
- {"label":"Home", "x":17, "y":0},
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":2, "y":1, "w":1.5},
- {"label":"Q", "x":3.5, "y":1},
- {"label":"W", "x":4.5, "y":1},
- {"label":"E", "x":5.5, "y":1},
- {"label":"R", "x":6.5, "y":1},
- {"label":"T", "x":7.5, "y":1},
- {"label":"Y", "x":8.5, "y":1},
- {"label":"U", "x":9.5, "y":1},
- {"label":"I", "x":10.5, "y":1},
- {"label":"O", "x":11.5, "y":1},
- {"label":"P", "x":12.5, "y":1},
- {"label":"{", "x":13.5, "y":1},
- {"label":"}", "x":14.5, "y":1},
- {"label":"|", "x":15.5, "y":1, "w":1.5},
- {"label":"End", "x":17, "y":1},
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":2, "y":2, "w":1.75},
- {"label":"A", "x":3.75, "y":2},
- {"label":"S", "x":4.75, "y":2},
- {"label":"D", "x":5.75, "y":2},
- {"label":"F", "x":6.75, "y":2},
- {"label":"G", "x":7.75, "y":2},
- {"label":"H", "x":8.75, "y":2},
- {"label":"J", "x":9.75, "y":2},
- {"label":"K", "x":10.75, "y":2},
- {"label":"L", "x":11.75, "y":2},
- {"label":":", "x":12.75, "y":2},
- {"label":"\"", "x":13.75, "y":2},
- {"label":"Enter", "x":14.75, "y":2, "w":2.25},
- {"label":"Ins", "x":17, "y":2},
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":2, "y":3, "w":1.25},
- {"x":3.25, "y":3},
- {"label":"Z", "x":4.25, "y":3},
- {"label":"X", "x":5.25, "y":3},
- {"label":"C", "x":6.25, "y":3},
- {"label":"V", "x":7.25, "y":3},
- {"label":"B", "x":8.25, "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.25, "y":3},
- {"label":"Shift", "x":14.25, "y":3, "w":1.75},
- {"label":"Up", "x":16, "y":3},
- {"label":"Del", "x":17, "y":3},
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":2, "y":4, "w":1.5},
- {"label":"Win", "x":3.5, "y":4},
- {"label":"Alt", "x":4.5, "y":4, "w":1.5},
- {"label":"Space", "x":6, "y":4, "w":7},
- {"label":"Fn", "x":13, "y":4, "w":1.5},
- {"label":"Left", "x":15, "y":4},
- {"label":"Down", "x":16, "y":4},
- {"label":"Right", "x":17, "y":4}
+ {"matrix": [0, 0], "x": 0, "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},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0},
+ {"matrix": [2, 14], "x": 16, "y": 0},
+ {"matrix": [0, 15], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 2, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1},
+ {"matrix": [1, 14], "x": 15.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 15], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75},
+ {"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},
+ {"matrix": [2, 12], "x": 13.75, "y": 2},
+ {"matrix": [2, 13], "x": 14.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 15], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25},
+ {"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},
+ {"matrix": [3, 12], "x": 13.25, "y": 3},
+ {"matrix": [3, 13], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16, "y": 3},
+ {"matrix": [3, 15], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 3.5, "y": 4},
+ {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 6, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 13, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 13], "x": 15, "y": 4},
+ {"matrix": [4, 14], "x": 16, "y": 4},
+ {"matrix": [4, 15], "x": 17, "y": 4}
]
},
"LAYOUT_iso": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "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":"Backspace", "x":15, "y":0, "w":2},
- {"label":"Home", "x":17, "y":0},
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":2, "y":1, "w":1.5},
- {"label":"Q", "x":3.5, "y":1},
- {"label":"W", "x":4.5, "y":1},
- {"label":"E", "x":5.5, "y":1},
- {"label":"R", "x":6.5, "y":1},
- {"label":"T", "x":7.5, "y":1},
- {"label":"Y", "x":8.5, "y":1},
- {"label":"U", "x":9.5, "y":1},
- {"label":"I", "x":10.5, "y":1},
- {"label":"O", "x":11.5, "y":1},
- {"label":"P", "x":12.5, "y":1},
- {"label":"{", "x":13.5, "y":1},
- {"label":"}", "x":14.5, "y":1},
- {"label":"End", "x":17, "y":1},
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":2, "y":2, "w":1.75},
- {"label":"A", "x":3.75, "y":2},
- {"label":"S", "x":4.75, "y":2},
- {"label":"D", "x":5.75, "y":2},
- {"label":"F", "x":6.75, "y":2},
- {"label":"G", "x":7.75, "y":2},
- {"label":"H", "x":8.75, "y":2},
- {"label":"J", "x":9.75, "y":2},
- {"label":"K", "x":10.75, "y":2},
- {"label":"L", "x":11.75, "y":2},
- {"label":":", "x":12.75, "y":2},
- {"label":"\"", "x":13.75, "y":2},
- {"label":"|", "x":14.75, "y":2},
- {"label":"Enter", "x":15.75, "y":1, "w":1.25, "h":2},
- {"label":"Ins", "x":17, "y":2},
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":2, "y":3, "w":1.25},
- {"x":3.25, "y":3},
- {"label":"Z", "x":4.25, "y":3},
- {"label":"X", "x":5.25, "y":3},
- {"label":"C", "x":6.25, "y":3},
- {"label":"V", "x":7.25, "y":3},
- {"label":"B", "x":8.25, "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.25, "y":3},
- {"label":"Shift", "x":14.25, "y":3, "w":1.75},
- {"label":"Up", "x":16, "y":3},
- {"label":"Del", "x":17, "y":3},
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":2, "y":4, "w":1.25},
- {"label":"Win", "x":3.25, "y":4, "w":1.25},
- {"label":"Alt", "x":4.5, "y":4, "w":1.25},
- {"x":5.75, "y":4, "w":6.25},
- {"label":"Fn", "x":12, "y":4, "w":1.5},
- {"label":"Ctrl", "x":13.5, "y":4, "w":1.5},
- {"label":"Left", "x":15, "y":4},
- {"label":"Down", "x":16, "y":4},
- {"label":"Right", "x":17, "y":4}
+ {"matrix": [0, 0], "x": 0, "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},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0, "w": 2},
+ {"matrix": [0, 15], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 2, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1},
+ {"matrix": [1, 15], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75},
+ {"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},
+ {"matrix": [2, 12], "x": 13.75, "y": 2},
+ {"matrix": [1, 14], "x": 14.75, "y": 2},
+ {"matrix": [2, 13], "x": 15.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [2, 15], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25},
+ {"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},
+ {"matrix": [3, 12], "x": 13.25, "y": 3},
+ {"matrix": [3, 13], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16, "y": 3},
+ {"matrix": [3, 15], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 5.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 12, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 15, "y": 4},
+ {"matrix": [4, 14], "x": 16, "y": 4},
+ {"matrix": [4, 15], "x": 17, "y": 4}
]
},
"LAYOUT_iso_small_bspc": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "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":"Backspace", "x":15, "y":0},
- {"x":16, "y":0},
- {"label":"Home", "x":17, "y":0},
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":2, "y":1, "w":1.5},
- {"label":"Q", "x":3.5, "y":1},
- {"label":"W", "x":4.5, "y":1},
- {"label":"E", "x":5.5, "y":1},
- {"label":"R", "x":6.5, "y":1},
- {"label":"T", "x":7.5, "y":1},
- {"label":"Y", "x":8.5, "y":1},
- {"label":"U", "x":9.5, "y":1},
- {"label":"I", "x":10.5, "y":1},
- {"label":"O", "x":11.5, "y":1},
- {"label":"P", "x":12.5, "y":1},
- {"label":"{", "x":13.5, "y":1},
- {"label":"}", "x":14.5, "y":1},
- {"label":"End", "x":17, "y":1},
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":2, "y":2, "w":1.75},
- {"label":"A", "x":3.75, "y":2},
- {"label":"S", "x":4.75, "y":2},
- {"label":"D", "x":5.75, "y":2},
- {"label":"F", "x":6.75, "y":2},
- {"label":"G", "x":7.75, "y":2},
- {"label":"H", "x":8.75, "y":2},
- {"label":"J", "x":9.75, "y":2},
- {"label":"K", "x":10.75, "y":2},
- {"label":"L", "x":11.75, "y":2},
- {"label":":", "x":12.75, "y":2},
- {"label":"\"", "x":13.75, "y":2},
- {"label":"|", "x":14.75, "y":2},
- {"label":"Enter", "x":15.75, "y":1, "w":1.25, "h":2},
- {"label":"Ins", "x":17, "y":2},
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":2, "y":3, "w":1.25},
- {"x":3.25, "y":3},
- {"label":"Z", "x":4.25, "y":3},
- {"label":"X", "x":5.25, "y":3},
- {"label":"C", "x":6.25, "y":3},
- {"label":"V", "x":7.25, "y":3},
- {"label":"B", "x":8.25, "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.25, "y":3},
- {"label":"Shift", "x":14.25, "y":3, "w":1.75},
- {"label":"Up", "x":16, "y":3},
- {"label":"Del", "x":17, "y":3},
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":2, "y":4, "w":1.25},
- {"label":"Win", "x":3.25, "y":4, "w":1.25},
- {"label":"Alt", "x":4.5, "y":4, "w":1.25},
- {"x":5.75, "y":4, "w":6.25},
- {"label":"Fn", "x":12, "y":4, "w":1.5},
- {"label":"Ctrl", "x":13.5, "y":4, "w":1.5},
- {"label":"Left", "x":15, "y":4},
- {"label":"Down", "x":16, "y":4},
- {"label":"Right", "x":17, "y":4}
+ {"matrix": [0, 0], "x": 0, "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},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0},
+ {"matrix": [2, 14], "x": 16, "y": 0},
+ {"matrix": [0, 15], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 2, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1},
+ {"matrix": [1, 15], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75},
+ {"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},
+ {"matrix": [2, 12], "x": 13.75, "y": 2},
+ {"matrix": [1, 14], "x": 14.75, "y": 2},
+ {"matrix": [2, 13], "x": 15.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [2, 15], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25},
+ {"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},
+ {"matrix": [3, 12], "x": 13.25, "y": 3},
+ {"matrix": [3, 13], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16, "y": 3},
+ {"matrix": [3, 15], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 5.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 12, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 15, "y": 4},
+ {"matrix": [4, 14], "x": 16, "y": 4},
+ {"matrix": [4, 15], "x": 17, "y": 4}
]
},
"LAYOUT_iso_1u": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "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":"Backspace", "x":15, "y":0, "w":2},
- {"label":"Home", "x":17, "y":0},
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":2, "y":1, "w":1.5},
- {"label":"Q", "x":3.5, "y":1},
- {"label":"W", "x":4.5, "y":1},
- {"label":"E", "x":5.5, "y":1},
- {"label":"R", "x":6.5, "y":1},
- {"label":"T", "x":7.5, "y":1},
- {"label":"Y", "x":8.5, "y":1},
- {"label":"U", "x":9.5, "y":1},
- {"label":"I", "x":10.5, "y":1},
- {"label":"O", "x":11.5, "y":1},
- {"label":"P", "x":12.5, "y":1},
- {"label":"{", "x":13.5, "y":1},
- {"label":"}", "x":14.5, "y":1},
- {"label":"End", "x":17, "y":1},
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":2, "y":2, "w":1.75},
- {"label":"A", "x":3.75, "y":2},
- {"label":"S", "x":4.75, "y":2},
- {"label":"D", "x":5.75, "y":2},
- {"label":"F", "x":6.75, "y":2},
- {"label":"G", "x":7.75, "y":2},
- {"label":"H", "x":8.75, "y":2},
- {"label":"J", "x":9.75, "y":2},
- {"label":"K", "x":10.75, "y":2},
- {"label":"L", "x":11.75, "y":2},
- {"label":":", "x":12.75, "y":2},
- {"label":"\"", "x":13.75, "y":2},
- {"label":"|", "x":14.75, "y":2},
- {"label":"Enter", "x":15.75, "y":1, "w":1.25, "h":2},
- {"label":"Ins", "x":17, "y":2},
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":2, "y":3, "w":1.25},
- {"x":3.25, "y":3},
- {"label":"Z", "x":4.25, "y":3},
- {"label":"X", "x":5.25, "y":3},
- {"label":"C", "x":6.25, "y":3},
- {"label":"V", "x":7.25, "y":3},
- {"label":"B", "x":8.25, "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.25, "y":3},
- {"label":"Shift", "x":14.25, "y":3, "w":1.75},
- {"label":"Up", "x":16, "y":3},
- {"label":"Del", "x":17, "y":3},
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":2, "y":4, "w":1.25},
- {"label":"Win", "x":3.25, "y":4, "w":1.25},
- {"label":"Alt", "x":4.5, "y":4, "w":1.25},
- {"x":5.75, "y":4, "w":6.25},
- {"label":"Fn", "x":12, "y":4},
- {"label":"Alt", "x":13, "y":4},
- {"label":"Ctrl", "x":14, "y":4},
- {"label":"Left", "x":15, "y":4},
- {"label":"Down", "x":16, "y":4},
- {"label":"Right", "x":17, "y":4}
+ {"matrix": [0, 0], "x": 0, "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},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0, "w": 2},
+ {"matrix": [0, 15], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 2, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1},
+ {"matrix": [1, 15], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75},
+ {"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},
+ {"matrix": [2, 12], "x": 13.75, "y": 2},
+ {"matrix": [1, 14], "x": 14.75, "y": 2},
+ {"matrix": [2, 13], "x": 15.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [2, 15], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25},
+ {"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},
+ {"matrix": [3, 12], "x": 13.25, "y": 3},
+ {"matrix": [3, 13], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16, "y": 3},
+ {"matrix": [3, 15], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 5.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 12, "y": 4},
+ {"matrix": [4, 11], "x": 13, "y": 4},
+ {"matrix": [4, 12], "x": 14, "y": 4},
+ {"matrix": [4, 13], "x": 15, "y": 4},
+ {"matrix": [4, 14], "x": 16, "y": 4},
+ {"matrix": [4, 15], "x": 17, "y": 4}
]
},
"LAYOUT_iso_1u_small_bspc": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "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":"Backspace", "x":15, "y":0},
- {"x":16, "y":0},
- {"label":"Home", "x":17, "y":0},
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":2, "y":1, "w":1.5},
- {"label":"Q", "x":3.5, "y":1},
- {"label":"W", "x":4.5, "y":1},
- {"label":"E", "x":5.5, "y":1},
- {"label":"R", "x":6.5, "y":1},
- {"label":"T", "x":7.5, "y":1},
- {"label":"Y", "x":8.5, "y":1},
- {"label":"U", "x":9.5, "y":1},
- {"label":"I", "x":10.5, "y":1},
- {"label":"O", "x":11.5, "y":1},
- {"label":"P", "x":12.5, "y":1},
- {"label":"{", "x":13.5, "y":1},
- {"label":"}", "x":14.5, "y":1},
- {"label":"End", "x":17, "y":1},
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":2, "y":2, "w":1.75},
- {"label":"A", "x":3.75, "y":2},
- {"label":"S", "x":4.75, "y":2},
- {"label":"D", "x":5.75, "y":2},
- {"label":"F", "x":6.75, "y":2},
- {"label":"G", "x":7.75, "y":2},
- {"label":"H", "x":8.75, "y":2},
- {"label":"J", "x":9.75, "y":2},
- {"label":"K", "x":10.75, "y":2},
- {"label":"L", "x":11.75, "y":2},
- {"label":":", "x":12.75, "y":2},
- {"label":"\"", "x":13.75, "y":2},
- {"label":"|", "x":14.75, "y":2},
- {"label":"Enter", "x":15.75, "y":1, "w":1.25, "h":2},
- {"label":"Ins", "x":17, "y":2},
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":2, "y":3, "w":1.25},
- {"x":3.25, "y":3},
- {"label":"Z", "x":4.25, "y":3},
- {"label":"X", "x":5.25, "y":3},
- {"label":"C", "x":6.25, "y":3},
- {"label":"V", "x":7.25, "y":3},
- {"label":"B", "x":8.25, "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.25, "y":3},
- {"label":"Shift", "x":14.25, "y":3, "w":1.75},
- {"label":"Up", "x":16, "y":3},
- {"label":"Del", "x":17, "y":3},
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":2, "y":4, "w":1.25},
- {"label":"Win", "x":3.25, "y":4, "w":1.25},
- {"label":"Alt", "x":4.5, "y":4, "w":1.25},
- {"x":5.75, "y":4, "w":6.25},
- {"label":"Fn", "x":12, "y":4},
- {"label":"Alt", "x":13, "y":4},
- {"label":"Ctrl", "x":14, "y":4},
- {"label":"Left", "x":15, "y":4},
- {"label":"Down", "x":16, "y":4},
- {"label":"Right", "x":17, "y":4}
+ {"matrix": [0, 0], "x": 0, "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},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0},
+ {"matrix": [2, 14], "x": 16, "y": 0},
+ {"matrix": [0, 15], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 2, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1},
+ {"matrix": [1, 15], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75},
+ {"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},
+ {"matrix": [2, 12], "x": 13.75, "y": 2},
+ {"matrix": [1, 14], "x": 14.75, "y": 2},
+ {"matrix": [2, 13], "x": 15.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [2, 15], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25},
+ {"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},
+ {"matrix": [3, 12], "x": 13.25, "y": 3},
+ {"matrix": [3, 13], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16, "y": 3},
+ {"matrix": [3, 15], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 5.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 12, "y": 4},
+ {"matrix": [4, 11], "x": 13, "y": 4},
+ {"matrix": [4, 12], "x": 14, "y": 4},
+ {"matrix": [4, 13], "x": 15, "y": 4},
+ {"matrix": [4, 14], "x": 16, "y": 4},
+ {"matrix": [4, 15], "x": 17, "y": 4}
]
},
"LAYOUT_iso_7u": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "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":"Backspace", "x":15, "y":0, "w":2},
- {"label":"Home", "x":17, "y":0},
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":2, "y":1, "w":1.5},
- {"label":"Q", "x":3.5, "y":1},
- {"label":"W", "x":4.5, "y":1},
- {"label":"E", "x":5.5, "y":1},
- {"label":"R", "x":6.5, "y":1},
- {"label":"T", "x":7.5, "y":1},
- {"label":"Y", "x":8.5, "y":1},
- {"label":"U", "x":9.5, "y":1},
- {"label":"I", "x":10.5, "y":1},
- {"label":"O", "x":11.5, "y":1},
- {"label":"P", "x":12.5, "y":1},
- {"label":"{", "x":13.5, "y":1},
- {"label":"}", "x":14.5, "y":1},
- {"label":"End", "x":17, "y":1},
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":2, "y":2, "w":1.75},
- {"label":"A", "x":3.75, "y":2},
- {"label":"S", "x":4.75, "y":2},
- {"label":"D", "x":5.75, "y":2},
- {"label":"F", "x":6.75, "y":2},
- {"label":"G", "x":7.75, "y":2},
- {"label":"H", "x":8.75, "y":2},
- {"label":"J", "x":9.75, "y":2},
- {"label":"K", "x":10.75, "y":2},
- {"label":"L", "x":11.75, "y":2},
- {"label":":", "x":12.75, "y":2},
- {"label":"\"", "x":13.75, "y":2},
- {"label":"|", "x":14.75, "y":2},
- {"label":"Enter", "x":15.75, "y":1, "w":1.25, "h":2},
- {"label":"Ins", "x":17, "y":2},
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":2, "y":3, "w":1.25},
- {"x":3.25, "y":3},
- {"label":"Z", "x":4.25, "y":3},
- {"label":"X", "x":5.25, "y":3},
- {"label":"C", "x":6.25, "y":3},
- {"label":"V", "x":7.25, "y":3},
- {"label":"B", "x":8.25, "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.25, "y":3},
- {"label":"Shift", "x":14.25, "y":3, "w":1.75},
- {"label":"Up", "x":16, "y":3},
- {"label":"Del", "x":17, "y":3},
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":2, "y":4, "w":1.5},
- {"label":"Win", "x":3.5, "y":4, "w":1.5},
- {"x":5, "y":4, "w":7},
- {"label":"Fn", "x":12, "y":4, "w":1.5},
- {"label":"Ctrl", "x":13.5, "y":4, "w":1.5},
- {"label":"Left", "x":15, "y":4},
- {"label":"Down", "x":16, "y":4},
- {"label":"Right", "x":17, "y":4}
+ {"matrix": [0, 0], "x": 0, "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},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0, "w": 2},
+ {"matrix": [0, 15], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 2, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1},
+ {"matrix": [1, 15], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75},
+ {"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},
+ {"matrix": [2, 12], "x": 13.75, "y": 2},
+ {"matrix": [1, 14], "x": 14.75, "y": 2},
+ {"matrix": [2, 13], "x": 15.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [2, 15], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25},
+ {"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},
+ {"matrix": [3, 12], "x": 13.25, "y": 3},
+ {"matrix": [3, 13], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16, "y": 3},
+ {"matrix": [3, 15], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 3.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 5, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 12, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 15, "y": 4},
+ {"matrix": [4, 14], "x": 16, "y": 4},
+ {"matrix": [4, 15], "x": 17, "y": 4}
]
},
"LAYOUT_iso_7u_small_bspc": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "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":"Backspace", "x":15, "y":0},
- {"x":16, "y":0},
- {"label":"Home", "x":17, "y":0},
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":2, "y":1, "w":1.5},
- {"label":"Q", "x":3.5, "y":1},
- {"label":"W", "x":4.5, "y":1},
- {"label":"E", "x":5.5, "y":1},
- {"label":"R", "x":6.5, "y":1},
- {"label":"T", "x":7.5, "y":1},
- {"label":"Y", "x":8.5, "y":1},
- {"label":"U", "x":9.5, "y":1},
- {"label":"I", "x":10.5, "y":1},
- {"label":"O", "x":11.5, "y":1},
- {"label":"P", "x":12.5, "y":1},
- {"label":"{", "x":13.5, "y":1},
- {"label":"}", "x":14.5, "y":1},
- {"label":"End", "x":17, "y":1},
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":2, "y":2, "w":1.75},
- {"label":"A", "x":3.75, "y":2},
- {"label":"S", "x":4.75, "y":2},
- {"label":"D", "x":5.75, "y":2},
- {"label":"F", "x":6.75, "y":2},
- {"label":"G", "x":7.75, "y":2},
- {"label":"H", "x":8.75, "y":2},
- {"label":"J", "x":9.75, "y":2},
- {"label":"K", "x":10.75, "y":2},
- {"label":"L", "x":11.75, "y":2},
- {"label":":", "x":12.75, "y":2},
- {"label":"\"", "x":13.75, "y":2},
- {"label":"|", "x":14.75, "y":2},
- {"label":"Enter", "x":15.75, "y":1, "w":1.25, "h":2},
- {"label":"Ins", "x":17, "y":2},
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":2, "y":3, "w":1.25},
- {"x":3.25, "y":3},
- {"label":"Z", "x":4.25, "y":3},
- {"label":"X", "x":5.25, "y":3},
- {"label":"C", "x":6.25, "y":3},
- {"label":"V", "x":7.25, "y":3},
- {"label":"B", "x":8.25, "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.25, "y":3},
- {"label":"Shift", "x":14.25, "y":3, "w":1.75},
- {"label":"Up", "x":16, "y":3},
- {"label":"Del", "x":17, "y":3},
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":2, "y":4, "w":1.5},
- {"label":"Win", "x":3.5, "y":4, "w":1.5},
- {"x":5, "y":4, "w":7},
- {"label":"Fn", "x":12, "y":4, "w":1.5},
- {"label":"Ctrl", "x":13.5, "y":4, "w":1.5},
- {"label":"Left", "x":15, "y":4},
- {"label":"Down", "x":16, "y":4},
- {"label":"Right", "x":17, "y":4}
+ {"matrix": [0, 0], "x": 0, "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},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0},
+ {"matrix": [2, 14], "x": 16, "y": 0},
+ {"matrix": [0, 15], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 2, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1},
+ {"matrix": [1, 15], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75},
+ {"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},
+ {"matrix": [2, 12], "x": 13.75, "y": 2},
+ {"matrix": [1, 14], "x": 14.75, "y": 2},
+ {"matrix": [2, 13], "x": 15.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [2, 15], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25},
+ {"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},
+ {"matrix": [3, 12], "x": 13.25, "y": 3},
+ {"matrix": [3, 13], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16, "y": 3},
+ {"matrix": [3, 15], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 3.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 5, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 12, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 15, "y": 4},
+ {"matrix": [4, 14], "x": 16, "y": 4},
+ {"matrix": [4, 15], "x": 17, "y": 4}
]
},
"LAYOUT_iso_blocker": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "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":"Backspace", "x":15, "y":0, "w":2},
- {"label":"Home", "x":17, "y":0},
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":2, "y":1, "w":1.5},
- {"label":"Q", "x":3.5, "y":1},
- {"label":"W", "x":4.5, "y":1},
- {"label":"E", "x":5.5, "y":1},
- {"label":"R", "x":6.5, "y":1},
- {"label":"T", "x":7.5, "y":1},
- {"label":"Y", "x":8.5, "y":1},
- {"label":"U", "x":9.5, "y":1},
- {"label":"I", "x":10.5, "y":1},
- {"label":"O", "x":11.5, "y":1},
- {"label":"P", "x":12.5, "y":1},
- {"label":"{", "x":13.5, "y":1},
- {"label":"}", "x":14.5, "y":1},
- {"label":"End", "x":17, "y":1},
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":2, "y":2, "w":1.75},
- {"label":"A", "x":3.75, "y":2},
- {"label":"S", "x":4.75, "y":2},
- {"label":"D", "x":5.75, "y":2},
- {"label":"F", "x":6.75, "y":2},
- {"label":"G", "x":7.75, "y":2},
- {"label":"H", "x":8.75, "y":2},
- {"label":"J", "x":9.75, "y":2},
- {"label":"K", "x":10.75, "y":2},
- {"label":"L", "x":11.75, "y":2},
- {"label":":", "x":12.75, "y":2},
- {"label":"\"", "x":13.75, "y":2},
- {"label":"|", "x":14.75, "y":2},
- {"label":"Enter", "x":15.75, "y":1, "w":1.25, "h":2},
- {"label":"Ins", "x":17, "y":2},
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":2, "y":3, "w":1.25},
- {"x":3.25, "y":3},
- {"label":"Z", "x":4.25, "y":3},
- {"label":"X", "x":5.25, "y":3},
- {"label":"C", "x":6.25, "y":3},
- {"label":"V", "x":7.25, "y":3},
- {"label":"B", "x":8.25, "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.25, "y":3},
- {"label":"Shift", "x":14.25, "y":3, "w":1.75},
- {"label":"Up", "x":16, "y":3},
- {"label":"Del", "x":17, "y":3},
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":2, "y":4, "w":1.25},
- {"label":"Win", "x":3.25, "y":4, "w":1.25},
- {"label":"Alt", "x":4.5, "y":4, "w":1.25},
- {"x":5.75, "y":4, "w":6.25},
- {"label":"Fn", "x":12, "y":4, "w":1.25},
- {"label":"Ctrl", "x":13.25, "y":4, "w":1.25},
- {"label":"Left", "x":15, "y":4},
- {"label":"Down", "x":16, "y":4},
- {"label":"Right", "x":17, "y":4}
+ {"matrix": [0, 0], "x": 0, "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},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0, "w": 2},
+ {"matrix": [0, 15], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 2, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1},
+ {"matrix": [1, 15], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75},
+ {"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},
+ {"matrix": [2, 12], "x": 13.75, "y": 2},
+ {"matrix": [1, 14], "x": 14.75, "y": 2},
+ {"matrix": [2, 13], "x": 15.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [2, 15], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25},
+ {"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},
+ {"matrix": [3, 12], "x": 13.25, "y": 3},
+ {"matrix": [3, 13], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16, "y": 3},
+ {"matrix": [3, 15], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 5.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 12, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 13.25, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 13], "x": 15, "y": 4},
+ {"matrix": [4, 14], "x": 16, "y": 4},
+ {"matrix": [4, 15], "x": 17, "y": 4}
]
},
"LAYOUT_iso_blocker_small_bspc": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "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":"Backspace", "x":15, "y":0},
- {"x":16, "y":0},
- {"label":"Home", "x":17, "y":0},
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":2, "y":1, "w":1.5},
- {"label":"Q", "x":3.5, "y":1},
- {"label":"W", "x":4.5, "y":1},
- {"label":"E", "x":5.5, "y":1},
- {"label":"R", "x":6.5, "y":1},
- {"label":"T", "x":7.5, "y":1},
- {"label":"Y", "x":8.5, "y":1},
- {"label":"U", "x":9.5, "y":1},
- {"label":"I", "x":10.5, "y":1},
- {"label":"O", "x":11.5, "y":1},
- {"label":"P", "x":12.5, "y":1},
- {"label":"{", "x":13.5, "y":1},
- {"label":"}", "x":14.5, "y":1},
- {"label":"End", "x":17, "y":1},
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":2, "y":2, "w":1.75},
- {"label":"A", "x":3.75, "y":2},
- {"label":"S", "x":4.75, "y":2},
- {"label":"D", "x":5.75, "y":2},
- {"label":"F", "x":6.75, "y":2},
- {"label":"G", "x":7.75, "y":2},
- {"label":"H", "x":8.75, "y":2},
- {"label":"J", "x":9.75, "y":2},
- {"label":"K", "x":10.75, "y":2},
- {"label":"L", "x":11.75, "y":2},
- {"label":":", "x":12.75, "y":2},
- {"label":"\"", "x":13.75, "y":2},
- {"label":"|", "x":14.75, "y":2},
- {"label":"Enter", "x":15.75, "y":1, "w":1.25, "h":2},
- {"label":"Ins", "x":17, "y":2},
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":2, "y":3, "w":1.25},
- {"x":3.25, "y":3},
- {"label":"Z", "x":4.25, "y":3},
- {"label":"X", "x":5.25, "y":3},
- {"label":"C", "x":6.25, "y":3},
- {"label":"V", "x":7.25, "y":3},
- {"label":"B", "x":8.25, "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.25, "y":3},
- {"label":"Shift", "x":14.25, "y":3, "w":1.75},
- {"label":"Up", "x":16, "y":3},
- {"label":"Del", "x":17, "y":3},
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":2, "y":4, "w":1.25},
- {"label":"Win", "x":3.25, "y":4, "w":1.25},
- {"label":"Alt", "x":4.5, "y":4, "w":1.25},
- {"x":5.75, "y":4, "w":6.25},
- {"label":"Fn", "x":12, "y":4, "w":1.25},
- {"label":"Ctrl", "x":13.25, "y":4, "w":1.25},
- {"label":"Left", "x":15, "y":4},
- {"label":"Down", "x":16, "y":4},
- {"label":"Right", "x":17, "y":4}
+ {"matrix": [0, 0], "x": 0, "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},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0},
+ {"matrix": [2, 14], "x": 16, "y": 0},
+ {"matrix": [0, 15], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 2, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1},
+ {"matrix": [1, 15], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75},
+ {"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},
+ {"matrix": [2, 12], "x": 13.75, "y": 2},
+ {"matrix": [1, 14], "x": 14.75, "y": 2},
+ {"matrix": [2, 13], "x": 15.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [2, 15], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25},
+ {"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},
+ {"matrix": [3, 12], "x": 13.25, "y": 3},
+ {"matrix": [3, 13], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16, "y": 3},
+ {"matrix": [3, 15], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 5.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 12, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 13.25, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 13], "x": 15, "y": 4},
+ {"matrix": [4, 14], "x": 16, "y": 4},
+ {"matrix": [4, 15], "x": 17, "y": 4}
]
},
"LAYOUT_iso_blocker_7u": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "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":"Backspace", "x":15, "y":0, "w":2},
- {"label":"Home", "x":17, "y":0},
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":2, "y":1, "w":1.5},
- {"label":"Q", "x":3.5, "y":1},
- {"label":"W", "x":4.5, "y":1},
- {"label":"E", "x":5.5, "y":1},
- {"label":"R", "x":6.5, "y":1},
- {"label":"T", "x":7.5, "y":1},
- {"label":"Y", "x":8.5, "y":1},
- {"label":"U", "x":9.5, "y":1},
- {"label":"I", "x":10.5, "y":1},
- {"label":"O", "x":11.5, "y":1},
- {"label":"P", "x":12.5, "y":1},
- {"label":"{", "x":13.5, "y":1},
- {"label":"}", "x":14.5, "y":1},
- {"label":"End", "x":17, "y":1},
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":2, "y":2, "w":1.75},
- {"label":"A", "x":3.75, "y":2},
- {"label":"S", "x":4.75, "y":2},
- {"label":"D", "x":5.75, "y":2},
- {"label":"F", "x":6.75, "y":2},
- {"label":"G", "x":7.75, "y":2},
- {"label":"H", "x":8.75, "y":2},
- {"label":"J", "x":9.75, "y":2},
- {"label":"K", "x":10.75, "y":2},
- {"label":"L", "x":11.75, "y":2},
- {"label":":", "x":12.75, "y":2},
- {"label":"\"", "x":13.75, "y":2},
- {"label":"|", "x":14.75, "y":2},
- {"label":"Enter", "x":15.75, "y":1, "w":1.25, "h":2},
- {"label":"Ins", "x":17, "y":2},
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":2, "y":3, "w":1.25},
- {"x":3.25, "y":3},
- {"label":"Z", "x":4.25, "y":3},
- {"label":"X", "x":5.25, "y":3},
- {"label":"C", "x":6.25, "y":3},
- {"label":"V", "x":7.25, "y":3},
- {"label":"B", "x":8.25, "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.25, "y":3},
- {"label":"Shift", "x":14.25, "y":3, "w":1.75},
- {"label":"Up", "x":16, "y":3},
- {"label":"Del", "x":17, "y":3},
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":2, "y":4, "w":1.5},
- {"label":"Win", "x":3.5, "y":4},
- {"label":"Alt", "x":4.5, "y":4, "w":1.5},
- {"x":6, "y":4, "w":6.75},
- {"label":"Fn", "x":12.75, "y":4, "w":1.5},
- {"label":"Left", "x":15, "y":4},
- {"label":"Down", "x":16, "y":4},
- {"label":"Right", "x":17, "y":4}
+ {"matrix": [0, 0], "x": 0, "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},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0, "w": 2},
+ {"matrix": [0, 15], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 2, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1},
+ {"matrix": [1, 15], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75},
+ {"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},
+ {"matrix": [2, 12], "x": 13.75, "y": 2},
+ {"matrix": [1, 14], "x": 14.75, "y": 2},
+ {"matrix": [2, 13], "x": 15.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [2, 15], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25},
+ {"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},
+ {"matrix": [3, 12], "x": 13.25, "y": 3},
+ {"matrix": [3, 13], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16, "y": 3},
+ {"matrix": [3, 15], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 3.5, "y": 4},
+ {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 6, "y": 4, "w": 6.75},
+ {"matrix": [4, 10], "x": 12.75, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 13], "x": 15, "y": 4},
+ {"matrix": [4, 14], "x": 16, "y": 4},
+ {"matrix": [4, 15], "x": 17, "y": 4}
]
},
"LAYOUT_iso_blocker_7u_small_bspc": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "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":"Backspace", "x":15, "y":0},
- {"x":16, "y":0},
- {"label":"Home", "x":17, "y":0},
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":2, "y":1, "w":1.5},
- {"label":"Q", "x":3.5, "y":1},
- {"label":"W", "x":4.5, "y":1},
- {"label":"E", "x":5.5, "y":1},
- {"label":"R", "x":6.5, "y":1},
- {"label":"T", "x":7.5, "y":1},
- {"label":"Y", "x":8.5, "y":1},
- {"label":"U", "x":9.5, "y":1},
- {"label":"I", "x":10.5, "y":1},
- {"label":"O", "x":11.5, "y":1},
- {"label":"P", "x":12.5, "y":1},
- {"label":"{", "x":13.5, "y":1},
- {"label":"}", "x":14.5, "y":1},
- {"label":"End", "x":17, "y":1},
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":2, "y":2, "w":1.75},
- {"label":"A", "x":3.75, "y":2},
- {"label":"S", "x":4.75, "y":2},
- {"label":"D", "x":5.75, "y":2},
- {"label":"F", "x":6.75, "y":2},
- {"label":"G", "x":7.75, "y":2},
- {"label":"H", "x":8.75, "y":2},
- {"label":"J", "x":9.75, "y":2},
- {"label":"K", "x":10.75, "y":2},
- {"label":"L", "x":11.75, "y":2},
- {"label":":", "x":12.75, "y":2},
- {"label":"\"", "x":13.75, "y":2},
- {"label":"|", "x":14.75, "y":2},
- {"label":"Enter", "x":15.75, "y":1, "w":1.25, "h":2},
- {"label":"Ins", "x":17, "y":2},
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":2, "y":3, "w":1.25},
- {"x":3.25, "y":3},
- {"label":"Z", "x":4.25, "y":3},
- {"label":"X", "x":5.25, "y":3},
- {"label":"C", "x":6.25, "y":3},
- {"label":"V", "x":7.25, "y":3},
- {"label":"B", "x":8.25, "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.25, "y":3},
- {"label":"Shift", "x":14.25, "y":3, "w":1.75},
- {"label":"Up", "x":16, "y":3},
- {"label":"Del", "x":17, "y":3},
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":2, "y":4, "w":1.5},
- {"label":"Win", "x":3.5, "y":4},
- {"label":"Alt", "x":4.5, "y":4, "w":1.5},
- {"label":"Space", "x":6, "y":4, "w":7},
- {"label":"Fn", "x":13, "y":4, "w":1.5},
- {"label":"Left", "x":15, "y":4},
- {"label":"Down", "x":16, "y":4},
- {"label":"Right", "x":17, "y":4}
+ {"matrix": [0, 0], "x": 0, "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},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0},
+ {"matrix": [2, 14], "x": 16, "y": 0},
+ {"matrix": [0, 15], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 2, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 13], "x": 14.5, "y": 1},
+ {"matrix": [1, 15], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75},
+ {"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},
+ {"matrix": [2, 12], "x": 13.75, "y": 2},
+ {"matrix": [1, 14], "x": 14.75, "y": 2},
+ {"matrix": [2, 13], "x": 15.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [2, 15], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25},
+ {"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},
+ {"matrix": [3, 12], "x": 13.25, "y": 3},
+ {"matrix": [3, 13], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16, "y": 3},
+ {"matrix": [3, 15], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 3.5, "y": 4},
+ {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 6, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 13, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 13], "x": 15, "y": 4},
+ {"matrix": [4, 14], "x": 16, "y": 4},
+ {"matrix": [4, 15], "x": 17, "y": 4}
]
}
}
diff --git a/keyboards/jacky_studio/s7_elephant/rev1/rev1.h b/keyboards/jacky_studio/s7_elephant/rev1/rev1.h
deleted file mode 100644
index 18b04aaaf9..0000000000
--- a/keyboards/jacky_studio/s7_elephant/rev1/rev1.h
+++ /dev/null
@@ -1,869 +0,0 @@
-/* Copyright 2020 MudkipMao
- *
- * 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
-
-/* ANSI
- * ,------. ,-------------------------------------------------------------------------------------------------.
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | |
- * `------' `-------------------------------------------------------------------------------------------------'
- */
-
-#define LAYOUT_ansi( \
-K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K013, 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, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, \
-K400, K401, K402, K403, K407, K410, K411, K413, K414, K415 \
-) { \
-{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, 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, ____, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315 }, \
-{ K400, K401, K402, K403, ____, ____, ____, K407, ____, ____, K410, K411, ____, K413, K414, K415 } \
-}
-
-/* ANSI with small shift
- * ,------. ,-------------------------------------------------------------------------------------------------.
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | |
- * `------' `-------------------------------------------------------------------------------------------------'
- */
-
-#define LAYOUT_ansi_small_lshift( \
-K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K013, 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, K313, K314, K315, \
-K400, K401, K402, K403, K407, K410, K411, K413, K414, K415 \
-) { \
-{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, 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, K313, K314, K315 }, \
-{ K400, K401, K402, K403, ____, ____, ____, K407, ____, ____, K410, K411, ____, K413, K414, K415 } \
-}
-
-/* ANSI with small backspace
- * ,------. ,-------------------------------------------------------------------------------------------------.
- * | | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | |
- * `------' `-------------------------------------------------------------------------------------------------'
- */
-
-#define LAYOUT_ansi_small_bspc( \
-K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K013, K214, 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, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, \
-K400, K401, K402, K403, K407, K410, K411, K413, K414, K415 \
-) { \
-{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, 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, K214, K215 }, \
-{ K300, K301, ____, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315 }, \
-{ K400, K401, K402, K403, ____, ____, ____, K407, ____, ____, K410, K411, ____, K413, K414, K415 } \
-}
-
-/* ANSI with small shift and small backspace
- * ,------. ,-------------------------------------------------------------------------------------------------.
- * | | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | |
- * `------' `-------------------------------------------------------------------------------------------------'
- */
-
-#define LAYOUT_ansi_small_lshift_small_bspc( \
-K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K013, K214, 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, K313, K314, K315, \
-K400, K401, K402, K403, K407, K410, K411, K413, K414, K415 \
-) { \
-{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, 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, K214, K215 }, \
-{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315 }, \
-{ K400, K401, K402, K403, ____, ____, ____, K407, ____, ____, K410, K411, ____, K413, K414, K415 } \
-}
-
-/* **************************************************************************************************************************************** */
-/* ANSI with 1u keys in the bottom row
- * ,------. ,-------------------------------------------------------------------------------------------------.
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | |
- * `------' `-------------------------------------------------------------------------------------------------'
- */
-
-#define LAYOUT_ansi_1u( \
-K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K013, 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, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, \
-K400, K401, K402, K403, K407, K410, K411, K412, K413, K414, K415 \
-) { \
-{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, 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, ____, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315 }, \
-{ K400, K401, K402, K403, ____, ____, ____, K407, ____, ____, K410, K411, K412, K413, K414, K415 } \
-}
-
-/* ANSI with small shift and 1u keys in the bottom row
- * ,------. ,-------------------------------------------------------------------------------------------------.
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | |
- * `------' `-------------------------------------------------------------------------------------------------'
- */
-
-#define LAYOUT_ansi_1u_small_lshift( \
-K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K013, 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, K313, K314, K315, \
-K400, K401, K402, K403, K407, K410, K411, K412, K413, K414, K415 \
-) { \
-{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, 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, K313, K314, K315 }, \
-{ K400, K401, K402, K403, ____, ____, ____, K407, ____, ____, K410, K411, K412, K413, K414, K415 } \
-}
-
-/* ANSI with small backspace and 1u keys in the bottom row
- * ,------. ,-------------------------------------------------------------------------------------------------.
- * | | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | |
- * `------' `-------------------------------------------------------------------------------------------------'
- */
-
-#define LAYOUT_ansi_1u_small_bspc( \
-K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K013, K214, 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, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, \
-K400, K401, K402, K403, K407, K410, K411, K412, K413, K414, K415 \
-) { \
-{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, 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, K214, K215 }, \
-{ K300, K301, ____, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315 }, \
-{ K400, K401, K402, K403, ____, ____, ____, K407, ____, ____, K410, K411, K412, K413, K414, K415 } \
-}
-
-/* ANSI with small shift and small backspace and 1u keys in the bottom row
- * ,------. ,-------------------------------------------------------------------------------------------------.
- * | | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | |
- * `------' `-------------------------------------------------------------------------------------------------'
- */
-
-#define LAYOUT_ansi_1u_small_lshift_small_bspc( \
-K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K013, K214, 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, K313, K314, K315, \
-K400, K401, K402, K403, K407, K410, K411, K412, K413, K414, K415 \
-) { \
-{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, 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, K214, K215 }, \
-{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315 }, \
-{ K400, K401, K402, K403, ____, ____, ____, K407, ____, ____, K410, K411, K412, K413, K414, K415 } \
-}
-
-/* **************************************************************************************************************************************** */
-/* ANSI with 7u spacebar
- * ,------. ,-------------------------------------------------------------------------------------------------.
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | |
- * `------' `-------------------------------------------------------------------------------------------------'
- */
-
-#define LAYOUT_ansi_7u( \
-K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K013, 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, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, \
-K400, K401, K402, K407, K410, K411, K413, K414, K415 \
-) { \
-{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, 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, ____, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315 }, \
-{ K400, K401, K402, ____, ____, ____, ____, K407, ____, ____, K410, K411, ____, K413, K414, K415 } \
-}
-
-/* ANSI with small shift and 7u spacebar
- * ,------. ,-------------------------------------------------------------------------------------------------.
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | |
- * `------' `-------------------------------------------------------------------------------------------------'
- */
-
-#define LAYOUT_ansi_7u_small_lshift( \
-K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K013, 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, K313, K314, K315, \
-K400, K401, K402, K407, K410, K411, K413, K414, K415 \
-) { \
-{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, 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, K313, K314, K315 }, \
-{ K400, K401, K402, ____, ____, ____, ____, K407, ____, ____, K410, K411, ____, K413, K414, K415 } \
-}
-
-/* ANSI with small backspace and 7u spacebar
- * ,------. ,-------------------------------------------------------------------------------------------------.
- * | | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | |
- * `------' `-------------------------------------------------------------------------------------------------'
- */
-
-#define LAYOUT_ansi_7u_small_bspc( \
-K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K013, K214, 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, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, \
-K400, K401, K402, K407, K410, K411, K413, K414, K415 \
-) { \
-{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, 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, K214, K215 }, \
-{ K300, K301, ____, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315 }, \
-{ K400, K401, K402, ____, ____, ____, ____, K407, ____, ____, K410, K411, ____, K413, K414, K415 } \
-}
-
-/* ANSI with small shift and small backspace and 7u spacebar
- * ,------. ,-------------------------------------------------------------------------------------------------.
- * | | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | |
- * `------' `-------------------------------------------------------------------------------------------------'
- */
-
-#define LAYOUT_ansi_7u_small_lshift_small_bspc( \
-K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K013, K214, 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, K313, K314, K315, \
-K400, K401, K402, K407, K410, K411, K413, K414, K415 \
-) { \
-{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, 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, K214, K215 }, \
-{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315 }, \
-{ K400, K401, K402, ____, ____, ____, ____, K407, ____, ____, K410, K411, ____, K413, K414, K415 } \
-}
-
-/* **************************************************************************************************************************************** */
-/* ANSI with blocker
- * ,------. ,-------------------------------------------------------------------------------------------------.
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | |
- * `------' `-------------------------------------------------------------------------- -------------------'
- */
-
-#define LAYOUT_ansi_blocker( \
-K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K013, 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, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, \
-K400, K401, K402, K403, K407, K410, K411, K413, K414, K415 \
-) { \
-{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, 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, ____, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315 }, \
-{ K400, K401, K402, K403, ____, ____, ____, K407, ____, ____, K410, K411, ____, K413, K414, K415 } \
-}
-
-/* ANSI with blocker and small shift
- * ,------. ,-------------------------------------------------------------------------------------------------.
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | |
- * `------' `-------------------------------------------------------------------------- -------------------'
- */
-
-#define LAYOUT_ansi_blocker_small_lshift( \
-K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K013, 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, K313, K314, K315, \
-K400, K401, K402, K403, K407, K410, K411, K413, K414, K415 \
-) { \
-{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, 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, K313, K314, K315 }, \
-{ K400, K401, K402, K403, ____, ____, ____, K407, ____, ____, K410, K411, ____, K413, K414, K415 } \
-}
-
-/* ANSI with blocker and small backspace
- * ,------. ,-------------------------------------------------------------------------------------------------.
- * | | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | |
- * `------' `-------------------------------------------------------------------------- -------------------'
- */
-
-#define LAYOUT_ansi_blocker_small_bspc( \
-K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K013, K214, 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, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, \
-K400, K401, K402, K403, K407, K410, K411, K413, K414, K415 \
-) { \
-{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, 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, K214, K215 }, \
-{ K300, K301, ____, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315 }, \
-{ K400, K401, K402, K403, ____, ____, ____, K407, ____, ____, K410, K411, ____, K413, K414, K415 } \
-}
-
-/* ANSI with blocker and small shift and small backspace
- * ,------. ,-------------------------------------------------------------------------------------------------.
- * | | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | |
- * `------' `-------------------------------------------------------------------------- -------------------'
- */
-
-#define LAYOUT_ansi_blocker_small_lshift_small_bspc( \
-K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K013, K214, 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, K313, K314, K315, \
-K400, K401, K402, K403, K407, K410, K411, K413, K414, K415 \
-) { \
-{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, 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, K214, K215 }, \
-{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315 }, \
-{ K400, K401, K402, K403, ____, ____, ____, K407, ____, ____, K410, K411, ____, K413, K414, K415 } \
-}
-
-/* **************************************************************************************************************************************** */
-/* ANSI with blocker and 7u spacebar
- * ,------. ,-------------------------------------------------------------------------------------------------.
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | |
- * `------' `--------------------------------------------------------------------------- ------------------'
- */
-
-#define LAYOUT_ansi_blocker_7u( \
-K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K013, 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, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, \
-K400, K401, K402, K403, K407, K410, K413, K414, K415 \
-) { \
-{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, 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, ____, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315 }, \
-{ K400, K401, K402, K403, ____, ____, ____, K407, ____, ____, K410, ____, ____, K413, K414, K415 } \
-}
-
-/* ANSI with blocker and small shift and 7u spacebar
- * ,------. ,-------------------------------------------------------------------------------------------------.
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | |
- * `------' `--------------------------------------------------------------------------- ------------------'
- */
-
-#define LAYOUT_ansi_blocker_7u_small_lshift( \
-K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K013, 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, K313, K314, K315, \
-K400, K401, K402, K403, K407, K410, K413, K414, K415 \
-) { \
-{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, 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, K313, K314, K315 }, \
-{ K400, K401, K402, K403, ____, ____, ____, K407, ____, ____, K410, ____, ____, K413, K414, K415 } \
-}
-
-/* ANSI with blocker and small backspace and 7u spacebar
- * ,------. ,-------------------------------------------------------------------------------------------------.
- * | | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | |
- * `------' `--------------------------------------------------------------------------- ------------------'
- */
-
-#define LAYOUT_ansi_blocker_7u_small_bspc( \
-K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K013, K214, 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, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, \
-K400, K401, K402, K403, K407, K410, K413, K414, K415 \
-) { \
-{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, 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, K214, K215 }, \
-{ K300, K301, ____, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315 }, \
-{ K400, K401, K402, K403, ____, ____, ____, K407, ____, ____, K410, ____, ____, K413, K414, K415 } \
-}
-
-/* ANSI with blocker and small shift and small backspace and 7u spacebar
- * ,------. ,-------------------------------------------------------------------------------------------------.
- * | | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | |
- * `------' `--------------------------------------------------------------------------- ------------------'
- */
-
-#define LAYOUT_ansi_blocker_7u_small_lshift_small_bspc( \
-K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K013, K214, 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, K313, K314, K315, \
-K400, K401, K402, K403, K407, K410, K413, K414, K415 \
-) { \
-{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, 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, K214, K215 }, \
-{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315 }, \
-{ K400, K401, K402, K403, ____, ____, ____, K407, ____, ____, K410, ____, ____, K413, K414, K415 } \
-}
-
-/* **************************************************************************************************************************************** */
-/* ISO
- * ,------. ,-------------------------------------------------------------------------------------------------.
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- | | | | | | | | | | | | | | | | | |
- * |------| |------------------------------------------------------------------------------------ |-----|
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | |
- * `------' `-------------------------------------------------------------------------------------------------'
- */
-
-#define LAYOUT_iso( \
-K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K013, 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, K114, K213, K215, \
-K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, \
-K400, K401, K402, K403, K407, K410, K411, K413, K414, K415 \
-) { \
-{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, 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, K313, K314, K315 }, \
-{ K400, K401, K402, K403, ____, ____, ____, K407, ____, ____, K410, K411, ____, K413, K414, K415 } \
-}
-
-/* ISO with small backspace
- * ,------. ,-------------------------------------------------------------------------------------------------.
- * | | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- | | | | | | | | | | | | | | | | | |
- * |------| |------------------------------------------------------------------------------------ |-----|
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | |
- * `------' `-------------------------------------------------------------------------------------------------'
- */
-
-#define LAYOUT_iso_small_bspc( \
-K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K013, K214, 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, K114, K213, K215, \
-K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, \
-K400, K401, K402, K403, K407, K410, K411, K413, K414, K415 \
-) { \
-{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, 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, K214, K215 }, \
-{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315 }, \
-{ K400, K401, K402, K403, ____, ____, ____, K407, ____, ____, K410, K411, ____, K413, K414, K415 } \
-}
-
-/* **************************************************************************************************************************************** */
-/* ISO with 1u keys in the bottom row
- * ,------. ,-------------------------------------------------------------------------------------------------.
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- | | | | | | | | | | | | | | | | | |
- * |------| |------------------------------------------------------------------------------------ |-----|
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | |
- * `------' `-------------------------------------------------------------------------------------------------'
- */
-
-#define LAYOUT_iso_1u( \
-K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K013, 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, K114, K213, K215, \
-K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, \
-K400, K401, K402, K403, K407, K410, K411, K412, K413, K414, K415 \
-) { \
-{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, 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, K313, K314, K315 }, \
-{ K400, K401, K402, K403, ____, ____, ____, K407, ____, ____, K410, K411, K412, K413, K414, K415 } \
-}
-
-/* ISO with small backspace and 1u keys in the bottom row
- * ,------. ,-------------------------------------------------------------------------------------------------.
- * | | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- | | | | | | | | | | | | | | | | | |
- * |------| |------------------------------------------------------------------------------------ |-----|
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | |
- * `------' `-------------------------------------------------------------------------------------------------'
- */
-
-#define LAYOUT_iso_1u_small_bspc( \
-K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K013, K214, 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, K114, K213, K215, \
-K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, \
-K400, K401, K402, K403, K407, K410, K411, K412, K413, K414, K415 \
-) { \
-{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, 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, K214, K215 }, \
-{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315 }, \
-{ K400, K401, K402, K403, ____, ____, ____, K407, ____, ____, K410, K411, K412, K413, K414, K415 } \
-}
-
-/* **************************************************************************************************************************************** */
-/* ISO with 7u spacebar
- * ,------. ,-------------------------------------------------------------------------------------------------.
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- | | | | | | | | | | | | | | | | | |
- * |------| |------------------------------------------------------------------------------------ |-----|
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | |
- * `------' `-------------------------------------------------------------------------------------------------'
- */
-
-#define LAYOUT_iso_7u( \
-K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K013, 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, K114, K213, K215, \
-K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, \
-K400, K401, K402, K407, K410, K411, K413, K414, K415 \
-) { \
-{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, 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, K313, K314, K315 }, \
-{ K400, K401, K402, ____, ____, ____, ____, K407, ____, ____, K410, K411, ____, K413, K414, K415 } \
-}
-
-/* ISO with small backspace and 7u spacebar
- * ,------. ,-------------------------------------------------------------------------------------------------.
- * | | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- | | | | | | | | | | | | | | | | | |
- * |------| |------------------------------------------------------------------------------------ |-----|
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | |
- * `------' `-------------------------------------------------------------------------------------------------'
- */
-
-#define LAYOUT_iso_7u_small_bspc( \
-K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K013, K214, 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, K114, K213, K215, \
-K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, \
-K400, K401, K402, K407, K410, K411, K413, K414, K415 \
-) { \
-{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, 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, K214, K215 }, \
-{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315 }, \
-{ K400, K401, K402, ____, ____, ____, ____, K407, ____, ____, K410, K411, ____, K413, K414, K415 } \
-}
-/* **************************************************************************************************************************************** */
-/* ISO with blocker
- * ,------. ,-------------------------------------------------------------------------------------------------.
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- | | | | | | | | | | | | | | | | | |
- * |------| |------------------------------------------------------------------------------------ |-----|
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | |
- * `------' `-------------------------------------------------------------------------- -------------------'
- */
-
-#define LAYOUT_iso_blocker( \
-K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K013, 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, K114, K213, K215, \
-K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, \
-K400, K401, K402, K403, K407, K410, K411, K413, K414, K415 \
-) { \
-{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, 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, K313, K314, K315 }, \
-{ K400, K401, K402, K403, ____, ____, ____, K407, ____, ____, K410, K411, ____, K413, K414, K415 } \
-}
-
-/* ISO with blocker and small backspace
- * ,------. ,-------------------------------------------------------------------------------------------------.
- * | | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- | | | | | | | | | | | | | | | | | |
- * |------| |------------------------------------------------------------------------------------ |-----|
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | |
- * `------' `-------------------------------------------------------------------------- -------------------'
- */
-
-#define LAYOUT_iso_blocker_small_bspc( \
-K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K013, K214, 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, K114, K213, K215, \
-K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, \
-K400, K401, K402, K403, K407, K410, K411, K413, K414, K415 \
-) { \
-{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, 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, K214, K215 }, \
-{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315 }, \
-{ K400, K401, K402, K403, ____, ____, ____, K407, ____, ____, K410, K411, ____, K413, K414, K415 } \
-}
-
-/* **************************************************************************************************************************************** */
-/* ISO with blocker and 7u spacebar
- * ,------. ,-------------------------------------------------------------------------------------------------.
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- | | | | | | | | | | | | | | | | | |
- * |------| |------------------------------------------------------------------------------------ |-----|
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | |
- * `------' `--------------------------------------------------------------------------- ------------------'
- */
-
-#define LAYOUT_iso_blocker_7u( \
-K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K013, 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, K114, K213, K215, \
-K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, \
-K400, K401, K402, K403, K407, K410, K413, K414, K415 \
-) { \
-{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, 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, K313, K314, K315 }, \
-{ K400, K401, K402, K403, ____, ____, ____, K407, ____, ____, K410, ____, ____, K413, K414, K415 } \
-}
-
-/* ISO with blocker and small backspace and 7u spacebar
- * ,------. ,-------------------------------------------------------------------------------------------------.
- * | | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- | | | | | | | | | | | | | | | | | |
- * |------| |------------------------------------------------------------------------------------ |-----|
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | | | | | | | |
- * |------| |-------------------------------------------------------------------------------------------------|
- * | | | | | | | | | | | |
- * `------' `--------------------------------------------------------------------------- ------------------'
- */
-
-#define LAYOUT_iso_blocker_7u_small_bspc( \
-K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K013, K214, 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, K114, K213, K215, \
-K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, \
-K400, K401, K402, K403, K407, K410, K413, K414, K415 \
-) { \
-{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, 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, K214, K215 }, \
-{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315 }, \
-{ K400, K401, K402, K403, ____, ____, ____, K407, ____, ____, K410, ____, ____, K413, K414, K415 } \
-}
diff --git a/keyboards/jae/j01/info.json b/keyboards/jae/j01/info.json
index 74bcf21b47..6af9cc38af 100644
--- a/keyboards/jae/j01/info.json
+++ b/keyboards/jae/j01/info.json
@@ -25,11 +25,193 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_ansi": {
- "layout": [{"x":0, "y":0}, {"x":1, "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":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.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":18, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2.5, "y":1, "w":1.5}, {"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":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1, "w":1.5}, {"x":18, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2.5, "y":2, "w":1.75}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"x":11.25, "y":2}, {"x":12.25, "y":2}, {"x":13.25, "y":2}, {"x":14.25, "y":2}, {"x":15.25, "y":2, "w":2.25}, {"x":18, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2.5, "y":3, "w":2.25}, {"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}, {"x":13.75, "y":3}, {"x":14.75, "y":3, "w":1.75}, {"x":16.75, "y":3.25}, {"x":18, "y":3}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":1.25}, {"x":6.25, "y":4, "w":6.25}, {"x":12.5, "y":4, "w":1.5}, {"x":14, "y":4, "w":1.5}, {"x":15.75, "y":4.25}, {"x":16.75, "y":4.25}, {"x":17.75, "y":4.25}]
- },
+ "layout": [
+ {"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},
+ {"matrix": [1, 15], "x": 16.5, "y": 0},
+
+ {"matrix": [0, 16], "x": 18, "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": [2, 14], "x": 16, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 16], "x": 18, "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": 15.25, "y": 2, "w": 2.25},
+ {"matrix": [2, 16], "x": 18, "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, 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},
+ {"matrix": [3, 14], "x": 14.75, "y": 3, "w": 1.75},
+
+ {"matrix": [3, 15], "x": 16.75, "y": 3.25},
+
+ {"matrix": [3, 16], "x": 18, "y": 3},
+
+ {"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, 8], "x": 6.25, "y": 4, "w": 6.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 14, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 14], "x": 15.75, "y": 4.25},
+ {"matrix": [4, 15], "x": 16.75, "y": 4.25},
+ {"matrix": [4, 16], "x": 17.75, "y": 4.25}
+ ]
+ },
"LAYOUT_iso": {
- "layout": [{"x":0, "y":0}, {"x":1, "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":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.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":18, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2.5, "y":1, "w":1.5}, {"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":14, "y":1}, {"x":15, "y":1}, {"x":18, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2.5, "y":2, "w":1.75}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"x":11.25, "y":2}, {"x":12.25, "y":2}, {"x":13.25, "y":2}, {"x":14.25, "y":2}, {"x":15.25, "y":2}, {"x":16.25, "y":1, "w":1.25, "h":2}, {"x":18, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2.5, "y":3, "w":1.25}, {"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}, {"x":13.75, "y":3}, {"x":14.75, "y":3, "w":1.75}, {"x":16.75, "y":3.25}, {"x":18, "y":3}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":1.25}, {"x":6.25, "y":4, "w":6.25}, {"x":12.5, "y":4, "w":1.5}, {"x":14, "y":4, "w":1.5}, {"x":15.75, "y":4.25}, {"x":16.75, "y":4.25}, {"x":17.75, "y":4.25}]
+ "layout": [
+ {"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},
+ {"matrix": [1, 15], "x": 16.5, "y": 0},
+
+ {"matrix": [0, 16], "x": 18, "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, 16], "x": 18, "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},
+ {"matrix": [2, 15], "x": 16.25, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [2, 16], "x": 18, "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": [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},
+ {"matrix": [3, 14], "x": 14.75, "y": 3, "w": 1.75},
+
+ {"matrix": [3, 15], "x": 16.75, "y": 3.25},
+
+ {"matrix": [3, 16], "x": 18, "y": 3},
+
+ {"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, 8], "x": 6.25, "y": 4, "w": 6.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 14, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 14], "x": 15.75, "y": 4.25},
+ {"matrix": [4, 15], "x": 16.75, "y": 4.25},
+ {"matrix": [4, 16], "x": 17.75, "y": 4.25}
+ ]
}
}
}
diff --git a/keyboards/jae/j01/j01.c b/keyboards/jae/j01/j01.c
index 8763f8f0d4..95f3e9b042 100644
--- a/keyboards/jae/j01/j01.c
+++ b/keyboards/jae/j01/j01.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "j01.h"
+#include "quantum.h"
// Optional override functions below.
// You can leave any or all of these undefined.
diff --git a/keyboards/jae/j01/j01.h b/keyboards/jae/j01/j01.h
deleted file mode 100644
index 3d35f185c5..0000000000
--- a/keyboards/jae/j01/j01.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * 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 XXX KC_NO
-
-#define LAYOUT_ansi( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k1f, k0g, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k2e, k1g, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2f, k2g, \
- k30, k31, k32, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3g, \
- k42, k43, k44, k48, k4c, k4d, k4e, k4f, k4g \
-) \
-{ \
- {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, k1g}, \
- {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g}, \
- {k30, k31, k32, XXX, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3g}, \
- {XXX, XXX, k42, k43, k44, XXX, XXX, XXX, k48, XXX, XXX, XXX, k4c, k4d, k4e, k4f, k4g} \
-}
-
-#define LAYOUT_iso( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k1f, k0g, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1g, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3g, \
- k42, k43, k44, k48, k4c, k4d, k4e, k4f, k4g \
-) \
-{ \
- {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, k1g}, \
- {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g}, \
- {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3g}, \
- {XXX, XXX, k42, k43, k44, XXX, XXX, XXX, k48, XXX, XXX, XXX, k4c, k4d, k4e, k4f, k4g} \
-}
-
diff --git a/keyboards/jagdpietr/drakon/drakon.c b/keyboards/jagdpietr/drakon/drakon.c
index 59b7a4fba5..4bc6815696 100644
--- a/keyboards/jagdpietr/drakon/drakon.c
+++ b/keyboards/jagdpietr/drakon/drakon.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "drakon.h"
+#include "quantum.h"
char wpm_str[10];
diff --git a/keyboards/jagdpietr/drakon/drakon.h b/keyboards/jagdpietr/drakon/drakon.h
deleted file mode 100644
index 68315914d9..0000000000
--- a/keyboards/jagdpietr/drakon/drakon.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* Copyright 2020 jagdpietr
- *
- * 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.
- */
-
-
-/* LAYOUT_ansi
- * ,---------------------------------------------------------. .---.
- * |00 |01 |02 |03 |04 |05 |06 |07 |08 |09 |0A |0B |0C |0D|2D| |5C |
- * |---------------------------------------------------------| ,-----------.
- * |10 |11 |12 |13 |14 |15 |16 |17 |18 |19 |1A |1B |1C |1D | |5A |5D |59 |
- * |---------------------------------------------------------| `-----------'
- * |20 |21 |22 |23 |24 |25 |26 |27 |28 |29 |2A |2B |2C | |5B |
- * |---------------------------------------------------------. `---'
- * |30 |31 |32 |33 |34 |35 |36 |37 |38 |39 |3A |3B | |3C |
- * |--------------------------------------------------'--`---'---.
- * |40 |41 |42 | 43 |49 |4A | |4B |4C |4D |
- * `----------------------------------------------' `-----------'
- */
-
-#define LAYOUT_ansi( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, K5C, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K5A, K5D, K59, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K5B, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
- K40, K41, K42, K43, 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, XXX }, \
- { K40, K41, K42, K43, XXX, XXX, XXX, XXX, XXX, K49, K4A, K4B, K4C, K4D }, \
- { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, K59, K5A, K5B, K5C, K5D } \
-}
-
-/* LAYOUT_wkl
- * ,---------------------------------------------------------. .---.
- * |00 |01 |02 |03 |04 |05 |06 |07 |08 |09 |0A |0B |0C |0D|2D| |5C |
- * |---------------------------------------------------------| ,-----------.
- * |10 |11 |12 |13 |14 |15 |16 |17 |18 |19 |1A |1B |1C |1D | |5A |5D |59 |
- * |---------------------------------------------------------| `-----------'
- * |20 |21 |22 |23 |24 |25 |26 |27 |28 |29 |2A |2B |2C | |5B |
- * |---------------------------------------------------------. `---'
- * |30 |31 |32 |33 |34 |35 |36 |37 |38 |39 |3A |3B | |3C |
- * |--------------------------------------------------'--`---'---.
- * |40 | |42 | 43 |49 |4A | |4B |4C |4D |
- * `----------------------------------------------' `-----------'
- */
-
-#define LAYOUT_wkl( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, K5C, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K5A, K5D, K59, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K5B, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
- K40, K42, K43, 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, XXX }, \
- { K40, XXX, K42, K43, XXX, XXX, XXX, XXX, XXX, K49, K4A, K4B, K4C, K4D }, \
- { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, K59, K5A, K5B, K5C, K5D } \
-}
diff --git a/keyboards/jagdpietr/drakon/info.json b/keyboards/jagdpietr/drakon/info.json
index 9c28b21336..0c90ef30c6 100644
--- a/keyboards/jagdpietr/drakon/info.json
+++ b/keyboards/jagdpietr/drakon/info.json
@@ -22,10 +22,167 @@
"bootloader": "atmel-dfu",
"layouts": {
"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}, {"x":14, "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":17.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":16.25, "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.25}, {"x":13.75, "y":3.25}, {"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.75, "y":4.25}, {"x":13.75, "y":4.25}, {"x":14.75, "y":4.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": [2, 13], "x": 14, "y": 0},
+
+ {"matrix": [5, 12], "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": [5, 10], "x": 15.25, "y": 1},
+ {"matrix": [5, 13], "x": 16.25, "y": 1},
+ {"matrix": [5, 9], "x": 17.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": [5, 11], "x": 16.25, "y": 2},
+
+ {"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.25},
+
+ {"matrix": [3, 12], "x": 13.75, "y": 3.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, 3], "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.75, "y": 4.25},
+ {"matrix": [4, 12], "x": 13.75, "y": 4.25},
+ {"matrix": [4, 13], "x": 14.75, "y": 4.25}
+ ]
},
"LAYOUT_wkl": {
- "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":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":17.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":16.25, "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.25}, {"x":13.75, "y":3.25}, {"x":0, "y":4, "w":1.25}, {"x":1.75, "y":4, "w":1.25}, {"x":3, "y":4, "w":7}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.75, "y":4.25}, {"x":13.75, "y":4.25}, {"x":14.75, "y":4.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": [2, 13], "x": 14, "y": 0},
+
+ {"matrix": [5, 12], "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": [5, 10], "x": 15.25, "y": 1},
+ {"matrix": [5, 13], "x": 16.25, "y": 1},
+ {"matrix": [5, 9], "x": 17.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": [5, 11], "x": 16.25, "y": 2},
+
+ {"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.25},
+
+ {"matrix": [3, 12], "x": 13.75, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 1.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3, "y": 4, "w": 7},
+ {"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.75, "y": 4.25},
+ {"matrix": [4, 12], "x": 13.75, "y": 4.25},
+ {"matrix": [4, 13], "x": 14.75, "y": 4.25}
+ ]
}
}
}
diff --git a/keyboards/kb_elmo/vertex/info.json b/keyboards/kb_elmo/vertex/info.json
index ec022d5363..4fefa6bb34 100644
--- a/keyboards/kb_elmo/vertex/info.json
+++ b/keyboards/kb_elmo/vertex/info.json
@@ -18,200 +18,212 @@
"layouts": {
"LAYOUT_8keys": {
"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, "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.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},
- {"x":11.75, "y":2, "w":1.25},
- {"x":0, "y":3, "w":1.5},
- {"x":1.5, "y":3, "w":1.25},
- {"x":2.75, "y":3, "w":1.25},
- {"x":4, "y":3, "w":2.5},
- {"x":6.5, "y":3, "w":2.5},
- {"x":9, "y":3, "w":1.25},
- {"x":10.25, "y":3, "w":1.25},
- {"x":11.5, "y":3, "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": [3, 11], "x": 12, "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, "w": 1.75},
+
+ {"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, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [3, 2], "x": 1.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 3], "x": 2.75, "y": 3, "w": 1.25},
+ {"matrix": [3, 4], "x": 4, "y": 3, "w": 2.5},
+ {"matrix": [3, 6], "x": 6.5, "y": 3, "w": 2.5},
+ {"matrix": [3, 7], "x": 9, "y": 3, "w": 1.25},
+ {"matrix": [3, 8], "x": 10.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 10], "x": 11.5, "y": 3, "w": 1.5}
]
},
"LAYOUT_8keys_full_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, "w":2},
- {"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.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},
- {"x":11.75, "y":2, "w":1.25},
- {"x":0, "y":3, "w":1.5},
- {"x":1.5, "y":3, "w":1.25},
- {"x":2.75, "y":3, "w":1.25},
- {"x":4, "y":3, "w":2.5},
- {"x":6.5, "y":3, "w":2.5},
- {"x":9, "y":3, "w":1.25},
- {"x":10.25, "y":3, "w":1.25},
- {"x":11.5, "y":3, "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, "w": 2},
+
+ {"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.75},
+
+ {"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, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [3, 2], "x": 1.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 3], "x": 2.75, "y": 3, "w": 1.25},
+ {"matrix": [3, 4], "x": 4, "y": 3, "w": 2.5},
+ {"matrix": [3, 6], "x": 6.5, "y": 3, "w": 2.5},
+ {"matrix": [3, 7], "x": 9, "y": 3, "w": 1.25},
+ {"matrix": [3, 8], "x": 10.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 10], "x": 11.5, "y": 3, "w": 1.5}
]
},
"LAYOUT_10keys": {
"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, "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.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},
- {"x":11.75, "y":2, "w":1.25},
- {"x":0, "y":3},
- {"x":1, "y":3},
- {"x":2, "y":3},
- {"x":3, "y":3},
- {"x":4, "y":3, "w":2.5},
- {"x":6.5, "y":3, "w":2.5},
- {"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": [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": [3, 11], "x": 12, "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, "w": 1.75},
+
+ {"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, "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, "w": 2.5},
+ {"matrix": [3, 6], "x": 6.5, "y": 3, "w": 2.5},
+ {"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}
]
},
"LAYOUT_10keys_full_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, "w":2},
- {"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.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},
- {"x":11.75, "y":2, "w":1.25},
- {"x":0, "y":3},
- {"x":1, "y":3},
- {"x":2, "y":3},
- {"x":3, "y":3},
- {"x":4, "y":3, "w":2.5},
- {"x":6.5, "y":3, "w":2.5},
- {"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": [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": 2},
+
+ {"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.75},
+
+ {"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, "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, "w": 2.5},
+ {"matrix": [3, 6], "x": 6.5, "y": 3, "w": 2.5},
+ {"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}
]
}
}
diff --git a/keyboards/kb_elmo/vertex/vertex.h b/keyboards/kb_elmo/vertex/vertex.h
deleted file mode 100644
index 89728fa3bc..0000000000
--- a/keyboards/kb_elmo/vertex/vertex.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright 2021 kb-elmo<mail@elmo.space>
- *
- * 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_8keys( \
- k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k311, \
- 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, k302, k303, k304, k306, k307, k308, k310 \
-) { \
- { 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, ____, k302, k303, k304, ____, k306, k307, k308, ____, k310, k311 } \
-}
-
-#define LAYOUT_8keys_full_bs( \
- 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, k302, k303, k304, k306, k307, k308, k310 \
-) { \
- { 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, ____, k302, k303, k304, ____, k306, k307, k308, ____, k310, ____ } \
-}
-
-#define LAYOUT_10keys( \
- k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k311, \
- 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, k306, k307, k308, k309, k310 \
-) { \
- { 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, ____, k306, k307, k308, k309, k310, k311 } \
-}
-
-#define LAYOUT_10keys_full_bs( \
- 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, k306, k307, k308, k309, k310 \
-) { \
- { 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, ____, k306, k307, k308, k309, k310, ____ } \
-}
diff --git a/keyboards/keybage/radpad/info.json b/keyboards/keybage/radpad/info.json
index 7b3d0c9ea4..2d8e566a79 100644
--- a/keyboards/keybage/radpad/info.json
+++ b/keyboards/keybage/radpad/info.json
@@ -30,93 +30,93 @@
"layouts": {
"LAYOUT_4x4_encoders": {
"layout": [
- {"x":0, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
- {"x":3, "y":0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"x":3, "y":1},
+ {"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},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
- {"x":3, "y":2},
+ {"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},
- {"x":0, "y":3},
- {"x":1, "y":3},
- {"x":2, "y":3},
- {"x":3, "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},
- {"x":0, "y":4},
- {"x":1, "y":4},
- {"x":2, "y":4},
- {"x":3, "y":4}
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4}
]
},
"LAYOUT_4x3_encoders": {
"layout": [
- {"x":0, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
- {"x":3, "y":0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"x":3, "y":1},
+ {"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},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
- {"x":3, "y":2},
+ {"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},
- {"x":0, "y":3},
- {"x":1, "y":3},
- {"x":2, "y":3},
- {"x":3, "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}
]
},
"LAYOUT_3x4_encoders": {
"layout": [
- {"x":0, "y":0},
+ {"matrix": [0, 1], "x": 0, "y": 0},
- {"x":2, "y":0},
+ {"matrix": [0, 3], "x": 2, "y": 0},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
+ {"matrix": [1, 1], "x": 0, "y": 1},
+ {"matrix": [1, 2], "x": 1, "y": 1},
+ {"matrix": [1, 3], "x": 2, "y": 1},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
+ {"matrix": [2, 1], "x": 0, "y": 2},
+ {"matrix": [2, 2], "x": 1, "y": 2},
+ {"matrix": [2, 3], "x": 2, "y": 2},
- {"x":0, "y":3},
- {"x":1, "y":3},
- {"x":2, "y":3},
+ {"matrix": [3, 1], "x": 0, "y": 3},
+ {"matrix": [3, 2], "x": 1, "y": 3},
+ {"matrix": [3, 3], "x": 2, "y": 3},
- {"x":0, "y":4},
- {"x":1, "y":4},
- {"x":2, "y":4}
+ {"matrix": [4, 1], "x": 0, "y": 4},
+ {"matrix": [4, 2], "x": 1, "y": 4},
+ {"matrix": [4, 3], "x": 2, "y": 4}
]
},
"LAYOUT_3x3_encoders": {
"layout": [
- {"x":0, "y":0},
+ {"matrix": [0, 1], "x": 0, "y": 0},
- {"x":2, "y":0},
+ {"matrix": [0, 3], "x": 2, "y": 0},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
+ {"matrix": [1, 1], "x": 0, "y": 1},
+ {"matrix": [1, 2], "x": 1, "y": 1},
+ {"matrix": [1, 3], "x": 2, "y": 1},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
+ {"matrix": [2, 1], "x": 0, "y": 2},
+ {"matrix": [2, 2], "x": 1, "y": 2},
+ {"matrix": [2, 3], "x": 2, "y": 2},
- {"x":0, "y":3},
- {"x":1, "y":3},
- {"x":2, "y":3}
+ {"matrix": [3, 1], "x": 0, "y": 3},
+ {"matrix": [3, 2], "x": 1, "y": 3},
+ {"matrix": [3, 3], "x": 2, "y": 3}
]
}
}
diff --git a/keyboards/keybage/radpad/radpad.h b/keyboards/keybage/radpad/radpad.h
deleted file mode 100644
index be6583bb8e..0000000000
--- a/keyboards/keybage/radpad/radpad.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* Copyright 2020 Brandon Schlack
- *
- * 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.
- */
-#define LAYOUT_4x4_encoders( \
- k00, k03, \
- k10, k11, k12, k13, \
- k20, k21, k22, k23, \
- k30, k31, k32, k33, \
- k40, k41, k42, k43 \
-) \
-{ \
- { k00, XXX, XXX, k03 }, \
- { k10, k11, k12, k13 }, \
- { k20, k21, k22, k23 }, \
- { k30, k31, k32, k33 }, \
- { k40, k41, k42, k43 } \
-}
-
-#define LAYOUT_4x3_encoders( \
- k00, k03, \
- k10, k11, k12, k13, \
- k20, k21, k22, k23, \
- k30, k31, k32, k33 \
-) \
-{ \
- { k00, XXX, XXX, k03 }, \
- { k10, k11, k12, k13 }, \
- { k20, k21, k22, k23 }, \
- { k30, k31, k32, k33 }, \
- { XXX, XXX, XXX, XXX } \
-}
-
-#define LAYOUT_3x4_encoders( \
- k01, k03, \
- k11, k12, k13, \
- k21, k22, k23, \
- k31, k32, k33, \
- k41, k42, k43 \
-) \
-{ \
- { XXX, k01, XXX, k03 }, \
- { XXX, k11, k12, k13 }, \
- { XXX, k21, k22, k23 }, \
- { XXX, k31, k32, k33 }, \
- { XXX, k41, k42, k43 } \
-}
-
-#define LAYOUT_3x3_encoders( \
- k01, k03, \
- k11, k12, k13, \
- k21, k22, k23, \
- k31, k32, k33 \
-) \
-{ \
- { XXX, k01, XXX, k03 }, \
- { XXX, k11, k12, k13 }, \
- { XXX, k21, k22, k23 }, \
- { XXX, k31, k32, k33 }, \
- { XXX, XXX, XXX, XXX } \
-}
diff --git a/keyboards/kingly_keys/ave/staggered/info.json b/keyboards/kingly_keys/ave/staggered/info.json
index b975a4aa68..b3795f8101 100644
--- a/keyboards/kingly_keys/ave/staggered/info.json
+++ b/keyboards/kingly_keys/ave/staggered/info.json
@@ -24,113 +24,133 @@
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
- "LAYOUT_staggered": {
- "layout": [
- {"label":"k001", "x":0, "y":0},
- {"label":"k002", "x":1.5, "y":0},
- {"label":"k011", "x":10.5, "y":0},
- {"label":"k012", "x":11.5, "y":0},
- {"label":"k013", "x":12.5, "y":0},
- {"label":"k101", "x":0, "y":1.5},
- {"label":"k102", "x":1.5, "y":1.5},
- {"label":"k103", "x":2.5, "y":1.5},
- {"label":"k104", "x":3.5, "y":1.5},
- {"label":"k105", "x":4.5, "y":1.5},
- {"label":"k106", "x":5.5, "y":1.5},
- {"label":"k107", "x":6.5, "y":1.5},
- {"label":"k108", "x":7.5, "y":1.5},
- {"label":"k109", "x":8.5, "y":1.5},
- {"label":"k110", "x":9.5, "y":1.5},
- {"label":"k111", "x":10.5, "y":1.5},
- {"label":"k112", "x":11.5, "y":1.5},
- {"label":"k113", "x":12.5, "y":1.5},
- {"label":"k201", "x":0, "y":2.5},
- {"label":"k202", "x":1.5, "y":2.5, "w":1.25},
- {"label":"k203", "x":2.75, "y":2.5},
- {"label":"k204", "x":3.75, "y":2.5},
- {"label":"k205", "x":4.75, "y":2.5},
- {"label":"k206", "x":5.75, "y":2.5},
- {"label":"k207", "x":6.75, "y":2.5},
- {"label":"k208", "x":7.75, "y":2.5},
- {"label":"k209", "x":8.75, "y":2.5},
- {"label":"k210", "x":9.75, "y":2.5},
- {"label":"k211", "x":10.75, "y":2.5},
- {"label":"k213", "x":11.75, "y":2.5, "w":1.75},
- {"label":"k301", "x":0, "y":3.5},
- {"label":"k302", "x":1.5, "y":3.5, "w":1.75},
- {"label":"k303", "x":3.25, "y":3.5},
- {"label":"k304", "x":4.25, "y":3.5},
- {"label":"k305", "x":5.25, "y":3.5},
- {"label":"k306", "x":6.25, "y":3.5},
- {"label":"k307", "x":7.25, "y":3.5},
- {"label":"k308", "x":8.25, "y":3.5},
- {"label":"k309", "x":9.25, "y":3.5},
- {"label":"k310", "x":10.25, "y":3.5},
- {"label":"k312", "x":11.25, "y":3.5},
- {"label":"k313", "x":12.25, "y":3.5, "w":1.25},
- {"label":"k401", "x":0, "y":4.5},
- {"label":"k402", "x":1.5, "y":4.5, "w":1.25},
- {"label":"k403", "x":2.75, "y":4.5},
- {"label":"k404", "x":3.75, "y":4.5, "w":1.25},
- {"label":"k406", "x":5, "y":4.5, "w":2.75},
- {"label":"k408", "x":7.75, "y":4.5, "w":2.25},
- {"label":"k411", "x":10, "y":4.5, "w":1.25},
- {"label":"k412", "x":11.25, "y":4.5},
- {"label":"k413", "x":12.25, "y":4.5, "w":1.25}
- ]
- },
- "LAYOUT_staggered_big_boy": {
- "layout": [
- {"label":"k001", "x":0, "y":0},
- {"label":"k002", "x":1.5, "y":0},
- {"label":"k011", "x":10.5, "y":0},
- {"label":"k012", "x":11.5, "y":0},
- {"label":"k013", "x":12.5, "y":0},
- {"label":"k101", "x":0, "y":1.5},
- {"label":"k102", "x":1.5, "y":1.5},
- {"label":"k103", "x":2.5, "y":1.5},
- {"label":"k104", "x":3.5, "y":1.5},
- {"label":"k105", "x":4.5, "y":1.5},
- {"label":"k106", "x":5.5, "y":1.5},
- {"label":"k107", "x":6.5, "y":1.5},
- {"label":"k108", "x":7.5, "y":1.5},
- {"label":"k109", "x":8.5, "y":1.5},
- {"label":"k110", "x":9.5, "y":1.5},
- {"label":"k111", "x":10.5, "y":1.5},
- {"label":"k112", "x":11.5, "y":1.5},
- {"label":"k113", "x":12.5, "y":1.5},
- {"label":"k201", "x":0, "y":2.5},
- {"label":"k202", "x":1.5, "y":2.5, "w":1.25},
- {"label":"k203", "x":2.75, "y":2.5},
- {"label":"k204", "x":3.75, "y":2.5},
- {"label":"k205", "x":4.75, "y":2.5},
- {"label":"k206", "x":5.75, "y":2.5},
- {"label":"k207", "x":6.75, "y":2.5},
- {"label":"k208", "x":7.75, "y":2.5},
- {"label":"k209", "x":8.75, "y":2.5},
- {"label":"k210", "x":9.75, "y":2.5},
- {"label":"k211", "x":10.75, "y":2.5},
- {"label":"k213", "x":11.75, "y":2.5, "w":1.75},
- {"label":"k301", "x":0, "y":3.5},
- {"label":"k302", "x":1.5, "y":3.5, "w":1.75},
- {"label":"k303", "x":3.25, "y":3.5},
- {"label":"k304", "x":4.25, "y":3.5},
- {"label":"k305", "x":5.25, "y":3.5},
- {"label":"k306", "x":6.25, "y":3.5},
- {"label":"k307", "x":7.25, "y":3.5},
- {"label":"k308", "x":8.25, "y":3.5},
- {"label":"k309", "x":9.25, "y":3.5},
- {"label":"k310", "x":10.25, "y":3.5},
- {"label":"k312", "x":11.25, "y":3.5},
- {"label":"k313", "x":12.25, "y":3.5, "w":1.25},
- {"label":"k401", "x":0, "y":4.5},
- {"label":"k402", "x":1.5, "y":4.5, "w":1.25},
- {"label":"k403", "x":2.75, "y":4.5},
- {"label":"k406", "x":3.75, "y":4.5, "w":6.25},
- {"label":"k411", "x":10, "y":4.5, "w":1.25},
- {"label":"k412", "x":11.25, "y":4.5},
- {"label":"k413", "x":12.25, "y":4.5, "w":1.25}
- ]
+ "LAYOUT_staggered": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.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": [1, 0], "x": 0, "y": 1.5},
+
+ {"matrix": [1, 1], "x": 1.5, "y": 1.5},
+ {"matrix": [1, 2], "x": 2.5, "y": 1.5},
+ {"matrix": [1, 3], "x": 3.5, "y": 1.5},
+ {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+ {"matrix": [1, 5], "x": 5.5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6.5, "y": 1.5},
+ {"matrix": [1, 7], "x": 7.5, "y": 1.5},
+ {"matrix": [1, 8], "x": 8.5, "y": 1.5},
+ {"matrix": [1, 9], "x": 9.5, "y": 1.5},
+ {"matrix": [1, 10], "x": 10.5, "y": 1.5},
+ {"matrix": [1, 11], "x": 11.5, "y": 1.5},
+ {"matrix": [1, 12], "x": 12.5, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5},
+
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5, "w": 1.25},
+ {"matrix": [2, 2], "x": 2.75, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.75, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.75, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.75, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.75, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.75, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.75, "y": 2.5},
+ {"matrix": [2, 9], "x": 9.75, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.75, "y": 2.5},
+ {"matrix": [2, 12], "x": 11.75, "y": 2.5, "w": 1.75},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5},
+
+ {"matrix": [3, 1], "x": 1.5, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 2], "x": 3.25, "y": 3.5},
+ {"matrix": [3, 3], "x": 4.25, "y": 3.5},
+ {"matrix": [3, 4], "x": 5.25, "y": 3.5},
+ {"matrix": [3, 5], "x": 6.25, "y": 3.5},
+ {"matrix": [3, 6], "x": 7.25, "y": 3.5},
+ {"matrix": [3, 7], "x": 8.25, "y": 3.5},
+ {"matrix": [3, 8], "x": 9.25, "y": 3.5},
+ {"matrix": [3, 9], "x": 10.25, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.25, "y": 3.5},
+ {"matrix": [3, 12], "x": 12.25, "y": 3.5, "w": 1.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.75, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 5], "x": 5, "y": 4.5, "w": 2.75},
+ {"matrix": [4, 7], "x": 7.75, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 10], "x": 10, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.25}
+ ]
+ },
+ "LAYOUT_staggered_big_boy": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.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": [1, 0], "x": 0, "y": 1.5},
+
+ {"matrix": [1, 1], "x": 1.5, "y": 1.5},
+ {"matrix": [1, 2], "x": 2.5, "y": 1.5},
+ {"matrix": [1, 3], "x": 3.5, "y": 1.5},
+ {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+ {"matrix": [1, 5], "x": 5.5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6.5, "y": 1.5},
+ {"matrix": [1, 7], "x": 7.5, "y": 1.5},
+ {"matrix": [1, 8], "x": 8.5, "y": 1.5},
+ {"matrix": [1, 9], "x": 9.5, "y": 1.5},
+ {"matrix": [1, 10], "x": 10.5, "y": 1.5},
+ {"matrix": [1, 11], "x": 11.5, "y": 1.5},
+ {"matrix": [1, 12], "x": 12.5, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5},
+
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5, "w": 1.25},
+ {"matrix": [2, 2], "x": 2.75, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.75, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.75, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.75, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.75, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.75, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.75, "y": 2.5},
+ {"matrix": [2, 9], "x": 9.75, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.75, "y": 2.5},
+ {"matrix": [2, 12], "x": 11.75, "y": 2.5, "w": 1.75},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5},
+
+ {"matrix": [3, 1], "x": 1.5, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 2], "x": 3.25, "y": 3.5},
+ {"matrix": [3, 3], "x": 4.25, "y": 3.5},
+ {"matrix": [3, 4], "x": 5.25, "y": 3.5},
+ {"matrix": [3, 5], "x": 6.25, "y": 3.5},
+ {"matrix": [3, 6], "x": 7.25, "y": 3.5},
+ {"matrix": [3, 7], "x": 8.25, "y": 3.5},
+ {"matrix": [3, 8], "x": 9.25, "y": 3.5},
+ {"matrix": [3, 9], "x": 10.25, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.25, "y": 3.5},
+ {"matrix": [3, 12], "x": 12.25, "y": 3.5, "w": 1.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4.5},
+ {"matrix": [4, 5], "x": 3.75, "y": 4.5, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.25}
+ ]
}
}
}
diff --git a/keyboards/kingly_keys/ave/staggered/staggered.h b/keyboards/kingly_keys/ave/staggered/staggered.h
deleted file mode 100644
index 674122bc0c..0000000000
--- a/keyboards/kingly_keys/ave/staggered/staggered.h
+++ /dev/null
@@ -1,52 +0,0 @@
- /*
- Copyright 2020 Garret Gartner
-
- 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 XXXX KC_NO
-
-#define LAYOUT_staggered( \
- k001, k002, k011, k012, k013, \
- k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, \
- k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k213, \
- k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k312, k313, \
- k401, k402, k403, k404, k406, k408, k411, k412, k413 \
-) \
-{ \
- { k001, k002, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, k011, k012, k013 }, \
- { k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113 }, \
- { k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, XXXX, k213 }, \
- { k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, XXXX, k312, k313 }, \
- { k401, k402, k403, k404, XXXX, k406, XXXX, k408, XXXX, XXXX, k411, k412, k413 } \
-}
-
-#define LAYOUT_staggered_big_boy( \
- k001, k002, k011, k012, k013, \
- k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, \
- k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k213, \
- k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k312, k313, \
- k401, k402, k403, k406, k411, k412, k413 \
-) \
-{ \
- { k001, k002, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, k011, k012, k013 }, \
- { k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113 }, \
- { k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, XXXX, k213 }, \
- { k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, XXXX, k312, k313 }, \
- { k401, k402, k403, XXXX, XXXX, k406, XXXX, XXXX, XXXX, XXXX, k411, k412, k413 } \
-}
diff --git a/keyboards/knobgoblin/info.json b/keyboards/knobgoblin/info.json
index b17c1077cc..e3f2d93e15 100644
--- a/keyboards/knobgoblin/info.json
+++ b/keyboards/knobgoblin/info.json
@@ -28,35 +28,34 @@
"layouts": {
"LAYOUT_ortho": {
"layout": [
-
- {"label": "F17", "x": 1, "y": 0},
- {"label": "F18", "x": 2, "y": 0},
- {"label": "F19", "x": 3, "y": 0},
- {"label": "F20", "x": 4, "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},
- {"label": "F13", "x": 1, "y": 1},
- {"label": "F14", "x": 2, "y": 1},
- {"label": "F15", "x": 3, "y": 1},
- {"label": "F16", "x": 4, "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},
- {"label": "F9", "x": 1, "y": 2},
- {"label": "F10", "x": 2, "y": 2},
- {"label": "F11", "x": 3, "y": 2},
- {"label": "F12", "x": 4, "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},
- {"label": "K2", "x": 0, "y": 3},
- {"label": "F5", "x": 1, "y": 3},
- {"label": "F6", "x": 2, "y": 3},
- {"label": "F7", "x": 3, "y": 3},
- {"label": "F8", "x": 4, "y": 3},
-
- {"label": "K1", "x": 0, "y": 4},
- {"label": "F1", "x": 1, "y": 4},
- {"label": "F2", "x": 2, "y": 4},
- {"label": "F3", "x": 3, "y": 4},
- {"label": "F4", "x": 4, "y": 4}
+ {"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": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4}
]
}
}
+
}
diff --git a/keyboards/knobgoblin/knobgoblin.c b/keyboards/knobgoblin/knobgoblin.c
index fcf86a3a40..55112847df 100644
--- a/keyboards/knobgoblin/knobgoblin.c
+++ b/keyboards/knobgoblin/knobgoblin.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "knobgoblin.h"
+#include "quantum.h"
#ifdef ENCODER_ENABLE
/* assign keycodes to the encoder rotation */
diff --git a/keyboards/knobgoblin/knobgoblin.h b/keyboards/knobgoblin/knobgoblin.h
deleted file mode 100644
index b5b2cf7e5f..0000000000
--- a/keyboards/knobgoblin/knobgoblin.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2020 MrT1ddl3s
- *
- * 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_ortho( \
- K01, K02, K03, K04, \
- K11, K12, K13, K14, \
- K21, K22, K23, K24, \
- K30, K31, K32, K33, K34, \
- K40, K41, K42, K43, K44 \
-) { \
- { KC_NO, K01, K02, K03, K04 }, \
- { KC_NO, K11, K12, K13, K14 }, \
- { KC_NO, K21, K22, K23, K24 }, \
- { K30, K31, K32, K33, K34 }, \
- { K40, K41, K42, K43, K44 } \
-}
diff --git a/keyboards/kprepublic/bm40hsrgb/bm40hsrgb.c b/keyboards/kprepublic/bm40hsrgb/bm40hsrgb.c
index a0ba84db3c..16e515042d 100755
--- a/keyboards/kprepublic/bm40hsrgb/bm40hsrgb.c
+++ b/keyboards/kprepublic/bm40hsrgb/bm40hsrgb.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 "bm40hsrgb.h"
+#include "quantum.h"
#if defined(RGB_MATRIX_ENABLE)
led_config_t g_led_config = {
diff --git a/keyboards/kprepublic/bm40hsrgb/bm40hsrgb.h b/keyboards/kprepublic/bm40hsrgb/bm40hsrgb.h
deleted file mode 100755
index 5bde6ec9c5..0000000000
--- a/keyboards/kprepublic/bm40hsrgb/bm40hsrgb.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2020 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 LAYOUT_planck_mit( \
- 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, K307, K308, K309, K310, K311 \
-) { \
- { 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, KC_NO, K307, K308, K309, K310, K311 } \
-}
-
diff --git a/keyboards/kprepublic/bm40hsrgb/info.json b/keyboards/kprepublic/bm40hsrgb/info.json
index cf58efba9f..bf0bf727bd 100644
--- a/keyboards/kprepublic/bm40hsrgb/info.json
+++ b/keyboards/kprepublic/bm40hsrgb/info.json
@@ -25,53 +25,56 @@
"layouts": {
"LAYOUT_planck_mit": {
"layout": [
- {"label":"K00 (B3,B6)", "x":0, "y":0},
- {"label":"K01 (B3,C6)", "x":1, "y":0},
- {"label":"K02 (B3,B4)", "x":2, "y":0},
- {"label":"K03 (B3,D7)", "x":3, "y":0},
- {"label":"K04 (B3,D4)", "x":4, "y":0},
- {"label":"K05 (B3,D6)", "x":5, "y":0},
- {"label":"K06 (B3,C7)", "x":6, "y":0},
- {"label":"K07 (B3,F6)", "x":7, "y":0},
- {"label":"K08 (B3,F5)", "x":8, "y":0},
- {"label":"K09 (B3,F4)", "x":9, "y":0},
- {"label":"K0A (B3,F1)", "x":10, "y":0},
- {"label":"K0B (B3,F0)", "x":11, "y":0},
- {"label":"K10 (B2,B6)", "x":0, "y":1},
- {"label":"K11 (B2,C6)", "x":1, "y":1},
- {"label":"K12 (B2,B4)", "x":2, "y":1},
- {"label":"K13 (B2,D7)", "x":3, "y":1},
- {"label":"K14 (B2,D4)", "x":4, "y":1},
- {"label":"K15 (B2,D6)", "x":5, "y":1},
- {"label":"K16 (B2,C7)", "x":6, "y":1},
- {"label":"K17 (B2,F6)", "x":7, "y":1},
- {"label":"K18 (B2,F5)", "x":8, "y":1},
- {"label":"K19 (B2,F4)", "x":9, "y":1},
- {"label":"K1A (B2,F1)", "x":10, "y":1},
- {"label":"K1B (B2,F0)", "x":11, "y":1},
- {"label":"K20 (E6,B6)", "x":0, "y":2},
- {"label":"K21 (E6,C6)", "x":1, "y":2},
- {"label":"K22 (E6,B4)", "x":2, "y":2},
- {"label":"K23 (E6,D7)", "x":3, "y":2},
- {"label":"K24 (E6,D4)", "x":4, "y":2},
- {"label":"K25 (E6,D6)", "x":5, "y":2},
- {"label":"K26 (E6,C7)", "x":6, "y":2},
- {"label":"K27 (E6,F6)", "x":7, "y":2},
- {"label":"K28 (E6,F5)", "x":8, "y":2},
- {"label":"K29 (E6,F4)", "x":9, "y":2},
- {"label":"K2A (E6,F1)", "x":10, "y":2},
- {"label":"K2B (E6,F0)", "x":11, "y":2},
- {"label":"K30 (B5,B6)", "x":0, "y":3},
- {"label":"K31 (B5,C6)", "x":1, "y":3},
- {"label":"K32 (B5,B4)", "x":2, "y":3},
- {"label":"K33 (B5,D7)", "x":3, "y":3},
- {"label":"K34 (B5,D4)", "x":4, "y":3},
- {"label":"K35 (B5,D6)", "x":5, "y":3, "w":2},
- {"label":"K37 (B5,F6)", "x":7, "y":3},
- {"label":"K38 (B5,F5)", "x":8, "y":3},
- {"label":"K39 (B5,F4)", "x":9, "y":3},
- {"label":"K3A (B5,F1)", "x":10, "y":3},
- {"label":"K3B (B5,F0)", "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": [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}
]
}
}
diff --git a/keyboards/kwub/bloop/bloop.h b/keyboards/kwub/bloop/bloop.h
deleted file mode 100644
index 548225c058..0000000000
--- a/keyboards/kwub/bloop/bloop.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Copyright 2021 Kwabena Aduse-Poku (Kwub)
- *
- * 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_625( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K314, \
- K400, K401, K402, K405, K409, K410, K411, K412, K414 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, KC_NO }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO, K314 }, \
- { K400, K401, K402, KC_NO, KC_NO, K405, KC_NO, KC_NO, KC_NO, K409, K410, K411, K412, KC_NO, K414 } \
-}
-
-#define LAYOUT_625_split_bs( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K314, \
- K400, K401, K402, K405, K409, K410, K411, K412, K414 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO, K314 }, \
- { K400, K401, K402, KC_NO, KC_NO, K405, KC_NO, KC_NO, KC_NO, K409, K410, K411, K412, KC_NO, K414 } \
-}
-
-#define LAYOUT_7( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K314, \
- K400, K401, K402, K405, K410, K411, K412, K414 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, KC_NO }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO, K314 }, \
- { K400, K401, K402, KC_NO, KC_NO, K405, KC_NO, KC_NO, KC_NO, KC_NO, K410, K411, K412, KC_NO, K414 } \
-}
-
-#define LAYOUT_7_split_bs( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K314, \
- K400, K401, K402, K405, K410, K411, K412, K414 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO, K314 }, \
- { K400, K401, K402, KC_NO, KC_NO, K405, KC_NO, KC_NO, KC_NO, KC_NO, K410, K411, K412, KC_NO, K414 } \
-}
diff --git a/keyboards/kwub/bloop/info.json b/keyboards/kwub/bloop/info.json
index b344f9f3e7..d0a45bccfc 100644
--- a/keyboards/kwub/bloop/info.json
+++ b/keyboards/kwub/bloop/info.json
@@ -18,38 +18,302 @@
"layouts": {
"LAYOUT_625": {
"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}
+ {"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},
+
+ {"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": [2, 14], "x": 15, "y": 2},
+
+ {"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},
+ {"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, 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": 13, "y": 4},
+ {"matrix": [4, 12], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
},
"LAYOUT_625_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":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}
+ {"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, 12], "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, 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},
+ {"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, 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": 13, "y": 4},
+ {"matrix": [4, 12], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
},
"LAYOUT_7": {
"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}
+ {"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},
+
+ {"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": [2, 14], "x": 15, "y": 2},
+
+ {"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},
+ {"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, 5], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 11], "x": 13, "y": 4},
+ {"matrix": [4, 12], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
},
"LAYOUT_7_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":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}
+ {"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, 12], "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, 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},
+ {"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, 5], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 11], "x": 13, "y": 4},
+ {"matrix": [4, 12], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
}
}
diff --git a/keyboards/labbe/labbeminiv1/info.json b/keyboards/labbe/labbeminiv1/info.json
index 59c53f7ed1..80ff4d88c5 100644
--- a/keyboards/labbe/labbeminiv1/info.json
+++ b/keyboards/labbe/labbeminiv1/info.json
@@ -17,7 +17,13 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_wasd": {
- "layout": [{"x":1, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}]
+ "layout": [
+ {"matrix": [0, 1], "x": 1, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1}
+ ]
}
}
} \ No newline at end of file
diff --git a/keyboards/labbe/labbeminiv1/labbeminiv1.c b/keyboards/labbe/labbeminiv1/labbeminiv1.c
index 46ab7d057f..a2ce367c5b 100644
--- a/keyboards/labbe/labbeminiv1/labbeminiv1.c
+++ b/keyboards/labbe/labbeminiv1/labbeminiv1.c
@@ -13,7 +13,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "labbeminiv1.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = {
diff --git a/keyboards/labbe/labbeminiv1/labbeminiv1.h b/keyboards/labbe/labbeminiv1/labbeminiv1.h
deleted file mode 100644
index daee5df9de..0000000000
--- a/keyboards/labbe/labbeminiv1/labbeminiv1.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * 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_wasd(k01, k10, k11, k12) { {KC_NO, k01, KC_NO}, {k10, k11, k12} } \ No newline at end of file
diff --git a/keyboards/latincompass/latin47ble/info.json b/keyboards/latincompass/latin47ble/info.json
index d52f51352d..44aab18307 100644
--- a/keyboards/latincompass/latin47ble/info.json
+++ b/keyboards/latincompass/latin47ble/info.json
@@ -22,57 +22,58 @@
"layouts": {
"LAYOUT_planck_mit": {
"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": [0, 11], "x": 11, "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},
+ {"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},
- {"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},
+ {"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},
- {"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": [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, 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}
]
}
}
+
}
diff --git a/keyboards/latincompass/latin47ble/latin47ble.h b/keyboards/latincompass/latin47ble/latin47ble.h
deleted file mode 100644
index 87ecaad658..0000000000
--- a/keyboards/latincompass/latin47ble/latin47ble.h
+++ /dev/null
@@ -1,30 +0,0 @@
- /* Copyright 2020 haierwangwei2005
- *
- * 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_planck_mit( \
- 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 \
-) { \
- { 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 } \
-}
diff --git a/keyboards/latincompass/latinpadble/info.json b/keyboards/latincompass/latinpadble/info.json
index 19b0604f80..125289bc94 100644
--- a/keyboards/latincompass/latinpadble/info.json
+++ b/keyboards/latincompass/latinpadble/info.json
@@ -26,27 +26,27 @@
"layouts": {
"LAYOUT_pad": {
"layout": [
- {"label":"Num Lock", "x":0, "y":0, "w":0.8, "h":0.8},
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 0.8, "h": 0.8},
- {"label":"7", "x":0, "y":1},
- {"label":"8", "x":1, "y":1},
- {"label":"9", "x":2, "y":1},
- {"label":"+", "x":3, "y":1},
+ {"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},
- {"label":"4", "x":0, "y":2},
- {"label":"5", "x":1, "y":2},
- {"label":"6", "x":2, "y":2},
- {"label":"+", "x":3, "y":2},
+ {"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},
- {"label":"1", "x":0, "y":3},
- {"label":"2", "x":1, "y":3},
- {"label":"3", "x":2, "y":3},
- {"label":"Enter", "x":3, "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},
- {"label":"0", "x":0, "y":4},
- {"label":"0", "x":1, "y":4},
- {"label":".", "x":2, "y":4},
- {"label":"Enter", "x":3, "y":4}
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4}
]
}
}
diff --git a/keyboards/latincompass/latinpadble/latinpadble.c b/keyboards/latincompass/latinpadble/latinpadble.c
deleted file mode 100644
index a6cd6784e1..0000000000
--- a/keyboards/latincompass/latinpadble/latinpadble.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 haierwangwei2005
- *
- * 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 "latinpadble.h"
diff --git a/keyboards/latincompass/latinpadble/latinpadble.h b/keyboards/latincompass/latinpadble/latinpadble.h
deleted file mode 100644
index 2e3d1be5f7..0000000000
--- a/keyboards/latincompass/latinpadble/latinpadble.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 haierwangwei2005
- *
- * 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_pad( \
- K40, \
- K00, K01, K02, K03, \
- K10, K11, K12, K13, \
- K20, K21, K22, K23, \
- K30, K31, K32, K33 \
-) { \
- { K40 },\
- { K00, K01, K02, K03 }, \
- { K10, K11, K12, K13 }, \
- { K20, K21, K22, K23 }, \
- { K30, K31, K32, K33 } \
-}
-
diff --git a/keyboards/lm_keyboard/lm60n/info.json b/keyboards/lm_keyboard/lm60n/info.json
index 73d8a51372..ed8af5bc77 100644
--- a/keyboards/lm_keyboard/lm60n/info.json
+++ b/keyboards/lm_keyboard/lm60n/info.json
@@ -25,535 +25,560 @@
"layouts": {
"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},
- {"x":15.5, "y":0},
- {"x":16.5, "y":0},
- {"x":17.5, "y":0},
- {"x":18.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.5, "y":1},
- {"x":16.5, "y":1},
- {"x":17.5, "y":1},
- {"x":18.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":15.5, "y":2},
- {"x":16.5, "y":2},
- {"x":17.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":2.75},
- {"x":15.5, "y":3},
- {"x":16.5, "y":3},
- {"x":17.5, "y":3},
- {"x":18.5, "y":3, "h":2},
-
- {"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},
- {"x":15.5, "y":4, "w":2},
- {"x":17.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, 14], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [6, 8], "x": 15.5, "y": 0},
+ {"matrix": [6, 9], "x": 16.5, "y": 0},
+ {"matrix": [6, 10], "x": 17.5, "y": 0},
+ {"matrix": [6, 11], "x": 18.5, "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": [5, 8], "x": 15.5, "y": 1},
+ {"matrix": [5, 9], "x": 16.5, "y": 1},
+ {"matrix": [5, 10], "x": 17.5, "y": 1},
+ {"matrix": [5, 11], "x": 18.5, "y": 1, "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": 2, "w": 2.25},
+
+ {"matrix": [5, 12], "x": 15.5, "y": 2},
+ {"matrix": [5, 13], "x": 16.5, "y": 2},
+ {"matrix": [5, 14], "x": 17.5, "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, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 8], "x": 15.5, "y": 3},
+ {"matrix": [4, 9], "x": 16.5, "y": 3},
+ {"matrix": [4, 10], "x": 17.5, "y": 3},
+ {"matrix": [4, 11], "x": 18.5, "y": 3, "h": 2},
+
+ {"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": 6.25},
+ {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 13.75, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 12], "x": 15.5, "y": 4, "w": 2},
+ {"matrix": [4, 13], "x": 17.5, "y": 4}
]
},
-
"LAYOUT_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":15.5, "y":0},
- {"x":16.5, "y":0},
- {"x":17.5, "y":0},
- {"x":18.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.5, "y":1},
- {"x":16.5, "y":1},
- {"x":17.5, "y":1},
- {"x":18.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":15.5, "y":2},
- {"x":16.5, "y":2},
- {"x":17.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},
- {"x":13.25, "y":3, "w":1.75},
- {"x":15.5, "y":3},
- {"x":16.5, "y":3},
- {"x":17.5, "y":3},
- {"x":18.5, "y":3, "h":2},
-
- {"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},
- {"x":15.5, "y":4, "w":2},
- {"x":17.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, 14], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [6, 8], "x": 15.5, "y": 0},
+ {"matrix": [6, 9], "x": 16.5, "y": 0},
+ {"matrix": [6, 10], "x": 17.5, "y": 0},
+ {"matrix": [6, 11], "x": 18.5, "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": [5, 8], "x": 15.5, "y": 1},
+ {"matrix": [5, 9], "x": 16.5, "y": 1},
+ {"matrix": [5, 10], "x": 17.5, "y": 1},
+ {"matrix": [5, 11], "x": 18.5, "y": 1, "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": 2, "w": 2.25},
+
+ {"matrix": [5, 12], "x": 15.5, "y": 2},
+ {"matrix": [5, 13], "x": 16.5, "y": 2},
+ {"matrix": [5, 14], "x": 17.5, "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},
+ {"matrix": [3, 13], "x": 13.25, "y": 3, "w": 1.75},
+
+ {"matrix": [4, 8], "x": 15.5, "y": 3},
+ {"matrix": [4, 9], "x": 16.5, "y": 3},
+ {"matrix": [4, 10], "x": 17.5, "y": 3},
+ {"matrix": [4, 11], "x": 18.5, "y": 3, "h": 2},
+
+ {"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": 7},
+ {"matrix": [4, 5], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 12.5, "y": 4},
+ {"matrix": [4, 7], "x": 13.5, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 12], "x": 15.5, "y": 4, "w": 2},
+ {"matrix": [4, 13], "x": 17.5, "y": 4}
]
},
-
"LAYOUT_all_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},
- {"x":14, "y":0},
- {"x":15.5, "y":0},
- {"x":16.5, "y":0},
- {"x":17.5, "y":0},
- {"x":18.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.5, "y":1},
- {"x":16.5, "y":1},
- {"x":17.5, "y":1},
- {"x":18.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},
- {"x":13.75, "y":2, "w":1.25},
- {"x":15.5, "y":2},
- {"x":16.5, "y":2},
- {"x":17.5, "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},
- {"x":13.25, "y":3, "w":1.75},
- {"x":15.5, "y":3},
- {"x":16.5, "y":3},
- {"x":17.5, "y":3},
- {"x":18.5, "y":3, "h":2},
-
- {"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},
- {"x":15.5, "y":4, "w":2},
- {"x":17.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": [6, 8], "x": 15.5, "y": 0},
+ {"matrix": [6, 9], "x": 16.5, "y": 0},
+ {"matrix": [6, 10], "x": 17.5, "y": 0},
+ {"matrix": [6, 11], "x": 18.5, "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": [5, 8], "x": 15.5, "y": 1},
+ {"matrix": [5, 9], "x": 16.5, "y": 1},
+ {"matrix": [5, 10], "x": 17.5, "y": 1},
+ {"matrix": [5, 11], "x": 18.5, "y": 1, "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": 2, "w": 1.25},
+
+ {"matrix": [5, 12], "x": 15.5, "y": 2},
+ {"matrix": [5, 13], "x": 16.5, "y": 2},
+ {"matrix": [5, 14], "x": 17.5, "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},
+ {"matrix": [3, 13], "x": 13.25, "y": 3, "w": 1.75},
+
+ {"matrix": [4, 8], "x": 15.5, "y": 3},
+ {"matrix": [4, 9], "x": 16.5, "y": 3},
+ {"matrix": [4, 10], "x": 17.5, "y": 3},
+ {"matrix": [4, 11], "x": 18.5, "y": 3, "h": 2},
+
+ {"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": 6.25},
+ {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 13.75, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 12], "x": 15.5, "y": 4, "w": 2},
+ {"matrix": [4, 13], "x": 17.5, "y": 4}
]
},
-
"LAYOUT_all_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},
- {"x":14, "y":0},
- {"x":15.5, "y":0},
- {"x":16.5, "y":0},
- {"x":17.5, "y":0},
- {"x":18.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.5, "y":1},
- {"x":16.5, "y":1},
- {"x":17.5, "y":1},
- {"x":18.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},
- {"x":13.75, "y":2, "w":1.25},
- {"x":15.5, "y":2},
- {"x":16.5, "y":2},
- {"x":17.5, "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},
- {"x":13.25, "y":3, "w":1.75},
- {"x":15.5, "y":3},
- {"x":16.5, "y":3},
- {"x":17.5, "y":3},
- {"x":18.5, "y":3, "h":2},
-
- {"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},
- {"x":15.5, "y":4, "w":2},
- {"x":17.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": [6, 8], "x": 15.5, "y": 0},
+ {"matrix": [6, 9], "x": 16.5, "y": 0},
+ {"matrix": [6, 10], "x": 17.5, "y": 0},
+ {"matrix": [6, 11], "x": 18.5, "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": [5, 8], "x": 15.5, "y": 1},
+ {"matrix": [5, 9], "x": 16.5, "y": 1},
+ {"matrix": [5, 10], "x": 17.5, "y": 1},
+ {"matrix": [5, 11], "x": 18.5, "y": 1, "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": 2, "w": 1.25},
+
+ {"matrix": [5, 12], "x": 15.5, "y": 2},
+ {"matrix": [5, 13], "x": 16.5, "y": 2},
+ {"matrix": [5, 14], "x": 17.5, "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},
+ {"matrix": [3, 13], "x": 13.25, "y": 3, "w": 1.75},
+
+ {"matrix": [4, 8], "x": 15.5, "y": 3},
+ {"matrix": [4, 9], "x": 16.5, "y": 3},
+ {"matrix": [4, 10], "x": 17.5, "y": 3},
+ {"matrix": [4, 11], "x": 18.5, "y": 3, "h": 2},
+
+ {"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": 7},
+ {"matrix": [4, 5], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 12.5, "y": 4},
+ {"matrix": [4, 7], "x": 13.5, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 12], "x": 15.5, "y": 4, "w": 2},
+ {"matrix": [4, 13], "x": 17.5, "y": 4}
]
},
-
"LAYOUT_all_iso_6_25": {
"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.5, "y":0},
- {"x":16.5, "y":0},
- {"x":17.5, "y":0},
- {"x":18.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.75, "y":1, "w":1.25, "h":2},
- {"x":15.5, "y":1},
- {"x":16.5, "y":1},
- {"x":17.5, "y":1},
- {"x":18.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},
- {"x":15.5, "y":2},
- {"x":16.5, "y":2},
- {"x":17.5, "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},
- {"x":13.25, "y":3, "w":1.75},
- {"x":15.5, "y":3},
- {"x":16.5, "y":3},
- {"x":17.5, "y":3},
- {"x":18.5, "y":3, "h":2},
-
- {"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},
- {"x":15.5, "y":4, "w":2},
- {"x":17.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": [6, 8], "x": 15.5, "y": 0},
+ {"matrix": [6, 9], "x": 16.5, "y": 0},
+ {"matrix": [6, 10], "x": 17.5, "y": 0},
+ {"matrix": [6, 11], "x": 18.5, "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, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [5, 8], "x": 15.5, "y": 1},
+ {"matrix": [5, 9], "x": 16.5, "y": 1},
+ {"matrix": [5, 10], "x": 17.5, "y": 1},
+ {"matrix": [5, 11], "x": 18.5, "y": 1, "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": [5, 12], "x": 15.5, "y": 2},
+ {"matrix": [5, 13], "x": 16.5, "y": 2},
+ {"matrix": [5, 14], "x": 17.5, "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},
+ {"matrix": [3, 13], "x": 13.25, "y": 3, "w": 1.75},
+
+ {"matrix": [4, 8], "x": 15.5, "y": 3},
+ {"matrix": [4, 9], "x": 16.5, "y": 3},
+ {"matrix": [4, 10], "x": 17.5, "y": 3},
+ {"matrix": [4, 11], "x": 18.5, "y": 3, "h": 2},
+
+ {"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": 6.25},
+ {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 13.75, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 12], "x": 15.5, "y": 4, "w": 2},
+ {"matrix": [4, 13], "x": 17.5, "y": 4}
]
},
-
"LAYOUT_all_iso_7": {
"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.5, "y":0},
- {"x":16.5, "y":0},
- {"x":17.5, "y":0},
- {"x":18.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.75, "y":1, "w":1.25, "h":2},
- {"x":15.5, "y":1},
- {"x":16.5, "y":1},
- {"x":17.5, "y":1},
- {"x":18.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},
- {"x":15.5, "y":2},
- {"x":16.5, "y":2},
- {"x":17.5, "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},
- {"x":13.25, "y":3, "w":1.75},
- {"x":15.5, "y":3},
- {"x":16.5, "y":3},
- {"x":17.5, "y":3},
- {"x":18.5, "y":3, "h":2},
-
- {"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},
- {"x":15.5, "y":4, "w":2},
- {"x":17.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": [6, 8], "x": 15.5, "y": 0},
+ {"matrix": [6, 9], "x": 16.5, "y": 0},
+ {"matrix": [6, 10], "x": 17.5, "y": 0},
+ {"matrix": [6, 11], "x": 18.5, "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, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [5, 8], "x": 15.5, "y": 1},
+ {"matrix": [5, 9], "x": 16.5, "y": 1},
+ {"matrix": [5, 10], "x": 17.5, "y": 1},
+ {"matrix": [5, 11], "x": 18.5, "y": 1, "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": [5, 12], "x": 15.5, "y": 2},
+ {"matrix": [5, 13], "x": 16.5, "y": 2},
+ {"matrix": [5, 14], "x": 17.5, "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},
+ {"matrix": [3, 13], "x": 13.25, "y": 3, "w": 1.75},
+
+ {"matrix": [4, 8], "x": 15.5, "y": 3},
+ {"matrix": [4, 9], "x": 16.5, "y": 3},
+ {"matrix": [4, 10], "x": 17.5, "y": 3},
+ {"matrix": [4, 11], "x": 18.5, "y": 3, "h": 2},
+
+ {"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": 7},
+ {"matrix": [4, 5], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 12.5, "y": 4},
+ {"matrix": [4, 7], "x": 13.5, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 12], "x": 15.5, "y": 4, "w": 2},
+ {"matrix": [4, 13], "x": 17.5, "y": 4}
]
}
}
diff --git a/keyboards/lm_keyboard/lm60n/lm60n.h b/keyboards/lm_keyboard/lm60n/lm60n.h
deleted file mode 100644
index f64a1a9d39..0000000000
--- a/keyboards/lm_keyboard/lm60n/lm60n.h
+++ /dev/null
@@ -1,204 +0,0 @@
-/* Copyright 2021 gkeyboard
- *
- * 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.
- */
-
-/* LAYOUT_ansi
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e │ |68 |69 |6a |6b |
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┼───┤
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │ |58 |59 |5a |5b |
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┼───┼───┤ |
- * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2d │ |5c |5d |5e | |
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ ├───┼───┼───┼───┤
- * │30 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d | |48 |49 |4a |4b |
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ├───┴───┼───┤ |
- * │40 │41 │42 │43 │44 │45 │46 │47 │ |4c |4d | |
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───────┴───┴───┘
-*/
-#define LAYOUT_ansi( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, k68, k69, k6a, k6b, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k58, k59, k5a, k5b, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, k5c, k5d, k5e, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k48, k49, k4a, k4b, \
- k40, k41, k42, k43, k44, k45, k46, k47, 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, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, XXX }, \
- { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k58, k59, k5a, k5b, k5c, k5d, k5e }, \
- { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k68, k69, k6a, k6b, XXX, XXX, XXX } \
-}
-
-/* LAYOUT_tsangan
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e │ |68 |69 |6a |6b |
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┼───┤
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │ |58 |59 |5a |5b |
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┼───┼───┤ |
- * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2d │ |5c |5d |5e | |
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤ ├───┼───┼───┼───┤
- * │30 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c |3d │ |48 |49 |4a |4b |
- * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴┬─────┤ ├───┴───┼───┤ |
- * │40 │41 │42 │43 (7u) │45 │46 │47 │ |4c |4d | |
- * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───────┴───┴───┘
-*/
-#define LAYOUT_tsangan( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, k68, k69, k6a, k6b, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k58, k59, k5a, k5b, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, k5c, k5d, k5e, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k48, k49, k4a, k4b, \
- k40, k41, k42, k43, k45, k46, k47, 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, k3d, XXX }, \
- { k40, k41, k42, k43, XXX, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, XXX }, \
- { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k58, k59, k5a, k5b, k5c, k5d, k5e }, \
- { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k68, k69, k6a, k6b, XXX, XXX, XXX } \
-}
-
-/* LAYOUT_all_ansi
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │ |68 |69 |6a |6b |
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┼───┤
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │ |58 |59 |5a |5b │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┤ ├───┼───┼───┤ |
- * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c |2d │ |5c |5d |5e | |
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤ ├───┼───┼───┼───┤
- * │30 |31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c |3d │ |48 |49 |4a |4b |
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬──┴─┬────┤ ├───┴───┼───┤ |
- * │40 │41 │42 │43 │44 │45 │46 │47 │ |4c |4d | |
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───────┴───┴───┘
-*/
-#define LAYOUT_all_ansi( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k68, k69, k6a, k6b, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k58, k59, k5a, k5b, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k5c, k5d, k5e, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k48, k49, k4a, k4b, \
- k40, k41, k42, k43, k44, k45, k46, k47, 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, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, XXX }, \
- { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k58, k59, k5a, k5b, k5c, k5d, k5e }, \
- { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k68, k69, k6a, k6b, XXX, XXX, XXX } \
-}
-
-/* LAYOUT_all_tsangan
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d |0e │ |68 |69 |6a |6b |
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┼───┤
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │ |58 |59 |5a |5b |
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┤ ├───┼───┼───┤ |
- * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c |2d │ |5c |5d |5e | |
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤ ├───┼───┼───┼───┤
- * │30 |31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c |3d │ |48 |49 |4a |4b |
- * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴┬─────┤ ├───┴───┼───┤ |
- * │40 │41 │42 │43 (7u) │45 │46 │47 │ |4c |4d | |
- * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───────┴───┴───┘
-*/
-#define LAYOUT_all_tsangan( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k68, k69, k6a, k6b, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k58, k59, k5a, k5b, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k5c, k5d, k5e, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k48, k49, k4a, k4b, \
- k40, k41, k42, k43, k45, k46, k47, 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, k43, XXX, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, XXX }, \
- { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k58, k59, k5a, k5b, k5c, k5d, k5e }, \
- { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k68, k69, k6a, k6b, XXX, XXX, XXX } \
-}
-
-/* LAYOUT_all__iso_6_25
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │ |68 |69 |6a |6b |
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┼───┤
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │2d │ |58 |59 |5a |5b |
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ | ├───┼───┼───┤ |
- * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c | │ |5c |5d |5e | |
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤ ├───┼───┼───┼───┤
- * │30 |31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c |3d │ |48 |49 |4a |4b |
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬──┴─┬────┤ ├───┴───┼───┤ |
- * │40 │41 │42 │43 │44 │45 │46 │47 │ |4c |4d | |
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───────┴───┴───┘
-*/
-#define LAYOUT_all_iso_6_25( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k68, k69, k6a, k6b, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2d, k58, k59, k5a, k5b, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k5c, k5d, k5e, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k48, k49, k4a, k4b, \
- k40, k41, k42, k43, k44, k45, k46, k47, 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, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, XXX }, \
- { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k58, k59, k5a, k5b, k5c, k5d, k5e }, \
- { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k68, k69, k6a, k6b, XXX, XXX, XXX } \
-}
-
-/* LAYOUT_all__iso_7
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d |0e │ |68 |69 |6a |6b |
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┼───┤
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │2d │ |58 |59 |5a |5b |
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ | ├───┼───┼───┤ |
- * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c | │ |5c |5d |5e | |
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤ ├───┼───┼───┼───┤
- * │30 |31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c |3d │ |48 |49 |4a |4b |
- * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴┬─────┤ ├───┴───┼───┤ |
- * │40 │41 │42 │43 (7u) │45 │46 │47 │ |4c |4d | |
- * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───────┴───┴───┘
-*/
-#define LAYOUT_all_iso_7( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k68, k69, k6a, k6b, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2d, k58, k59, k5a, k5b, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k5c, k5d, k5e, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k48, k49, k4a, k4b, \
- k40, k41, k42, k43, k45, k46, k47, 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, k43, XXX, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, XXX }, \
- { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k58, k59, k5a, k5b, k5c, k5d, k5e }, \
- { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k68, k69, k6a, k6b, XXX, XXX, XXX } \
-}
diff --git a/keyboards/lw67/info.json b/keyboards/lw67/info.json
index 2dae9dc2e1..87722c409c 100644
--- a/keyboards/lw67/info.json
+++ b/keyboards/lw67/info.json
@@ -20,21 +20,334 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
- "layouts":{
- "LAYOUT_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":"Mute", "x":16, "y":0.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":"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":"Delete", "x":15.5, "y":2}, {"label":"PgUp", "x":16.5, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"\u2191", "x":15.25, "y":3.25}, {"label":"PgDn", "x":16.5, "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":"\u2190", "x":14.25, "y":4.25}, {"label":"\u2193", "x":15.25, "y":4.25}, {"label":"\u2192", "x":16.25, "y":4.25}]
- },
+ "layouts": {
+ "LAYOUT_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_ansi_splitbs": {
- "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":"Mute", "x":16, "y":0.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":"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":"Delete", "x":15.5, "y":2}, {"label":"PgUp", "x":16.5, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"\u2191", "x":15.25, "y":3.25}, {"label":"PgDn", "x":16.5, "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":"\u2190", "x":14.25, "y":4.25}, {"label":"\u2193", "x":15.25, "y":4.25}, {"label":"\u2192", "x":16.25, "y":4.25}]
+ {"matrix": [0, 15], "x": 16, "y": 0.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},
+
+ {"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.5, "y": 2},
+ {"matrix": [2, 15], "x": 16.5, "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": 2.75},
+
+ {"matrix": [3, 13], "x": 15.25, "y": 3.25},
+
+ {"matrix": [3, 14], "x": 16.5, "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": 6.25},
+ {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 12.5, "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}
+ ]
+ },
+ "LAYOUT_ansi_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": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [0, 15], "x": 16, "y": 0.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},
+
+ {"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.5, "y": 2},
+ {"matrix": [2, 15], "x": 16.5, "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": 2.75},
+
+ {"matrix": [3, 13], "x": 15.25, "y": 3.25},
+
+ {"matrix": [3, 14], "x": 16.5, "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": 6.25},
+ {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 12.5, "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}
+ ]
},
+ "LAYOUT_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, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [0, 15], "x": 16, "y": 0.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": [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.5, "y": 2},
+ {"matrix": [2, 15], "x": 16.5, "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": 2.75},
+
+ {"matrix": [3, 13], "x": 15.25, "y": 3.25},
+
+ {"matrix": [3, 14], "x": 16.5, "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": 6.25},
+ {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25},
- "LAYOUT_iso": {
- "layout": [{"label":"Esc", "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":"Mute", "x":16, "y":0.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":"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":"Delete", "x":15.5, "y":2}, {"label":"PgUp", "x":16.5, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"\u2191", "x":15.25, "y":3.25}, {"label":"PgDn", "x":16.5, "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":"\u2190", "x":14.25, "y":4.25}, {"label":"\u2193", "x":15.25, "y":4.25}, {"label":"\u2192", "x":16.25, "y":4.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}
+ ]
},
+ "LAYOUT_iso_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": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [0, 15], "x": 16, "y": 0.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": [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.5, "y": 2},
+ {"matrix": [2, 15], "x": 16.5, "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": 2.75},
+
+ {"matrix": [3, 13], "x": 15.25, "y": 3.25},
+
+ {"matrix": [3, 14], "x": 16.5, "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": 6.25},
+ {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25},
- "LAYOUT_iso_splitbs": {
- "layout": [{"label":"Esc", "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":"\u00ac", "x":13, "y":0}, {"label":"Backspace", "x":14, "y":0}, {"label":"Mute", "x":16, "y":0.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":"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":"Delete", "x":15.5, "y":2}, {"label":"PgUp", "x":16.5, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"\u2191", "x":15.25, "y":3.25}, {"label":"PgDn", "x":16.5, "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":"\u2190", "x":14.25, "y":4.25}, {"label":"\u2193", "x":15.25, "y":4.25}, {"label":"\u2192", "x":16.25, "y":4.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}
+ ]
}
- }
+ }
}
diff --git a/keyboards/lw67/lw67.c b/keyboards/lw67/lw67.c
deleted file mode 100644
index 87f69e9df5..0000000000
--- a/keyboards/lw67/lw67.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* Copyright 2021 Laneware Peripherals
- *
- * 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 "lw67.h"
diff --git a/keyboards/lw67/lw67.h b/keyboards/lw67/lw67.h
deleted file mode 100644
index fba187d078..0000000000
--- a/keyboards/lw67/lw67.h
+++ /dev/null
@@ -1,131 +0,0 @@
- /* Copyright 2021 Laneware Peripherals
- *
- * 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"
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │000│001│002│003│004│005│006│007│008│009│010│011│012│ 013 │ ┌───┐
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ │015│
- * │ 100 │101│102│103│104│105│106│107│108│109│110│111│112│ 113 │ └───┘
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ┌───┬───┐
- * │ 200 │201│202│203│204│205│206│207│208│209│210│211│ 213 │ │214│215│
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ └───┼───┤
- * │ 300 │302│303│304│305│306│307│308│309│310│311│ 312 │┌───┐│314│
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┘│313│└───┘
- * │ 400│ 401│ 402│ 403 │ 404│ 405│ 406│ ┌───┼───┼───┐
- * └────┴────┴────┴────────────────────────┴────┴────┴────┘ │407│408│409│
- * └───┴───┴───┘
- */
-
-#define LAYOUT_ansi( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K015, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214, K215, \
- K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, KC_NO, K015 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, KC_NO, KC_NO }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, KC_NO, K213, K214, K215 }, \
- { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, KC_NO }, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │000│001│002│003│004│005│006│007│008│009│010│011│012│013│014│ ┌───┐
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ │015│
- * │ 100 │101│102│103│104│105│106│107│108│109│110│111│112│ 113 │ └───┘
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ┌───┬───┐
- * │ 200 │201│202│203│204│205│206│207│208│209│210│211│ 213 │ │214│215│
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ └───┼───┤
- * │ 300 │302│303│304│305│306│307│308│309│310│311│ 312 │┌───┐│314│
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┘│313│└───┘
- * │ 400│ 401│ 402│ 403 │ 404│ 405│ 406│ ┌───┼───┼───┐
- * └────┴────┴────┴────────────────────────┴────┴────┴────┘ │407│408│409│
- * └───┴───┴───┘
- */
-
-#define LAYOUT_ansi_splitbs( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214, K215, \
- K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, KC_NO, KC_NO }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, KC_NO, K213, K214, K215 }, \
- { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, KC_NO }, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │000│001│002│003│004│005│006│007│008│009│010│011│012│ 013 │ ┌───┐
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ │015│
- * │ 100 │101│102│103│104│105│106│107│108│109│110│111│112│ │ └───┘
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ 213│ ┌───┬───┐
- * │ 200 │201│202│203│204│205│206│207│208│209│210│211│212│ │ │214│215│
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ └───┼───┤
- * │ 300│301│302│303│304│305│306│307│308│309│310│311│ 312 │┌───┐│314│
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┘│313│└───┘
- * │ 400│ 401│ 402│ 403 │ 404│ 405│ 406│ ┌───┼───┼───┐
- * └────┴────┴────┴────────────────────────┴────┴────┴────┘ │407│408│409│
- * └───┴───┴───┘
- */
-
-#define LAYOUT_iso( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K015, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, KC_NO, K015 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO, KC_NO, KC_NO }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, KC_NO }, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │000│001│002│003│004│005│006│007│008│009│010│011│012│013│014│ ┌───┐
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ │015│
- * │ 100 │101│102│103│104│105│106│107│108│109│110│111│112│ │ └───┘
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ 213│ ┌───┬───┐
- * │ 200 │201│202│203│204│205│206│207│208│209│210│211│212│ │ │214│215│
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ └───┼───┤
- * │ 300│301│302│303│304│305│306│307│308│309│310│311│ 312 │┌───┐│314│
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┘│313│└───┘
- * │ 400│ 401│ 402│ 403 │ 404│ 405│ 406│ ┌───┼───┼───┐
- * └────┴────┴────┴────────────────────────┴────┴────┴────┘ │407│408│409│
- * └───┴───┴───┘
- */
-
-#define LAYOUT_iso_splitbs( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO, KC_NO, KC_NO }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, KC_NO }, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
-}
diff --git a/keyboards/lw75/info.json b/keyboards/lw75/info.json
index 3249465704..8eb4f219be 100644
--- a/keyboards/lw75/info.json
+++ b/keyboards/lw75/info.json
@@ -20,21 +20,422 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
- "layouts":{
- "LAYOUT_ansi":{
- "layout": [{"label":"Mute", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"F1", "x":2.5, "y":0}, {"label":"F2", "x":3.5, "y":0}, {"label":"F3", "x":4.5, "y":0}, {"label":"F4", "x":5.5, "y":0}, {"label":"F5", "x":6.75, "y":0}, {"label":"F6", "x":7.75, "y":0}, {"label":"F7", "x":8.75, "y":0}, {"label":"F8", "x":9.75, "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":"F13", "x":15.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":"Delete", "x":15.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":"PgUp", "x":15.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":"PgDn", "x":15.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":1.75}, {"label":"Insert", "x":15.5, "y":4.25}, {"label":"\u2191", "x":14.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25}, {"label":"Win", "x":11, "y":5.25}, {"label":"Ctrl", "x":12, "y":5.25}, {"label":"\u2190", "x":13.25, "y":5.5}, {"label":"\u2193", "x":14.25, "y":5.5}, {"label":"\u2192", "x":15.25, "y":5.5}]
- },
+ "layouts": {
+ "LAYOUT_ansi": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
- "LAYOUT_ansi_splitbs": {
- "layout": [{"label":"Mute", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"F1", "x":2.5, "y":0}, {"label":"F2", "x":3.5, "y":0}, {"label":"F3", "x":4.5, "y":0}, {"label":"F4", "x":5.5, "y":0}, {"label":"F5", "x":6.75, "y":0}, {"label":"F6", "x":7.75, "y":0}, {"label":"F7", "x":8.75, "y":0}, {"label":"F8", "x":9.75, "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":"F13", "x":15.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}, {"label":"Fn", "x":14, "y":1.25}, {"label":"Delete", "x":15.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":"PgUp", "x":15.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":"PgDn", "x":15.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":1.75}, {"label":"Insert", "x":15.5, "y":4.25}, {"label":"\u2191", "x":14.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25}, {"label":"Win", "x":11, "y":5.25}, {"label":"Ctrl", "x":12, "y":5.25}, {"label":"\u2190", "x":13.25, "y":5.5}, {"label":"\u2193", "x":14.25, "y":5.5}, {"label":"\u2192", "x":15.25, "y":5.5}]
+ {"matrix": [0, 1], "x": 1.25, "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.75, "y": 0},
+ {"matrix": [0, 7], "x": 7.75, "y": 0},
+ {"matrix": [0, 8], "x": 8.75, "y": 0},
+ {"matrix": [0, 9], "x": 9.75, "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": [0, 14], "x": 15.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, "w": 2},
+
+ {"matrix": [1, 15], "x": 15.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, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 15.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, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [3, 14], "x": 15.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, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+ {"matrix": [4, 13], "x": 15.5, "y": 4.25},
+
+ {"matrix": [4, 14], "x": 14.25, "y": 4.5},
+
+ {"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, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 4], "x": 10, "y": 5.25},
+ {"matrix": [5, 5], "x": 11, "y": 5.25},
+ {"matrix": [5, 6], "x": 12, "y": 5.25},
+
+ {"matrix": [5, 7], "x": 13.25, "y": 5.5},
+ {"matrix": [5, 8], "x": 14.25, "y": 5.5},
+ {"matrix": [5, 9], "x": 15.25, "y": 5.5}
+ ]
+ },
+ "LAYOUT_ansi_splitbs": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.25, "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.75, "y": 0},
+ {"matrix": [0, 7], "x": 7.75, "y": 0},
+ {"matrix": [0, 8], "x": 8.75, "y": 0},
+ {"matrix": [0, 9], "x": 9.75, "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": [0, 14], "x": 15.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.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, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 15.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, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [3, 14], "x": 15.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, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+ {"matrix": [4, 13], "x": 15.5, "y": 4.25},
+
+ {"matrix": [4, 14], "x": 14.25, "y": 4.5},
+
+ {"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, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 4], "x": 10, "y": 5.25},
+ {"matrix": [5, 5], "x": 11, "y": 5.25},
+ {"matrix": [5, 6], "x": 12, "y": 5.25},
+
+ {"matrix": [5, 7], "x": 13.25, "y": 5.5},
+ {"matrix": [5, 8], "x": 14.25, "y": 5.5},
+ {"matrix": [5, 9], "x": 15.25, "y": 5.5}
+ ]
},
+ "LAYOUT_iso": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.25, "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.75, "y": 0},
+ {"matrix": [0, 7], "x": 7.75, "y": 0},
+ {"matrix": [0, 8], "x": 8.75, "y": 0},
+ {"matrix": [0, 9], "x": 9.75, "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": [0, 14], "x": 15.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, "w": 2},
+
+ {"matrix": [1, 15], "x": 15.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.75, "y": 2.25, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 15.5, "y": 2.25},
+
+ {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+
+ {"matrix": [3, 14], "x": 15.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, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+ {"matrix": [4, 13], "x": 15.5, "y": 4.25},
+
+ {"matrix": [4, 14], "x": 14.25, "y": 4.5},
+
+ {"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, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 4], "x": 10, "y": 5.25},
+ {"matrix": [5, 5], "x": 11, "y": 5.25},
+ {"matrix": [5, 6], "x": 12, "y": 5.25},
- "LAYOUT_iso": {
- "layout": [{"label":"Mute", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"F1", "x":2.5, "y":0}, {"label":"F2", "x":3.5, "y":0}, {"label":"F3", "x":4.5, "y":0}, {"label":"F4", "x":5.5, "y":0}, {"label":"F5", "x":6.75, "y":0}, {"label":"F6", "x":7.75, "y":0}, {"label":"F7", "x":8.75, "y":0}, {"label":"F8", "x":9.75, "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":"F13", "x":15.5, "y":0}, {"label":"\u00ac", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"\"", "x":2, "y":1.25}, {"label":"\u00a3", "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":"Delete", "x":15.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":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2}, {"label":"PgUp", "x":15.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":"~", "x":12.75, "y":3.25}, {"label":"PgDn", "x":15.5, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":1.25}, {"label":"|", "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}, {"label":"Insert", "x":15.5, "y":4.25}, {"label":"\u2191", "x":14.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"AltGr", "x":10, "y":5.25}, {"label":"Win", "x":11, "y":5.25}, {"label":"Ctrl", "x":12, "y":5.25}, {"label":"\u2190", "x":13.25, "y":5.5}, {"label":"\u2193", "x":14.25, "y":5.5}, {"label":"\u2192", "x":15.25, "y":5.5}]
+ {"matrix": [5, 7], "x": 13.25, "y": 5.5},
+ {"matrix": [5, 8], "x": 14.25, "y": 5.5},
+ {"matrix": [5, 9], "x": 15.25, "y": 5.5}
+ ]
},
+ "LAYOUT_iso_splitbs": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.25, "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.75, "y": 0},
+ {"matrix": [0, 7], "x": 7.75, "y": 0},
+ {"matrix": [0, 8], "x": 8.75, "y": 0},
+ {"matrix": [0, 9], "x": 9.75, "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": [0, 14], "x": 15.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.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.75, "y": 2.25, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 15.5, "y": 2.25},
+
+ {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+
+ {"matrix": [3, 14], "x": 15.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, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+ {"matrix": [4, 13], "x": 15.5, "y": 4.25},
+
+ {"matrix": [4, 14], "x": 14.25, "y": 4.5},
+
+ {"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, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 4], "x": 10, "y": 5.25},
+ {"matrix": [5, 5], "x": 11, "y": 5.25},
+ {"matrix": [5, 6], "x": 12, "y": 5.25},
- "LAYOUT_iso_splitbs": {
- "layout": [{"label":"Mute", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"F1", "x":2.5, "y":0}, {"label":"F2", "x":3.5, "y":0}, {"label":"F3", "x":4.5, "y":0}, {"label":"F4", "x":5.5, "y":0}, {"label":"F5", "x":6.75, "y":0}, {"label":"F6", "x":7.75, "y":0}, {"label":"F7", "x":8.75, "y":0}, {"label":"F8", "x":9.75, "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":"F13", "x":15.5, "y":0}, {"label":"\u00ac", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"\"", "x":2, "y":1.25}, {"label":"\u00a3", "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}, {"label":"Fn", "x":14, "y":1.25}, {"label":"Delete", "x":15.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":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2}, {"label":"PgUp", "x":15.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":"~", "x":12.75, "y":3.25}, {"label":"PgDn", "x":15.5, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":1.25}, {"label":"|", "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}, {"label":"Insert", "x":15.5, "y":4.25}, {"label":"\u2191", "x":14.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"AltGr", "x":10, "y":5.25}, {"label":"Win", "x":11, "y":5.25}, {"label":"Ctrl", "x":12, "y":5.25}, {"label":"\u2190", "x":13.25, "y":5.5}, {"label":"\u2193", "x":14.25, "y":5.5}, {"label":"\u2192", "x":15.25, "y":5.5}]
+ {"matrix": [5, 7], "x": 13.25, "y": 5.5},
+ {"matrix": [5, 8], "x": 14.25, "y": 5.5},
+ {"matrix": [5, 9], "x": 15.25, "y": 5.5}
+ ]
}
- }
+ }
}
diff --git a/keyboards/lw75/lw75.c b/keyboards/lw75/lw75.c
deleted file mode 100644
index 1ec6841515..0000000000
--- a/keyboards/lw75/lw75.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2023 Laneware Peripherals
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "lw75.h"
diff --git a/keyboards/lw75/lw75.h b/keyboards/lw75/lw75.h
deleted file mode 100644
index cfbaf81467..0000000000
--- a/keyboards/lw75/lw75.h
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright 2023 Laneware Peripherals
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-/* ┌───┐┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐ ┌───┐
- * │000││001││002│003│004│005││006│007│008│009││010│011│012│013│ │014│
- * └───┘└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘ └───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┐
- * │100│101│102│103│104│105│106│107│108│109│110│111│112│ 113 │ │115│
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┤
- * │ 200 │201│202│203│204│205│206│207│208│209│210│211│212│ 213 │ │214│
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┤
- * │ 300 │301│302│303│304│305│306│307│308│309│310│311│ 313 │ │314│
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┤
- * │ 400 │402│403│404│405│406│407│408│409│410│411│ 412 │┌───┐│414│
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┘│413│└───┘
- * │ 500│ 501│ 502│ 503 │504│505│506│┌───┼───┼───┐
- * └────┴────┴────┴────────────────────────┴───┴───┴───┘│507│508│509│
- * └───┴───┴───┘
- */
-
-#define LAYOUT_ansi( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
- 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, K214, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \
- K400, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, \
- K500, K501, K502, K503, K504, K505, K506, K507, K508, K509 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014}, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, KC_NO, K115 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214}, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314}, \
- { K400, KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414}, \
- { K500, K501, K502, K503, K504, K505, K506, K507, K508, K509} \
-}
-
-/* ┌───┐┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐ ┌───┐
- * │000││001││002│003│004│005││006│007│008│009││010│011│012│013│ │014│
- * └───┘└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘ └───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┐
- * │100│101│102│103│104│105│106│107│108│109│110│111│112│113│114│ │115│
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┤
- * │ 200 │201│202│203│204│205│206│207│208│209│210│211│212│ 213 │ │214│
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┤
- * │ 300 │301│302│303│304│305│306│307│308│309│310│311│ 313 │ │314│
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┤
- * │ 400 │402│403│404│405│406│407│408│409│410│411│ 412 │┌───┐│414│
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┘│413│└───┘
- * │ 500│ 501│ 502│ 503 │504│505│506│┌───┼───┼───┐
- * └────┴────┴────┴────────────────────────┴───┴───┴───┘│507│508│509│
- * └───┴───┴───┘
- */
-
-#define LAYOUT_ansi_splitbs( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
- 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, K214, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \
- K400, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, \
- K500, K501, K502, K503, K504, K505, K506, K507, K508, K509 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014}, \
- { 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, K214}, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314}, \
- { K400, KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414}, \
- { K500, K501, K502, K503, K504, K505, K506, K507, K508, K509} \
-}
-
-/* ┌───┐┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐ ┌───┐
- * │000││001││002│003│004│005││006│007│008│009││010│011│012│013│ │014│
- * └───┘└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘ └───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┐
- * │100│101│102│103│104│105│106│107│108│109│110│111│112│ 113 │ │115│
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┤
- * │ 200 │201│202│203│204│205│206│207│208│209│210│211│212│ 313 │ │214│
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ ├───┤
- * │ 300 │301│302│303│304│305│306│307│308│309│310│311│312│ │ │314│
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┘ ├───┤
- * │ 400│401│402│403│404│405│406│407│408│409│410│411│ 412 │┌───┐│414│
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┘│413│└───┘
- * │ 500│ 501│ 502│ 503 │504│505│506│┌───┼───┼───┐
- * └────┴────┴────┴────────────────────────┴───┴───┴───┘│507│508│509│
- * └───┴───┴───┘
- */
-
-#define LAYOUT_iso( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
- 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, K214,\
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, \
- K500, K501, K502, K503, K504, K505, K506, K507, K508, K509 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014}, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, KC_NO, K115 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214}, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314}, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414}, \
- { K500, K501, K502, K503, K504, K505, K506, K507, K508, K509} \
-}
-
-/* ┌───┐┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐ ┌───┐
- * │000││001││002│003│004│005││006│007│008│009││010│011│012│013│ │014│
- * └───┘└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘ └───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┐
- * │100│101│102│103│104│105│106│107│108│109│110│111│112│113│114│ │115│
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┤
- * │ 200 │201│202│203│204│205│206│207│208│209│210│211│212│ 313 │ │214│
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ ├───┤
- * │ 300 │301│302│303│304│305│306│307│308│309│310│311│312│ │ │314│
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┘ ├───┤
- * │ 400│401│402│403│404│405│406│407│408│409│410│411│ 412 │┌───┐│414│
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┘│413│└───┘
- * │ 500│ 501│ 502│ 503 │504│505│506│┌───┼───┼───┐
- * └────┴────┴────┴────────────────────────┴───┴───┴───┘│507│508│509│
- * └───┴───┴───┘
- */
-
-#define LAYOUT_iso_splitbs( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
- 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, K214,\
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, \
- K500, K501, K502, K503, K504, K505, K506, K507, K508, K509 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014}, \
- { 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, KC_NO, K214}, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314}, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414}, \
- { K500, K501, K502, K503, K504, K505, K506, K507, K508, K509} \
-}
diff --git a/keyboards/machkeyboards/mach3/info.json b/keyboards/machkeyboards/mach3/info.json
index 3af4e154c1..83cdd13a8f 100644
--- a/keyboards/machkeyboards/mach3/info.json
+++ b/keyboards/machkeyboards/mach3/info.json
@@ -23,42 +23,17 @@
"layouts": {
"LAYOUT_3x3": {
"layout": [
- {
- "x": 0,
- "y": 0
- },
- {
- "x": 1,
- "y": 0
- },
- {
- "x": 2,
- "y": 0
- },
- {
- "x": 0,
- "y": 1
- },
- {
- "x": 1,
- "y": 1
- },
- {
- "x": 2,
- "y": 1
- },
- {
- "x": 0,
- "y": 2
- },
- {
- "x": 1,
- "y": 2
- },
- {
- "x": 2,
- "y": 2
- }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2}
]
}
}
diff --git a/keyboards/machkeyboards/mach3/mach3.c b/keyboards/machkeyboards/mach3/mach3.c
index 509aac9fe5..2a417b0a02 100644
--- a/keyboards/machkeyboards/mach3/mach3.c
+++ b/keyboards/machkeyboards/mach3/mach3.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 "mach3.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
diff --git a/keyboards/machkeyboards/mach3/mach3.h b/keyboards/machkeyboards/mach3/mach3.h
deleted file mode 100644
index 2eeadb3fba..0000000000
--- a/keyboards/machkeyboards/mach3/mach3.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2021 Mach Keyboards
- *
- * 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_3x3( \
- K00, K01, K02, \
- K10, K11, K12, \
- K20, K21, K22 \
- ) \
- { \
- { K00, K01, K02 }, \
- { K10, K11, K12 }, \
- { K20, K21, K22 } \
- }
diff --git a/keyboards/macro1/info.json b/keyboards/macro1/info.json
index 5fb86fecb7..c23f85776b 100644
--- a/keyboards/macro1/info.json
+++ b/keyboards/macro1/info.json
@@ -20,83 +20,99 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
- "layouts":{
- "LAYOUT_numpad":{
- "layout":[
- {"label":"Mute", "x":0, "y":0},
- {"label":"Play", "x":2, "y":0},
- {"label":"Backspace", "x":3, "y":0},
- {"label":"Numlock", "x":0, "y":1},
- {"label":"/", "x":1, "y":1},
- {"label":"*", "x":2, "y":1},
- {"label":"-", "x":3, "y":1},
- {"label":"7", "x":0, "y":2},
- {"label":"8", "x":1, "y":2},
- {"label":"9", "x":2, "y":2},
- {"label":"+", "x":3, "y":2, "h":2},
- {"label":"4", "x":0, "y":3},
- {"label":"5", "x":1, "y":3},
- {"label":"6", "x":2, "y":3},
- {"label":"1", "x":0, "y":4},
- {"label":"2", "x":1, "y":4},
- {"label":"3", "x":2, "y":4},
- {"label":"Enter", "x":3, "y":4, "h":2},
- {"label":"0", "x":0, "y":5, "w":2},
- {"label":".", "x":2, "y":5}
- ]
- },
-
- "LAYOUT_southpaw":{
- "layout":[
- {"label":"Mute", "x":0, "y":0},
- {"label":"Play", "x":2, "y":0},
- {"label":"Backspace", "x":3, "y":0},
- {"label":"Numlock", "x":0, "y":1},
- {"label":"/", "x":1, "y":1},
- {"label":"*", "x":2, "y":1},
- {"label":"-", "x":3, "y":1},
- {"label":"+", "x":0, "y":2, "h":2},
- {"label":"7", "x":1, "y":2},
- {"label":"8", "x":2, "y":2},
- {"label":"9", "x":3, "y":2},
- {"label":"4", "x":1, "y":3},
- {"label":"5", "x":2, "y":3},
- {"label":"6", "x":3, "y":3},
- {"label":"Enter", "x":0, "y":4, "h":2},
- {"label":"1", "x":1, "y":4},
- {"label":"2", "x":2, "y":4},
- {"label":"3", "x":3, "y":4},
- {"label":".", "x":1, "y":5},
- {"label":"0", "x":2, "y":5, "w":2}
- ]
- },
-
- "LAYOUT_macropad":{
- "layout":[
- {"label":"Mute", "x":0, "y":0},
- {"label":"F1", "x":2, "y":0},
- {"label":"F2", "x":3, "y":0},
- {"label":"F3", "x":0, "y":1},
- {"label":"F4", "x":1, "y":1},
- {"label":"F5", "x":2, "y":1},
- {"label":"F6", "x":3, "y":1},
- {"label":"F7", "x":0, "y":2},
- {"label":"F8", "x":1, "y":2},
- {"label":"F9", "x":2, "y":2},
- {"label":"F10", "x":3, "y":2},
- {"label":"F11", "x":0, "y":3},
- {"label":"F12", "x":1, "y":3},
- {"label":"F13", "x":2, "y":3},
- {"label":"F14", "x":3, "y":3},
- {"label":"F15", "x":0, "y":4},
- {"label":"F16", "x":1, "y":4},
- {"label":"F17", "x":2, "y":4},
- {"label":"F18", "x":3, "y":4},
- {"label":"F19", "x":0, "y":5},
- {"label":"F20", "x":1, "y":5},
- {"label":"F21", "x":2, "y":5},
- {"label":"F22", "x":3, "y":5}
- ]
- }
- }
+ "layouts": {
+ "LAYOUT_numpad": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "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": [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, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4, "h": 2},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 2},
+ {"matrix": [5, 2], "x": 2, "y": 5}
+ ]
+ },
+ "LAYOUT_southpaw": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "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": [2, 0], "x": 0, "y": 2, "h": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "h": 2},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+
+ {"matrix": [5, 1], "x": 1, "y": 5},
+ {"matrix": [5, 2], "x": 2, "y": 5, "w": 2}
+ ]
+ },
+ "LAYOUT_macropad": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "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": [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": [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": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5},
+ {"matrix": [5, 1], "x": 1, "y": 5},
+ {"matrix": [5, 2], "x": 2, "y": 5},
+ {"matrix": [5, 3], "x": 3, "y": 5}
+ ]
+ }
+ }
} \ No newline at end of file
diff --git a/keyboards/macro1/macro1.c b/keyboards/macro1/macro1.c
deleted file mode 100644
index a9cba4ecfa..0000000000
--- a/keyboards/macro1/macro1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Laneware Peripherals
- *
- * 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 "macro1.h"
diff --git a/keyboards/macro1/macro1.h b/keyboards/macro1/macro1.h
deleted file mode 100644
index 1066258050..0000000000
--- a/keyboards/macro1/macro1.h
+++ /dev/null
@@ -1,115 +0,0 @@
- /* Copyright 2021 Laneware Peripherals
- *
- * 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"
-
-/* KEYMAP_numpad
- * ┌───┐ ┌───┬───┐
- * │K00│ │K02│K03│
- * └───┘ └───┴───┘
- * ┌───┬───┬───┬───┐
- * │K10│K11│K12│K13│
- * ├───┼───┼───┼───┤
- * │K20│K21│K22│K23│
- * ├───┼───┼───┤ │
- * │K30│K31│K32│ │
- * ├───┼───┼───┼───┤
- * │K40│K41│K42│K43│
- * ├───┴───┼───┤ │
- * │K50 │K52│ │
- * └───────┴───┴───┘
- */
-#define LAYOUT_numpad( \
- K00, K02, K03, \
- K10, K11, K12, K13, \
- K20, K21, K22, K23, \
- K30, K31, K32, \
- K40, K41, K42, K43, \
- K50, K52 \
-) { \
- { K00, KC_NO, K02, K03 }, \
- { K10, K11, K12, K13 }, \
- { K20, K21, K22, K23 }, \
- { K30, K31, K32, KC_NO }, \
- { K40, K41, K42, K43 }, \
- { K50, KC_NO, K52, KC_NO } \
-}
-
-/* KEYMAP_southpaw
- * ┌───┐ ┌───┬───┐
- * │K00│ │K02│K03│
- * └───┘ └───┴───┘
- * ┌───┬───┬───┬───┐
- * │K10│K11│K12│K13│
- * ├───┼───┼───┼───┤
- * │K20│K21│K22│K23│
- * │ ├───┼───┼───┤
- * │ │K31│K32│K33│
- * ├───┼───┼───┼───┤
- * │K40│K41│K42│K43│
- * │ ├───┼───┴───┤
- * │ │K51│K52 │
- * └───┴───┴───────┘
- */
-#define LAYOUT_southpaw( \
- K00, K02, K03, \
- K10, K11, K12, K13, \
- K20, K21, K22, K23, \
- K31, K32, K33, \
- K40, K41, K42, K43, \
- K51, K52 \
-) { \
- { K00, KC_NO, K02, K03 }, \
- { K10, K11, K12, K13 }, \
- { K20, K21, K22, K23 }, \
- { KC_NO, K31, K32, K33 }, \
- { K40, K41, K42, K43 }, \
- { KC_NO, K51, K52, KC_NO } \
-}
-
-/* KEYMAP_macropad
- * ┌───┐ ┌───┬───┐
- * │K00│ │K01│K02│
- * └───┘ └───┴───┘
- * ┌───┬───┬───┬───┐
- * │K10│K11│K12│K13│
- * ├───┼───┼───┼───┤
- * │K20│K21│K22│K23│
- * ├───┼───┼───┼───┤
- * │K30│K31│K32│K33│
- * ├───┼───┼───┼───┤
- * │K40│K41│K42│K43│
- * ├───┼───┼───┼───┤
- * │K50│K51│K52│K53│
- * └───┴───┴───┴───┘
- */
-#define LAYOUT_macropad( \
- K00, K02, K03, \
- K10, K11, K12, K13, \
- K20, K21, K22, K23, \
- K30, K31, K32, K33, \
- K40, K41, K42, K43, \
- K50, K51, K52, K53 \
-) { \
- { K00, KC_NO, K02, K03 }, \
- { K10, K11, K12, K13 }, \
- { K20, K21, K22, K23 }, \
- { K30, K31, K32, K33 }, \
- { K40, K41, K42, K43 }, \
- { K50, K51, K52, K53 } \
-}
diff --git a/keyboards/marksard/treadstone48/rev2/info.json b/keyboards/marksard/treadstone48/rev2/info.json
index 223fff5818..e96ce9fd17 100644
--- a/keyboards/marksard/treadstone48/rev2/info.json
+++ b/keyboards/marksard/treadstone48/rev2/info.json
@@ -18,259 +18,63 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
+ "layout_aliases": {
+ "LAYOUT_full": "LAYOUT_base"
+ },
"layouts": {
"LAYOUT_base": {
"layout": [
- {
- "label": "Esc",
- "x": 1,
- "y": 0
- },
- {
- "label": "Q",
- "x": 2.25,
- "y": 0
- },
- {
- "label": "W",
- "x": 3.25,
- "y": 0
- },
- {
- "label": "E",
- "x": 4.25,
- "y": 0
- },
- {
- "label": "R",
- "x": 5.25,
- "y": 0
- },
- {
- "label": "T",
- "x": 6.25,
- "y": 0
- },
- {
- "label": "Y",
- "x": 7.75,
- "y": 0
- },
- {
- "label": "U",
- "x": 8.75,
- "y": 0
- },
- {
- "label": "I",
- "x": 9.75,
- "y": 0
- },
- {
- "label": "O",
- "x": 10.75,
- "y": 0
- },
- {
- "label": "P",
- "x": 11.75,
- "y": 0
- },
- {
- "label": "Backspace",
- "x": 12.75,
- "y": 0,
- "w": 2
- },
- {
- "label": "Tab",
- "x": 1,
- "y": 1,
- "w": 1.5
- },
- {
- "label": "A",
- "x": 2.5,
- "y": 1
- },
- {
- "label": "S",
- "x": 3.5,
- "y": 1
- },
- {
- "label": "D",
- "x": 4.5,
- "y": 1
- },
- {
- "label": "F",
- "x": 5.5,
- "y": 1
- },
- {
- "label": "G",
- "x": 6.5,
- "y": 1
- },
- {
- "label": "H",
- "x": 7.5,
- "y": 1
- },
- {
- "label": "J",
- "x": 8.5,
- "y": 1
- },
- {
- "label": "K",
- "x": 9.5,
- "y": 1
- },
- {
- "label": "L",
- "x": 10.5,
- "y": 1
- },
- {
- "label": ":",
- "x": 11.5,
- "y": 1
- },
- {
- "label": "Enter",
- "x": 12.5,
- "y": 1,
- "w": 2.25
- },
- {
- "label": "Shift",
- "x": 0,
- "y": 2,
- "w": 2.25
- },
- {
- "label": "Z",
- "x": 2.25,
- "y": 2
- },
- {
- "label": "X",
- "x": 3.25,
- "y": 2
- },
- {
- "label": "C",
- "x": 4.25,
- "y": 2
- },
- {
- "label": "V",
- "x": 5.25,
- "y": 2
- },
- {
- "label": "B",
- "x": 6.25,
- "y": 2
- },
- {
- "label": "N",
- "x": 7.75,
- "y": 2
- },
- {
- "label": "M",
- "x": 8.75,
- "y": 2
- },
- {
- "label": "<",
- "x": 9.75,
- "y": 2
- },
- {
- "label": ">",
- "x": 10.75,
- "y": 2
- },
- {
- "label": "?",
- "x": 11.75,
- "y": 2
- },
- {
- "label": "\u2191",
- "x": 12.75,
- "y": 2
- },
- {
- "label": "Ctrl",
- "x": 0.75,
- "y": 3,
- "w": 1.25
- },
- {
- "label": "Win",
- "x": 2,
- "y": 3,
- "w": 1.25
- },
- {
- "label": "Alt",
- "x": 3.25,
- "y": 3,
- "w": 1.25
- },
- {
- "label": "Lower",
- "x": 4.5,
- "y": 3
- },
- {
- "label": "Backspace",
- "x": 5.5,
- "y": 3,
- "w": 2
- },
- {
- "label": "Space",
- "x": 7.5,
- "y": 3,
- "w": 2
- },
- {
- "label": "Raise",
- "x": 9.5,
- "y": 3
- },
- {
- "label": "Menu",
- "x": 10.5,
- "y": 3,
- "w": 1.25
- },
- {
- "label": "\u2190",
- "x": 11.75,
- "y": 3
- },
- {
- "label": "\u2193",
- "x": 12.75,
- "y": 3
- },
- {
- "label": "\u2192",
- "x": 13.75,
- "y": 3
- },
- {
- "label": "Shift",
- "x": 13.75,
- "y": 2
- }
+ {"matrix": [4, 5], "x": 1, "y": 0},
+ {"matrix": [4, 4], "x": 2.25, "y": 0},
+ {"matrix": [4, 3], "x": 3.25, "y": 0},
+ {"matrix": [4, 2], "x": 4.25, "y": 0},
+ {"matrix": [4, 1], "x": 5.25, "y": 0},
+ {"matrix": [4, 0], "x": 6.25, "y": 0},
+ {"matrix": [0, 5], "x": 7.75, "y": 0},
+ {"matrix": [0, 4], "x": 8.75, "y": 0},
+ {"matrix": [0, 3], "x": 9.75, "y": 0},
+ {"matrix": [0, 2], "x": 10.75, "y": 0},
+ {"matrix": [0, 1], "x": 11.75, "y": 0},
+ {"matrix": [0, 0], "x": 12.75, "y": 0, "w": 2},
+
+ {"matrix": [5, 5], "x": 1, "y": 1, "w": 1.5},
+ {"matrix": [5, 4], "x": 2.5, "y": 1},
+ {"matrix": [5, 3], "x": 3.5, "y": 1},
+ {"matrix": [5, 2], "x": 4.5, "y": 1},
+ {"matrix": [5, 1], "x": 5.5, "y": 1},
+ {"matrix": [5, 0], "x": 6.5, "y": 1},
+ {"matrix": [1, 5], "x": 7.5, "y": 1},
+ {"matrix": [1, 4], "x": 8.5, "y": 1},
+ {"matrix": [1, 3], "x": 9.5, "y": 1},
+ {"matrix": [1, 2], "x": 10.5, "y": 1},
+ {"matrix": [1, 1], "x": 11.5, "y": 1},
+ {"matrix": [1, 0], "x": 12.5, "y": 1, "w": 2.25},
+
+ {"matrix": [6, 5], "x": 0, "y": 2, "w": 2.25},
+ {"matrix": [6, 4], "x": 2.25, "y": 2},
+ {"matrix": [6, 3], "x": 3.25, "y": 2},
+ {"matrix": [6, 2], "x": 4.25, "y": 2},
+ {"matrix": [6, 1], "x": 5.25, "y": 2},
+ {"matrix": [6, 0], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.75, "y": 2},
+ {"matrix": [2, 4], "x": 8.75, "y": 2},
+ {"matrix": [2, 3], "x": 9.75, "y": 2},
+ {"matrix": [2, 2], "x": 10.75, "y": 2},
+ {"matrix": [2, 1], "x": 11.75, "y": 2},
+ {"matrix": [2, 0], "x": 12.75, "y": 2},
+
+ {"matrix": [7, 5], "x": 0.75, "y": 3, "w": 1.25},
+ {"matrix": [7, 4], "x": 2, "y": 3, "w": 1.25},
+ {"matrix": [7, 3], "x": 3.25, "y": 3, "w": 1.25},
+ {"matrix": [7, 2], "x": 4.5, "y": 3},
+ {"matrix": [7, 1], "x": 5.5, "y": 3, "w": 2},
+ {"matrix": [7, 0], "x": 7.5, "y": 3, "w": 2},
+ {"matrix": [3, 5], "x": 9.5, "y": 3},
+ {"matrix": [3, 4], "x": 10.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 3], "x": 11.75, "y": 3},
+ {"matrix": [3, 2], "x": 12.75, "y": 3},
+ {"matrix": [3, 1], "x": 13.75, "y": 3},
+ {"matrix": [3, 0], "x": 13.75, "y": 2}
]
}
}
diff --git a/keyboards/marksard/treadstone48/rev2/rev2.h b/keyboards/marksard/treadstone48/rev2/rev2.h
deleted file mode 100644
index 651468c4a5..0000000000
--- a/keyboards/marksard/treadstone48/rev2/rev2.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2020 marksard
- *
- * 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_base( \
- L00, L01, L02, L03, L04, L05, L40, L41, L42, L43, L44, L45, \
- L10, L11, L12, L13, L14, L15, L50, L51, L52, L53, L54, L55, \
- L20, L21, L22, L23, L24, L25, L60, L61, L62, L63, L64, L65, \
- L30, L31, L32, L33, L34, L35, L70, L71, L72, L73, L74, L75 \
- ) \
- { \
- { L45, L44, L43, L42, L41, L40 }, \
- { L55, L54, L53, L52, L51, L50 }, \
- { L65, L64, L63, L62, L61, L60 }, \
- { L75, L74, L73, L72, L71, L70 }, \
- { L05, L04, L03, L02, L01, L00 }, \
- { L15, L14, L13, L12, L11, L10 }, \
- { L25, L24, L23, L22, L21, L20 }, \
- { L35, L34, L33, L32, L31, L30 } \
- }
-
-// full Keymap
-#define LAYOUT_full LAYOUT_base
diff --git a/keyboards/meme/info.json b/keyboards/meme/info.json
index f76f55e621..d844fc45ca 100644
--- a/keyboards/meme/info.json
+++ b/keyboards/meme/info.json
@@ -20,20 +20,309 @@
"processor": "atmega32u2",
"bootloader": "atmel-dfu",
"layouts": {
- "LAYOUT_spicy": {
- "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}, {"x":15, "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}, {"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":"Enter", "x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "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":"Win", "x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
- },
+ "LAYOUT_spicy": {
+ "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": [1, 6], "x": 13, "y": 0},
+ {"matrix": [0, 7], "x": 14, "y": 0},
+ {"matrix": [1, 7], "x": 15, "y": 0},
- "LAYOUT_normie": {
- "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, "w":2}, {"x":15, "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}, {"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":"Enter", "x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "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":"Win", "x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
- },
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [3, 0], "x": 1.5, "y": 1},
+ {"matrix": [2, 1], "x": 2.5, "y": 1},
+ {"matrix": [3, 1], "x": 3.5, "y": 1},
+ {"matrix": [2, 2], "x": 4.5, "y": 1},
+ {"matrix": [3, 2], "x": 5.5, "y": 1},
+ {"matrix": [2, 3], "x": 6.5, "y": 1},
+ {"matrix": [3, 3], "x": 7.5, "y": 1},
+ {"matrix": [2, 4], "x": 8.5, "y": 1},
+ {"matrix": [3, 4], "x": 9.5, "y": 1},
+ {"matrix": [2, 5], "x": 10.5, "y": 1},
+ {"matrix": [3, 5], "x": 11.5, "y": 1},
+ {"matrix": [2, 6], "x": 12.5, "y": 1},
+ {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [3, 7], "x": 15, "y": 1},
- "LAYOUT_dank": {
- "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, "w":2}, {"x":15, "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}, {"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":"Enter", "x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "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.5}, {"x":11.5, "y":4, "w":1.5}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
- },
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [5, 0], "x": 1.75, "y": 2},
+ {"matrix": [4, 1], "x": 2.75, "y": 2},
+ {"matrix": [5, 1], "x": 3.75, "y": 2},
+ {"matrix": [4, 2], "x": 4.75, "y": 2},
+ {"matrix": [5, 2], "x": 5.75, "y": 2},
+ {"matrix": [4, 3], "x": 6.75, "y": 2},
+ {"matrix": [5, 3], "x": 7.75, "y": 2},
+ {"matrix": [4, 4], "x": 8.75, "y": 2},
+ {"matrix": [5, 4], "x": 9.75, "y": 2},
+ {"matrix": [4, 5], "x": 10.75, "y": 2},
+ {"matrix": [5, 5], "x": 11.75, "y": 2},
+ {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [5, 7], "x": 15, "y": 2},
- "LAYOUT_meme": {
- "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}, {"x":15, "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}, {"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":"Enter", "x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "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.5}, {"x":11.5, "y":4, "w":1.5}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
- }
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [7, 0], "x": 2.25, "y": 3},
+ {"matrix": [6, 1], "x": 3.25, "y": 3},
+ {"matrix": [7, 1], "x": 4.25, "y": 3},
+ {"matrix": [6, 2], "x": 5.25, "y": 3},
+ {"matrix": [7, 2], "x": 6.25, "y": 3},
+ {"matrix": [6, 3], "x": 7.25, "y": 3},
+ {"matrix": [7, 3], "x": 8.25, "y": 3},
+ {"matrix": [6, 4], "x": 9.25, "y": 3},
+ {"matrix": [7, 4], "x": 10.25, "y": 3},
+ {"matrix": [6, 5], "x": 11.25, "y": 3},
+ {"matrix": [7, 6], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [6, 7], "x": 14, "y": 3},
+ {"matrix": [7, 7], "x": 15, "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": [9, 2], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [8, 5], "x": 10, "y": 4},
+ {"matrix": [9, 5], "x": 11, "y": 4},
+ {"matrix": [8, 6], "x": 12, "y": 4},
+ {"matrix": [9, 6], "x": 13, "y": 4},
+ {"matrix": [8, 7], "x": 14, "y": 4},
+ {"matrix": [9, 7], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_normie": {
+ "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, "w": 2},
+ {"matrix": [1, 7], "x": 15, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [3, 0], "x": 1.5, "y": 1},
+ {"matrix": [2, 1], "x": 2.5, "y": 1},
+ {"matrix": [3, 1], "x": 3.5, "y": 1},
+ {"matrix": [2, 2], "x": 4.5, "y": 1},
+ {"matrix": [3, 2], "x": 5.5, "y": 1},
+ {"matrix": [2, 3], "x": 6.5, "y": 1},
+ {"matrix": [3, 3], "x": 7.5, "y": 1},
+ {"matrix": [2, 4], "x": 8.5, "y": 1},
+ {"matrix": [3, 4], "x": 9.5, "y": 1},
+ {"matrix": [2, 5], "x": 10.5, "y": 1},
+ {"matrix": [3, 5], "x": 11.5, "y": 1},
+ {"matrix": [2, 6], "x": 12.5, "y": 1},
+ {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [3, 7], "x": 15, "y": 1},
+
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [5, 0], "x": 1.75, "y": 2},
+ {"matrix": [4, 1], "x": 2.75, "y": 2},
+ {"matrix": [5, 1], "x": 3.75, "y": 2},
+ {"matrix": [4, 2], "x": 4.75, "y": 2},
+ {"matrix": [5, 2], "x": 5.75, "y": 2},
+ {"matrix": [4, 3], "x": 6.75, "y": 2},
+ {"matrix": [5, 3], "x": 7.75, "y": 2},
+ {"matrix": [4, 4], "x": 8.75, "y": 2},
+ {"matrix": [5, 4], "x": 9.75, "y": 2},
+ {"matrix": [4, 5], "x": 10.75, "y": 2},
+ {"matrix": [5, 5], "x": 11.75, "y": 2},
+ {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [5, 7], "x": 15, "y": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [7, 0], "x": 2.25, "y": 3},
+ {"matrix": [6, 1], "x": 3.25, "y": 3},
+ {"matrix": [7, 1], "x": 4.25, "y": 3},
+ {"matrix": [6, 2], "x": 5.25, "y": 3},
+ {"matrix": [7, 2], "x": 6.25, "y": 3},
+ {"matrix": [6, 3], "x": 7.25, "y": 3},
+ {"matrix": [7, 3], "x": 8.25, "y": 3},
+ {"matrix": [6, 4], "x": 9.25, "y": 3},
+ {"matrix": [7, 4], "x": 10.25, "y": 3},
+ {"matrix": [6, 5], "x": 11.25, "y": 3},
+ {"matrix": [7, 6], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [6, 7], "x": 14, "y": 3},
+ {"matrix": [7, 7], "x": 15, "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": [9, 2], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [8, 5], "x": 10, "y": 4},
+ {"matrix": [9, 5], "x": 11, "y": 4},
+ {"matrix": [8, 6], "x": 12, "y": 4},
+ {"matrix": [9, 6], "x": 13, "y": 4},
+ {"matrix": [8, 7], "x": 14, "y": 4},
+ {"matrix": [9, 7], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_dank": {
+ "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, "w": 2},
+ {"matrix": [1, 7], "x": 15, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [3, 0], "x": 1.5, "y": 1},
+ {"matrix": [2, 1], "x": 2.5, "y": 1},
+ {"matrix": [3, 1], "x": 3.5, "y": 1},
+ {"matrix": [2, 2], "x": 4.5, "y": 1},
+ {"matrix": [3, 2], "x": 5.5, "y": 1},
+ {"matrix": [2, 3], "x": 6.5, "y": 1},
+ {"matrix": [3, 3], "x": 7.5, "y": 1},
+ {"matrix": [2, 4], "x": 8.5, "y": 1},
+ {"matrix": [3, 4], "x": 9.5, "y": 1},
+ {"matrix": [2, 5], "x": 10.5, "y": 1},
+ {"matrix": [3, 5], "x": 11.5, "y": 1},
+ {"matrix": [2, 6], "x": 12.5, "y": 1},
+ {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [3, 7], "x": 15, "y": 1},
+
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [5, 0], "x": 1.75, "y": 2},
+ {"matrix": [4, 1], "x": 2.75, "y": 2},
+ {"matrix": [5, 1], "x": 3.75, "y": 2},
+ {"matrix": [4, 2], "x": 4.75, "y": 2},
+ {"matrix": [5, 2], "x": 5.75, "y": 2},
+ {"matrix": [4, 3], "x": 6.75, "y": 2},
+ {"matrix": [5, 3], "x": 7.75, "y": 2},
+ {"matrix": [4, 4], "x": 8.75, "y": 2},
+ {"matrix": [5, 4], "x": 9.75, "y": 2},
+ {"matrix": [4, 5], "x": 10.75, "y": 2},
+ {"matrix": [5, 5], "x": 11.75, "y": 2},
+ {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [5, 7], "x": 15, "y": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [7, 0], "x": 2.25, "y": 3},
+ {"matrix": [6, 1], "x": 3.25, "y": 3},
+ {"matrix": [7, 1], "x": 4.25, "y": 3},
+ {"matrix": [6, 2], "x": 5.25, "y": 3},
+ {"matrix": [7, 2], "x": 6.25, "y": 3},
+ {"matrix": [6, 3], "x": 7.25, "y": 3},
+ {"matrix": [7, 3], "x": 8.25, "y": 3},
+ {"matrix": [6, 4], "x": 9.25, "y": 3},
+ {"matrix": [7, 4], "x": 10.25, "y": 3},
+ {"matrix": [6, 5], "x": 11.25, "y": 3},
+ {"matrix": [7, 6], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [6, 7], "x": 14, "y": 3},
+ {"matrix": [7, 7], "x": 15, "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": [9, 2], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [8, 5], "x": 10, "y": 4, "w": 1.5},
+ {"matrix": [8, 6], "x": 11.5, "y": 4, "w": 1.5},
+ {"matrix": [9, 6], "x": 13, "y": 4},
+ {"matrix": [8, 7], "x": 14, "y": 4},
+ {"matrix": [9, 7], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_meme": {
+ "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": [1, 6], "x": 13, "y": 0},
+ {"matrix": [0, 7], "x": 14, "y": 0},
+ {"matrix": [1, 7], "x": 15, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [3, 0], "x": 1.5, "y": 1},
+ {"matrix": [2, 1], "x": 2.5, "y": 1},
+ {"matrix": [3, 1], "x": 3.5, "y": 1},
+ {"matrix": [2, 2], "x": 4.5, "y": 1},
+ {"matrix": [3, 2], "x": 5.5, "y": 1},
+ {"matrix": [2, 3], "x": 6.5, "y": 1},
+ {"matrix": [3, 3], "x": 7.5, "y": 1},
+ {"matrix": [2, 4], "x": 8.5, "y": 1},
+ {"matrix": [3, 4], "x": 9.5, "y": 1},
+ {"matrix": [2, 5], "x": 10.5, "y": 1},
+ {"matrix": [3, 5], "x": 11.5, "y": 1},
+ {"matrix": [2, 6], "x": 12.5, "y": 1},
+ {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [3, 7], "x": 15, "y": 1},
+
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [5, 0], "x": 1.75, "y": 2},
+ {"matrix": [4, 1], "x": 2.75, "y": 2},
+ {"matrix": [5, 1], "x": 3.75, "y": 2},
+ {"matrix": [4, 2], "x": 4.75, "y": 2},
+ {"matrix": [5, 2], "x": 5.75, "y": 2},
+ {"matrix": [4, 3], "x": 6.75, "y": 2},
+ {"matrix": [5, 3], "x": 7.75, "y": 2},
+ {"matrix": [4, 4], "x": 8.75, "y": 2},
+ {"matrix": [5, 4], "x": 9.75, "y": 2},
+ {"matrix": [4, 5], "x": 10.75, "y": 2},
+ {"matrix": [5, 5], "x": 11.75, "y": 2},
+ {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [5, 7], "x": 15, "y": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [7, 0], "x": 2.25, "y": 3},
+ {"matrix": [6, 1], "x": 3.25, "y": 3},
+ {"matrix": [7, 1], "x": 4.25, "y": 3},
+ {"matrix": [6, 2], "x": 5.25, "y": 3},
+ {"matrix": [7, 2], "x": 6.25, "y": 3},
+ {"matrix": [6, 3], "x": 7.25, "y": 3},
+ {"matrix": [7, 3], "x": 8.25, "y": 3},
+ {"matrix": [6, 4], "x": 9.25, "y": 3},
+ {"matrix": [7, 4], "x": 10.25, "y": 3},
+ {"matrix": [6, 5], "x": 11.25, "y": 3},
+ {"matrix": [7, 6], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [6, 7], "x": 14, "y": 3},
+ {"matrix": [7, 7], "x": 15, "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": [9, 2], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [8, 5], "x": 10, "y": 4, "w": 1.5},
+ {"matrix": [8, 6], "x": 11.5, "y": 4, "w": 1.5},
+ {"matrix": [9, 6], "x": 13, "y": 4},
+ {"matrix": [8, 7], "x": 14, "y": 4},
+ {"matrix": [9, 7], "x": 15, "y": 4}
+ ]
+ }
}
}
diff --git a/keyboards/meme/meme.h b/keyboards/meme/meme.h
deleted file mode 100644
index 36c533ea9d..0000000000
--- a/keyboards/meme/meme.h
+++ /dev/null
@@ -1,97 +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_spicy( \
- k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, \
- k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k37, \
- k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k56, k57, \
- k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k76, k67, k77, \
- k80, k90, k81, k92, k85, k95, k86, k96, k87, k97 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07 }, \
- { k10, k11, k12, k13, k14, k15, k16, k17 }, \
- { k20, k21, k22, k23, k24, k25, k26, XXX }, \
- { k30, k31, k32, k33, k34, k35, k36, k37 }, \
- { k40, k41, k42, k43, k44, k45, XXX, XXX }, \
- { k50, k51, k52, k53, k54, k55, k56, k57 }, \
- { k60, k61, k62, k63, k64, k65, XXX, k67 }, \
- { k70, k71, k72, k73, k74, XXX, k76, k77 }, \
- { k80, k81, XXX, XXX, XXX, k85, k86, k87 }, \
- { k90, XXX, k92, XXX, XXX, k95, k96, k97 } \
-}
-
-#define LAYOUT_normie( \
- k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k07, k17, \
- k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k37, \
- k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k56, k57, \
- k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k76, k67, k77, \
- k80, k90, k81, k92, k85, k95, k86, k96, k87, k97 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07 }, \
- { k10, k11, k12, k13, k14, k15, XXX, k17 }, \
- { k20, k21, k22, k23, k24, k25, k26, XXX }, \
- { k30, k31, k32, k33, k34, k35, k36, k37 }, \
- { k40, k41, k42, k43, k44, k45, XXX, XXX }, \
- { k50, k51, k52, k53, k54, k55, k56, k57 }, \
- { k60, k61, k62, k63, k64, k65, XXX, k67 }, \
- { k70, k71, k72, k73, k74, XXX, k76, k77 }, \
- { k80, k81, XXX, XXX, XXX, k85, k86, k87 }, \
- { k90, XXX, k92, XXX, XXX, k95, k96, k97 } \
-}
-
-#define LAYOUT_dank( \
- k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k07, k17, \
- k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k37, \
- k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k56, k57, \
- k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k76, k67, k77, \
- k80, k90, k81, k92, k85, k86, k96, k87, k97 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07 }, \
- { k10, k11, k12, k13, k14, k15, XXX, k17 }, \
- { k20, k21, k22, k23, k24, k25, k26, XXX }, \
- { k30, k31, k32, k33, k34, k35, k36, k37 }, \
- { k40, k41, k42, k43, k44, k45, XXX, XXX }, \
- { k50, k51, k52, k53, k54, k55, k56, k57 }, \
- { k60, k61, k62, k63, k64, k65, XXX, k67 }, \
- { k70, k71, k72, k73, k74, XXX, k76, k77 }, \
- { k80, k81, XXX, XXX, XXX, k85, k86, k87 }, \
- { k90, XXX, k92, XXX, XXX, XXX, k96, k97 } \
-}
-
-#define LAYOUT_meme( \
- k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, \
- k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k37, \
- k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k56, k57, \
- k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k76, k67, k77, \
- k80, k90, k81, k92, k85, k86, k96, k87, k97 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07 }, \
- { k10, k11, k12, k13, k14, k15, k16, k17 }, \
- { k20, k21, k22, k23, k24, k25, k26, XXX }, \
- { k30, k31, k32, k33, k34, k35, k36, k37 }, \
- { k40, k41, k42, k43, k44, k45, XXX, XXX }, \
- { k50, k51, k52, k53, k54, k55, k56, k57 }, \
- { k60, k61, k62, k63, k64, k65, XXX, k67 }, \
- { k70, k71, k72, k73, k74, XXX, k76, k77 }, \
- { k80, k81, XXX, XXX, XXX, k85, k86, k87 }, \
- { k90, XXX, k92, XXX, XXX, XXX, k96, k97 } \
-}
diff --git a/keyboards/merge/um70/info.json b/keyboards/merge/um70/info.json
index fd566ab395..f067225e0b 100644
--- a/keyboards/merge/um70/info.json
+++ b/keyboards/merge/um70/info.json
@@ -28,16 +28,374 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_rspace_2u_bksp": {
- "layout": [{"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":7.5, "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.75, "y":0}, {"x":1.5, "y":1, "w":1.5}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "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.75, "y":1}, {"x":0, "y":2}, {"x":1.5, "y":2, "w":1.75}, {"x":3.25, "y":2}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "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":17.75, "y":2}, {"x":0, "y":3}, {"x":1.5, "y":3, "w":2.25}, {"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":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.5, "y":3.25}, {"x":0, "y":4}, {"x":1.5, "y":4, "w":1.25}, {"x":2.75, "y":4, "w":1.25}, {"x":4, "y":4, "w":1.25}, {"x":5.25, "y":4, "w":1.25}, {"x":6.5, "y":4, "w":2.25}, {"x":9.5, "y":4, "w":2.75}, {"x":12.25, "y":4, "w":1.5}, {"x":13.75, "y":4, "w":1.5}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25}, {"x":17.5, "y":4.25}]
+ "layout": [
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [5, 0], "x": 9.25, "y": 0},
+ {"matrix": [5, 1], "x": 10.25, "y": 0},
+ {"matrix": [5, 2], "x": 11.25, "y": 0},
+ {"matrix": [5, 3], "x": 12.25, "y": 0},
+ {"matrix": [5, 4], "x": 13.25, "y": 0},
+ {"matrix": [5, 5], "x": 14.25, "y": 0},
+ {"matrix": [5, 7], "x": 15.25, "y": 0, "w": 2},
+
+ {"matrix": [7, 7], "x": 17.75, "y": 0},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [6, 0], "x": 8.75, "y": 1},
+ {"matrix": [6, 1], "x": 9.75, "y": 1},
+ {"matrix": [6, 2], "x": 10.75, "y": 1},
+ {"matrix": [6, 3], "x": 11.75, "y": 1},
+ {"matrix": [6, 4], "x": 12.75, "y": 1},
+ {"matrix": [6, 5], "x": 13.75, "y": 1},
+ {"matrix": [6, 6], "x": 14.75, "y": 1},
+ {"matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5},
+
+ {"matrix": [8, 7], "x": 17.75, "y": 1},
+
+ {"matrix": [4, 5], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [7, 0], "x": 9, "y": 2},
+ {"matrix": [7, 1], "x": 10, "y": 2},
+ {"matrix": [7, 2], "x": 11, "y": 2},
+ {"matrix": [7, 3], "x": 12, "y": 2},
+ {"matrix": [7, 4], "x": 13, "y": 2},
+ {"matrix": [7, 5], "x": 14, "y": 2},
+ {"matrix": [7, 6], "x": 15, "y": 2, "w": 2.25},
+
+ {"matrix": [9, 7], "x": 17.75, "y": 2},
+
+ {"matrix": [4, 6], "x": 0, "y": 3},
+
+ {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 3.75, "y": 3},
+ {"matrix": [3, 2], "x": 4.75, "y": 3},
+ {"matrix": [3, 3], "x": 5.75, "y": 3},
+ {"matrix": [3, 4], "x": 6.75, "y": 3},
+ {"matrix": [3, 5], "x": 7.75, "y": 3},
+
+ {"matrix": [8, 0], "x": 9.5, "y": 3},
+ {"matrix": [8, 1], "x": 10.5, "y": 3},
+ {"matrix": [8, 2], "x": 11.5, "y": 3},
+ {"matrix": [8, 3], "x": 12.5, "y": 3},
+ {"matrix": [8, 4], "x": 13.5, "y": 3},
+ {"matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75},
+
+ {"matrix": [8, 6], "x": 16.5, "y": 3.25},
+
+ {"matrix": [4, 7], "x": 0, "y": 4},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25},
+
+ {"matrix": [9, 0], "x": 9.5, "y": 4, "w": 2.75},
+ {"matrix": [9, 1], "x": 12.25, "y": 4, "w": 1.5},
+ {"matrix": [9, 2], "x": 13.75, "y": 4, "w": 1.5},
+
+ {"matrix": [9, 3], "x": 15.5, "y": 4.25},
+ {"matrix": [9, 4], "x": 16.5, "y": 4.25},
+ {"matrix": [9, 5], "x": 17.5, "y": 4.25}
+ ]
},
"LAYOUT_rspace_split_bksp": {
- "layout": [{"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":7.5, "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.75, "y":0}, {"x":1.5, "y":1, "w":1.5}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "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.75, "y":1}, {"x":0, "y":2}, {"x":1.5, "y":2, "w":1.75}, {"x":3.25, "y":2}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "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":17.75, "y":2}, {"x":0, "y":3}, {"x":1.5, "y":3, "w":2.25}, {"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":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.5, "y":3.25}, {"x":0, "y":4}, {"x":1.5, "y":4, "w":1.25}, {"x":2.75, "y":4, "w":1.25}, {"x":4, "y":4, "w":1.25}, {"x":5.25, "y":4, "w":1.25}, {"x":6.5, "y":4, "w":2.25}, {"x":9.5, "y":4, "w":2.75}, {"x":12.25, "y":4, "w":1.5}, {"x":13.75, "y":4, "w":1.5}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25}, {"x":17.5, "y":4.25}]
+ "layout": [
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [5, 0], "x": 9.25, "y": 0},
+ {"matrix": [5, 1], "x": 10.25, "y": 0},
+ {"matrix": [5, 2], "x": 11.25, "y": 0},
+ {"matrix": [5, 3], "x": 12.25, "y": 0},
+ {"matrix": [5, 4], "x": 13.25, "y": 0},
+ {"matrix": [5, 5], "x": 14.25, "y": 0},
+ {"matrix": [5, 6], "x": 15.25, "y": 0},
+ {"matrix": [5, 7], "x": 16.25, "y": 0},
+
+ {"matrix": [7, 7], "x": 17.75, "y": 0},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [6, 0], "x": 8.75, "y": 1},
+ {"matrix": [6, 1], "x": 9.75, "y": 1},
+ {"matrix": [6, 2], "x": 10.75, "y": 1},
+ {"matrix": [6, 3], "x": 11.75, "y": 1},
+ {"matrix": [6, 4], "x": 12.75, "y": 1},
+ {"matrix": [6, 5], "x": 13.75, "y": 1},
+ {"matrix": [6, 6], "x": 14.75, "y": 1},
+ {"matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5},
+
+ {"matrix": [8, 7], "x": 17.75, "y": 1},
+
+ {"matrix": [4, 5], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [7, 0], "x": 9, "y": 2},
+ {"matrix": [7, 1], "x": 10, "y": 2},
+ {"matrix": [7, 2], "x": 11, "y": 2},
+ {"matrix": [7, 3], "x": 12, "y": 2},
+ {"matrix": [7, 4], "x": 13, "y": 2},
+ {"matrix": [7, 5], "x": 14, "y": 2},
+ {"matrix": [7, 6], "x": 15, "y": 2, "w": 2.25},
+
+ {"matrix": [9, 7], "x": 17.75, "y": 2},
+
+ {"matrix": [4, 6], "x": 0, "y": 3},
+
+ {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 3.75, "y": 3},
+ {"matrix": [3, 2], "x": 4.75, "y": 3},
+ {"matrix": [3, 3], "x": 5.75, "y": 3},
+ {"matrix": [3, 4], "x": 6.75, "y": 3},
+ {"matrix": [3, 5], "x": 7.75, "y": 3},
+
+ {"matrix": [8, 0], "x": 9.5, "y": 3},
+ {"matrix": [8, 1], "x": 10.5, "y": 3},
+ {"matrix": [8, 2], "x": 11.5, "y": 3},
+ {"matrix": [8, 3], "x": 12.5, "y": 3},
+ {"matrix": [8, 4], "x": 13.5, "y": 3},
+ {"matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75},
+
+ {"matrix": [8, 6], "x": 16.5, "y": 3.25},
+
+ {"matrix": [4, 7], "x": 0, "y": 4},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25},
+
+ {"matrix": [9, 0], "x": 9.5, "y": 4, "w": 2.75},
+ {"matrix": [9, 1], "x": 12.25, "y": 4, "w": 1.5},
+ {"matrix": [9, 2], "x": 13.75, "y": 4, "w": 1.5},
+
+ {"matrix": [9, 3], "x": 15.5, "y": 4.25},
+ {"matrix": [9, 4], "x": 16.5, "y": 4.25},
+ {"matrix": [9, 5], "x": 17.5, "y": 4.25}
+ ]
},
"LAYOUT_lspace_2u_bksp": {
- "layout": [{"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":7.5, "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.75, "y":0}, {"x":1.5, "y":1, "w":1.5}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "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.75, "y":1}, {"x":0, "y":2}, {"x":1.5, "y":2, "w":1.75}, {"x":3.25, "y":2}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "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":17.75, "y":2}, {"x":0, "y":3}, {"x":1.5, "y":3, "w":2.25}, {"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":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.5, "y":3.25}, {"x":0, "y":4}, {"x":1.5, "y":4, "w":1.25}, {"x":2.75, "y":4, "w":1.25}, {"x":4, "y":4, "w":1.25}, {"x":5.25, "y":4, "w":2.25}, {"x":7.5, "y":4, "w":1.25}, {"x":9.5, "y":4, "w":2.75}, {"x":12.25, "y":4, "w":1.5}, {"x":13.75, "y":4, "w":1.5}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25}, {"x":17.5, "y":4.25}]
+ "layout": [
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [5, 0], "x": 9.25, "y": 0},
+ {"matrix": [5, 1], "x": 10.25, "y": 0},
+ {"matrix": [5, 2], "x": 11.25, "y": 0},
+ {"matrix": [5, 3], "x": 12.25, "y": 0},
+ {"matrix": [5, 4], "x": 13.25, "y": 0},
+ {"matrix": [5, 5], "x": 14.25, "y": 0},
+ {"matrix": [5, 7], "x": 15.25, "y": 0, "w": 2},
+
+ {"matrix": [7, 7], "x": 17.75, "y": 0},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [6, 0], "x": 8.75, "y": 1},
+ {"matrix": [6, 1], "x": 9.75, "y": 1},
+ {"matrix": [6, 2], "x": 10.75, "y": 1},
+ {"matrix": [6, 3], "x": 11.75, "y": 1},
+ {"matrix": [6, 4], "x": 12.75, "y": 1},
+ {"matrix": [6, 5], "x": 13.75, "y": 1},
+ {"matrix": [6, 6], "x": 14.75, "y": 1},
+ {"matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5},
+
+ {"matrix": [8, 7], "x": 17.75, "y": 1},
+
+ {"matrix": [4, 5], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [7, 0], "x": 9, "y": 2},
+ {"matrix": [7, 1], "x": 10, "y": 2},
+ {"matrix": [7, 2], "x": 11, "y": 2},
+ {"matrix": [7, 3], "x": 12, "y": 2},
+ {"matrix": [7, 4], "x": 13, "y": 2},
+ {"matrix": [7, 5], "x": 14, "y": 2},
+ {"matrix": [7, 6], "x": 15, "y": 2, "w": 2.25},
+
+ {"matrix": [9, 7], "x": 17.75, "y": 2},
+
+ {"matrix": [4, 6], "x": 0, "y": 3},
+
+ {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 3.75, "y": 3},
+ {"matrix": [3, 2], "x": 4.75, "y": 3},
+ {"matrix": [3, 3], "x": 5.75, "y": 3},
+ {"matrix": [3, 4], "x": 6.75, "y": 3},
+ {"matrix": [3, 5], "x": 7.75, "y": 3},
+
+ {"matrix": [8, 0], "x": 9.5, "y": 3},
+ {"matrix": [8, 1], "x": 10.5, "y": 3},
+ {"matrix": [8, 2], "x": 11.5, "y": 3},
+ {"matrix": [8, 3], "x": 12.5, "y": 3},
+ {"matrix": [8, 4], "x": 13.5, "y": 3},
+ {"matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75},
+
+ {"matrix": [8, 6], "x": 16.5, "y": 3.25},
+
+ {"matrix": [4, 7], "x": 0, "y": 4},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25},
+ {"matrix": [4, 3], "x": 7.5, "y": 4, "w": 1.25},
+
+ {"matrix": [9, 0], "x": 9.5, "y": 4, "w": 2.75},
+ {"matrix": [9, 1], "x": 12.25, "y": 4, "w": 1.5},
+ {"matrix": [9, 2], "x": 13.75, "y": 4, "w": 1.5},
+
+ {"matrix": [9, 3], "x": 15.5, "y": 4.25},
+ {"matrix": [9, 4], "x": 16.5, "y": 4.25},
+ {"matrix": [9, 5], "x": 17.5, "y": 4.25}
+ ]
},
"LAYOUT_lspace_split_bksp": {
- "layout": [{"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":7.5, "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.75, "y":0}, {"x":1.5, "y":1, "w":1.5}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "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.75, "y":1}, {"x":0, "y":2}, {"x":1.5, "y":2, "w":1.75}, {"x":3.25, "y":2}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "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":17.75, "y":2}, {"x":0, "y":3}, {"x":1.5, "y":3, "w":2.25}, {"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":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.5, "y":3.25}, {"x":0, "y":4}, {"x":1.5, "y":4, "w":1.25}, {"x":2.75, "y":4, "w":1.25}, {"x":4, "y":4, "w":1.25}, {"x":5.25, "y":4, "w":2.25}, {"x":7.5, "y":4, "w":1.25}, {"x":9.5, "y":4, "w":2.75}, {"x":12.25, "y":4, "w":1.5}, {"x":13.75, "y":4, "w":1.5}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25}, {"x":17.5, "y":4.25}]
+ "layout": [
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [5, 0], "x": 9.25, "y": 0},
+ {"matrix": [5, 1], "x": 10.25, "y": 0},
+ {"matrix": [5, 2], "x": 11.25, "y": 0},
+ {"matrix": [5, 3], "x": 12.25, "y": 0},
+ {"matrix": [5, 4], "x": 13.25, "y": 0},
+ {"matrix": [5, 5], "x": 14.25, "y": 0},
+ {"matrix": [5, 6], "x": 15.25, "y": 0},
+ {"matrix": [5, 7], "x": 16.25, "y": 0},
+
+ {"matrix": [7, 7], "x": 17.75, "y": 0},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [6, 0], "x": 8.75, "y": 1},
+ {"matrix": [6, 1], "x": 9.75, "y": 1},
+ {"matrix": [6, 2], "x": 10.75, "y": 1},
+ {"matrix": [6, 3], "x": 11.75, "y": 1},
+ {"matrix": [6, 4], "x": 12.75, "y": 1},
+ {"matrix": [6, 5], "x": 13.75, "y": 1},
+ {"matrix": [6, 6], "x": 14.75, "y": 1},
+ {"matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5},
+
+ {"matrix": [8, 7], "x": 17.75, "y": 1},
+
+ {"matrix": [4, 5], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [7, 0], "x": 9, "y": 2},
+ {"matrix": [7, 1], "x": 10, "y": 2},
+ {"matrix": [7, 2], "x": 11, "y": 2},
+ {"matrix": [7, 3], "x": 12, "y": 2},
+ {"matrix": [7, 4], "x": 13, "y": 2},
+ {"matrix": [7, 5], "x": 14, "y": 2},
+ {"matrix": [7, 6], "x": 15, "y": 2, "w": 2.25},
+
+ {"matrix": [9, 7], "x": 17.75, "y": 2},
+
+ {"matrix": [4, 6], "x": 0, "y": 3},
+
+ {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 3.75, "y": 3},
+ {"matrix": [3, 2], "x": 4.75, "y": 3},
+ {"matrix": [3, 3], "x": 5.75, "y": 3},
+ {"matrix": [3, 4], "x": 6.75, "y": 3},
+ {"matrix": [3, 5], "x": 7.75, "y": 3},
+
+ {"matrix": [8, 0], "x": 9.5, "y": 3},
+ {"matrix": [8, 1], "x": 10.5, "y": 3},
+ {"matrix": [8, 2], "x": 11.5, "y": 3},
+ {"matrix": [8, 3], "x": 12.5, "y": 3},
+ {"matrix": [8, 4], "x": 13.5, "y": 3},
+ {"matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75},
+
+ {"matrix": [8, 6], "x": 16.5, "y": 3.25},
+
+ {"matrix": [4, 7], "x": 0, "y": 4},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25},
+ {"matrix": [4, 3], "x": 7.5, "y": 4, "w": 1.25},
+
+ {"matrix": [9, 0], "x": 9.5, "y": 4, "w": 2.75},
+ {"matrix": [9, 1], "x": 12.25, "y": 4, "w": 1.5},
+ {"matrix": [9, 2], "x": 13.75, "y": 4, "w": 1.5},
+
+ {"matrix": [9, 3], "x": 15.5, "y": 4.25},
+ {"matrix": [9, 4], "x": 16.5, "y": 4.25},
+ {"matrix": [9, 5], "x": 17.5, "y": 4.25}
+ ]
}
}
}
diff --git a/keyboards/merge/um70/um70.c b/keyboards/merge/um70/um70.c
index 3283e7e26b..b63fcdbedd 100644
--- a/keyboards/merge/um70/um70.c
+++ b/keyboards/merge/um70/um70.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "um70.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
/*
diff --git a/keyboards/merge/um70/um70.h b/keyboards/merge/um70/um70.h
deleted file mode 100644
index 9b46c94a96..0000000000
--- a/keyboards/merge/um70/um70.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* Copyright 2021 duoshock
- *
- * 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_rspace_split_bksp( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, R27, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R37, \
- L45, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R47, \
- L46, L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36,\
- L47, L40, L41, L42, L43, L44, R40, R41, R42, R43, R44, R45 \
-) { \
- { 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, XXX, XXX }, \
- { L40, L41, L42, L43, L44, L45, L46, L47 }, \
- { 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 }, \
- { R40, R41, R42, R43, R44, R45, XXX, R47 } \
-}
-
-#define LAYOUT_rspace_2u_bksp( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R07, R27, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R37, \
- L45, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R47, \
- L46, L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36,\
- L47, L40, L41, L42, L43, L44, R40, R41, R42, R43, R44, R45 \
-) { \
- { 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, XXX, XXX }, \
- { L40, L41, L42, L43, L44, L45, L46, L47 }, \
- { R00, R01, R02, R03, R04, R05, XXX, 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 }, \
- { R40, R41, R42, R43, R44, R45, XXX, R47 } \
-}
-
-#define LAYOUT_lspace_2u_bksp( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R07, R27, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R37, \
- L45, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R47, \
- L46, L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36,\
- L47, L40, L41, L42, L44, L43, R40, R41, R42, R43, R44, R45 \
-) { \
- { 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, XXX, XXX }, \
- { L40, L41, L42, L43, L44, L45, L46, L47 }, \
- { R00, R01, R02, R03, R04, R05, XXX, 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 }, \
- { R40, R41, R42, R43, R44, R45, XXX, R47 } \
-}
-
-#define LAYOUT_lspace_split_bksp( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, R27, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R37, \
- L45, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R47, \
- L46, L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36,\
- L47, L40, L41, L42, L44, L43, R40, R41, R42, R43, R44, R45 \
-) { \
- { 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, XXX, XXX }, \
- { L40, L41, L42, L43, L44, L45, L46, L47 }, \
- { 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 }, \
- { R40, R41, R42, R43, R44, R45, XXX, R47 } \
-}
diff --git a/keyboards/merge/um80/info.json b/keyboards/merge/um80/info.json
index 9b7e73b2da..fb2b86f9b1 100644
--- a/keyboards/merge/um80/info.json
+++ b/keyboards/merge/um80/info.json
@@ -28,7 +28,121 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_rspace_split_bksp": {
- "layout": [{"label":"Esc", "x":1.5, "y":0}, {"label":"F1", "x":2.75, "y":0}, {"label":"F2", "x":3.75, "y":0}, {"label":"F3", "x":4.75, "y":0}, {"label":"F4", "x":5.75, "y":0}, {"label":"F5", "x":7, "y":0}, {"label":"F6", "x":8, "y":0}, {"label":"F7", "x":10.25, "y":0}, {"label":"F8", "x":11.25, "y":0}, {"label":"F9", "x":12.5, "y":0}, {"label":"F10", "x":13.5, "y":0}, {"label":"F11", "x":14.5, "y":0}, {"label":"F12", "x":15.5, "y":0}, {"label":"Del", "x":16.75, "y":0}, {"label":"Encoder", "x":18.25, "y":0}, {"label":"~", "x":1.5, "y":1.25}, {"label":"!", "x":2.5, "y":1.25}, {"label":"@", "x":3.5, "y":1.25}, {"label":"#", "x":4.5, "y":1.25}, {"label":"$", "x":5.5, "y":1.25}, {"label":"%", "x":6.5, "y":1.25}, {"label":"^", "x":7.5, "y":1.25}, {"label":"&", "x":9.75, "y":1.25}, {"label":"*", "x":10.75, "y":1.25}, {"label":"(", "x":11.75, "y":1.25}, {"label":")", "x":12.75, "y":1.25}, {"label":"_", "x":13.75, "y":1.25}, {"label":"+", "x":14.75, "y":1.25}, {"label":"~", "x":15.75, "y":1.25}, {"label":"Bksp", "x":16.75, "y":1.25}, {"label":"Home", "x":18.25, "y":1.25}, {"label":"M0", "x":0, "y":2.25}, {"label":"Tab", "x":1.5, "y":2.25, "w":1.5}, {"label":"Q", "x":3, "y":2.25}, {"label":"W", "x":4, "y":2.25}, {"label":"E", "x":5, "y":2.25}, {"label":"R", "x":6, "y":2.25}, {"label":"T", "x":7, "y":2.25}, {"label":"Y", "x":9.25, "y":2.25}, {"label":"U", "x":10.25, "y":2.25}, {"label":"I", "x":11.25, "y":2.25}, {"label":"O", "x":12.25, "y":2.25}, {"label":"P", "x":13.25, "y":2.25}, {"label":"{", "x":14.25, "y":2.25}, {"label":"}", "x":15.25, "y":2.25}, {"label":"|", "x":16.25, "y":2.25, "w":1.5}, {"label":"PgUp", "x":18.25, "y":2.25}, {"label":"M1", "x":0, "y":3.25}, {"label":"Caps Lock", "x":1.5, "y":3.25, "w":1.75}, {"label":"A", "x":3.25, "y":3.25}, {"label":"S", "x":4.25, "y":3.25}, {"label":"D", "x":5.25, "y":3.25}, {"label":"F", "x":6.25, "y":3.25}, {"label":"G", "x":7.25, "y":3.25}, {"label":"H", "x":9.5, "y":3.25}, {"label":"J", "x":10.5, "y":3.25}, {"label":"K", "x":11.5, "y":3.25}, {"label":"L", "x":12.5, "y":3.25}, {"label":":", "x":13.5, "y":3.25}, {"label":"\"", "x":14.5, "y":3.25}, {"label":"Enter", "x":15.5, "y":3.25, "w":2.25}, {"label":"PgDn", "x":18.25, "y":3.25}, {"label":"M2", "x":0, "y":4.25}, {"label":"Shift", "x":1.5, "y":4.25, "w":2.25}, {"label":"Z", "x":3.75, "y":4.25}, {"label":"X", "x":4.75, "y":4.25}, {"label":"C", "x":5.75, "y":4.25}, {"label":"V", "x":6.75, "y":4.25}, {"label":"B", "x":7.75, "y":4.25}, {"label":"N", "x":10, "y":4.25}, {"label":"M", "x":11, "y":4.25}, {"label":"<", "x":12, "y":4.25}, {"label":">", "x":13, "y":4.25}, {"label":"?", "x":14, "y":4.25}, {"label":"Shift", "x":15, "y":4.25, "w":1.75}, {"label":"\u2191", "x":17, "y":4.5}, {"label":"M3", "x":0, "y":5.25}, {"label":"Ctrl", "x":1.5, "y":5.25, "w":1.25}, {"label":"Win", "x":2.75, "y":5.25, "w":1.25}, {"label":"Alt", "x":4, "y":5.25, "w":1.25}, {"x":5.25, "y":5.25, "w":1.25}, {"x":6.5, "y":5.25, "w":2.25}, {"x":10, "y":5.25, "w":2.75}, {"label":"Alt", "x":12.75, "y":5.25, "w":1.5}, {"label":"Ctrl", "x":14.25, "y":5.25, "w":1.5}, {"label":"\u2190", "x":16, "y":5.5}, {"label":"\u2193", "x":17, "y":5.5}, {"label":"\u2192", "x":18, "y":5.5}]
+ "layout": [
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+
+ {"matrix": [0, 1], "x": 2.75, "y": 0},
+ {"matrix": [0, 2], "x": 3.75, "y": 0},
+ {"matrix": [0, 3], "x": 4.75, "y": 0},
+ {"matrix": [0, 4], "x": 5.75, "y": 0},
+
+ {"matrix": [0, 5], "x": 7, "y": 0},
+ {"matrix": [0, 6], "x": 8, "y": 0},
+
+ {"matrix": [6, 0], "x": 10.25, "y": 0},
+ {"matrix": [6, 1], "x": 11.25, "y": 0},
+
+ {"matrix": [6, 2], "x": 12.5, "y": 0},
+ {"matrix": [6, 3], "x": 13.5, "y": 0},
+ {"matrix": [6, 4], "x": 14.5, "y": 0},
+ {"matrix": [6, 5], "x": 15.5, "y": 0},
+
+ {"matrix": [6, 6], "x": 16.75, "y": 0},
+
+ {"matrix": [6, 7], "x": 18.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1.25},
+ {"matrix": [1, 1], "x": 2.5, "y": 1.25},
+ {"matrix": [1, 2], "x": 3.5, "y": 1.25},
+ {"matrix": [1, 3], "x": 4.5, "y": 1.25},
+ {"matrix": [1, 4], "x": 5.5, "y": 1.25},
+ {"matrix": [1, 5], "x": 6.5, "y": 1.25},
+ {"matrix": [1, 6], "x": 7.5, "y": 1.25},
+
+ {"matrix": [7, 0], "x": 9.75, "y": 1.25},
+ {"matrix": [7, 1], "x": 10.75, "y": 1.25},
+ {"matrix": [7, 2], "x": 11.75, "y": 1.25},
+ {"matrix": [7, 3], "x": 12.75, "y": 1.25},
+ {"matrix": [7, 4], "x": 13.75, "y": 1.25},
+ {"matrix": [7, 5], "x": 14.75, "y": 1.25},
+ {"matrix": [7, 6], "x": 15.75, "y": 1.25},
+ {"matrix": [7, 7], "x": 16.75, "y": 1.25},
+
+ {"matrix": [9, 7], "x": 18.25, "y": 1.25},
+
+ {"matrix": [2, 7], "x": 0, "y": 2.25},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 3, "y": 2.25},
+ {"matrix": [2, 2], "x": 4, "y": 2.25},
+ {"matrix": [2, 3], "x": 5, "y": 2.25},
+ {"matrix": [2, 4], "x": 6, "y": 2.25},
+ {"matrix": [2, 5], "x": 7, "y": 2.25},
+
+ {"matrix": [8, 0], "x": 9.25, "y": 2.25},
+ {"matrix": [8, 1], "x": 10.25, "y": 2.25},
+ {"matrix": [8, 2], "x": 11.25, "y": 2.25},
+ {"matrix": [8, 3], "x": 12.25, "y": 2.25},
+ {"matrix": [8, 4], "x": 13.25, "y": 2.25},
+ {"matrix": [8, 5], "x": 14.25, "y": 2.25},
+ {"matrix": [8, 6], "x": 15.25, "y": 2.25},
+ {"matrix": [8, 7], "x": 16.25, "y": 2.25, "w": 1.5},
+
+ {"matrix": [10, 7], "x": 18.25, "y": 2.25},
+
+ {"matrix": [3, 7], "x": 0, "y": 3.25},
+
+ {"matrix": [3, 0], "x": 1.5, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 3.25, "y": 3.25},
+ {"matrix": [3, 2], "x": 4.25, "y": 3.25},
+ {"matrix": [3, 3], "x": 5.25, "y": 3.25},
+ {"matrix": [3, 4], "x": 6.25, "y": 3.25},
+ {"matrix": [3, 5], "x": 7.25, "y": 3.25},
+
+ {"matrix": [9, 0], "x": 9.5, "y": 3.25},
+ {"matrix": [9, 1], "x": 10.5, "y": 3.25},
+ {"matrix": [9, 2], "x": 11.5, "y": 3.25},
+ {"matrix": [9, 3], "x": 12.5, "y": 3.25},
+ {"matrix": [9, 4], "x": 13.5, "y": 3.25},
+ {"matrix": [9, 5], "x": 14.5, "y": 3.25},
+ {"matrix": [9, 6], "x": 15.5, "y": 3.25, "w": 2.25},
+
+ {"matrix": [11, 7], "x": 18.25, "y": 3.25},
+
+ {"matrix": [4, 7], "x": 0, "y": 4.25},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4.25, "w": 2.25},
+ {"matrix": [4, 1], "x": 3.75, "y": 4.25},
+ {"matrix": [4, 2], "x": 4.75, "y": 4.25},
+ {"matrix": [4, 3], "x": 5.75, "y": 4.25},
+ {"matrix": [4, 4], "x": 6.75, "y": 4.25},
+ {"matrix": [4, 5], "x": 7.75, "y": 4.25},
+
+ {"matrix": [10, 0], "x": 10, "y": 4.25},
+ {"matrix": [10, 1], "x": 11, "y": 4.25},
+ {"matrix": [10, 2], "x": 12, "y": 4.25},
+ {"matrix": [10, 3], "x": 13, "y": 4.25},
+ {"matrix": [10, 4], "x": 14, "y": 4.25},
+ {"matrix": [10, 5], "x": 15, "y": 4.25, "w": 1.75},
+
+ {"matrix": [11, 6], "x": 17, "y": 4.5},
+
+ {"matrix": [5, 7], "x": 0, "y": 5.25},
+
+ {"matrix": [5, 0], "x": 1.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 2.75, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 2], "x": 4, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 3], "x": 5.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 4], "x": 6.5, "y": 5.25, "w": 2.25},
+
+ {"matrix": [11, 0], "x": 10, "y": 5.25, "w": 2.75},
+ {"matrix": [11, 1], "x": 12.75, "y": 5.25, "w": 1.5},
+ {"matrix": [11, 2], "x": 14.25, "y": 5.25, "w": 1.5},
+
+ {"matrix": [11, 3], "x": 16, "y": 5.5},
+ {"matrix": [11, 4], "x": 17, "y": 5.5},
+ {"matrix": [11, 5], "x": 18, "y": 5.5}
+ ]
}
}
}
diff --git a/keyboards/merge/um80/um80.c b/keyboards/merge/um80/um80.c
index 557197c89d..d13f34562c 100644
--- a/keyboards/merge/um80/um80.c
+++ b/keyboards/merge/um80/um80.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "um80.h"
+#include "quantum.h"
#ifndef WPM_ENABLE
# define get_current_wpm() 0
diff --git a/keyboards/merge/um80/um80.h b/keyboards/merge/um80/um80.h
deleted file mode 100644
index 9e17b70021..0000000000
--- a/keyboards/merge/um80/um80.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2021 duoshock
- *
- * 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_rspace_split_bksp( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, R17, R37, \
- L27, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R27, R47, \
- L37, L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36, R57, \
- L47, L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45, R56,\
- L57, L50, L51, L52, L53, L54, R50, R51, R52, R53, R54, R55 \
-) { \
- { L00, L01, L02, L03, L04, L05, L06, XXX }, \
- { L10, L11, L12, L13, L14, L15, L16, XXX }, \
- { L20, L21, L22, L23, L24, L25, XXX, L27 }, \
- { L30, L31, L32, L33, L34, L35, XXX, L37 }, \
- { L40, L41, L42, L43, L44, L45, XXX, L47 }, \
- { L50, L51, L52, L53, L54, XXX, XXX, L57 }, \
- { 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 }, \
- { R40, R41, R42, R43, R44, R45, XXX, R47 }, \
- { R50, R51, R52, R53, R54, R55, R56, R57 } \
-}
diff --git a/keyboards/mode/m80v1/m80s/info.json b/keyboards/mode/m80v1/m80s/info.json
index 48f5444fc2..fbce0cd37e 100644
--- a/keyboards/mode/m80v1/m80s/info.json
+++ b/keyboards/mode/m80v1/m80s/info.json
@@ -18,95 +18,110 @@
"layouts": {
"LAYOUT_eighty_m80s": {
"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": "LBkspc", "x":13, "y":1.5},
- {"label":"Mute", "x":15.25, "y":0},
- {"label":"VolDn", "x":16.25, "y":0},
- {"label":"VolUp", "x":17.25, "y":0},
- {"label":"~", "x":0, "y":1.5},
- {"label":"1", "x":1, "y":1.5},
- {"label":"2", "x":2, "y":1.5},
- {"label":"3", "x":3, "y":1.5},
- {"label":"4", "x":4, "y":1.5},
- {"label":"5", "x":5, "y":1.5},
- {"label":"6", "x":6, "y":1.5},
- {"label":"7", "x":7, "y":1.5},
- {"label":"8", "x":8, "y":1.5},
- {"label":"9", "x":9, "y":1.5},
- {"label":"0", "x":10, "y":1.5},
- {"label":"_", "x":11, "y":1.5},
- {"label":"+", "x":12, "y":1.5},
- {"label": "RBkspc", "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":"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":"|", "x":13.5, "y":2.5, "w":1.5},
- {"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":"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":"Enter", "x":12.75, "y":3.5, "w":2.25},
- {"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":1.75},
- {"label":"FN1", "x":14, "y":4.5},
- {"label":"\u2191", "x":16.25, "y":4.5},
- {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
- {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
- {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
- {"x":3.75, "y":5.5, "w":6.25},
- {"label":"Alt", "x":10, "y":5.5, "w":1.25},
- {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
- {"label":"FN1", "x":12.5, "y":5.5, "w":1.25},
- {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
- {"label":"\u2190", "x":15.25, "y":5.5},
- {"label":"\u2193", "x":16.25, "y":5.5},
- {"label":"\u2192", "x":17.25, "y":5.5}]
+ {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
+
+ {"matrix": [3, 14], "x": 13, "y": 1.5},
+
+ {"matrix": [0, 13], "x": 15.25, "y": 0},
+ {"matrix": [0, 14], "x": 16.25, "y": 0},
+ {"matrix": [0, 15], "x": 17.25, "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": [3, 13], "x": 14, "y": 1.5},
+
+ {"matrix": [1, 13], "x": 15.25, "y": 1.5},
+ {"matrix": [1, 14], "x": 16.25, "y": 1.5},
+ {"matrix": [1, 15], "x": 17.25, "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": [4, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [2, 13], "x": 15.25, "y": 2.5},
+ {"matrix": [2, 14], "x": 16.25, "y": 2.5},
+ {"matrix": [2, 15], "x": 17.25, "y": 2.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},
+ {"matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 1.75},
+ {"matrix": [4, 12], "x": 14, "y": 4.5},
+
+ {"matrix": [4, 14], "x": 16.25, "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, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 11], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 12], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [5, 13], "x": 15.25, "y": 5.5},
+ {"matrix": [5, 14], "x": 16.25, "y": 5.5},
+ {"matrix": [5, 15], "x": 17.25, "y": 5.5}
+ ]
}
}
}
diff --git a/keyboards/mode/m80v1/m80s/m80s.h b/keyboards/mode/m80v1/m80s/m80s.h
deleted file mode 100644
index e1a5f990ba..0000000000
--- a/keyboards/mode/m80v1/m80s/m80s.h
+++ /dev/null
@@ -1,32 +0,0 @@
- /* Copyright 2020 Á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.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_eighty_m80s( \
- K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K415, K114, K115, K116, \
- K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K414, K214, K215, K216, \
- K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K514, K314, K315, K316, \
- K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, \
- K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513, K515, \
- K601, K602, K603, K607, K610, K611, K612, K613, K614, K615, K616 \
-) { \
- { K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116 }, \
- { K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216 }, \
- { K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316 }, \
- { K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, K415 , KC_NO }, \
- { K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513, K514, K515, KC_NO }, \
- { K601, K602, K603, KC_NO, KC_NO, KC_NO, K607, KC_NO, KC_NO, K610, K611, K612, K613, K614, K615, K616 } \
-}
diff --git a/keyboards/mode/m80v2/m80v2s/info.json b/keyboards/mode/m80v2/m80v2s/info.json
index 5793fa00a7..df7bd3ed50 100644
--- a/keyboards/mode/m80v2/m80v2s/info.json
+++ b/keyboards/mode/m80v2/m80v2s/info.json
@@ -22,97 +22,112 @@
"layouts": {
"LAYOUT_m80v2s": {
"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": "LBkspc", "x":13, "y":1.5},
- {"label":"Mute", "x":15.25, "y":0},
- {"label":"VolDn", "x":16.25, "y":0},
- {"label":"VolUp", "x":17.25, "y":0},
- {"label":"~", "x":0, "y":1.5},
- {"label":"1", "x":1, "y":1.5},
- {"label":"2", "x":2, "y":1.5},
- {"label":"3", "x":3, "y":1.5},
- {"label":"4", "x":4, "y":1.5},
- {"label":"5", "x":5, "y":1.5},
- {"label":"6", "x":6, "y":1.5},
- {"label":"7", "x":7, "y":1.5},
- {"label":"8", "x":8, "y":1.5},
- {"label":"9", "x":9, "y":1.5},
- {"label":"0", "x":10, "y":1.5},
- {"label":"_", "x":11, "y":1.5},
- {"label":"+", "x":12, "y":1.5},
- {"label": "RBkspc", "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":"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":"|", "x":13.5, "y":2.5, "w":1.5},
- {"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":"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":"NUBS", "x":12.75, "y":3.5},
- {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
- {"label":"Shift", "x":0, "y":4.5, "w":1.25},
- {"label":"NUHS", "x":1.25, "y":4.5},
- {"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":1.75},
- {"label":"FN1", "x":14, "y":4.5},
- {"label":"\u2191", "x":16.25, "y":4.5},
- {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
- {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
- {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
- {"x":3.75, "y":5.5, "w":6.25},
- {"label":"Alt", "x":10, "y":5.5, "w":1.25},
- {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
- {"label":"FN1", "x":12.5, "y":5.5, "w":1.25},
- {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
- {"label":"\u2190", "x":15.25, "y":5.5},
- {"label":"\u2193", "x":16.25, "y":5.5},
- {"label":"\u2192", "x":17.25, "y":5.5}]
+ {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
+
+ {"matrix": [0, 13], "x": 13, "y": 1.5},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "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": 14, "y": 1.5},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+ {"matrix": [1, 16], "x": 17.25, "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": [2, 14], "x": 15.25, "y": 2.5},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+ {"matrix": [2, 16], "x": 17.25, "y": 2.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},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4.5},
+
+ {"matrix": [4, 15], "x": 16.25, "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, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+ {"matrix": [5, 16], "x": 17.25, "y": 5.5}
+ ]
}
}
}
diff --git a/keyboards/mode/m80v2/m80v2s/m80v2s.h b/keyboards/mode/m80v2/m80v2s/m80v2s.h
deleted file mode 100644
index 88f38d8b05..0000000000
--- a/keyboards/mode/m80v2/m80v2s/m80v2s.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
-
-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_m80v2s( \
- 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, K1G, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
- K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4F, \
- K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E, K5F, K5G \
-)\
-{\
- { 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, K1G }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, ___, ___ }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, ___, K4F, ___ }, \
- { K50, K51, K52, ___, ___, ___, K56, ___, ___, ___, K5A, K5B, K5C, K5D, K5E, K5F, K5G } \
-}
diff --git a/keyboards/moonlander/info.json b/keyboards/moonlander/info.json
index c8b0133f47..fc09859f82 100644
--- a/keyboards/moonlander/info.json
+++ b/keyboards/moonlander/info.json
@@ -16,22 +16,89 @@
"layouts": {
"LAYOUT_moonlander": {
"layout": [
- {"x":0, "y":0.375}, {"x":1, "y":0.375}, {"x":2, "y":0.125}, {"x":3, "y":0}, {"x":4, "y":0.125}, {"x":5, "y":0.25}, {"x":6, "y":0.25},
- {"x":10, "y":0.25}, {"x":11, "y":0.25}, {"x":12, "y":0.125}, {"x":13, "y":0}, {"x":14, "y":0.125}, {"x":15, "y":0.375}, {"x":16, "y":0.375},
+ {"matrix": [0, 0], "x": 0, "y": 0.375},
+ {"matrix": [0, 1], "x": 1, "y": 0.375},
+ {"matrix": [0, 2], "x": 2, "y": 0.125},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.125},
+ {"matrix": [0, 5], "x": 5, "y": 0.25},
+ {"matrix": [0, 6], "x": 6, "y": 0.25},
- {"x":0, "y":1.375}, {"x":1, "y":1.375}, {"x":2, "y":1.125}, {"x":3, "y":1}, {"x":4, "y":1.125}, {"x":5, "y":1.25}, {"x":6, "y":1.25},
- {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.125}, {"x":13, "y":1}, {"x":14, "y":1.125}, {"x":15, "y":1.375}, {"x":16, "y":1.375},
+ {"matrix": [6, 0], "x": 10, "y": 0.25},
+ {"matrix": [6, 1], "x": 11, "y": 0.25},
+ {"matrix": [6, 2], "x": 12, "y": 0.125},
+ {"matrix": [6, 3], "x": 13, "y": 0},
+ {"matrix": [6, 4], "x": 14, "y": 0.125},
+ {"matrix": [6, 5], "x": 15, "y": 0.375},
+ {"matrix": [6, 6], "x": 16, "y": 0.375},
- {"x":0, "y":2.375}, {"x":1, "y":2.375}, {"x":2, "y":2.125}, {"x":3, "y":2}, {"x":4, "y":2.125}, {"x":5, "y":2.25}, {"x":6, "y":2.25},
- {"x":10, "y":2.25}, {"x":11, "y":2.25}, {"x":12, "y":2.125}, {"x":13, "y":2}, {"x":14, "y":2.125}, {"x":15, "y":2.375}, {"x":16, "y":2.375},
+ {"matrix": [1, 0], "x": 0, "y": 1.375},
+ {"matrix": [1, 1], "x": 1, "y": 1.375},
+ {"matrix": [1, 2], "x": 2, "y": 1.125},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.125},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
- {"x":0, "y":3.375}, {"x":1, "y":3.375}, {"x":2, "y":3.125}, {"x":3, "y":3}, {"x":4, "y":3.125}, {"x":5, "y":3.25},
- {"x":11, "y":3.25}, {"x":12, "y":3.125}, {"x":13, "y":3}, {"x":14, "y":3.125}, {"x":15, "y":3.375}, {"x":16, "y":3.375},
+ {"matrix": [7, 0], "x": 10, "y": 1.25},
+ {"matrix": [7, 1], "x": 11, "y": 1.25},
+ {"matrix": [7, 2], "x": 12, "y": 1.125},
+ {"matrix": [7, 3], "x": 13, "y": 1},
+ {"matrix": [7, 4], "x": 14, "y": 1.125},
+ {"matrix": [7, 5], "x": 15, "y": 1.375},
+ {"matrix": [7, 6], "x": 16, "y": 1.375},
- {"x":0, "y":4.375}, {"x":1, "y":4.375}, {"x":2, "y":4.125}, {"x":3, "y":4}, {"x":4, "y":4.125}, {"x":5, "y":4.5, "w":2},
- {"x":10, "y":4.5, "w":2}, {"x":12, "y":4.125}, {"x":13, "y":4}, {"x":14, "y":4.125}, {"x":15, "y":4.375}, {"x":16, "y":4.375},
+ {"matrix": [2, 0], "x": 0, "y": 2.375},
+ {"matrix": [2, 1], "x": 1, "y": 2.375},
+ {"matrix": [2, 2], "x": 2, "y": 2.125},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.125},
+ {"matrix": [2, 5], "x": 5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6, "y": 2.25},
- {"x":5, "y":5.5, "h":1.5}, {"x":6, "y":5.5, "h":1.5}, {"x":7, "y":5.5, "h":1.5}, {"x":9, "y":5.5, "h":1.5}, {"x":10, "y":5.5, "h":1.5}, {"x":11, "y":5.5, "h":1.5}
+ {"matrix": [8, 0], "x": 10, "y": 2.25},
+ {"matrix": [8, 1], "x": 11, "y": 2.25},
+ {"matrix": [8, 2], "x": 12, "y": 2.125},
+ {"matrix": [8, 3], "x": 13, "y": 2},
+ {"matrix": [8, 4], "x": 14, "y": 2.125},
+ {"matrix": [8, 5], "x": 15, "y": 2.375},
+ {"matrix": [8, 6], "x": 16, "y": 2.375},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.375},
+ {"matrix": [3, 1], "x": 1, "y": 3.375},
+ {"matrix": [3, 2], "x": 2, "y": 3.125},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3.125},
+ {"matrix": [3, 5], "x": 5, "y": 3.25},
+
+ {"matrix": [9, 1], "x": 11, "y": 3.25},
+ {"matrix": [9, 2], "x": 12, "y": 3.125},
+ {"matrix": [9, 3], "x": 13, "y": 3},
+ {"matrix": [9, 4], "x": 14, "y": 3.125},
+ {"matrix": [9, 5], "x": 15, "y": 3.375},
+ {"matrix": [9, 6], "x": 16, "y": 3.375},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.375},
+ {"matrix": [4, 1], "x": 1, "y": 4.375},
+ {"matrix": [4, 2], "x": 2, "y": 4.125},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4.125},
+ {"matrix": [5, 3], "x": 5, "y": 4.5, "w": 2},
+
+ {"matrix": [11, 3], "x": 10, "y": 4.5, "w": 2},
+ {"matrix": [10, 2], "x": 12, "y": 4.125},
+ {"matrix": [10, 3], "x": 13, "y": 4},
+ {"matrix": [10, 4], "x": 14, "y": 4.125},
+ {"matrix": [10, 5], "x": 15, "y": 4.375},
+ {"matrix": [10, 6], "x": 16, "y": 4.375},
+
+ {"matrix": [5, 0], "x": 5, "y": 5.5, "h": 1.5},
+ {"matrix": [5, 1], "x": 6, "y": 5.5, "h": 1.5},
+ {"matrix": [5, 2], "x": 7, "y": 5.5, "h": 1.5},
+
+ {"matrix": [11, 4], "x": 9, "y": 5.5, "h": 1.5},
+ {"matrix": [11, 5], "x": 10, "y": 5.5, "h": 1.5},
+ {"matrix": [11, 6], "x": 11, "y": 5.5, "h": 1.5}
]
}
}
diff --git a/keyboards/moonlander/moonlander.c b/keyboards/moonlander/moonlander.c
index 70bcd63152..e81c884adf 100644
--- a/keyboards/moonlander/moonlander.c
+++ b/keyboards/moonlander/moonlander.c
@@ -17,7 +17,7 @@
*/
-
+#include QMK_KEYBOARD_H
#include "moonlander.h"
keyboard_config_t keyboard_config;
diff --git a/keyboards/moonlander/moonlander.h b/keyboards/moonlander/moonlander.h
index 400c97be0d..f68b60379c 100644
--- a/keyboards/moonlander/moonlander.h
+++ b/keyboards/moonlander/moonlander.h
@@ -36,30 +36,6 @@ extern bool mcp23018_leds[];
// clang-format off
-#define LAYOUT_moonlander( \
- k00, k01, k02, k03, k04, k05, k06, k60, k61, k62, k63, k64, k65, k66, \
- k10, k11, k12, k13, k14, k15, k16, k70, k71, k72, k73, k74, k75, k76, \
- k20, k21, k22, k23, k24, k25, k26, k80, k81, k82, k83, k84, k85, k86, \
- k30, k31, k32, k33, k34, k35, k91, k92, k93, k94, k95, k96, \
- k40, k41, k42, k43, k44, k53, kb3, ka2, ka3, ka4, ka5, ka6, \
- k50, k51, k52, kb4, kb5, kb6 \
-) \
-{ \
- { 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, KC_NO }, \
- { k40, k41, k42, k43, k44, KC_NO, KC_NO }, \
- { k50, k51, k52, k53, KC_NO, KC_NO, KC_NO }, \
-\
- { k60, k61, k62, k63, k64, k65, k66 }, \
- { k70, k71, k72, k73, k74, k75, k76 }, \
- { k80, k81, k82, k83, k84, k85, k86 }, \
- { KC_NO, k91, k92, k93, k94, k95, k96 }, \
- { KC_NO, KC_NO, ka2, ka3, ka4, ka5, ka6 }, \
- { KC_NO, KC_NO, KC_NO, kb3, kb4, kb5, kb6 } \
-}
-
#define LED_LAYOUT_moonlander( \
l00, l01, l02, l03, l04, l05, l06, l60, l61, l62, l63, l64, l65, l66, \
l10, l11, l12, l13, l14, l15, l16, l70, l71, l72, l73, l74, l75, l76, \
diff --git a/keyboards/ms_sculpt/info.json b/keyboards/ms_sculpt/info.json
index 1e540bd58c..39782eea71 100644
--- a/keyboards/ms_sculpt/info.json
+++ b/keyboards/ms_sculpt/info.json
@@ -32,100 +32,100 @@
"layouts": {
"LAYOUT_iso": {
"layout": [
- {"label":"Esc", "x":0, "y":0, "h":0.8},
- {"label":"F1", "x":1, "y":0, "h":0.8},
- {"label":"F2", "x":2, "y":0, "h":0.8},
- {"label":"F3", "x":3, "y":0, "h":0.8},
- {"label":"F4", "x":4, "y":0, "h":0.8},
- {"label":"F5", "x":5, "y":0, "h":0.8},
- {"label":"F6", "x":6, "y":0, "h":0.8},
- {"label":"F7", "x":8, "y":0, "w":0.975, "h":0.8},
- {"label":"F8", "x":8.975, "y":0, "w":0.975, "h":0.8},
- {"label":"F9", "x":9.95, "y":0, "w":0.975, "h":0.8},
- {"label":"F10", "x":10.925, "y":0, "w":0.975, "h":0.8},
- {"label":"F11", "x":11.9, "y":0, "w":0.975, "h":0.8},
- {"label":"F12", "x":12.875, "y":0, "w":0.975, "h":0.8},
- {"label":"Print Screen", "x":13.85, "y":0, "w":0.975, "h":0.8},
- {"label":"Scroll Lock", "x":14.825, "y":0, "w":0.975, "h":0.8},
- {"label":"Pause", "x":15.8, "y":0, "w":0.975, "h":0.8},
- {"label":"Calculator", "x":16.775, "y":0, "w":0.975, "h":0.8},
+ {"matrix": [4, 13], "x": 0, "y": 0, "h": 0.8},
+ {"matrix": [7, 12], "x": 1, "y": 0, "h": 0.8},
+ {"matrix": [7, 11], "x": 2, "y": 0, "h": 0.8},
+ {"matrix": [1, 11], "x": 3, "y": 0, "h": 0.8},
+ {"matrix": [4, 11], "x": 4, "y": 0, "h": 0.8},
+ {"matrix": [1, 10], "x": 5, "y": 0, "h": 0.8},
+ {"matrix": [1, 15], "x": 6, "y": 0, "h": 0.8},
+ {"matrix": [7, 9], "x": 8, "y": 0, "w": 0.975, "h": 0.8},
+ {"matrix": [7, 7], "x": 8.975, "y": 0, "w": 0.975, "h": 0.8},
+ {"matrix": [7, 5], "x": 9.95, "y": 0, "w": 0.975, "h": 0.8},
+ {"matrix": [7, 8], "x": 10.925, "y": 0, "w": 0.975, "h": 0.8},
+ {"matrix": [7, 3], "x": 11.9, "y": 0, "w": 0.975, "h": 0.8},
+ {"matrix": [1, 3], "x": 12.875, "y": 0, "w": 0.975, "h": 0.8},
+ {"matrix": [7, 1], "x": 13.85, "y": 0, "w": 0.975, "h": 0.8},
+ {"matrix": [3, 1], "x": 14.825, "y": 0, "w": 0.975, "h": 0.8},
+ {"matrix": [0, 1], "x": 15.8, "y": 0, "w": 0.975, "h": 0.8},
+ {"matrix": [2, 3], "x": 16.775, "y": 0, "w": 0.975, "h": 0.8},
- {"label":"`~", "x":0, "y":0.8},
- {"label":"1!", "x":1, "y":0.8},
- {"label":"2@", "x":2, "y":0.8},
- {"label":"3#", "x":3, "y":0.8},
- {"label":"4$", "x":4, "y":0.8},
- {"label":"5%", "x":5, "y":0.8},
- {"label":"6^", "x":6, "y":0.8},
- {"label":"7&", "x":8, "y":0.8, "w":1.5},
- {"label":"8*", "x":9.5, "y":0.8},
- {"label":"9(", "x":10.5, "y":0.8},
- {"label":"0)", "x":11.5, "y":0.8},
- {"label":"-_", "x":12.5, "y":0.8},
- {"label":"=+", "x":13.5, "y":0.8},
- {"label":"Backspace", "x":14.5, "y":0.8, "w":2.25},
- {"label":"Delete", "x":16.75, "y":0.8, "h":2},
- {"label":"Home", "x":17.75, "y":0.8},
+ {"matrix": [7, 13], "x": 0, "y": 0.8},
+ {"matrix": [0, 13], "x": 1, "y": 0.8},
+ {"matrix": [0, 12], "x": 2, "y": 0.8},
+ {"matrix": [2, 13], "x": 3, "y": 0.8},
+ {"matrix": [1, 13], "x": 4, "y": 0.8},
+ {"matrix": [7, 10], "x": 5, "y": 0.8},
+ {"matrix": [7, 15], "x": 6, "y": 0.8},
+ {"matrix": [0, 9], "x": 8, "y": 0.8, "w": 1.5},
+ {"matrix": [0, 7], "x": 9.5, "y": 0.8},
+ {"matrix": [0, 5], "x": 10.5, "y": 0.8},
+ {"matrix": [0, 4], "x": 11.5, "y": 0.8},
+ {"matrix": [1, 5], "x": 12.5, "y": 0.8},
+ {"matrix": [7, 4], "x": 13.5, "y": 0.8},
+ {"matrix": [0, 8], "x": 14.5, "y": 0.8, "w": 2.25},
+ {"matrix": [0, 3], "x": 16.75, "y": 0.8, "h": 2},
+ {"matrix": [2, 1], "x": 17.75, "y": 0.8},
- {"label":"Tab", "x":0, "y":1.8, "w":1.25},
- {"label":"Q", "x":1.25, "y":1.8},
- {"label":"W", "x":2.25, "y":1.8},
- {"label":"E", "x":3.25, "y":1.8},
- {"label":"R", "x":4.25, "y":1.8},
- {"label":"T", "x":5.25, "y":1.8, "w":1.75},
- {"label":"Y", "x":8, "y":1.8, "w":1.25},
- {"label":"U", "x":9.25, "y":1.8},
- {"label":"I", "x":10.25, "y":1.8},
- {"label":"O", "x":11.25, "y":1.8},
- {"label":"P", "x":12.25, "y":1.8},
- {"label":"[{", "x":13.25, "y":1.8},
- {"label":"]}", "x":14.25, "y":1.8},
- {"label":"End", "x":17.75, "y":1.8},
+ {"matrix": [0, 10], "x": 0, "y": 1.8, "w": 1.25},
+ {"matrix": [0, 11], "x": 1.25, "y": 1.8},
+ {"matrix": [1, 12], "x": 2.25, "y": 1.8},
+ {"matrix": [2, 11], "x": 3.25, "y": 1.8},
+ {"matrix": [2, 10], "x": 4.25, "y": 1.8},
+ {"matrix": [2, 15], "x": 5.25, "y": 1.8, "w": 1.75},
+ {"matrix": [1, 9], "x": 8, "y": 1.8, "w": 1.25},
+ {"matrix": [2, 9], "x": 9.25, "y": 1.8},
+ {"matrix": [2, 7], "x": 10.25, "y": 1.8},
+ {"matrix": [2, 5], "x": 11.25, "y": 1.8},
+ {"matrix": [2, 4], "x": 12.25, "y": 1.8},
+ {"matrix": [1, 4], "x": 13.25, "y": 1.8},
+ {"matrix": [1, 7], "x": 14.25, "y": 1.8},
+ {"matrix": [5, 1], "x": 17.75, "y": 1.8},
- {"label":"Shift", "x":0, "y":2.8, "w":1.5},
- {"label":"A", "x":1.5, "y":2.8},
- {"label":"S", "x":2.5, "y":2.8},
- {"label":"D", "x":3.5, "y":2.8},
- {"label":"F", "x":4.5, "y":2.8},
- {"label":"G", "x":5.5, "y":2.8, "w":1.5},
- {"label":"H", "x":8, "y":2.8, "w":1.5},
- {"label":"J", "x":9.5, "y":2.8},
- {"label":"K", "x":10.5, "y":2.8},
- {"label":"L", "x":11.5, "y":2.8},
- {"label":";:", "x":12.5, "y":2.8},
- {"label":"'@", "x":13.5, "y":2.8},
- {"label":"#~", "x":14.5, "y":2.8},
- {"label":"Enter", "x":15.5, "y":1.8, "w":1.25, "h":2},
- {"label":"Insert", "x":16.75, "y":2.8},
- {"label":"Page Up", "x":17.75, "y":2.8},
+ {"matrix": [2, 12], "x": 0, "y": 2.8, "w": 1.5},
+ {"matrix": [3, 13], "x": 1.5, "y": 2.8},
+ {"matrix": [4, 12], "x": 2.5, "y": 2.8},
+ {"matrix": [3, 11], "x": 3.5, "y": 2.8},
+ {"matrix": [3, 10], "x": 4.5, "y": 2.8},
+ {"matrix": [4, 10], "x": 5.5, "y": 2.8, "w": 1.5},
+ {"matrix": [4, 9], "x": 8, "y": 2.8, "w": 1.5},
+ {"matrix": [3, 9], "x": 9.5, "y": 2.8},
+ {"matrix": [3, 7], "x": 10.5, "y": 2.8},
+ {"matrix": [3, 5], "x": 11.5, "y": 2.8},
+ {"matrix": [3, 4], "x": 12.5, "y": 2.8},
+ {"matrix": [4, 5], "x": 13.5, "y": 2.8},
+ {"matrix": [5, 4], "x": 14.5, "y": 2.8},
+ {"matrix": [3, 3], "x": 15.5, "y": 1.8, "w": 1.25, "h": 2},
+ {"matrix": [1, 8], "x": 16.75, "y": 2.8},
+ {"matrix": [1, 1], "x": 17.75, "y": 2.8},
- {"label":"Shift", "x":0, "y":3.8},
- {"label":"\\|", "x":1, "y":3.8},
- {"label":"Z", "x":2, "y":3.8},
- {"label":"X", "x":3, "y":3.8},
- {"label":"C", "x":4, "y":3.8},
- {"label":"V", "x":5, "y":3.8},
- {"label":"B", "x":6, "y":3.8},
- {"label":"N", "x":8, "y":3.8, "w":2},
- {"label":"M", "x":10, "y":3.8},
- {"label":",<", "x":11, "y":3.8},
- {"label":".>", "x":12, "y":3.8},
- {"label":"/?", "x":13, "y":3.8},
- {"label":"Shift", "x":14, "y":3.8, "w":2.75},
- {"label":"\u2191", "x":16.75, "y":3.8},
- {"label":"Page Down", "x":17.75, "y":3.8},
+ {"matrix": [5, 14], "x": 0, "y": 3.8},
+ {"matrix": [3, 12], "x": 1, "y": 3.8},
+ {"matrix": [5, 13], "x": 2, "y": 3.8},
+ {"matrix": [5, 12], "x": 3, "y": 3.8},
+ {"matrix": [5, 11], "x": 4, "y": 3.8},
+ {"matrix": [5, 10], "x": 5, "y": 3.8},
+ {"matrix": [6, 10], "x": 6, "y": 3.8},
+ {"matrix": [6, 9], "x": 8, "y": 3.8, "w": 2},
+ {"matrix": [5, 9], "x": 10, "y": 3.8},
+ {"matrix": [5, 7], "x": 11, "y": 3.8},
+ {"matrix": [5, 5], "x": 12, "y": 3.8},
+ {"matrix": [4, 4], "x": 13, "y": 3.8},
+ {"matrix": [5, 2], "x": 14, "y": 3.8, "w": 2.75},
+ {"matrix": [6, 3], "x": 16.75, "y": 3.8},
+ {"matrix": [5, 3], "x": 17.75, "y": 3.8},
- {"label":"Ctrl", "x":0, "y":4.8, "w":1.5},
- {"label":"GUI", "x":1.5, "y":4.8, "w":1.5},
- {"label":"Alt", "x":3, "y":4.8, "w":1.5},
- {"label":"Space", "x":4.5, "y":4.8, "w":3},
- {"label":"Space", "x":7.5, "y":4.8, "w":3},
- {"label":"AltGr", "x":10.5, "y":4.8, "w":1.5},
- {"label":"App", "x":12, "y":4.8, "w":1.5},
- {"label":"Ctrl", "x":13.5, "y":4.8, "w":2.25},
- {"label":"\u2190", "x":15.75, "y":4.8},
- {"label":"\u2192", "x":16.75, "y":4.8},
- {"label":"\u2193", "x":17.75, "y":4.8}
+ {"matrix": [6, 17], "x": 0, "y": 4.8, "w": 1.5},
+ {"matrix": [3, 15], "x": 1.5, "y": 4.8, "w": 1.5},
+ {"matrix": [4, 16], "x": 3, "y": 4.8, "w": 1.5},
+ {"matrix": [6, 11], "x": 4.5, "y": 4.8, "w": 3},
+ {"matrix": [6, 8], "x": 7.5, "y": 4.8, "w": 3},
+ {"matrix": [4, 6], "x": 10.5, "y": 4.8, "w": 1.5},
+ {"matrix": [4, 3], "x": 12, "y": 4.8, "w": 1.5},
+ {"matrix": [6, 0], "x": 13.5, "y": 4.8, "w": 2.25},
+ {"matrix": [4, 8], "x": 15.75, "y": 4.8},
+ {"matrix": [6, 4], "x": 16.75, "y": 4.8},
+ {"matrix": [6, 1], "x": 17.75, "y": 4.8}
]
}
}
diff --git a/keyboards/ms_sculpt/ms_sculpt.h b/keyboards/ms_sculpt/ms_sculpt.h
deleted file mode 100644
index 056f7d5b5d..0000000000
--- a/keyboards/ms_sculpt/ms_sculpt.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2022 Jean Bernard (@jn-bernard)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_iso( \
- k4D, k7C, k7B, k1B, k4B, k1A, k1F, k79, k77, k75, k78, k73, k13, k71, k31, k01, k23, \
- k7D, k0D, k0C, k2D, k1D, k7A, k7F, k09, k07, k05, k04, k15, k74, k08, k03, k21, \
- k0A, k0B, k1C, k2B, k2A, k2F, k19, k29, k27, k25, k24, k14, k17, k51, \
- k2C, k3D, k4C, k3B, k3A, k4A, k49, k39, k37, k35, k34, k45, k65, k33, k18, k11, \
- k5E, k6C, k5D, k5C, k5B, k5A, k6A, k69, k59, k57, k55, k44, k52, k63, k53, \
- k6H, k3F, k4G, k6B, k68, k46, k43, k60, k48, k64, k61 \
-) \
-{ \
- {KC_NO, k01, KC_NO, k03, k04, k05, KC_NO, k07, k08, k09, k0A, k0B, k0C, k0D, KC_NO, KC_NO, KC_NO, KC_NO}, \
- {KC_NO, k11, KC_NO, k13, k14, k15, KC_NO, k17, k18, k19, k1A, k1B, k1C, k1D, KC_NO, k1F, KC_NO, KC_NO}, \
- {KC_NO, k21, KC_NO, k23, k24, k25, KC_NO, k27, KC_NO, k29, k2A, k2B, k2C, k2D, KC_NO, k2F, KC_NO, KC_NO}, \
- {KC_NO, k31, KC_NO, k33, k34, k35, KC_NO, k37, KC_NO, k39, k3A, k3B, k6C, k3D, KC_NO, k3F, KC_NO, KC_NO}, \
- {KC_NO, KC_NO, KC_NO, k43, k44, k45, k46, KC_NO, k48, k49, k4A, k4B, k4C, k4D, KC_NO, KC_NO, k4G, KC_NO}, \
- {KC_NO, k51, k52, k53, k65, k55, KC_NO, k57, KC_NO, k59, k5A, k5B, k5C, k5D, k5E, KC_NO, KC_NO, KC_NO}, \
- {k60, k61, KC_NO, k63, k64, KC_NO, KC_NO, KC_NO, k68, k69, k6A, k6B, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k6H}, \
- {KC_NO, k71, KC_NO, k73, k74, k75, KC_NO, k77, k78, k79, k7A, k7B, k7C, k7D, KC_NO, k7F, KC_NO, KC_NO} \
-}
diff --git a/keyboards/nightly_boards/adellein/adellein.h b/keyboards/nightly_boards/adellein/adellein.h
index c78b76fbad..33cf8e0b68 100644
--- a/keyboards/nightly_boards/adellein/adellein.h
+++ b/keyboards/nightly_boards/adellein/adellein.h
@@ -18,38 +18,3 @@
#include "quantum.h"
#include "encoder_action.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_40ergo_split_ent( \
- 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, K1C, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
- K30, K32, K34, K35, K37, K39, 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, K1B, K1C }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \
- { K30, KC_NO, K32, KC_NO, K34, K35, KC_NO, K37, KC_NO, K39, KC_NO, KC_NO, K3C }, \
-}
-
-#define LAYOUT_40ergo_split_ent_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, K1B, K1C, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
- K30, K32, K34, K35, K37, K39, K3C, \
- E00A, E00B \
-) { \
- { 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, K1C }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \
- { K30, E00A, K32, E00B, K34, K35, KC_NO, K37, KC_NO, K39, KC_NO, KC_NO, K3C }, \
-}
-
diff --git a/keyboards/nightly_boards/adellein/info.json b/keyboards/nightly_boards/adellein/info.json
index d45356262d..5aca4e8a1d 100644
--- a/keyboards/nightly_boards/adellein/info.json
+++ b/keyboards/nightly_boards/adellein/info.json
@@ -26,112 +26,120 @@
"layouts": {
"LAYOUT_40ergo_split_ent": {
"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":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, "w":1.5},
-
- {"x":0.25, "y":1, "w":1.25},
- {"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":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":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":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},
- {"x":14.5, "y":2, "w":1.75},
-
- {"x":0.25, "y":3, "w":1.25},
- {"x":2.75, "y":3, "w":1.25},
- {"x":4, "y":3, "w":2.25},
- {"x":6.25, "y":3},
- {"x":8, "y":3, "w":2.75},
- {"x":10.75, "y":3, "w":1.25},
- {"x":14.75, "y":3, "w":1.25}
- ]
+ {"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": 8.25, "y": 0},
+ {"matrix": [0, 7], "x": 9.25, "y": 0},
+ {"matrix": [0, 8], "x": 10.25, "y": 0},
+ {"matrix": [0, 9], "x": 11.25, "y": 0},
+ {"matrix": [0, 10], "x": 12.25, "y": 0},
+ {"matrix": [0, 11], "x": 13.25, "y": 0},
+ {"matrix": [0, 12], "x": 14.25, "y": 0, "w": 1.5},
+
+ {"matrix": [1, 0], "x": 0.25, "y": 1, "w": 1.25},
+ {"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": 8.75, "y": 1},
+ {"matrix": [1, 7], "x": 9.75, "y": 1},
+ {"matrix": [1, 8], "x": 10.75, "y": 1},
+ {"matrix": [1, 9], "x": 11.75, "y": 1},
+ {"matrix": [1, 10], "x": 12.75, "y": 1},
+ {"matrix": [1, 11], "x": 13.75, "y": 1},
+ {"matrix": [1, 12], "x": 14.75, "y": 1, "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": 8.5, "y": 2},
+ {"matrix": [2, 7], "x": 9.5, "y": 2},
+ {"matrix": [2, 8], "x": 10.5, "y": 2},
+ {"matrix": [2, 9], "x": 11.5, "y": 2},
+ {"matrix": [2, 10], "x": 12.5, "y": 2},
+ {"matrix": [2, 11], "x": 13.5, "y": 2},
+ {"matrix": [2, 12], "x": 14.5, "y": 2, "w": 1.75},
+
+ {"matrix": [3, 0], "x": 0.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3, "w": 1.25},
+ {"matrix": [3, 4], "x": 4, "y": 3, "w": 2.25},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+ {"matrix": [3, 7], "x": 8, "y": 3, "w": 2.75},
+ {"matrix": [3, 9], "x": 10.75, "y": 3, "w": 1.25},
+ {"matrix": [3, 12], "x": 14.75, "y": 3, "w": 1.25}
+ ]
},
"LAYOUT_40ergo_split_ent_encoder": {
"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":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, "w":1.5},
-
- {"x":0.25, "y":1, "w":1.25},
- {"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":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":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":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},
- {"x":14.5, "y":2, "w":1.75},
-
- {"x":0.25, "y":3, "w":1.25},
- {"x":2.75, "y":3, "w":1.25},
- {"x":4, "y":3, "w":2.25},
- {"x":6.25, "y":3},
- {"x":8, "y":3, "w":2.75},
- {"x":10.75, "y":3, "w":1.25},
- {"x":14.75, "y":3, "w":1.25},
-
- {"x":5.75, "y":4},
- {"x":6.75, "y":4}
- ]
+ {"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": 8.25, "y": 0},
+ {"matrix": [0, 7], "x": 9.25, "y": 0},
+ {"matrix": [0, 8], "x": 10.25, "y": 0},
+ {"matrix": [0, 9], "x": 11.25, "y": 0},
+ {"matrix": [0, 10], "x": 12.25, "y": 0},
+ {"matrix": [0, 11], "x": 13.25, "y": 0},
+ {"matrix": [0, 12], "x": 14.25, "y": 0, "w": 1.5},
+
+ {"matrix": [1, 0], "x": 0.25, "y": 1, "w": 1.25},
+ {"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": 8.75, "y": 1},
+ {"matrix": [1, 7], "x": 9.75, "y": 1},
+ {"matrix": [1, 8], "x": 10.75, "y": 1},
+ {"matrix": [1, 9], "x": 11.75, "y": 1},
+ {"matrix": [1, 10], "x": 12.75, "y": 1},
+ {"matrix": [1, 11], "x": 13.75, "y": 1},
+ {"matrix": [1, 12], "x": 14.75, "y": 1, "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": 8.5, "y": 2},
+ {"matrix": [2, 7], "x": 9.5, "y": 2},
+ {"matrix": [2, 8], "x": 10.5, "y": 2},
+ {"matrix": [2, 9], "x": 11.5, "y": 2},
+ {"matrix": [2, 10], "x": 12.5, "y": 2},
+ {"matrix": [2, 11], "x": 13.5, "y": 2},
+ {"matrix": [2, 12], "x": 14.5, "y": 2, "w": 1.75},
+
+ {"matrix": [3, 0], "x": 0.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3, "w": 1.25},
+ {"matrix": [3, 4], "x": 4, "y": 3, "w": 2.25},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+ {"matrix": [3, 7], "x": 8, "y": 3, "w": 2.75},
+ {"matrix": [3, 9], "x": 10.75, "y": 3, "w": 1.25},
+ {"matrix": [3, 12], "x": 14.75, "y": 3, "w": 1.25},
+
+ {"matrix": [3, 1], "x": 5.75, "y": 4},
+ {"matrix": [3, 3], "x": 6.75, "y": 4}
+ ]
}
}
}
diff --git a/keyboards/nopunin10did/jabberwocky/v1/info.json b/keyboards/nopunin10did/jabberwocky/v1/info.json
index 175e57253b..bf83362e16 100644
--- a/keyboards/nopunin10did/jabberwocky/v1/info.json
+++ b/keyboards/nopunin10did/jabberwocky/v1/info.json
@@ -20,126 +20,256 @@
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
+ "LAYOUT_lh": {
+ "layout": [
+ {"matrix": [0, 8], "x": 0, "y": 0},
+ {"matrix": [1, 8], "x": 1, "y": 0},
+ {"matrix": [0, 9], "x": 2, "y": 0},
+ {"matrix": [1, 9], "x": 3, "y": 0},
+ {"matrix": [7, 0], "x": 4, "y": 0},
+ {"matrix": [1, 1], "x": 5, "y": 0},
+ {"matrix": [0, 1], "x": 6, "y": 0},
+ {"matrix": [1, 2], "x": 7, "y": 0},
+ {"matrix": [0, 2], "x": 8, "y": 0},
+ {"matrix": [1, 3], "x": 9, "y": 0},
+ {"matrix": [0, 3], "x": 10, "y": 0},
+ {"matrix": [0, 4], "x": 11, "y": 0},
+ {"matrix": [1, 4], "x": 12, "y": 0},
+ {"matrix": [0, 5], "x": 13, "y": 0},
+ {"matrix": [1, 5], "x": 14, "y": 0},
+ {"matrix": [0, 6], "x": 15, "y": 0},
+ {"matrix": [1, 6], "x": 16, "y": 0},
+ {"matrix": [0, 7], "x": 17, "y": 0},
+ {"matrix": [1, 7], "x": 18, "y": 0},
+ {"matrix": [0, 0], "x": 19, "y": 0},
+ {"matrix": [1, 0], "x": 20, "y": 0},
+ {"matrix": [2, 8], "x": 21, "y": 0},
+ {"matrix": [3, 8], "x": 22, "y": 0},
+ {"matrix": [2, 9], "x": 23, "y": 0},
+ {"matrix": [3, 9], "x": 24, "y": 0},
+ {"matrix": [4, 0], "x": 25, "y": 0},
+ {"matrix": [2, 1], "x": 26, "y": 0},
+ {"matrix": [3, 1], "x": 27, "y": 0},
+ {"matrix": [2, 2], "x": 28, "y": 0},
+ {"matrix": [3, 2], "x": 29, "y": 0},
+ {"matrix": [2, 3], "x": 30, "y": 0},
+ {"matrix": [2, 4], "x": 31, "y": 0},
+ {"matrix": [3, 4], "x": 32, "y": 0},
+ {"matrix": [2, 5], "x": 33, "y": 0},
+ {"matrix": [3, 5], "x": 34, "y": 0},
+ {"matrix": [2, 6], "x": 35, "y": 0},
+ {"matrix": [3, 6], "x": 36, "y": 0},
+ {"matrix": [2, 7], "x": 37, "y": 0},
+ {"matrix": [3, 7], "x": 38, "y": 0},
+ {"matrix": [2, 0], "x": 39, "y": 0},
+ {"matrix": [4, 8], "x": 40, "y": 0},
+ {"matrix": [5, 8], "x": 41, "y": 0},
+ {"matrix": [4, 9], "x": 42, "y": 0},
+ {"matrix": [5, 9], "x": 43, "y": 0},
+ {"matrix": [6, 0], "x": 44, "y": 0},
+ {"matrix": [4, 1], "x": 45, "y": 0},
+ {"matrix": [5, 1], "x": 46, "y": 0},
+ {"matrix": [4, 2], "x": 47, "y": 0},
+ {"matrix": [5, 2], "x": 48, "y": 0},
+ {"matrix": [4, 3], "x": 49, "y": 0},
+ {"matrix": [4, 4], "x": 50, "y": 0},
+ {"matrix": [5, 4], "x": 51, "y": 0},
+ {"matrix": [4, 5], "x": 52, "y": 0},
+ {"matrix": [5, 5], "x": 53, "y": 0},
+ {"matrix": [4, 6], "x": 54, "y": 0},
+ {"matrix": [5, 6], "x": 55, "y": 0},
+ {"matrix": [4, 7], "x": 56, "y": 0},
+ {"matrix": [5, 7], "x": 57, "y": 0},
+ {"matrix": [6, 8], "x": 58, "y": 0},
+ {"matrix": [7, 8], "x": 59, "y": 0},
+ {"matrix": [6, 9], "x": 60, "y": 0},
+ {"matrix": [7, 9], "x": 61, "y": 0},
+ {"matrix": [7, 1], "x": 62, "y": 0},
+ {"matrix": [6, 1], "x": 63, "y": 0},
+ {"matrix": [7, 2], "x": 64, "y": 0},
+ {"matrix": [6, 2], "x": 65, "y": 0},
+ {"matrix": [7, 3], "x": 66, "y": 0},
+ {"matrix": [6, 3], "x": 67, "y": 0},
+ {"matrix": [6, 4], "x": 68, "y": 0},
+ {"matrix": [7, 4], "x": 69, "y": 0},
+ {"matrix": [6, 5], "x": 70, "y": 0},
+ {"matrix": [7, 5], "x": 71, "y": 0},
+ {"matrix": [6, 6], "x": 72, "y": 0},
+ {"matrix": [7, 6], "x": 73, "y": 0},
+ {"matrix": [6, 7], "x": 74, "y": 0},
+ {"matrix": [7, 7], "x": 75, "y": 0},
+ {"matrix": [8, 8], "x": 76, "y": 0},
+ {"matrix": [9, 8], "x": 77, "y": 0},
+ {"matrix": [8, 9], "x": 78, "y": 0},
+ {"matrix": [9, 9], "x": 79, "y": 0},
+ {"matrix": [8, 0], "x": 80, "y": 0},
+ {"matrix": [9, 0], "x": 81, "y": 0},
+ {"matrix": [8, 1], "x": 82, "y": 0},
+ {"matrix": [9, 1], "x": 83, "y": 0},
+ {"matrix": [8, 2], "x": 84, "y": 0},
+ {"matrix": [9, 2], "x": 85, "y": 0},
+ {"matrix": [8, 3], "x": 86, "y": 0},
+ {"matrix": [9, 3], "x": 87, "y": 0},
+ {"matrix": [10, 4], "x": 88, "y": 0},
+ {"matrix": [8, 4], "x": 89, "y": 0},
+ {"matrix": [9, 4], "x": 90, "y": 0},
+ {"matrix": [8, 5], "x": 91, "y": 0},
+ {"matrix": [9, 5], "x": 92, "y": 0},
+ {"matrix": [8, 6], "x": 93, "y": 0},
+ {"matrix": [9, 6], "x": 94, "y": 0},
+ {"matrix": [8, 7], "x": 95, "y": 0},
+ {"matrix": [9, 7], "x": 96, "y": 0},
+ {"matrix": [10, 8], "x": 97, "y": 0},
+ {"matrix": [11, 8], "x": 98, "y": 0},
+ {"matrix": [10, 9], "x": 99, "y": 0},
+ {"matrix": [11, 9], "x": 100, "y": 0},
+ {"matrix": [10, 0], "x": 101, "y": 0},
+ {"matrix": [10, 1], "x": 102, "y": 0},
+ {"matrix": [10, 2], "x": 103, "y": 0},
+ {"matrix": [10, 3], "x": 104, "y": 0},
+ {"matrix": [11, 3], "x": 105, "y": 0},
+ {"matrix": [11, 4], "x": 106, "y": 0},
+ {"matrix": [10, 5], "x": 107, "y": 0},
+ {"matrix": [11, 5], "x": 108, "y": 0},
+ {"matrix": [10, 6], "x": 109, "y": 0},
+ {"matrix": [11, 6], "x": 110, "y": 0},
+ {"matrix": [10, 7], "x": 111, "y": 0},
+ {"matrix": [11, 7], "x": 112, "y": 0}
+ ]
+ },
"LAYOUT_rh": {
"layout": [
- {"x":0.75, "y":0.125},
- {"x":2.25, "y":0.125},
- {"x":3.25, "y":0.125},
- {"x":4.25, "y":0.125, "r":14, "rx":4, "ry":2.5},
- {"x":5.25, "y":0, "r":14, "rx":4, "ry":2.5},
- {"x":6.25, "y":0.125, "r":14, "rx":4, "ry":2.5},
- {"x":7.25, "y":0.25, "r":14, "rx":4, "ry":2.5},
- {"x":10.25, "y":0.25, "r":-14, "rx":13.25, "ry":2.5},
- {"x":11.25, "y":0.125, "r":-14, "rx":13.25, "ry":2.5},
- {"x":12.25, "y":0, "r":-14, "rx":13.25, "ry":2.5},
- {"x":13.25, "y":0.125, "r":-14, "rx":13.25, "ry":2.5},
- {"x":14.25, "y":0.125},
- {"x":15.25, "y":0.125},
- {"x":16.375, "y":0.125},
- {"x":17.375, "y":0.125},
- {"x":18.5, "y":0.125},
- {"x":19.5, "y":0.125},
- {"x":20.75, "y":0.125},
- {"x":21.75, "y":0.125},
- {"x":22.75, "y":0.125},
- {"x":23.75, "y":0.125},
-
- {"x":2, "y":1.375},
- {"x":3, "y":1.375},
- {"x":4.25, "y":1.375, "r":14, "rx":4, "ry":2.5},
- {"x":5.25, "y":1.25, "r":14, "rx":4, "ry":2.5},
- {"x":6.25, "y":1.375, "r":14, "rx":4, "ry":2.5},
- {"x":7.25, "y":1.5, "r":14, "rx":4, "ry":2.5},
- {"x":10.25, "y":1.5, "r":-14, "rx":13.25, "ry":2.5},
- {"x":11.25, "y":1.375, "r":-14, "rx":13.25, "ry":2.5},
- {"x":12.25, "y":1.25, "r":-14, "rx":13.25, "ry":2.5},
- {"x":13.25, "y":1.375, "r":-14, "rx":13.25, "ry":2.5},
- {"x":14.5, "y":1.375},
- {"x":15.5, "y":1.375},
- {"x":16.5, "y":1.375},
- {"x":17.5, "y":1.375},
- {"x":18.5, "y":1.375},
- {"x":20.75, "y":1.375},
- {"x":21.75, "y":1.375},
- {"x":22.75, "y":1.375},
- {"x":23.75, "y":1.375},
-
- {"x":1.25, "y":2.375, "w":1.5},
- {"x":2.75, "y":2.375},
- {"x":4.25, "y":2.375, "r":14, "rx":4, "ry":2.5},
- {"x":5.25, "y":2.25, "r":14, "rx":4, "ry":2.5},
- {"x":6.25, "y":2.375, "r":14, "rx":4, "ry":2.5},
- {"x":7.25, "y":2.5, "r":14, "rx":4, "ry":2.5},
- {"x":10.25, "y":2.5, "r":-14, "rx":13.25, "ry":2.5},
- {"x":11.25, "y":2.375, "r":-14, "rx":13.25, "ry":2.5},
- {"x":12.25, "y":2.25, "r":-14, "rx":13.25, "ry":2.5},
- {"x":13.25, "y":2.375, "r":-14, "rx":13.25, "ry":2.5},
- {"x":14.75, "y":2.375},
- {"x":15.75, "y":2.375},
- {"x":16.75, "y":2.375},
- {"x":17.75, "y":2.375, "w":1.5},
- {"x":20.75, "y":2.375},
- {"x":21.75, "y":2.375},
- {"x":22.75, "y":2.375},
- {"x":23.75, "y":2.375},
-
- {"x":0.75, "y":3.375, "w":1.75},
- {"x":2.5, "y":3.375},
- {"x":4.25, "y":3.375, "r":14, "rx":4, "ry":2.5},
- {"x":5.25, "y":3.25, "r":14, "rx":4, "ry":2.5},
- {"x":6.25, "y":3.375, "r":14, "rx":4, "ry":2.5},
- {"x":7.25, "y":3.5, "r":14, "rx":4, "ry":2.5},
- {"x":10.25, "y":3.5, "r":-14, "rx":13.25, "ry":2.5},
- {"x":11.25, "y":3.375, "r":-14, "rx":13.25, "ry":2.5},
- {"x":12.25, "y":3.25, "r":-14, "rx":13.25, "ry":2.5},
- {"x":13.25, "y":3.375, "r":-14, "rx":13.25, "ry":2.5},
- {"x":15, "y":3.375},
- {"x":16, "y":3.375},
- {"x":17, "y":3.375},
- {"x":18, "y":3.375, "w":1.25},
- {"x":20.75, "y":3.375},
- {"x":21.75, "y":3.375},
- {"x":22.75, "y":3.375},
- {"x":23.75, "y":3.375},
-
- {"x":0, "y":4.375, "w":1.25},
- {"x":1.25, "y":4.375},
- {"x":2.25, "y":4.375},
- {"x":4.25, "y":4.375, "r":14, "rx":4, "ry":2.5},
- {"x":5.25, "y":4.25, "r":14, "rx":4, "ry":2.5},
- {"x":6.25, "y":4.375, "r":14, "rx":4, "ry":2.5},
- {"x":7.25, "y":4.5, "r":14, "rx":4, "ry":2.5},
- {"x":8.25, "y":4.5, "r":14, "rx":4, "ry":2.5},
- {"x":9.25, "y":4.5, "r":-14, "rx":13.25, "ry":2.5},
- {"x":10.25, "y":4.5, "r":-14, "rx":13.25, "ry":2.5},
- {"x":11.25, "y":4.375, "r":-14, "rx":13.25, "ry":2.5},
- {"x":12.25, "y":4.25, "r":-14, "rx":13.25, "ry":2.5},
- {"x":13.25, "y":4.375, "r":-14, "rx":13.25, "ry":2.5},
- {"x":15.25, "y":4.375},
- {"x":16.25, "y":4.375},
- {"x":17.25, "y":4.375, "w":1.25},
- {"x":18.5, "y":4.375},
- {"x":20.75, "y":4.375},
- {"x":21.75, "y":4.375},
- {"x":22.75, "y":4.375},
- {"x":23.75, "y":4.375},
-
- {"x":0.5, "y":5.375, "w":1.25},
- {"x":1.75, "y":5.375, "w":1.25},
- {"x":4.75, "y":5.375, "w":1.25, "r":14, "rx":4, "ry":2.5},
- {"x":6, "y":5.375, "w":1.25, "r":14, "rx":4, "ry":2.5},
- {"x":7.25, "y":5.5, "w":2, "r":14, "rx":4, "ry":2.5},
- {"x":9.25, "y":5.5, "w":2.75, "r":-14, "rx":13.25, "ry":2.5},
- {"x":12, "y":5.375, "w":1.25, "r":-14, "rx":13.25, "ry":2.5},
- {"x":15, "y":5.375, "w":1.25},
- {"x":16.25, "y":5.375, "w":1.25},
- {"x":17.5, "y":5.375},
- {"x":18.5, "y":5.375},
- {"x":19.5, "y":5.375},
- {"x":20.75, "y":5.375},
- {"x":21.75, "y":5.375},
- {"x":22.75, "y":5.375},
- {"x":23.75, "y":5.375}
+ {"matrix": [7, 0], "x": 0.75, "y": 0.125},
+
+ {"matrix": [1, 1], "x": 2.25, "y": 0.125},
+ {"matrix": [0, 1], "x": 3.25, "y": 0.125},
+ {"matrix": [1, 2], "x": 4.25, "y": 0.125, "r": 14, "rx": 4, "ry": 2.5},
+ {"matrix": [0, 2], "x": 5.25, "y": 0, "r": 14, "rx": 4, "ry": 2.5},
+ {"matrix": [1, 3], "x": 6.25, "y": 0.125, "r": 14, "rx": 4, "ry": 2.5},
+ {"matrix": [0, 3], "x": 7.25, "y": 0.25, "r": 14, "rx": 4, "ry": 2.5},
+
+ {"matrix": [0, 4], "x": 10.25, "y": 0.25, "r": -14, "rx": 13.25, "ry": 2.5},
+ {"matrix": [1, 4], "x": 11.25, "y": 0.125, "r": -14, "rx": 13.25, "ry": 2.5},
+ {"matrix": [0, 5], "x": 12.25, "y": 0, "r": -14, "rx": 13.25, "ry": 2.5},
+ {"matrix": [1, 5], "x": 13.25, "y": 0.125, "r": -14, "rx": 13.25, "ry": 2.5},
+ {"matrix": [0, 6], "x": 14.25, "y": 0.125},
+ {"matrix": [1, 6], "x": 15.25, "y": 0.125},
+ {"matrix": [0, 7], "x": 16.375, "y": 0.125},
+ {"matrix": [1, 7], "x": 17.375, "y": 0.125},
+ {"matrix": [0, 0], "x": 18.5, "y": 0.125},
+ {"matrix": [1, 0], "x": 19.5, "y": 0.125},
+
+ {"matrix": [0, 8], "x": 20.75, "y": 0.125},
+ {"matrix": [1, 8], "x": 21.75, "y": 0.125},
+ {"matrix": [0, 9], "x": 22.75, "y": 0.125},
+ {"matrix": [1, 9], "x": 23.75, "y": 0.125},
+
+ {"matrix": [4, 0], "x": 2, "y": 1.375},
+ {"matrix": [2, 1], "x": 3, "y": 1.375},
+ {"matrix": [3, 1], "x": 4.25, "y": 1.375, "r": 14, "rx": 4, "ry": 2.5},
+ {"matrix": [2, 2], "x": 5.25, "y": 1.25, "r": 14, "rx": 4, "ry": 2.5},
+ {"matrix": [3, 2], "x": 6.25, "y": 1.375, "r": 14, "rx": 4, "ry": 2.5},
+ {"matrix": [2, 3], "x": 7.25, "y": 1.5, "r": 14, "rx": 4, "ry": 2.5},
+
+ {"matrix": [2, 4], "x": 10.25, "y": 1.5, "r": -14, "rx": 13.25, "ry": 2.5},
+ {"matrix": [3, 4], "x": 11.25, "y": 1.375, "r": -14, "rx": 13.25, "ry": 2.5},
+ {"matrix": [2, 5], "x": 12.25, "y": 1.25, "r": -14, "rx": 13.25, "ry": 2.5},
+ {"matrix": [3, 5], "x": 13.25, "y": 1.375, "r": -14, "rx": 13.25, "ry": 2.5},
+ {"matrix": [2, 6], "x": 14.5, "y": 1.375},
+ {"matrix": [3, 6], "x": 15.5, "y": 1.375},
+ {"matrix": [2, 7], "x": 16.5, "y": 1.375},
+ {"matrix": [3, 7], "x": 17.5, "y": 1.375},
+ {"matrix": [2, 0], "x": 18.5, "y": 1.375},
+
+ {"matrix": [2, 8], "x": 20.75, "y": 1.375},
+ {"matrix": [3, 8], "x": 21.75, "y": 1.375},
+ {"matrix": [2, 9], "x": 22.75, "y": 1.375},
+ {"matrix": [3, 9], "x": 23.75, "y": 1.375},
+
+ {"matrix": [6, 0], "x": 1.25, "y": 2.375, "w": 1.5},
+ {"matrix": [4, 1], "x": 2.75, "y": 2.375},
+ {"matrix": [5, 1], "x": 4.25, "y": 2.375, "r": 14, "rx": 4, "ry": 2.5},
+ {"matrix": [4, 2], "x": 5.25, "y": 2.25, "r": 14, "rx": 4, "ry": 2.5},
+ {"matrix": [5, 2], "x": 6.25, "y": 2.375, "r": 14, "rx": 4, "ry": 2.5},
+ {"matrix": [4, 3], "x": 7.25, "y": 2.5, "r": 14, "rx": 4, "ry": 2.5},
+
+ {"matrix": [4, 4], "x": 10.25, "y": 2.5, "r": -14, "rx": 13.25, "ry": 2.5},
+ {"matrix": [5, 4], "x": 11.25, "y": 2.375, "r": -14, "rx": 13.25, "ry": 2.5},
+ {"matrix": [4, 5], "x": 12.25, "y": 2.25, "r": -14, "rx": 13.25, "ry": 2.5},
+ {"matrix": [5, 5], "x": 13.25, "y": 2.375, "r": -14, "rx": 13.25, "ry": 2.5},
+ {"matrix": [4, 6], "x": 14.75, "y": 2.375},
+ {"matrix": [5, 6], "x": 15.75, "y": 2.375},
+ {"matrix": [4, 7], "x": 16.75, "y": 2.375},
+ {"matrix": [5, 7], "x": 17.75, "y": 2.375, "w": 1.5},
+
+ {"matrix": [4, 8], "x": 20.75, "y": 2.375},
+ {"matrix": [5, 8], "x": 21.75, "y": 2.375},
+ {"matrix": [4, 9], "x": 22.75, "y": 2.375},
+ {"matrix": [5, 9], "x": 23.75, "y": 2.375},
+
+ {"matrix": [7, 1], "x": 0.75, "y": 3.375, "w": 1.75},
+ {"matrix": [6, 1], "x": 2.5, "y": 3.375},
+ {"matrix": [7, 2], "x": 4.25, "y": 3.375, "r": 14, "rx": 4, "ry": 2.5},
+ {"matrix": [6, 2], "x": 5.25, "y": 3.25, "r": 14, "rx": 4, "ry": 2.5},
+ {"matrix": [7, 3], "x": 6.25, "y": 3.375, "r": 14, "rx": 4, "ry": 2.5},
+ {"matrix": [6, 3], "x": 7.25, "y": 3.5, "r": 14, "rx": 4, "ry": 2.5},
+
+ {"matrix": [6, 4], "x": 10.25, "y": 3.5, "r": -14, "rx": 13.25, "ry": 2.5},
+ {"matrix": [7, 4], "x": 11.25, "y": 3.375, "r": -14, "rx": 13.25, "ry": 2.5},
+ {"matrix": [6, 5], "x": 12.25, "y": 3.25, "r": -14, "rx": 13.25, "ry": 2.5},
+ {"matrix": [7, 5], "x": 13.25, "y": 3.375, "r": -14, "rx": 13.25, "ry": 2.5},
+ {"matrix": [6, 6], "x": 15, "y": 3.375},
+ {"matrix": [7, 6], "x": 16, "y": 3.375},
+ {"matrix": [6, 7], "x": 17, "y": 3.375},
+ {"matrix": [7, 7], "x": 18, "y": 3.375, "w": 1.25},
+
+ {"matrix": [6, 8], "x": 20.75, "y": 3.375},
+ {"matrix": [7, 8], "x": 21.75, "y": 3.375},
+ {"matrix": [6, 9], "x": 22.75, "y": 3.375},
+ {"matrix": [7, 9], "x": 23.75, "y": 3.375},
+
+ {"matrix": [8, 0], "x": 0, "y": 4.375, "w": 1.25},
+ {"matrix": [9, 0], "x": 1.25, "y": 4.375},
+ {"matrix": [8, 1], "x": 2.25, "y": 4.375},
+ {"matrix": [9, 1], "x": 4.25, "y": 4.375, "r": 14, "rx": 4, "ry": 2.5},
+ {"matrix": [8, 2], "x": 5.25, "y": 4.25, "r": 14, "rx": 4, "ry": 2.5},
+ {"matrix": [9, 2], "x": 6.25, "y": 4.375, "r": 14, "rx": 4, "ry": 2.5},
+ {"matrix": [8, 3], "x": 7.25, "y": 4.5, "r": 14, "rx": 4, "ry": 2.5},
+ {"matrix": [9, 3], "x": 8.25, "y": 4.5, "r": 14, "rx": 4, "ry": 2.5},
+
+ {"matrix": [10, 4], "x": 9.25, "y": 4.5, "r": -14, "rx": 13.25, "ry": 2.5},
+ {"matrix": [8, 4], "x": 10.25, "y": 4.5, "r": -14, "rx": 13.25, "ry": 2.5},
+ {"matrix": [9, 4], "x": 11.25, "y": 4.375, "r": -14, "rx": 13.25, "ry": 2.5},
+ {"matrix": [8, 5], "x": 12.25, "y": 4.25, "r": -14, "rx": 13.25, "ry": 2.5},
+ {"matrix": [9, 5], "x": 13.25, "y": 4.375, "r": -14, "rx": 13.25, "ry": 2.5},
+ {"matrix": [8, 6], "x": 15.25, "y": 4.375},
+ {"matrix": [9, 6], "x": 16.25, "y": 4.375},
+ {"matrix": [8, 7], "x": 17.25, "y": 4.375, "w": 1.25},
+
+ {"matrix": [9, 7], "x": 18.5, "y": 4.375},
+ {"matrix": [8, 8], "x": 20.75, "y": 4.375},
+ {"matrix": [9, 8], "x": 21.75, "y": 4.375},
+ {"matrix": [8, 9], "x": 22.75, "y": 4.375},
+ {"matrix": [9, 9], "x": 23.75, "y": 4.375},
+
+ {"matrix": [10, 0], "x": 0.5, "y": 5.375, "w": 1.25},
+ {"matrix": [10, 1], "x": 1.75, "y": 5.375, "w": 1.25},
+ {"matrix": [10, 2], "x": 4.75, "y": 5.375, "w": 1.25, "r": 14, "rx": 4, "ry": 2.5},
+ {"matrix": [10, 3], "x": 6, "y": 5.375, "w": 1.25, "r": 14, "rx": 4, "ry": 2.5},
+ {"matrix": [11, 3], "x": 7.25, "y": 5.5, "w": 2, "r": 14, "rx": 4, "ry": 2.5},
+
+ {"matrix": [11, 4], "x": 9.25, "y": 5.5, "w": 2.75, "r": -14, "rx": 13.25, "ry": 2.5},
+ {"matrix": [10, 5], "x": 12, "y": 5.375, "w": 1.25, "r": -14, "rx": 13.25, "ry": 2.5},
+ {"matrix": [11, 5], "x": 15, "y": 5.375, "w": 1.25},
+ {"matrix": [10, 6], "x": 16.25, "y": 5.375, "w": 1.25},
+ {"matrix": [11, 6], "x": 17.5, "y": 5.375},
+ {"matrix": [10, 7], "x": 18.5, "y": 5.375},
+ {"matrix": [11, 7], "x": 19.5, "y": 5.375},
+
+ {"matrix": [10, 8], "x": 20.75, "y": 5.375},
+ {"matrix": [11, 8], "x": 21.75, "y": 5.375},
+ {"matrix": [10, 9], "x": 22.75, "y": 5.375},
+ {"matrix": [11, 9], "x": 23.75, "y": 5.375}
]
}
}
diff --git a/keyboards/nopunin10did/jabberwocky/v1/v1.h b/keyboards/nopunin10did/jabberwocky/v1/v1.h
deleted file mode 100644
index 7abec1bf1a..0000000000
--- a/keyboards/nopunin10did/jabberwocky/v1/v1.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright 2022 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@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_rh( \
- K0007, K0101, K0100, K0201, K0200, K0301, K0300, K0400, K0401, K0500, K0501, K0600, K0601, K0700, K0701, K0000, K0001, K0800, K0801, K0900, K0901, \
- K0004, K0102, K0103, K0202, K0203, K0302, K0402, K0403, K0502, K0503, K0602, K0603, K0702, K0703, K0002, K0802, K0803, K0902, K0903, \
- K0006, K0104, K0105, K0204, K0205, K0304, K0404, K0405, K0504, K0505, K0604, K0605, K0704, K0705, K0804, K0805, K0904, K0905, \
- K0107, K0106, K0207, K0206, K0307, K0306, K0406, K0407, K0506, K0507, K0606, K0607, K0706, K0707, K0806, K0807, K0906, K0907, \
- K0008, K0009, K0108, K0109, K0208, K0209, K0308, K0309, K0410, K0408, K0409, K0508, K0509, K0608, K0609, K0708, K0709, K0808, K0809, K0908, K0909, \
- K0010, K0110, K0210, K0310, K0311, K0411, K0510, K0511, K0610, K0611, K0710, K0711, K0810, K0811, K0910, K0911 \
-) \
-{ \
- { K0000, K0100, K0200, K0300, K0400, K0500, K0600, K0700, K0800, K0900 }, \
- { K0001, K0101, K0201, K0301, K0401, K0501, K0601, K0701, K0801, K0901 }, \
- { K0002, K0102, K0202, K0302, K0402, K0502, K0602, K0702, K0802, K0902 }, \
- { KC_NO, K0103, K0203, KC_NO, K0403, K0503, K0603, K0703, K0803, K0903 }, \
- { K0004, K0104, K0204, K0304, K0404, K0504, K0604, K0704, K0804, K0904 }, \
- { KC_NO, K0105, K0205, KC_NO, K0405, K0505, K0605, K0705, K0805, K0905 }, \
- { K0006, K0106, K0206, K0306, K0406, K0506, K0606, K0706, K0806, K0906 }, \
- { K0007, K0107, K0207, K0307, K0407, K0507, K0607, K0707, K0807, K0907 }, \
- { K0008, K0108, K0208, K0308, K0408, K0508, K0608, K0708, K0808, K0908 }, \
- { K0009, K0109, K0209, K0309, K0409, K0509, K0609, K0709, K0809, K0909 }, \
- { K0010, K0110, K0210, K0310, K0410, K0510, K0610, K0710, K0810, K0910 }, \
- { KC_NO, KC_NO, KC_NO, K0311, K0411, K0511, K0611, K0711, K0811, K0911 } \
-}
-
-#define LAYOUT_lh( \
- K0800, K0801, K0900, K0901, K0007, K0101, K0100, K0201, K0200, K0301, K0300, K0400, K0401, K0500, K0501, K0600, K0601, K0700, K0701, K0000, K0001, \
- K0802, K0803, K0902, K0903, K0004, K0102, K0103, K0202, K0203, K0302, K0402, K0403, K0502, K0503, K0602, K0603, K0702, K0703, K0002, \
- K0804, K0805, K0904, K0905, K0006, K0104, K0105, K0204, K0205, K0304, K0404, K0405, K0504, K0505, K0604, K0605, K0704, K0705, \
- K0806, K0807, K0906, K0907, K0107, K0106, K0207, K0206, K0307, K0306, K0406, K0407, K0506, K0507, K0606, K0607, K0706, K0707, \
- K0808, K0809, K0908, K0909, K0008, K0009, K0108, K0109, K0208, K0209, K0308, K0309, K0410, K0408, K0409, K0508, K0509, K0608, K0609, K0708, K0709, \
- K0810, K0811, K0910, K0911, K0010, K0110, K0210, K0310, K0311, K0411, K0510, K0511, K0610, K0611, K0710, K0711 \
-) \
-{ \
- { K0000, K0100, K0200, K0300, K0400, K0500, K0600, K0700, K0800, K0900 }, \
- { K0001, K0101, K0201, K0301, K0401, K0501, K0601, K0701, K0801, K0901 }, \
- { K0002, K0102, K0202, K0302, K0402, K0502, K0602, K0702, K0802, K0902 }, \
- { KC_NO, K0103, K0203, KC_NO, K0403, K0503, K0603, K0703, K0803, K0903 }, \
- { K0004, K0104, K0204, K0304, K0404, K0504, K0604, K0704, K0804, K0904 }, \
- { KC_NO, K0105, K0205, KC_NO, K0405, K0505, K0605, K0705, K0805, K0905 }, \
- { K0006, K0106, K0206, K0306, K0406, K0506, K0606, K0706, K0806, K0906 }, \
- { K0007, K0107, K0207, K0307, K0407, K0507, K0607, K0707, K0807, K0907 }, \
- { K0008, K0108, K0208, K0308, K0408, K0508, K0608, K0708, K0808, K0908 }, \
- { K0009, K0109, K0209, K0309, K0409, K0509, K0609, K0709, K0809, K0909 }, \
- { K0010, K0110, K0210, K0310, K0410, K0510, K0610, K0710, K0810, K0910 }, \
- { KC_NO, KC_NO, KC_NO, K0311, K0411, K0511, K0611, K0711, K0811, K0911 } \
-}
diff --git a/keyboards/nopunin10did/jabberwocky/v2/info.json b/keyboards/nopunin10did/jabberwocky/v2/info.json
index 9fe24951e4..71d6d94542 100644
--- a/keyboards/nopunin10did/jabberwocky/v2/info.json
+++ b/keyboards/nopunin10did/jabberwocky/v2/info.json
@@ -27,246 +27,272 @@
"layouts": {
"LAYOUT_lh": {
"layout": [
- {"x":0, "y":0.125},
- {"x":1, "y":0.125},
- {"x":2, "y":0.125},
- {"x":3, "y":0.125},
- {"x":5, "y":0.125},
- {"x":6.5, "y":0.125},
- {"x":7.5, "y":0.125},
- {"x":8.5, "y":0.125},
- {"x":9.5, "y":0},
- {"x":10.5, "y":0.125},
- {"x":11.5, "y":0.25},
- {"x":14.75, "y":0.25},
- {"x":15.75, "y":0.125},
- {"x":16.75, "y":0},
- {"x":17.75, "y":0.125},
- {"x":18.75, "y":0.125},
- {"x":19.75, "y":0.125},
- {"x":21, "y":0.125},
- {"x":22, "y":0.125},
- {"x":23, "y":0.125},
- {"x":24, "y":0.125},
-
- {"x":0, "y":1.375},
- {"x":1, "y":1.375},
- {"x":2, "y":1.375},
- {"x":3, "y":1.375},
- {"x":6.25, "y":1.375},
- {"x":7.25, "y":1.375},
- {"x":8.5, "y":1.375},
- {"x":9.5, "y":1.25},
- {"x":10.5, "y":1.375},
- {"x":11.5, "y":1.5},
- {"x":14.75, "y":1.5},
- {"x":15.75, "y":1.375},
- {"x":16.75, "y":1.25},
- {"x":17.75, "y":1.375},
- {"x":19, "y":1.375},
- {"x":20, "y":1.375},
- {"x":21, "y":1.375},
- {"x":22, "y":1.375},
- {"x":23, "y":1.375},
-
- {"x":0, "y":2.375},
- {"x":1, "y":2.375},
- {"x":2, "y":2.375},
- {"x":3, "y":2.375},
- {"x":5.5, "y":2.375, "w":1.5},
- {"x":7, "y":2.375},
- {"x":8.5, "y":2.375},
- {"x":9.5, "y":2.25},
- {"x":10.5, "y":2.375},
- {"x":11.5, "y":2.5},
- {"x":14.75, "y":2.5},
- {"x":15.75, "y":2.375},
- {"x":16.75, "y":2.25},
- {"x":17.75, "y":2.375},
- {"x":19.25, "y":2.375},
- {"x":20.25, "y":2.375},
- {"x":21.25, "y":2.375},
- {"x":22.25, "y":2.375, "w":1.5},
-
- {"x":0, "y":3.375},
- {"x":1, "y":3.375},
- {"x":2, "y":3.375},
- {"x":3, "y":3.375},
- {"x":5, "y":3.375, "w":1.75},
- {"x":6.75, "y":3.375},
- {"x":8.5, "y":3.375},
- {"x":9.5, "y":3.25},
- {"x":10.5, "y":3.375},
- {"x":11.5, "y":3.5},
- {"x":14.75, "y":3.5},
- {"x":15.75, "y":3.375},
- {"x":16.75, "y":3.25},
- {"x":17.75, "y":3.375},
- {"x":19.5, "y":3.375},
- {"x":20.5, "y":3.375},
- {"x":21.5, "y":3.375},
- {"x":22.5, "y":3.375, "w":1.25},
-
- {"x":0, "y":4.375},
- {"x":1, "y":4.375},
- {"x":2, "y":4.375},
- {"x":3, "y":4.375},
- {"x":4.25, "y":4.375, "w":1.25},
- {"x":5.25, "y":4.375},
- {"x":6.25, "y":4.375},
- {"x":8.5, "y":4.375},
- {"x":9.5, "y":4.25},
- {"x":10.5, "y":4.375},
- {"x":11.5, "y":4.5},
- {"x":12.5, "y":4.5},
- {"x":13.75, "y":4.5},
- {"x":14.75, "y":4.5},
- {"x":15.75, "y":4.375},
- {"x":16.75, "y":4.25},
- {"x":17.75, "y":4.375},
- {"x":19.75, "y":4.375},
- {"x":20.75, "y":4.375},
- {"x":21.75, "y":4.375, "w":1.25},
- {"x":23, "y":4.375},
-
- {"x":0, "y":5.375},
- {"x":1, "y":5.375},
- {"x":2, "y":5.375},
- {"x":3, "y":5.375},
- {"x":4.75, "y":5.375, "w":1.25},
- {"x":6, "y":5.375, "w":1.25},
- {"x":9, "y":5.375, "w":1.25},
- {"x":10.25, "y":5.375, "w":1.25},
- {"x":11.5, "y":5.5, "w":2},
- {"x":13.75, "y":5.5, "w":2.75},
- {"x":16.5, "y":5.375, "w":1.25},
- {"x":19.5, "y":5.375, "w":1.25},
- {"x":20.75, "y":5.375, "w":1.25},
- {"x":22, "y":5.375},
- {"x":23, "y":5.375},
- {"x":24, "y":5.375}
+ {"matrix": [0, 0], "x": 0, "y": 0.125},
+ {"matrix": [1, 0], "x": 1, "y": 0.125},
+ {"matrix": [0, 1], "x": 2, "y": 0.125},
+ {"matrix": [1, 1], "x": 3, "y": 0.125},
+
+ {"matrix": [0, 2], "x": 5, "y": 0.125},
+
+ {"matrix": [1, 2], "x": 6.5, "y": 0.125},
+ {"matrix": [0, 3], "x": 7.5, "y": 0.125},
+ {"matrix": [1, 3], "x": 8.5, "y": 0.125},
+ {"matrix": [0, 4], "x": 9.5, "y": 0},
+ {"matrix": [1, 4], "x": 10.5, "y": 0.125},
+ {"matrix": [0, 5], "x": 11.5, "y": 0.25},
+
+ {"matrix": [1, 5], "x": 14.75, "y": 0.25},
+ {"matrix": [0, 6], "x": 15.75, "y": 0.125},
+ {"matrix": [1, 6], "x": 16.75, "y": 0},
+ {"matrix": [0, 7], "x": 17.75, "y": 0.125},
+ {"matrix": [1, 7], "x": 18.75, "y": 0.125},
+ {"matrix": [0, 8], "x": 19.75, "y": 0.125},
+ {"matrix": [1, 8], "x": 21, "y": 0.125},
+ {"matrix": [0, 9], "x": 22, "y": 0.125},
+ {"matrix": [1, 9], "x": 23, "y": 0.125},
+ {"matrix": [5, 9], "x": 24, "y": 0.125},
+
+ {"matrix": [2, 0], "x": 0, "y": 1.375},
+ {"matrix": [3, 0], "x": 1, "y": 1.375},
+ {"matrix": [2, 1], "x": 2, "y": 1.375},
+ {"matrix": [3, 1], "x": 3, "y": 1.375},
+
+ {"matrix": [3, 2], "x": 6.25, "y": 1.375},
+ {"matrix": [2, 3], "x": 7.25, "y": 1.375},
+ {"matrix": [3, 3], "x": 8.5, "y": 1.375},
+ {"matrix": [2, 4], "x": 9.5, "y": 1.25},
+ {"matrix": [3, 4], "x": 10.5, "y": 1.375},
+ {"matrix": [2, 5], "x": 11.5, "y": 1.5},
+
+ {"matrix": [3, 5], "x": 14.75, "y": 1.5},
+ {"matrix": [2, 6], "x": 15.75, "y": 1.375},
+ {"matrix": [3, 6], "x": 16.75, "y": 1.25},
+ {"matrix": [2, 7], "x": 17.75, "y": 1.375},
+ {"matrix": [3, 7], "x": 19, "y": 1.375},
+ {"matrix": [2, 8], "x": 20, "y": 1.375},
+ {"matrix": [3, 8], "x": 21, "y": 1.375},
+ {"matrix": [2, 9], "x": 22, "y": 1.375},
+ {"matrix": [3, 9], "x": 23, "y": 1.375},
+
+ {"matrix": [4, 0], "x": 0, "y": 2.375},
+ {"matrix": [5, 0], "x": 1, "y": 2.375},
+ {"matrix": [4, 1], "x": 2, "y": 2.375},
+ {"matrix": [5, 1], "x": 3, "y": 2.375},
+
+ {"matrix": [5, 2], "x": 5.5, "y": 2.375, "w": 1.5},
+ {"matrix": [4, 3], "x": 7, "y": 2.375},
+ {"matrix": [5, 3], "x": 8.5, "y": 2.375},
+ {"matrix": [4, 4], "x": 9.5, "y": 2.25},
+ {"matrix": [5, 4], "x": 10.5, "y": 2.375},
+ {"matrix": [4, 5], "x": 11.5, "y": 2.5},
+
+ {"matrix": [5, 5], "x": 14.75, "y": 2.5},
+ {"matrix": [4, 6], "x": 15.75, "y": 2.375},
+ {"matrix": [5, 6], "x": 16.75, "y": 2.25},
+ {"matrix": [4, 7], "x": 17.75, "y": 2.375},
+ {"matrix": [5, 7], "x": 19.25, "y": 2.375},
+ {"matrix": [4, 8], "x": 20.25, "y": 2.375},
+ {"matrix": [5, 8], "x": 21.25, "y": 2.375},
+ {"matrix": [4, 9], "x": 22.25, "y": 2.375, "w": 1.5},
+
+ {"matrix": [6, 0], "x": 0, "y": 3.375},
+ {"matrix": [7, 0], "x": 1, "y": 3.375},
+ {"matrix": [6, 1], "x": 2, "y": 3.375},
+ {"matrix": [7, 1], "x": 3, "y": 3.375},
+
+ {"matrix": [7, 2], "x": 5, "y": 3.375, "w": 1.75},
+ {"matrix": [6, 3], "x": 6.75, "y": 3.375},
+ {"matrix": [7, 3], "x": 8.5, "y": 3.375},
+ {"matrix": [6, 4], "x": 9.5, "y": 3.25},
+ {"matrix": [7, 4], "x": 10.5, "y": 3.375},
+ {"matrix": [6, 5], "x": 11.5, "y": 3.5},
+
+ {"matrix": [7, 5], "x": 14.75, "y": 3.5},
+ {"matrix": [6, 6], "x": 15.75, "y": 3.375},
+ {"matrix": [7, 6], "x": 16.75, "y": 3.25},
+ {"matrix": [6, 7], "x": 17.75, "y": 3.375},
+ {"matrix": [7, 7], "x": 19.5, "y": 3.375},
+ {"matrix": [6, 8], "x": 20.5, "y": 3.375},
+ {"matrix": [7, 8], "x": 21.5, "y": 3.375},
+ {"matrix": [7, 9], "x": 22.5, "y": 3.375, "w": 1.25},
+
+ {"matrix": [8, 0], "x": 0, "y": 4.375},
+ {"matrix": [9, 0], "x": 1, "y": 4.375},
+ {"matrix": [8, 1], "x": 2, "y": 4.375},
+ {"matrix": [9, 1], "x": 3, "y": 4.375},
+
+ {"matrix": [8, 2], "x": 4.25, "y": 4.375, "w": 1.25},
+ {"matrix": [9, 2], "x": 5.25, "y": 4.375},
+ {"matrix": [8, 3], "x": 6.25, "y": 4.375},
+ {"matrix": [9, 3], "x": 8.5, "y": 4.375},
+ {"matrix": [8, 4], "x": 9.5, "y": 4.25},
+ {"matrix": [9, 4], "x": 10.5, "y": 4.375},
+ {"matrix": [8, 5], "x": 11.5, "y": 4.5},
+ {"matrix": [10, 5], "x": 12.5, "y": 4.5},
+
+ {"matrix": [11, 5], "x": 13.75, "y": 4.5},
+ {"matrix": [9, 5], "x": 14.75, "y": 4.5},
+ {"matrix": [8, 6], "x": 15.75, "y": 4.375},
+ {"matrix": [9, 6], "x": 16.75, "y": 4.25},
+ {"matrix": [8, 7], "x": 17.75, "y": 4.375},
+ {"matrix": [9, 7], "x": 19.75, "y": 4.375},
+ {"matrix": [8, 8], "x": 20.75, "y": 4.375},
+ {"matrix": [9, 8], "x": 21.75, "y": 4.375, "w": 1.25},
+ {"matrix": [8, 9], "x": 23, "y": 4.375},
+
+ {"matrix": [10, 0], "x": 0, "y": 5.375},
+ {"matrix": [11, 0], "x": 1, "y": 5.375},
+ {"matrix": [10, 1], "x": 2, "y": 5.375},
+ {"matrix": [11, 1], "x": 3, "y": 5.375},
+
+ {"matrix": [11, 2], "x": 4.75, "y": 5.375, "w": 1.25},
+ {"matrix": [10, 3], "x": 6, "y": 5.375, "w": 1.25},
+ {"matrix": [11, 3], "x": 9, "y": 5.375, "w": 1.25},
+ {"matrix": [10, 4], "x": 10.25, "y": 5.375, "w": 1.25},
+ {"matrix": [11, 4], "x": 11.5, "y": 5.5, "w": 2},
+
+ {"matrix": [10, 6], "x": 13.75, "y": 5.5, "w": 2.75},
+ {"matrix": [11, 6], "x": 16.5, "y": 5.375, "w": 1.25},
+ {"matrix": [11, 7], "x": 19.5, "y": 5.375, "w": 1.25},
+ {"matrix": [10, 8], "x": 20.75, "y": 5.375, "w": 1.25},
+ {"matrix": [11, 8], "x": 22, "y": 5.375},
+ {"matrix": [10, 9], "x": 23, "y": 5.375},
+ {"matrix": [11, 9], "x": 24, "y": 5.375}
]
},
"LAYOUT_rh": {
"layout": [
- {"x":0.75, "y":0.125},
- {"x":2.25, "y":0.125},
- {"x":3.25, "y":0.125},
- {"x":4.25, "y":0.125},
- {"x":5.25, "y":0},
- {"x":6.25, "y":0.125},
- {"x":7.25, "y":0.25},
- {"x":10.5, "y":0.25},
- {"x":11.5, "y":0.125},
- {"x":12.5, "y":0},
- {"x":13.5, "y":0.125},
- {"x":14.5, "y":0.125},
- {"x":15.5, "y":0.125},
- {"x":16.75, "y":0.125},
- {"x":17.75, "y":0.125},
- {"x":18.75, "y":0.125},
- {"x":19.75, "y":0.125},
- {"x":21, "y":0.125},
- {"x":22, "y":0.125},
- {"x":23, "y":0.125},
- {"x":24, "y":0.125},
-
- {"x":2, "y":1.375},
- {"x":3, "y":1.375},
- {"x":4.25, "y":1.375},
- {"x":5.25, "y":1.25},
- {"x":6.25, "y":1.375},
- {"x":7.25, "y":1.5},
- {"x":10.5, "y":1.5},
- {"x":11.5, "y":1.375},
- {"x":12.5, "y":1.25},
- {"x":13.5, "y":1.375},
- {"x":14.75, "y":1.375},
- {"x":15.75, "y":1.375},
- {"x":16.75, "y":1.375},
- {"x":17.75, "y":1.375},
- {"x":18.75, "y":1.375},
- {"x":21, "y":1.375},
- {"x":22, "y":1.375},
- {"x":23, "y":1.375},
- {"x":24, "y":1.375},
-
- {"x":1.25, "y":2.375, "w":1.5},
- {"x":2.75, "y":2.375},
- {"x":4.25, "y":2.375},
- {"x":5.25, "y":2.25},
- {"x":6.25, "y":2.375},
- {"x":7.25, "y":2.5},
- {"x":10.5, "y":2.5},
- {"x":11.5, "y":2.375},
- {"x":12.5, "y":2.25},
- {"x":13.5, "y":2.375},
- {"x":15, "y":2.375},
- {"x":16, "y":2.375},
- {"x":17, "y":2.375},
- {"x":18, "y":2.375, "w":1.5},
- {"x":21, "y":2.375},
- {"x":22, "y":2.375},
- {"x":23, "y":2.375},
- {"x":24, "y":2.375},
-
- {"x":0.75, "y":3.375, "w":1.75},
- {"x":2.5, "y":3.375},
- {"x":4.25, "y":3.375},
- {"x":5.25, "y":3.25},
- {"x":6.25, "y":3.375},
- {"x":7.25, "y":3.5},
- {"x":10.5, "y":3.5},
- {"x":11.5, "y":3.375},
- {"x":12.5, "y":3.25},
- {"x":13.5, "y":3.375},
- {"x":15.25, "y":3.375},
- {"x":16.25, "y":3.375},
- {"x":17.25, "y":3.375},
- {"x":18.25, "y":3.375, "w":1.25},
- {"x":21, "y":3.375},
- {"x":22, "y":3.375},
- {"x":23, "y":3.375},
- {"x":24, "y":3.375},
-
- {"x":0, "y":4.375, "w":1.25},
- {"x":1.25, "y":4.375},
- {"x":2.25, "y":4.375},
- {"x":4.25, "y":4.375},
- {"x":5.25, "y":4.25},
- {"x":6.25, "y":4.375},
- {"x":7.25, "y":4.5},
- {"x":8.25, "y":4.5},
- {"x":9.5, "y":4.5},
- {"x":10.5, "y":4.5},
- {"x":11.5, "y":4.375},
- {"x":12.5, "y":4.25},
- {"x":13.5, "y":4.375},
- {"x":15.5, "y":4.375},
- {"x":16.5, "y":4.375},
- {"x":17.5, "y":4.375, "w":1.25},
- {"x":18.75, "y":4.375},
- {"x":21, "y":4.375},
- {"x":22, "y":4.375},
- {"x":23, "y":4.375},
- {"x":24, "y":4.375},
-
- {"x":0.5, "y":5.375, "w":1.25},
- {"x":1.75, "y":5.375, "w":1.25},
- {"x":4.75, "y":5.375, "w":1.25},
- {"x":6, "y":5.375, "w":1.25},
- {"x":7.25, "y":5.5, "w":2},
- {"x":9.5, "y":5.5, "w":2.75},
- {"x":12.25, "y":5.375, "w":1.25},
- {"x":15.25, "y":5.375, "w":1.25},
- {"x":16.5, "y":5.375, "w":1.25},
- {"x":17.75, "y":5.375},
- {"x":18.75, "y":5.375},
- {"x":19.75, "y":5.375},
- {"x":21, "y":5.375},
- {"x":22, "y":5.375},
- {"x":23, "y":5.375},
- {"x":24, "y":5.375}
+ {"matrix": [0, 2], "x": 0.75, "y": 0.125},
+
+ {"matrix": [1, 2], "x": 2.25, "y": 0.125},
+ {"matrix": [0, 3], "x": 3.25, "y": 0.125},
+ {"matrix": [1, 3], "x": 4.25, "y": 0.125},
+ {"matrix": [0, 4], "x": 5.25, "y": 0},
+ {"matrix": [1, 4], "x": 6.25, "y": 0.125},
+ {"matrix": [0, 5], "x": 7.25, "y": 0.25},
+
+ {"matrix": [1, 5], "x": 10.5, "y": 0.25},
+ {"matrix": [0, 6], "x": 11.5, "y": 0.125},
+ {"matrix": [1, 6], "x": 12.5, "y": 0},
+ {"matrix": [0, 7], "x": 13.5, "y": 0.125},
+ {"matrix": [1, 7], "x": 14.5, "y": 0.125},
+ {"matrix": [0, 8], "x": 15.5, "y": 0.125},
+ {"matrix": [1, 8], "x": 16.75, "y": 0.125},
+ {"matrix": [0, 9], "x": 17.75, "y": 0.125},
+ {"matrix": [1, 9], "x": 18.75, "y": 0.125},
+ {"matrix": [5, 9], "x": 19.75, "y": 0.125},
+
+ {"matrix": [0, 0], "x": 21, "y": 0.125},
+ {"matrix": [1, 0], "x": 22, "y": 0.125},
+ {"matrix": [0, 1], "x": 23, "y": 0.125},
+ {"matrix": [1, 1], "x": 24, "y": 0.125},
+
+ {"matrix": [3, 2], "x": 2, "y": 1.375},
+ {"matrix": [2, 3], "x": 3, "y": 1.375},
+ {"matrix": [3, 3], "x": 4.25, "y": 1.375},
+ {"matrix": [2, 4], "x": 5.25, "y": 1.25},
+ {"matrix": [3, 4], "x": 6.25, "y": 1.375},
+ {"matrix": [2, 5], "x": 7.25, "y": 1.5},
+
+ {"matrix": [3, 5], "x": 10.5, "y": 1.5},
+ {"matrix": [2, 6], "x": 11.5, "y": 1.375},
+ {"matrix": [3, 6], "x": 12.5, "y": 1.25},
+ {"matrix": [2, 7], "x": 13.5, "y": 1.375},
+ {"matrix": [3, 7], "x": 14.75, "y": 1.375},
+ {"matrix": [2, 8], "x": 15.75, "y": 1.375},
+ {"matrix": [3, 8], "x": 16.75, "y": 1.375},
+ {"matrix": [2, 9], "x": 17.75, "y": 1.375},
+ {"matrix": [3, 9], "x": 18.75, "y": 1.375},
+
+ {"matrix": [2, 0], "x": 21, "y": 1.375},
+ {"matrix": [3, 0], "x": 22, "y": 1.375},
+ {"matrix": [2, 1], "x": 23, "y": 1.375},
+ {"matrix": [3, 1], "x": 24, "y": 1.375},
+
+ {"matrix": [5, 2], "x": 1.25, "y": 2.375, "w": 1.5},
+ {"matrix": [4, 3], "x": 2.75, "y": 2.375},
+ {"matrix": [5, 3], "x": 4.25, "y": 2.375},
+ {"matrix": [4, 4], "x": 5.25, "y": 2.25},
+ {"matrix": [5, 4], "x": 6.25, "y": 2.375},
+ {"matrix": [4, 5], "x": 7.25, "y": 2.5},
+
+ {"matrix": [5, 5], "x": 10.5, "y": 2.5},
+ {"matrix": [4, 6], "x": 11.5, "y": 2.375},
+ {"matrix": [5, 6], "x": 12.5, "y": 2.25},
+ {"matrix": [4, 7], "x": 13.5, "y": 2.375},
+ {"matrix": [5, 7], "x": 15, "y": 2.375},
+ {"matrix": [4, 8], "x": 16, "y": 2.375},
+ {"matrix": [5, 8], "x": 17, "y": 2.375},
+ {"matrix": [4, 9], "x": 18, "y": 2.375, "w": 1.5},
+
+ {"matrix": [4, 0], "x": 21, "y": 2.375},
+ {"matrix": [5, 0], "x": 22, "y": 2.375},
+ {"matrix": [4, 1], "x": 23, "y": 2.375},
+ {"matrix": [5, 1], "x": 24, "y": 2.375},
+
+ {"matrix": [7, 2], "x": 0.75, "y": 3.375, "w": 1.75},
+ {"matrix": [6, 3], "x": 2.5, "y": 3.375},
+ {"matrix": [7, 3], "x": 4.25, "y": 3.375},
+ {"matrix": [6, 4], "x": 5.25, "y": 3.25},
+ {"matrix": [7, 4], "x": 6.25, "y": 3.375},
+ {"matrix": [6, 5], "x": 7.25, "y": 3.5},
+
+ {"matrix": [7, 5], "x": 10.5, "y": 3.5},
+ {"matrix": [6, 6], "x": 11.5, "y": 3.375},
+ {"matrix": [7, 6], "x": 12.5, "y": 3.25},
+ {"matrix": [6, 7], "x": 13.5, "y": 3.375},
+ {"matrix": [7, 7], "x": 15.25, "y": 3.375},
+ {"matrix": [6, 8], "x": 16.25, "y": 3.375},
+ {"matrix": [7, 8], "x": 17.25, "y": 3.375},
+ {"matrix": [7, 9], "x": 18.25, "y": 3.375, "w": 1.25},
+
+ {"matrix": [6, 0], "x": 21, "y": 3.375},
+ {"matrix": [7, 0], "x": 22, "y": 3.375},
+ {"matrix": [6, 1], "x": 23, "y": 3.375},
+ {"matrix": [7, 1], "x": 24, "y": 3.375},
+
+ {"matrix": [8, 2], "x": 0, "y": 4.375, "w": 1.25},
+ {"matrix": [9, 2], "x": 1.25, "y": 4.375},
+ {"matrix": [8, 3], "x": 2.25, "y": 4.375},
+ {"matrix": [9, 3], "x": 4.25, "y": 4.375},
+ {"matrix": [8, 4], "x": 5.25, "y": 4.25},
+ {"matrix": [9, 4], "x": 6.25, "y": 4.375},
+ {"matrix": [8, 5], "x": 7.25, "y": 4.5},
+ {"matrix": [10, 5], "x": 8.25, "y": 4.5},
+
+ {"matrix": [11, 5], "x": 9.5, "y": 4.5},
+ {"matrix": [9, 5], "x": 10.5, "y": 4.5},
+ {"matrix": [8, 6], "x": 11.5, "y": 4.375},
+ {"matrix": [9, 6], "x": 12.5, "y": 4.25},
+ {"matrix": [8, 7], "x": 13.5, "y": 4.375},
+ {"matrix": [9, 7], "x": 15.5, "y": 4.375},
+ {"matrix": [8, 8], "x": 16.5, "y": 4.375},
+ {"matrix": [9, 8], "x": 17.5, "y": 4.375, "w": 1.25},
+ {"matrix": [8, 9], "x": 18.75, "y": 4.375},
+
+ {"matrix": [8, 0], "x": 21, "y": 4.375},
+ {"matrix": [9, 0], "x": 22, "y": 4.375},
+ {"matrix": [8, 1], "x": 23, "y": 4.375},
+ {"matrix": [9, 1], "x": 24, "y": 4.375},
+
+ {"matrix": [11, 2], "x": 0.5, "y": 5.375, "w": 1.25},
+ {"matrix": [10, 3], "x": 1.75, "y": 5.375, "w": 1.25},
+ {"matrix": [11, 3], "x": 4.75, "y": 5.375, "w": 1.25},
+ {"matrix": [10, 4], "x": 6, "y": 5.375, "w": 1.25},
+ {"matrix": [11, 4], "x": 7.25, "y": 5.5, "w": 2},
+
+ {"matrix": [10, 6], "x": 9.5, "y": 5.5, "w": 2.75},
+ {"matrix": [11, 6], "x": 12.25, "y": 5.375, "w": 1.25},
+ {"matrix": [11, 7], "x": 15.25, "y": 5.375, "w": 1.25},
+ {"matrix": [10, 8], "x": 16.5, "y": 5.375, "w": 1.25},
+ {"matrix": [11, 8], "x": 17.75, "y": 5.375},
+ {"matrix": [10, 9], "x": 18.75, "y": 5.375},
+ {"matrix": [11, 9], "x": 19.75, "y": 5.375},
+
+ {"matrix": [10, 0], "x": 21, "y": 5.375},
+ {"matrix": [11, 0], "x": 22, "y": 5.375},
+ {"matrix": [10, 1], "x": 23, "y": 5.375},
+ {"matrix": [11, 1], "x": 24, "y": 5.375}
]
}
}
diff --git a/keyboards/nopunin10did/jabberwocky/v2/v2.h b/keyboards/nopunin10did/jabberwocky/v2/v2.h
deleted file mode 100644
index f319eb2240..0000000000
--- a/keyboards/nopunin10did/jabberwocky/v2/v2.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright 2022 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@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_lh( \
- K0000, K0001, K0100, K0101, K0200, K0201, K0300, K0301, K0400, K0401, K0500, K0501, K0600, K0601, K0700, K0701, K0800, K0801, K0900, K0901, K0905, \
- K0002, K0003, K0102, K0103, K0203, K0302, K0303, K0402, K0403, K0502, K0503, K0602, K0603, K0702, K0703, K0802, K0803, K0902, K0903, \
- K0004, K0005, K0104, K0105, K0205, K0304, K0305, K0404, K0405, K0504, K0505, K0604, K0605, K0704, K0705, K0804, K0805, K0904, \
- K0006, K0007, K0106, K0107, K0207, K0306, K0307, K0406, K0407, K0506, K0507, K0606, K0607, K0706, K0707, K0806, K0807, K0907, \
- K0008, K0009, K0108, K0109, K0208, K0209, K0308, K0309, K0408, K0409, K0508, K0510, K0511, K0509, K0608, K0609, K0708, K0709, K0808, K0809, K0908, \
- K0010, K0011, K0110, K0111, K0211, K0310, K0311, K0410, K0411, K0610, K0611, K0711, K0810, K0811, K0910, K0911 \
-) \
-{ \
- { K0000, K0100, K0200, K0300, K0400, K0500, K0600, K0700, K0800, K0900 }, \
- { K0001, K0101, K0201, K0301, K0401, K0501, K0601, K0701, K0801, K0901 }, \
- { K0002, K0102, KC_NO, K0302, K0402, K0502, K0602, K0702, K0802, K0902 }, \
- { K0003, K0103, K0203, K0303, K0403, K0503, K0603, K0703, K0803, K0903 }, \
- { K0004, K0104, KC_NO, K0304, K0404, K0504, K0604, K0704, K0804, K0904 }, \
- { K0005, K0105, K0205, K0305, K0405, K0505, K0605, K0705, K0805, K0905 }, \
- { K0006, K0106, KC_NO, K0306, K0406, K0506, K0606, K0706, K0806, KC_NO }, \
- { K0007, K0107, K0207, K0307, K0407, K0507, K0607, K0707, K0807, K0907 }, \
- { K0008, K0108, K0208, K0308, K0408, K0508, K0608, K0708, K0808, K0908 }, \
- { K0009, K0109, K0209, K0309, K0409, K0509, K0609, K0709, K0809, KC_NO }, \
- { K0010, K0110, KC_NO, K0310, K0410, K0510, K0610, KC_NO, K0810, K0910 }, \
- { K0011, K0111, K0211, K0311, K0411, K0511, K0611, K0711, K0811, K0911 } \
-}
-
-#define LAYOUT_rh( \
- K0200, K0201, K0300, K0301, K0400, K0401, K0500, K0501, K0600, K0601, K0700, K0701, K0800, K0801, K0900, K0901, K0905, K0000, K0001, K0100, K0101, \
- K0203, K0302, K0303, K0402, K0403, K0502, K0503, K0602, K0603, K0702, K0703, K0802, K0803, K0902, K0903, K0002, K0003, K0102, K0103, \
- K0205, K0304, K0305, K0404, K0405, K0504, K0505, K0604, K0605, K0704, K0705, K0804, K0805, K0904, K0004, K0005, K0104, K0105, \
- K0207, K0306, K0307, K0406, K0407, K0506, K0507, K0606, K0607, K0706, K0707, K0806, K0807, K0907, K0006, K0007, K0106, K0107, \
- K0208, K0209, K0308, K0309, K0408, K0409, K0508, K0510, K0511, K0509, K0608, K0609, K0708, K0709, K0808, K0809, K0908, K0008, K0009, K0108, K0109, \
- K0211, K0310, K0311, K0410, K0411, K0610, K0611, K0711, K0810, K0811, K0910, K0911, K0010, K0011, K0110, K0111 \
-) \
-{ \
- { K0000, K0100, K0200, K0300, K0400, K0500, K0600, K0700, K0800, K0900 }, \
- { K0001, K0101, K0201, K0301, K0401, K0501, K0601, K0701, K0801, K0901 }, \
- { K0002, K0102, KC_NO, K0302, K0402, K0502, K0602, K0702, K0802, K0902 }, \
- { K0003, K0103, K0203, K0303, K0403, K0503, K0603, K0703, K0803, K0903 }, \
- { K0004, K0104, KC_NO, K0304, K0404, K0504, K0604, K0704, K0804, K0904 }, \
- { K0005, K0105, K0205, K0305, K0405, K0505, K0605, K0705, K0805, K0905 }, \
- { K0006, K0106, KC_NO, K0306, K0406, K0506, K0606, K0706, K0806, KC_NO }, \
- { K0007, K0107, K0207, K0307, K0407, K0507, K0607, K0707, K0807, K0907 }, \
- { K0008, K0108, K0208, K0308, K0408, K0508, K0608, K0708, K0808, K0908 }, \
- { K0009, K0109, K0209, K0309, K0409, K0509, K0609, K0709, K0809, KC_NO }, \
- { K0010, K0110, KC_NO, K0310, K0410, K0510, K0610, KC_NO, K0810, K0910 }, \
- { K0011, K0111, K0211, K0311, K0411, K0511, K0611, K0711, K0811, K0911 } \
-}
diff --git a/keyboards/nyhxis/nfr_70/info.json b/keyboards/nyhxis/nfr_70/info.json
index 002c82f6b7..ee4f46aad7 100644
--- a/keyboards/nyhxis/nfr_70/info.json
+++ b/keyboards/nyhxis/nfr_70/info.json
@@ -16,168 +16,166 @@
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
- "LAYOUT_ansi":{
- "layout":
- [
- { "label": "ESC", "x": 0, "y": 0 },
- { "label": "F2", "x": 2.25, "y": 0 },
- { "label": "F4", "x": 4.25, "y": 0 },
- { "label": "F6", "x": 6.5, "y": 0 },
- { "label": "F8", "x": 8.5, "y": 0 },
- { "label": "F10", "x": 10.75, "y": 0 },
- { "label": "F12", "x": 12.75, "y": 0 },
- { "label": "F1", "x": 1.25, "y": 0 },
- { "label": "F3", "x": 3.25, "y": 0 },
- { "label": "F5", "x": 5.5, "y": 0 },
- { "label": "F7", "x": 7.5, "y": 0 },
- { "label": "F9", "x": 9.75, "y": 0 },
- { "label": "F11", "x": 11.75, "y": 0 },
- { "label": "F13", "x": 14, "y": 0 },
- { "label": "1", "x": 1, "y": 1.25 },
- { "label": "3", "x": 3, "y": 1.25 },
- { "label": "5", "x": 5, "y": 1.25 },
- { "label": "7", "x": 7, "y": 1.25 },
- { "label": "9", "x": 9, "y": 1.25 },
- { "label": "-", "x": 11, "y": 1.25 },
- { "label": "BACKSPACE", "x": 13, "y": 1.25, "w": 2 },
- { "label": "`", "x": 0, "y": 1.25 },
- { "label": "2", "x": 2, "y": 1.25 },
- { "label": "4", "x": 4, "y": 1.25 },
- { "label": "6", "x": 6, "y": 1.25 },
- { "label": "8", "x": 8, "y": 1.25 },
- { "label": "0", "x": 10, "y": 1.25 },
- { "label": "=", "x": 12, "y": 1.25 },
- { "label": "TAB", "x": 0, "y": 2.25, "w": 1.5 },
- { "label": "W", "x": 2.5, "y": 2.25 },
- { "label": "R", "x": 4.5, "y": 2.25 },
- { "label": "Y", "x": 6.5, "y": 2.25 },
- { "label": "I", "x": 8.5, "y": 2.25 },
- { "label": "P", "x": 10.5, "y": 2.25 },
- { "label": "]", "x": 12.5, "y": 2.25 },
- { "label": "Q", "x": 1.5, "y": 2.25 },
- { "label": "E", "x": 3.5, "y": 2.25 },
- { "label": "T", "x": 5.5, "y": 2.25 },
- { "label": "U", "x": 7.5, "y": 2.25 },
- { "label": "O", "x": 9.5, "y": 2.25 },
- { "label": "[", "x": 11.5, "y": 2.25 },
- { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
- { "label": "A", "x": 1.75, "y": 3.25 },
- { "label": "D", "x": 3.75, "y": 3.25 },
- { "label": "G", "x": 5.75, "y": 3.25 },
- { "label": "J", "x": 7.75, "y": 3.25 },
- { "label": "L", "x": 9.75, "y": 3.25 },
- { "label": "'", "x": 10.75, "y": 3.25 },
- { "x": 12.75, "y": 3.25 },
- { "label": "CAPS", "x": 0, "y": 3.25, "w": 1.75 },
- { "label": "S", "x": 2.75, "y": 3.25 },
- { "label": "F", "x": 4.75, "y": 3.25 },
- { "label": "H", "x": 6.75, "y": 3.25 },
- { "label": "K", "x": 8.75, "y": 3.25 },
- { "label": ";", "x": 11.75, "y": 3.25 },
- { "label": "ENTER", "x": 12.75, "y": 3.25, "w": 2.25 },
- { "label": "LSHIFT", "x": 0, "y": 4.25, "w": 2.25 },
- { "label": "Z", "x": 2.25, "y": 4.25 },
- { "label": "C", "x": 4.25, "y": 4.25 },
- { "label": "B", "x": 6.25, "y": 4.25 },
- { "label": "M", "x": 8.25, "y": 4.25 },
- { "label": ".", "x": 10.25, "y": 4.25 },
- { "label": "RSHIFT", "x": 12.25, "y": 4.25, "w": 2.75 },
- { "label": "NUBS", "x": 1.25, "y": 4.25 },
- { "label": "X", "x": 3.25, "y": 4.25 },
- { "label": "V", "x": 5.25, "y": 4.25 },
- { "label": "N", "x": 7.25, "y": 4.25 },
- { "label": ",", "x": 9.25, "y": 4.25 },
- { "label": "/", "x": 11.25, "y": 4.25 },
- { "label": "RALT", "x": 10, "y": 5.25, "w": 1.25 },
- { "label": "LCTRL", "x": 0, "y": 5.25, "w": 1.25 },
- { "label": "LWIN", "x": 1.25, "y": 5.25, "w": 1.25 },
- { "label": "LALT", "x": 2.5, "y": 5.25, "w": 1.25 },
- { "label": "SPACE", "x": 3.75, "y": 5.25, "w": 6.25 },
- { "label": "RWIN", "x": 11.25, "y": 5.25, "w": 1.25 },
- { "label": "MENU", "x": 12.5, "y": 5.25, "w": 1.25 },
- { "label": "RCTRL", "x": 13.75, "y": 5.25, "w": 1.25 }
+ "LAYOUT_ansi": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 2.25, "y": 0},
+ {"matrix": [0, 1], "x": 4.25, "y": 0},
+ {"matrix": [1, 1], "x": 6.5, "y": 0},
+ {"matrix": [0, 2], "x": 8.5, "y": 0},
+ {"matrix": [1, 2], "x": 10.75, "y": 0},
+ {"matrix": [0, 3], "x": 12.75, "y": 0},
+ {"matrix": [1, 3], "x": 1.25, "y": 0},
+ {"matrix": [0, 4], "x": 3.25, "y": 0},
+ {"matrix": [1, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 7.5, "y": 0},
+ {"matrix": [1, 5], "x": 9.75, "y": 0},
+ {"matrix": [0, 6], "x": 11.75, "y": 0},
+ {"matrix": [1, 6], "x": 14, "y": 0},
+ {"matrix": [3, 0], "x": 1, "y": 1.25},
+ {"matrix": [2, 0], "x": 3, "y": 1.25},
+ {"matrix": [3, 1], "x": 5, "y": 1.25},
+ {"matrix": [2, 1], "x": 7, "y": 1.25},
+ {"matrix": [3, 2], "x": 9, "y": 1.25},
+ {"matrix": [2, 2], "x": 11, "y": 1.25},
+ {"matrix": [3, 3], "x": 13, "y": 1.25, "w": 2},
+ {"matrix": [2, 3], "x": 0, "y": 1.25},
+ {"matrix": [3, 4], "x": 2, "y": 1.25},
+ {"matrix": [2, 4], "x": 4, "y": 1.25},
+ {"matrix": [3, 5], "x": 6, "y": 1.25},
+ {"matrix": [2, 5], "x": 8, "y": 1.25},
+ {"matrix": [3, 6], "x": 10, "y": 1.25},
+ {"matrix": [2, 6], "x": 12, "y": 1.25},
+ {"matrix": [6, 6], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [4, 0], "x": 2.5, "y": 2.25},
+ {"matrix": [5, 0], "x": 4.5, "y": 2.25},
+ {"matrix": [4, 1], "x": 6.5, "y": 2.25},
+ {"matrix": [5, 1], "x": 8.5, "y": 2.25},
+ {"matrix": [4, 2], "x": 10.5, "y": 2.25},
+ {"matrix": [5, 2], "x": 12.5, "y": 2.25},
+ {"matrix": [4, 3], "x": 1.5, "y": 2.25},
+ {"matrix": [5, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [4, 4], "x": 5.5, "y": 2.25},
+ {"matrix": [5, 4], "x": 7.5, "y": 2.25},
+ {"matrix": [4, 5], "x": 9.5, "y": 2.25},
+ {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+ {"matrix": [4, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+ {"matrix": [5, 6], "x": 1.75, "y": 3.25},
+ {"matrix": [7, 0], "x": 3.75, "y": 3.25},
+ {"matrix": [6, 0], "x": 5.75, "y": 3.25},
+ {"matrix": [7, 1], "x": 7.75, "y": 3.25},
+ {"matrix": [6, 1], "x": 9.75, "y": 3.25},
+ {"matrix": [7, 2], "x": 10.75, "y": 3.25},
+ {"matrix": [6, 2], "x": 12.75, "y": 3.25},
+ {"matrix": [7, 3], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [6, 3], "x": 2.75, "y": 3.25},
+ {"matrix": [7, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [6, 4], "x": 6.75, "y": 3.25},
+ {"matrix": [7, 5], "x": 8.75, "y": 3.25},
+ {"matrix": [6, 5], "x": 11.75, "y": 3.25},
+ {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+ {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [9, 0], "x": 2.25, "y": 4.25},
+ {"matrix": [8, 1], "x": 4.25, "y": 4.25},
+ {"matrix": [9, 1], "x": 6.25, "y": 4.25},
+ {"matrix": [8, 2], "x": 8.25, "y": 4.25},
+ {"matrix": [9, 2], "x": 10.25, "y": 4.25},
+ {"matrix": [8, 3], "x": 12.25, "y": 4.25, "w": 2.75},
+ {"matrix": [9, 3], "x": 1.25, "y": 4.25},
+ {"matrix": [8, 4], "x": 3.25, "y": 4.25},
+ {"matrix": [9, 4], "x": 5.25, "y": 4.25},
+ {"matrix": [8, 5], "x": 7.25, "y": 4.25},
+ {"matrix": [9, 5], "x": 9.25, "y": 4.25},
+ {"matrix": [8, 6], "x": 11.25, "y": 4.25},
+ {"matrix": [10, 0], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 1], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 2], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 3], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [9, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [10, 4], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 5], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 6], "x": 13.75, "y": 5.25, "w": 1.25}
]
},
- "LAYOUT_tsangan":{
- "layout":
- [
- { "label": "ESC", "x": 0, "y": 0 },
- { "label": "F2", "x": 2.25, "y": 0 },
- { "label": "F4", "x": 4.25, "y": 0 },
- { "label": "F6", "x": 6.5, "y": 0 },
- { "label": "F8", "x": 8.5, "y": 0 },
- { "label": "F10", "x": 10.75, "y": 0 },
- { "label": "F12", "x": 12.75, "y": 0 },
- { "label": "F1", "x": 1.25, "y": 0 },
- { "label": "F3", "x": 3.25, "y": 0 },
- { "label": "F5", "x": 5.5, "y": 0 },
- { "label": "F7", "x": 7.5, "y": 0 },
- { "label": "F9", "x": 9.75, "y": 0 },
- { "label": "F11", "x": 11.75, "y": 0 },
- { "label": "F13", "x": 14, "y": 0 },
- { "label": "1", "x": 1, "y": 1.25 },
- { "label": "3", "x": 3, "y": 1.25 },
- { "label": "5", "x": 5, "y": 1.25 },
- { "label": "7", "x": 7, "y": 1.25 },
- { "label": "9", "x": 9, "y": 1.25 },
- { "label": "-", "x": 11, "y": 1.25 },
- { "label": "BACKSPACE", "x": 13, "y": 1.25, "w": 2 },
- { "label": "`", "x": 0, "y": 1.25 },
- { "label": "2", "x": 2, "y": 1.25 },
- { "label": "4", "x": 4, "y": 1.25 },
- { "label": "6", "x": 6, "y": 1.25 },
- { "label": "8", "x": 8, "y": 1.25 },
- { "label": "0", "x": 10, "y": 1.25 },
- { "label": "=", "x": 12, "y": 1.25 },
- { "label": "TAB", "x": 0, "y": 2.25, "w": 1.5 },
- { "label": "W", "x": 2.5, "y": 2.25 },
- { "label": "R", "x": 4.5, "y": 2.25 },
- { "label": "Y", "x": 6.5, "y": 2.25 },
- { "label": "I", "x": 8.5, "y": 2.25 },
- { "label": "P", "x": 10.5, "y": 2.25 },
- { "label": "]", "x": 12.5, "y": 2.25 },
- { "label": "Q", "x": 1.5, "y": 2.25 },
- { "label": "E", "x": 3.5, "y": 2.25 },
- { "label": "T", "x": 5.5, "y": 2.25 },
- { "label": "U", "x": 7.5, "y": 2.25 },
- { "label": "O", "x": 9.5, "y": 2.25 },
- { "label": "[", "x": 11.5, "y": 2.25 },
- { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
- { "label": "A", "x": 1.75, "y": 3.25 },
- { "label": "D", "x": 3.75, "y": 3.25 },
- { "label": "G", "x": 5.75, "y": 3.25 },
- { "label": "J", "x": 7.75, "y": 3.25 },
- { "label": "L", "x": 9.75, "y": 3.25 },
- { "label": "'", "x": 10.75, "y": 3.25 },
- { "x": 12.75, "y": 3.25 },
- { "label": "CAPS", "x": 0, "y": 3.25, "w": 1.75 },
- { "label": "S", "x": 2.75, "y": 3.25 },
- { "label": "F", "x": 4.75, "y": 3.25 },
- { "label": "H", "x": 6.75, "y": 3.25 },
- { "label": "K", "x": 8.75, "y": 3.25 },
- { "label": ";", "x": 11.75, "y": 3.25 },
- { "label": "ENTER", "x": 12.75, "y": 3.25, "w": 2.25 },
- { "label": "LSHIFT", "x": 0, "y": 4.25, "w": 2.25 },
- { "label": "Z", "x": 2.25, "y": 4.25 },
- { "label": "C", "x": 4.25, "y": 4.25 },
- { "label": "B", "x": 6.25, "y": 4.25 },
- { "label": "M", "x": 8.25, "y": 4.25 },
- { "label": ".", "x": 10.25, "y": 4.25 },
- { "label": "RSHIFT", "x": 12.25, "y": 4.25, "w": 2.75 },
- { "label": "NUBS", "x": 1.25, "y": 4.25 },
- { "label": "X", "x": 3.25, "y": 4.25 },
- { "label": "V", "x": 5.25, "y": 4.25 },
- { "label": "N", "x": 7.25, "y": 4.25 },
- { "label": ",", "x": 9.25, "y": 4.25 },
- { "label": "/", "x": 11.25, "y": 4.25 },
- { "x": 10, "y": 5.25 },
- { "label": "LCTRL", "x": 0, "y": 5.25, "w": 1.5 },
- { "label": "LWIN", "x": 1.5, "y": 5.25 },
- { "label": "LALT", "x": 2.5, "y": 5.25, "w": 1.5 },
- { "label": "SPACE", "x": 4, "y": 5.25, "w": 7 },
- { "label": "RALT", "x": 11, "y": 5.25, "w": 1.5 },
- { "label": "RWIN", "x": 12.5, "y": 5.25 },
- { "label": "RCTRL", "x": 13.5, "y": 5.25, "w": 1.5 }
+ "LAYOUT_tsangan": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 2.25, "y": 0},
+ {"matrix": [0, 1], "x": 4.25, "y": 0},
+ {"matrix": [1, 1], "x": 6.5, "y": 0},
+ {"matrix": [0, 2], "x": 8.5, "y": 0},
+ {"matrix": [1, 2], "x": 10.75, "y": 0},
+ {"matrix": [0, 3], "x": 12.75, "y": 0},
+ {"matrix": [1, 3], "x": 1.25, "y": 0},
+ {"matrix": [0, 4], "x": 3.25, "y": 0},
+ {"matrix": [1, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 7.5, "y": 0},
+ {"matrix": [1, 5], "x": 9.75, "y": 0},
+ {"matrix": [0, 6], "x": 11.75, "y": 0},
+ {"matrix": [1, 6], "x": 14, "y": 0},
+ {"matrix": [3, 0], "x": 1, "y": 1.25},
+ {"matrix": [2, 0], "x": 3, "y": 1.25},
+ {"matrix": [3, 1], "x": 5, "y": 1.25},
+ {"matrix": [2, 1], "x": 7, "y": 1.25},
+ {"matrix": [3, 2], "x": 9, "y": 1.25},
+ {"matrix": [2, 2], "x": 11, "y": 1.25},
+ {"matrix": [3, 3], "x": 13, "y": 1.25, "w": 2},
+ {"matrix": [2, 3], "x": 0, "y": 1.25},
+ {"matrix": [3, 4], "x": 2, "y": 1.25},
+ {"matrix": [2, 4], "x": 4, "y": 1.25},
+ {"matrix": [3, 5], "x": 6, "y": 1.25},
+ {"matrix": [2, 5], "x": 8, "y": 1.25},
+ {"matrix": [3, 6], "x": 10, "y": 1.25},
+ {"matrix": [2, 6], "x": 12, "y": 1.25},
+ {"matrix": [6, 6], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [4, 0], "x": 2.5, "y": 2.25},
+ {"matrix": [5, 0], "x": 4.5, "y": 2.25},
+ {"matrix": [4, 1], "x": 6.5, "y": 2.25},
+ {"matrix": [5, 1], "x": 8.5, "y": 2.25},
+ {"matrix": [4, 2], "x": 10.5, "y": 2.25},
+ {"matrix": [5, 2], "x": 12.5, "y": 2.25},
+ {"matrix": [4, 3], "x": 1.5, "y": 2.25},
+ {"matrix": [5, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [4, 4], "x": 5.5, "y": 2.25},
+ {"matrix": [5, 4], "x": 7.5, "y": 2.25},
+ {"matrix": [4, 5], "x": 9.5, "y": 2.25},
+ {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+ {"matrix": [4, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+ {"matrix": [5, 6], "x": 1.75, "y": 3.25},
+ {"matrix": [7, 0], "x": 3.75, "y": 3.25},
+ {"matrix": [6, 0], "x": 5.75, "y": 3.25},
+ {"matrix": [7, 1], "x": 7.75, "y": 3.25},
+ {"matrix": [6, 1], "x": 9.75, "y": 3.25},
+ {"matrix": [7, 2], "x": 10.75, "y": 3.25},
+ {"matrix": [6, 2], "x": 12.75, "y": 3.25},
+ {"matrix": [7, 3], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [6, 3], "x": 2.75, "y": 3.25},
+ {"matrix": [7, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [6, 4], "x": 6.75, "y": 3.25},
+ {"matrix": [7, 5], "x": 8.75, "y": 3.25},
+ {"matrix": [6, 5], "x": 11.75, "y": 3.25},
+ {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+ {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [9, 0], "x": 2.25, "y": 4.25},
+ {"matrix": [8, 1], "x": 4.25, "y": 4.25},
+ {"matrix": [9, 1], "x": 6.25, "y": 4.25},
+ {"matrix": [8, 2], "x": 8.25, "y": 4.25},
+ {"matrix": [9, 2], "x": 10.25, "y": 4.25},
+ {"matrix": [8, 3], "x": 12.25, "y": 4.25, "w": 2.75},
+ {"matrix": [9, 3], "x": 1.25, "y": 4.25},
+ {"matrix": [8, 4], "x": 3.25, "y": 4.25},
+ {"matrix": [9, 4], "x": 5.25, "y": 4.25},
+ {"matrix": [8, 5], "x": 7.25, "y": 4.25},
+ {"matrix": [9, 5], "x": 9.25, "y": 4.25},
+ {"matrix": [9, 6], "x": 11.25, "y": 4.25},
+ {"matrix": [8, 6], "x": 10, "y": 5.25},
+ {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"matrix": [10, 1], "x": 1.5, "y": 5.25},
+ {"matrix": [10, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"matrix": [10, 3], "x": 4, "y": 5.25, "w": 7},
+ {"matrix": [10, 4], "x": 11, "y": 5.25, "w": 1.5},
+ {"matrix": [10, 5], "x": 12.5, "y": 5.25},
+ {"matrix": [10, 6], "x": 13.5, "y": 5.25, "w": 1.5}
]
}
}
diff --git a/keyboards/nyhxis/nfr_70/nfr_70.h b/keyboards/nyhxis/nfr_70/nfr_70.h
deleted file mode 100644
index e40e5f0800..0000000000
--- a/keyboards/nyhxis/nfr_70/nfr_70.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright 2022 Nyhxis (@nyhxis)
- *
- * 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_ansi( \
- K000, K010, K001, K011, K002, K012, K003, K013, K004, K014, K005, K015, K006, K016, \
- K030, K020, K031, K021, K032, K022, K033, K023, K034, K024, K035, K025, K036, K026, K066, \
- K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046, K056, \
- K070, K060, K071, K061, K072, K062, K073, K063, K074, K064, K075, K065, K076, \
- K080, K090, K081, K091, K082, K092, K083, K093, K084, K094, K085, K095, K086, \
- K100, K101, K102, K103, K096, K104, K105, K106 \
-) \
-{ \
- { K000, K001, K002, K003, K004, K005, K006 }, \
- { K010, K011, K012, K013, K014, K015, K016 }, \
- { K020, K021, K022, K023, K024, K025, K026 }, \
- { K030, K031, K032, K033, K034, K035, K036 }, \
- { K040, K041, K042, K043, K044, K045, K046 }, \
- { K050, K051, K052, K053, K054, K055, K056 }, \
- { K060, K061, K062, K063, K064, K065, K066 }, \
- { K070, K071, K072, K073, K074, K075, K076 }, \
- { K080, K081, K082, K083, K084, K085, K086 }, \
- { K090, K091, K092, K093, K094, K095, K096 }, \
- { K100, K101, K102, K103, K104, K105, K106 } \
-}
-
-#define LAYOUT_tsangan( \
- K000, K010, K001, K011, K002, K012, K003, K013, K004, K014, K005, K015, K006, K016, \
- K030, K020, K031, K021, K032, K022, K033, K023, K034, K024, K035, K025, K036, K026, K066, \
- K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046, K056, \
- K070, K060, K071, K061, K072, K062, K073, K063, K074, K064, K075, K065, K076, \
- K080, K090, K081, K091, K082, K092, K083, K093, K084, K094, K085, K095, K096, K086, \
- K100, K101, K102, K103, K104, K105, K106 \
-) \
-{ \
- { K000, K001, K002, K003, K004, K005, K006 }, \
- { K010, K011, K012, K013, K014, K015, K016 }, \
- { K020, K021, K022, K023, K024, K025, K026 }, \
- { K030, K031, K032, K033, K034, K035, K036 }, \
- { K040, K041, K042, K043, K044, K045, K046 }, \
- { K050, K051, K052, K053, K054, K055, K056 }, \
- { K060, K061, K062, K063, K064, K065, K066 }, \
- { K070, K071, K072, K073, K074, K075, K076 }, \
- { K080, K081, K082, K083, K084, K085, K086 }, \
- { K090, K091, K092, K093, K094, K095, K096 }, \
- { K100, K101, K102, K103, K104, K105, K106 } \
-}
diff --git a/keyboards/owlab/suit80/ansi/ansi.h b/keyboards/owlab/suit80/ansi/ansi.h
deleted file mode 100644
index d01296f2c1..0000000000
--- a/keyboards/owlab/suit80/ansi/ansi.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright 2021 owlab
-
-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_ansi( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K114, K214, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K313, K314, K412, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K413, K414, K510, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, \
- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K511, \
- K500, K501, K502, K504, K507, K508, K509, K512, K513, K514 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414 }, \
- { K500, K501, K502, KC_NO, K504, KC_NO, KC_NO, K507, K508, K509, K510, K511, K512, K513, K514 } \
-}
diff --git a/keyboards/owlab/suit80/ansi/info.json b/keyboards/owlab/suit80/ansi/info.json
index bb4d9f0243..a8ca09b4c6 100644
--- a/keyboards/owlab/suit80/ansi/info.json
+++ b/keyboards/owlab/suit80/ansi/info.json
@@ -18,93 +18,107 @@
"layouts": {
"LAYOUT_ansi": {
"layout": [
- {"x":0, "y":0},
- {"x":1.25, "y":0},
- {"x":2.25, "y":0},
- {"x":3.25, "y":0},
- {"x":4.25, "y":0},
- {"x":5.5, "y":0},
- {"x":6.5, "y":0},
- {"x":7.5, "y":0},
- {"x":8.5, "y":0},
- {"x":9.75, "y":0},
- {"x":10.75, "y":0},
- {"x":11.75, "y":0},
- {"x":12.75, "y":0},
- {"x":14, "y":0},
- {"x":15.25, "y":0},
- {"x":16.25, "y":0},
- {"x":17.25, "y":0},
- {"x":0, "y":1.25},
- {"x":1, "y":1.25},
- {"x":2, "y":1.25},
- {"x":3, "y":1.25},
- {"x":4, "y":1.25},
- {"x":5, "y":1.25},
- {"x":6, "y":1.25},
- {"x":7, "y":1.25},
- {"x":8, "y":1.25},
- {"x":9, "y":1.25},
- {"x":10, "y":1.25},
- {"x":11, "y":1.25},
- {"x":12, "y":1.25},
- {"x":13, "y":1.25, "w":2},
- {"x":15.25, "y":1.25},
- {"x":16.25, "y":1.25},
- {"x":17.25, "y":1.25},
- {"x":0, "y":2.25, "w":1.5},
- {"x":1.5, "y":2.25},
- {"x":2.5, "y":2.25},
- {"x":3.5, "y":2.25},
- {"x":4.5, "y":2.25},
- {"x":5.5, "y":2.25},
- {"x":6.5, "y":2.25},
- {"x":7.5, "y":2.25},
- {"x":8.5, "y":2.25},
- {"x":9.5, "y":2.25},
- {"x":10.5, "y":2.25},
- {"x":11.5, "y":2.25},
- {"x":12.5, "y":2.25},
- {"x":13.5, "y":2.25, "w":1.5},
- {"x":15.25, "y":2.25},
- {"x":16.25, "y":2.25},
- {"x":17.25, "y":2.25},
- {"x":0, "y":3.25, "w":1.75},
- {"x":1.75, "y":3.25},
- {"x":2.75, "y":3.25},
- {"x":3.75, "y":3.25},
- {"x":4.75, "y":3.25},
- {"x":5.75, "y":3.25},
- {"x":6.75, "y":3.25},
- {"x":7.75, "y":3.25},
- {"x":8.75, "y":3.25},
- {"x":9.75, "y":3.25},
- {"x":10.75, "y":3.25},
- {"x":11.75, "y":3.25},
- {"x":12.75, "y":3.25, "w":2.25},
- {"x":0, "y":4.25, "w":2.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":6.25, "y":4.25},
- {"x":7.25, "y":4.25},
- {"x":8.25, "y":4.25},
- {"x":9.25, "y":4.25},
- {"x":10.25, "y":4.25},
- {"x":11.25, "y":4.25},
- {"x":12.25, "y":4.25, "w":2.75},
- {"x":16.25, "y":4.25},
- {"x":0, "y":5.25, "w":1.5},
- {"x":1.5, "y":5.25},
- {"x":2.5, "y":5.25, "w":1.5},
- {"x":4, "y":5.25, "w":7},
- {"x":11, "y":5.25, "w":1.5},
- {"x":12.5, "y":5.25},
- {"x":13.5, "y":5.25, "w":1.5},
- {"x":15.25, "y":5.25},
- {"x":16.25, "y":5.25},
- {"x":17.25, "y":5.25}
+ {"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.25, "y": 0},
+ {"matrix": [1, 14], "x": 16.25, "y": 0},
+ {"matrix": [2, 14], "x": 17.25, "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": [3, 13], "x": 15.25, "y": 1.25},
+ {"matrix": [3, 14], "x": 16.25, "y": 1.25},
+ {"matrix": [4, 12], "x": 17.25, "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": [4, 13], "x": 15.25, "y": 2.25},
+ {"matrix": [4, 14], "x": 16.25, "y": 2.25},
+ {"matrix": [5, 10], "x": 17.25, "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": [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": 2.75},
+
+ {"matrix": [5, 11], "x": 16.25, "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, 4], "x": 4, "y": 5.25, "w": 7},
+ {"matrix": [5, 7], "x": 11, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 8], "x": 12.5, "y": 5.25},
+ {"matrix": [5, 9], "x": 13.5, "y": 5.25, "w": 1.5},
+
+ {"matrix": [5, 12], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 13], "x": 16.25, "y": 5.25},
+ {"matrix": [5, 14], "x": 17.25, "y": 5.25}
]
}
}
diff --git a/keyboards/quad_h/lb75/info.json b/keyboards/quad_h/lb75/info.json
index 2a69607316..5f88bae831 100644
--- a/keyboards/quad_h/lb75/info.json
+++ b/keyboards/quad_h/lb75/info.json
@@ -25,180 +25,194 @@
"layouts": {
"LAYOUT_continuous_fnrow": {
"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":"Print Screen", "x":13, "y":0},
- {"label":"Scroll Lock", "x":14, "y":0},
- {"label":"Pause", "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":"Back Space", "x":13, "y":1},
- {"label":"Delete", "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":"End", "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":"PgUp", "x":15, "y":3},
- {"label":"Shift", "x":0, "y":4, "w":1.25},
- {"label":"|", "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":"&uarr;", "x":14, "y":4},
- {"label":"PgDn", "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":6.25},
- {"label":"Alt", "x":10, "y":5},
- {"label":"Win", "x":11, "y":5},
- {"label":"Ctrl", "x":12, "y":5},
- {"label":"&larr;", "x":13, "y":5},
- {"label":"&darr;", "x":14, "y":5},
- {"label":"&rarr;", "x":15, "y":5}
- ]
+ {"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": [1, 6], "x": 13, "y": 0},
+ {"matrix": [0, 7], "x": 14, "y": 0},
+ {"matrix": [1, 7], "x": 15, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1},
+ {"matrix": [3, 0], "x": 1, "y": 1},
+ {"matrix": [2, 1], "x": 2, "y": 1},
+ {"matrix": [3, 1], "x": 3, "y": 1},
+ {"matrix": [2, 2], "x": 4, "y": 1},
+ {"matrix": [3, 2], "x": 5, "y": 1},
+ {"matrix": [2, 3], "x": 6, "y": 1},
+ {"matrix": [3, 3], "x": 7, "y": 1},
+ {"matrix": [2, 4], "x": 8, "y": 1},
+ {"matrix": [3, 4], "x": 9, "y": 1},
+ {"matrix": [2, 5], "x": 10, "y": 1},
+ {"matrix": [3, 5], "x": 11, "y": 1},
+ {"matrix": [2, 6], "x": 12, "y": 1},
+ {"matrix": [3, 6], "x": 13, "y": 1},
+ {"matrix": [2, 7], "x": 14, "y": 1},
+ {"matrix": [3, 7], "x": 15, "y": 1},
+
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [5, 0], "x": 1.5, "y": 2},
+ {"matrix": [4, 1], "x": 2.5, "y": 2},
+ {"matrix": [5, 1], "x": 3.5, "y": 2},
+ {"matrix": [4, 2], "x": 4.5, "y": 2},
+ {"matrix": [5, 2], "x": 5.5, "y": 2},
+ {"matrix": [4, 3], "x": 6.5, "y": 2},
+ {"matrix": [5, 3], "x": 7.5, "y": 2},
+ {"matrix": [4, 4], "x": 8.5, "y": 2},
+ {"matrix": [5, 4], "x": 9.5, "y": 2},
+ {"matrix": [4, 5], "x": 10.5, "y": 2},
+ {"matrix": [5, 5], "x": 11.5, "y": 2},
+ {"matrix": [4, 6], "x": 12.5, "y": 2},
+ {"matrix": [4, 7], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [5, 7], "x": 15, "y": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [7, 0], "x": 1.75, "y": 3},
+ {"matrix": [6, 1], "x": 2.75, "y": 3},
+ {"matrix": [7, 1], "x": 3.75, "y": 3},
+ {"matrix": [6, 2], "x": 4.75, "y": 3},
+ {"matrix": [7, 2], "x": 5.75, "y": 3},
+ {"matrix": [6, 3], "x": 6.75, "y": 3},
+ {"matrix": [7, 3], "x": 7.75, "y": 3},
+ {"matrix": [6, 4], "x": 8.75, "y": 3},
+ {"matrix": [7, 4], "x": 9.75, "y": 3},
+ {"matrix": [6, 5], "x": 10.75, "y": 3},
+ {"matrix": [7, 5], "x": 11.75, "y": 3},
+ {"matrix": [7, 6], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [7, 7], "x": 15, "y": 3},
+
+ {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [9, 0], "x": 1.25, "y": 4},
+ {"matrix": [8, 1], "x": 2.25, "y": 4},
+ {"matrix": [9, 1], "x": 3.25, "y": 4},
+ {"matrix": [8, 2], "x": 4.25, "y": 4},
+ {"matrix": [9, 2], "x": 5.25, "y": 4},
+ {"matrix": [8, 3], "x": 6.25, "y": 4},
+ {"matrix": [9, 3], "x": 7.25, "y": 4},
+ {"matrix": [8, 4], "x": 8.25, "y": 4},
+ {"matrix": [9, 4], "x": 9.25, "y": 4},
+ {"matrix": [8, 5], "x": 10.25, "y": 4},
+ {"matrix": [9, 5], "x": 11.25, "y": 4},
+ {"matrix": [8, 6], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [8, 7], "x": 14, "y": 4},
+ {"matrix": [9, 7], "x": 15, "y": 4},
+
+ {"matrix": [10, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [11, 0], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [10, 1], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [10, 3], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [10, 5], "x": 10, "y": 5},
+ {"matrix": [11, 5], "x": 11, "y": 5},
+ {"matrix": [10, 6], "x": 12, "y": 5},
+ {"matrix": [11, 6], "x": 13, "y": 5},
+ {"matrix": [10, 7], "x": 14, "y": 5},
+ {"matrix": [11, 7], "x": 15, "y": 5}
+ ]
},
"LAYOUT_divided_fnrow": {
"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":"Print Screen", "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":"Back Space", "x":13, "y":1},
- {"label":"Delete", "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":"End", "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":"PgUp", "x":15, "y":3},
- {"label":"Shift", "x":0, "y":4, "w":1.25},
- {"label":"|", "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":"&uarr;", "x":14, "y":4},
- {"label":"PgDn", "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":6.25},
- {"label":"Alt", "x":10, "y":5},
- {"label":"Win", "x":11, "y":5},
- {"label":"Ctrl", "x":12, "y":5},
- {"label":"&larr;", "x":13, "y":5},
- {"label":"&darr;", "x":14, "y":5},
- {"label":"&rarr;", "x":15, "y":5}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [1, 1], "x": 3.5, "y": 0},
+ {"matrix": [0, 2], "x": 4.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.5, "y": 0},
+ {"matrix": [1, 5], "x": 11.5, "y": 0},
+ {"matrix": [0, 6], "x": 12.5, "y": 0},
+ {"matrix": [1, 6], "x": 13.5, "y": 0},
+
+ {"matrix": [1, 7], "x": 15, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1},
+ {"matrix": [3, 0], "x": 1, "y": 1},
+ {"matrix": [2, 1], "x": 2, "y": 1},
+ {"matrix": [3, 1], "x": 3, "y": 1},
+ {"matrix": [2, 2], "x": 4, "y": 1},
+ {"matrix": [3, 2], "x": 5, "y": 1},
+ {"matrix": [2, 3], "x": 6, "y": 1},
+ {"matrix": [3, 3], "x": 7, "y": 1},
+ {"matrix": [2, 4], "x": 8, "y": 1},
+ {"matrix": [3, 4], "x": 9, "y": 1},
+ {"matrix": [2, 5], "x": 10, "y": 1},
+ {"matrix": [3, 5], "x": 11, "y": 1},
+ {"matrix": [2, 6], "x": 12, "y": 1},
+ {"matrix": [3, 6], "x": 13, "y": 1},
+ {"matrix": [2, 7], "x": 14, "y": 1},
+ {"matrix": [3, 7], "x": 15, "y": 1},
+
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [5, 0], "x": 1.5, "y": 2},
+ {"matrix": [4, 1], "x": 2.5, "y": 2},
+ {"matrix": [5, 1], "x": 3.5, "y": 2},
+ {"matrix": [4, 2], "x": 4.5, "y": 2},
+ {"matrix": [5, 2], "x": 5.5, "y": 2},
+ {"matrix": [4, 3], "x": 6.5, "y": 2},
+ {"matrix": [5, 3], "x": 7.5, "y": 2},
+ {"matrix": [4, 4], "x": 8.5, "y": 2},
+ {"matrix": [5, 4], "x": 9.5, "y": 2},
+ {"matrix": [4, 5], "x": 10.5, "y": 2},
+ {"matrix": [5, 5], "x": 11.5, "y": 2},
+ {"matrix": [4, 6], "x": 12.5, "y": 2},
+ {"matrix": [4, 7], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [5, 7], "x": 15, "y": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [7, 0], "x": 1.75, "y": 3},
+ {"matrix": [6, 1], "x": 2.75, "y": 3},
+ {"matrix": [7, 1], "x": 3.75, "y": 3},
+ {"matrix": [6, 2], "x": 4.75, "y": 3},
+ {"matrix": [7, 2], "x": 5.75, "y": 3},
+ {"matrix": [6, 3], "x": 6.75, "y": 3},
+ {"matrix": [7, 3], "x": 7.75, "y": 3},
+ {"matrix": [6, 4], "x": 8.75, "y": 3},
+ {"matrix": [7, 4], "x": 9.75, "y": 3},
+ {"matrix": [6, 5], "x": 10.75, "y": 3},
+ {"matrix": [7, 5], "x": 11.75, "y": 3},
+ {"matrix": [7, 6], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [7, 7], "x": 15, "y": 3},
+
+ {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [9, 0], "x": 1.25, "y": 4},
+ {"matrix": [8, 1], "x": 2.25, "y": 4},
+ {"matrix": [9, 1], "x": 3.25, "y": 4},
+ {"matrix": [8, 2], "x": 4.25, "y": 4},
+ {"matrix": [9, 2], "x": 5.25, "y": 4},
+ {"matrix": [8, 3], "x": 6.25, "y": 4},
+ {"matrix": [9, 3], "x": 7.25, "y": 4},
+ {"matrix": [8, 4], "x": 8.25, "y": 4},
+ {"matrix": [9, 4], "x": 9.25, "y": 4},
+ {"matrix": [8, 5], "x": 10.25, "y": 4},
+ {"matrix": [9, 5], "x": 11.25, "y": 4},
+ {"matrix": [8, 6], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [8, 7], "x": 14, "y": 4},
+ {"matrix": [9, 7], "x": 15, "y": 4},
+
+ {"matrix": [10, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [11, 0], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [10, 1], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [10, 3], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [10, 5], "x": 10, "y": 5},
+ {"matrix": [11, 5], "x": 11, "y": 5},
+ {"matrix": [10, 6], "x": 12, "y": 5},
+ {"matrix": [11, 6], "x": 13, "y": 5},
+ {"matrix": [10, 7], "x": 14, "y": 5},
+ {"matrix": [11, 7], "x": 15, "y": 5}
]
}
}
diff --git a/keyboards/quad_h/lb75/lb75.c b/keyboards/quad_h/lb75/lb75.c
index a18f45adb8..4c8e4f929b 100644
--- a/keyboards/quad_h/lb75/lb75.c
+++ b/keyboards/quad_h/lb75/lb75.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 "lb75.h"
+#include "quantum.h"
void matrix_init_kb(void) {
diff --git a/keyboards/quad_h/lb75/lb75.h b/keyboards/quad_h/lb75/lb75.h
deleted file mode 100644
index 697a5fbb21..0000000000
--- a/keyboards/quad_h/lb75/lb75.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * 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 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_continuous_fnrow( \
- K000, K010, K001, K011, K002, K012, K003, K013, K004, K014, K005, K015, K006, K016, K007, K017, \
- K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K036, K027, K037, \
- K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046, K047, K057, \
- K060, K070, K061, K071, K062, K072, K063, K073, K064, K074, K065, K075, K076, K077, \
- K080, K090, K081, K091, K082, K092, K083, K093, K084, K094, K085, K095, K086, K087, K097, \
- K100, K110, K101, K103, K105, K115, K106, K116, K107, K117 \
-) \
-{ \
- { K000, K001, K002, K003, K004, K005, K006, K007 }, \
- { K010, K011, K012, K013, K014, K015, K016, K017 }, \
- { K020, K021, K022, K023, K024, K025, K026, K027 }, \
- { K030, K031, K032, K033, K034, K035, K036, K037 }, \
- { K040, K041, K042, K043, K044, K045, K046, K047 }, \
- { K050, K051, K052, K053, K054, K055, KC_NO, K057 }, \
- { K060, K061, K062, K063, K064, K065, KC_NO, KC_NO }, \
- { K070, K071, K072, K073, K074, K075, K076, K077 }, \
- { K080, K081, K082, K083, K084, K085, K086, K087 }, \
- { K090, K091, K092, K093, K094, K095, KC_NO, K097 }, \
- { K100, K101, KC_NO, K103, KC_NO, K105, K106, K107 }, \
- { K110, KC_NO, KC_NO, KC_NO, KC_NO, K115, K116, K117 } \
-}
-
-#define LAYOUT_divided_fnrow( \
- K000, K010, K001, K011, K002, K003, K013, K004, K014, K005, K015, K006, K016, K017, \
- K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K036, K027, K037, \
- K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046, K047, K057, \
- K060, K070, K061, K071, K062, K072, K063, K073, K064, K074, K065, K075, K076, K077, \
- K080, K090, K081, K091, K082, K092, K083, K093, K084, K094, K085, K095, K086, K087, K097, \
- K100, K110, K101, K103, K105, K115, K106, K116, K107, K117 \
-) \
-{ \
- { K000, K001, K002, K003, K004, K005, K006, KC_NO }, \
- { K010, K011, KC_NO, K013, K014, K015, K016, K017 }, \
- { K020, K021, K022, K023, K024, K025, K026, K027 }, \
- { K030, K031, K032, K033, K034, K035, K036, K037 }, \
- { K040, K041, K042, K043, K044, K045, K046, K047 }, \
- { K050, K051, K052, K053, K054, K055, KC_NO, K057 }, \
- { K060, K061, K062, K063, K064, K065, KC_NO, KC_NO }, \
- { K070, K071, K072, K073, K074, K075, K076, K077 }, \
- { K080, K081, K082, K083, K084, K085, K086, K087 }, \
- { K090, K091, K092, K093, K094, K095, KC_NO, K097 }, \
- { K100, K101, KC_NO, K103, KC_NO, K105, K106, K107 }, \
- { K110, KC_NO, KC_NO, KC_NO, KC_NO, K115, K116, K117 } \
-}
-
diff --git a/keyboards/rart/rartlite/info.json b/keyboards/rart/rartlite/info.json
index 2b8a420eeb..db25aae529 100644
--- a/keyboards/rart/rartlite/info.json
+++ b/keyboards/rart/rartlite/info.json
@@ -23,127 +23,137 @@
"layouts": {
"LAYOUT_right_numpad": {
"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.25, "y": 0},
- {"x": 13.25, "y": 0},
- {"x": 14.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, "w":1.5},
- {"x": 12.25, "y": 1},
- {"x": 13.25, "y": 1},
- {"x": 14.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": 11, "y": 2.25},
- {"x": 12.25, "y": 2},
- {"x": 13.25, "y": 2},
- {"x": 14.25, "y": 2},
-
- {"x": 0, "y": 3, "w":1.25},
- {"x": 1.25, "y": 3},
- {"x": 2.25, "y": 3, "w":2.75},
- {"x": 5, "y": 3, "w":1.25},
- {"x": 6.25, "y": 3, "w":2.25},
- {"x": 8.5, "y": 3, "w":1.25},
- {"x": 10, "y": 3.25},
- {"x": 11, "y": 3.25},
- {"x": 12, "y": 3.25},
- {"x": 13.25, "y": 3},
- {"x": 14.25, "y": 3}
+ {"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": [3, 4], "x": 10, "y": 0},
+ {"matrix": [0, 5], "x": 11, "y": 0},
+
+ {"matrix": [1, 5], "x": 12.25, "y": 0},
+ {"matrix": [0, 6], "x": 13.25, "y": 0},
+ {"matrix": [1, 6], "x": 14.25, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [3, 0], "x": 1.5, "y": 1},
+ {"matrix": [2, 1], "x": 2.5, "y": 1},
+ {"matrix": [3, 1], "x": 3.5, "y": 1},
+ {"matrix": [2, 2], "x": 4.5, "y": 1},
+ {"matrix": [3, 2], "x": 5.5, "y": 1},
+ {"matrix": [2, 3], "x": 6.5, "y": 1},
+ {"matrix": [3, 3], "x": 7.5, "y": 1},
+ {"matrix": [2, 4], "x": 8.5, "y": 1},
+ {"matrix": [5, 4], "x": 9.5, "y": 1},
+ {"matrix": [2, 5], "x": 10.5, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 5], "x": 12.25, "y": 1},
+ {"matrix": [2, 6], "x": 13.25, "y": 1},
+ {"matrix": [3, 6], "x": 14.25, "y": 1},
+
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [5, 0], "x": 1.75, "y": 2},
+ {"matrix": [4, 1], "x": 2.75, "y": 2},
+ {"matrix": [5, 1], "x": 3.75, "y": 2},
+ {"matrix": [4, 2], "x": 4.75, "y": 2},
+ {"matrix": [5, 2], "x": 5.75, "y": 2},
+ {"matrix": [4, 3], "x": 6.75, "y": 2},
+ {"matrix": [5, 3], "x": 7.75, "y": 2},
+ {"matrix": [4, 4], "x": 8.75, "y": 2},
+ {"matrix": [7, 4], "x": 9.75, "y": 2},
+
+ {"matrix": [4, 5], "x": 11, "y": 2.25},
+
+ {"matrix": [5, 5], "x": 12.25, "y": 2},
+ {"matrix": [4, 6], "x": 13.25, "y": 2},
+ {"matrix": [5, 6], "x": 14.25, "y": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [7, 0], "x": 1.25, "y": 3},
+ {"matrix": [6, 1], "x": 2.25, "y": 3, "w": 2.75},
+ {"matrix": [6, 2], "x": 5, "y": 3, "w": 1.25},
+ {"matrix": [6, 3], "x": 6.25, "y": 3, "w": 2.25},
+ {"matrix": [7, 3], "x": 8.5, "y": 3, "w": 1.25},
+
+ {"matrix": [6, 4], "x": 10, "y": 3.25},
+ {"matrix": [6, 5], "x": 11, "y": 3.25},
+ {"matrix": [7, 5], "x": 12, "y": 3.25},
+
+ {"matrix": [6, 6], "x": 13.25, "y": 3},
+ {"matrix": [7, 6], "x": 14.25, "y": 3}
]
},
-
"LAYOUT_left_numpad": {
"layout": [
- {"x": 0, "y": 0},
- {"x": 1, "y": 0},
- {"x": 2, "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": 0, "y": 1},
- {"x": 1, "y": 1},
- {"x": 2, "y": 1},
- {"x": 3.25, "y": 1, "w":1.5},
- {"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, "w":1.5},
-
- {"x": 0, "y": 2},
- {"x": 1, "y": 2},
- {"x": 2, "y": 2},
- {"x": 3.25, "y": 2.25},
- {"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.75},
-
- {"x": 0, "y": 3},
- {"x": 1, "y": 3},
- {"x": 2.25, "y": 3.25},
- {"x": 3.25, "y": 3.25},
- {"x": 4.25, "y": 3.25},
- {"x": 5.5, "y": 3, "w":1.25},
- {"x": 6.75, "y": 3, "w":2.25},
- {"x": 9, "y": 3, "w":1.25},
- {"x": 10.25, "y": 3, "w":2.75},
- {"x": 13, "y": 3},
- {"x": 14, "y": 3, "w":1.25}
+ {"matrix": [1, 6], "x": 0, "y": 0},
+ {"matrix": [0, 6], "x": 1, "y": 0},
+ {"matrix": [1, 5], "x": 2, "y": 0},
+
+ {"matrix": [0, 5], "x": 3.25, "y": 0},
+ {"matrix": [3, 4], "x": 4.25, "y": 0},
+ {"matrix": [1, 4], "x": 5.25, "y": 0},
+ {"matrix": [0, 4], "x": 6.25, "y": 0},
+ {"matrix": [1, 3], "x": 7.25, "y": 0},
+ {"matrix": [0, 3], "x": 8.25, "y": 0},
+ {"matrix": [1, 2], "x": 9.25, "y": 0},
+ {"matrix": [0, 2], "x": 10.25, "y": 0},
+ {"matrix": [1, 1], "x": 11.25, "y": 0},
+ {"matrix": [0, 1], "x": 12.25, "y": 0},
+ {"matrix": [1, 0], "x": 13.25, "y": 0},
+ {"matrix": [0, 0], "x": 14.25, "y": 0},
+
+ {"matrix": [3, 6], "x": 0, "y": 1},
+ {"matrix": [2, 6], "x": 1, "y": 1},
+ {"matrix": [3, 5], "x": 2, "y": 1},
+
+ {"matrix": [2, 5], "x": 3.25, "y": 1, "w": 1.5},
+ {"matrix": [5, 4], "x": 4.75, "y": 1},
+ {"matrix": [2, 4], "x": 5.75, "y": 1},
+ {"matrix": [3, 3], "x": 6.75, "y": 1},
+ {"matrix": [2, 3], "x": 7.75, "y": 1},
+ {"matrix": [3, 2], "x": 8.75, "y": 1},
+ {"matrix": [2, 2], "x": 9.75, "y": 1},
+ {"matrix": [3, 1], "x": 10.75, "y": 1},
+ {"matrix": [2, 1], "x": 11.75, "y": 1},
+ {"matrix": [3, 0], "x": 12.75, "y": 1},
+ {"matrix": [2, 0], "x": 13.75, "y": 1, "w": 1.5},
+
+ {"matrix": [5, 6], "x": 0, "y": 2},
+ {"matrix": [4, 6], "x": 1, "y": 2},
+ {"matrix": [5, 5], "x": 2, "y": 2},
+
+ {"matrix": [4, 5], "x": 3.25, "y": 2.25},
+
+ {"matrix": [7, 4], "x": 4.5, "y": 2},
+ {"matrix": [4, 4], "x": 5.5, "y": 2},
+ {"matrix": [5, 3], "x": 6.5, "y": 2},
+ {"matrix": [4, 3], "x": 7.5, "y": 2},
+ {"matrix": [5, 2], "x": 8.5, "y": 2},
+ {"matrix": [4, 2], "x": 9.5, "y": 2},
+ {"matrix": [5, 1], "x": 10.5, "y": 2},
+ {"matrix": [4, 1], "x": 11.5, "y": 2},
+ {"matrix": [5, 0], "x": 12.5, "y": 2},
+ {"matrix": [4, 0], "x": 13.5, "y": 2, "w": 1.75},
+
+ {"matrix": [7, 6], "x": 0, "y": 3},
+ {"matrix": [6, 6], "x": 1, "y": 3},
+
+ {"matrix": [7, 5], "x": 2.25, "y": 3.25},
+ {"matrix": [6, 5], "x": 3.25, "y": 3.25},
+ {"matrix": [6, 4], "x": 4.25, "y": 3.25},
+
+ {"matrix": [7, 3], "x": 5.5, "y": 3, "w": 1.25},
+ {"matrix": [6, 3], "x": 6.75, "y": 3, "w": 2.25},
+ {"matrix": [6, 2], "x": 9, "y": 3, "w": 1.25},
+ {"matrix": [6, 1], "x": 10.25, "y": 3, "w": 2.75},
+ {"matrix": [7, 0], "x": 13, "y": 3},
+ {"matrix": [6, 0], "x": 14, "y": 3, "w": 1.25}
]
}
-
}
}
diff --git a/keyboards/rart/rartlite/rartlite.c b/keyboards/rart/rartlite/rartlite.c
index 1f431f928f..691c68253e 100644
--- a/keyboards/rart/rartlite/rartlite.c
+++ b/keyboards/rart/rartlite/rartlite.c
@@ -12,7 +12,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 "rartlite.h"
+#include "quantum.h"
void keyboard_pre_init_kb(void) {
setPinOutput(B1);
diff --git a/keyboards/rart/rartlite/rartlite.h b/keyboards/rart/rartlite/rartlite.h
deleted file mode 100644
index a602de2240..0000000000
--- a/keyboards/rart/rartlite/rartlite.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-Copyright 2021 Alabahuy
-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_right_numpad( \
- K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K34, K05, K15, K06, K16, \
- K20, K30, K21, K31, K22, K32, K23, K33, K24, K54, K25, K35, K26, K36, \
- K40, K50, K41, K51, K42, K52, K43, K53, K44, K74, K45, K55, K46, K56, \
- K60, K70, K61, K62, K63, K73, K64, K65, K75, K66, K76 \
-) \
-{ \
- { 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, K45, K46 }, \
- { K50, K51, K52, K53, K54, K55, K56 }, \
- { K60, K61, K62, K63, K64, K65, K66 }, \
- { K70, KC_NO, KC_NO, K73, K74, K75, K76 }, \
-}
-
-#define LAYOUT_left_numpad( \
- K16, K06, K15, K05, K34, K14, K04, K13, K03, K12, K02, K11, K01, K10, K00, \
- K36, K26, K35, K25, K54, K24, K33, K23, K32, K22, K31, K21, K30, K20, \
- K56, K46, K55, K45, K74, K44, K53, K43, K52, K42, K51, K41, K50, K40, \
- K76, K66, K75, K65, K64, K73, K63, K62, K61, K70, K60 \
-) \
-{ \
- { 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, K45, K46 }, \
- { K50, K51, K52, K53, K54, K55, K56 }, \
- { K60, K61, K62, K63, K64, K65, K66 }, \
- { K70, KC_NO, KC_NO, K73, K74, K75, K76 }, \
-}
diff --git a/keyboards/redscarf_iiplus/verb/info.json b/keyboards/redscarf_iiplus/verb/info.json
index ed1acaa11e..33e4aa6ea6 100644
--- a/keyboards/redscarf_iiplus/verb/info.json
+++ b/keyboards/redscarf_iiplus/verb/info.json
@@ -20,11 +20,189 @@
"bootloader": "qmk-dfu",
"layouts": {
"LAYOUT_78_ansi": {
- "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.25, "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.25, "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":17.25, "y":2}, {"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.25, "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}, {"x":13.25, "y":4}, {"x":14.25, "y":4}, {"x":15.25, "y":4}, {"x":16.25, "y":4}, {"x":17.25, "y":4}]
- },
+ "layout": [
+ {"matrix": [5, 1], "x": 0, "y": 0},
+ {"matrix": [5, 2], "x": 1, "y": 0},
+
+ {"matrix": [0, 0], "x": 2.25, "y": 0},
+ {"matrix": [0, 1], "x": 3.25, "y": 0},
+ {"matrix": [0, 2], "x": 4.25, "y": 0},
+ {"matrix": [0, 3], "x": 5.25, "y": 0},
+ {"matrix": [0, 4], "x": 6.25, "y": 0},
+ {"matrix": [0, 5], "x": 7.25, "y": 0},
+ {"matrix": [0, 6], "x": 8.25, "y": 0},
+ {"matrix": [0, 7], "x": 9.25, "y": 0},
+ {"matrix": [0, 8], "x": 10.25, "y": 0},
+ {"matrix": [0, 9], "x": 11.25, "y": 0},
+ {"matrix": [0, 10], "x": 12.25, "y": 0},
+ {"matrix": [0, 11], "x": 13.25, "y": 0},
+ {"matrix": [0, 12], "x": 14.25, "y": 0},
+ {"matrix": [0, 13], "x": 15.25, "y": 0},
+ {"matrix": [2, 12], "x": 16.25, "y": 0},
+ {"matrix": [0, 14], "x": 17.25, "y": 0},
+
+ {"matrix": [5, 3], "x": 0, "y": 1},
+ {"matrix": [5, 4], "x": 1, "y": 1},
+
+ {"matrix": [1, 0], "x": 2.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3.75, "y": 1},
+ {"matrix": [1, 2], "x": 4.75, "y": 1},
+ {"matrix": [1, 3], "x": 5.75, "y": 1},
+ {"matrix": [1, 4], "x": 6.75, "y": 1},
+ {"matrix": [1, 5], "x": 7.75, "y": 1},
+ {"matrix": [1, 6], "x": 8.75, "y": 1},
+ {"matrix": [1, 7], "x": 9.75, "y": 1},
+ {"matrix": [1, 8], "x": 10.75, "y": 1},
+ {"matrix": [1, 9], "x": 11.75, "y": 1},
+ {"matrix": [1, 10], "x": 12.75, "y": 1},
+ {"matrix": [1, 11], "x": 13.75, "y": 1},
+ {"matrix": [1, 12], "x": 14.75, "y": 1},
+ {"matrix": [1, 13], "x": 15.75, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 17.25, "y": 1},
+
+ {"matrix": [5, 5], "x": 0, "y": 2},
+ {"matrix": [5, 6], "x": 1, "y": 2},
+ {"matrix": [2, 0], "x": 2.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 4, "y": 2},
+ {"matrix": [2, 2], "x": 5, "y": 2},
+ {"matrix": [2, 3], "x": 6, "y": 2},
+ {"matrix": [2, 4], "x": 7, "y": 2},
+ {"matrix": [2, 5], "x": 8, "y": 2},
+ {"matrix": [2, 6], "x": 9, "y": 2},
+ {"matrix": [2, 7], "x": 10, "y": 2},
+ {"matrix": [2, 8], "x": 11, "y": 2},
+ {"matrix": [2, 9], "x": 12, "y": 2},
+ {"matrix": [2, 10], "x": 13, "y": 2},
+ {"matrix": [2, 11], "x": 14, "y": 2},
+ {"matrix": [2, 13], "x": 15, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 17.25, "y": 2},
+
+ {"matrix": [5, 7], "x": 0, "y": 3},
+ {"matrix": [5, 8], "x": 1, "y": 3},
+
+ {"matrix": [3, 0], "x": 2.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 4.5, "y": 3},
+ {"matrix": [3, 3], "x": 5.5, "y": 3},
+ {"matrix": [3, 4], "x": 6.5, "y": 3},
+ {"matrix": [3, 5], "x": 7.5, "y": 3},
+ {"matrix": [3, 6], "x": 8.5, "y": 3},
+ {"matrix": [3, 7], "x": 9.5, "y": 3},
+ {"matrix": [3, 8], "x": 10.5, "y": 3},
+ {"matrix": [3, 9], "x": 11.5, "y": 3},
+ {"matrix": [3, 10], "x": 12.5, "y": 3},
+ {"matrix": [3, 11], "x": 13.5, "y": 3},
+ {"matrix": [3, 12], "x": 14.5, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 16.25, "y": 3},
+ {"matrix": [3, 14], "x": 17.25, "y": 3},
+
+ {"matrix": [5, 9], "x": 0, "y": 4},
+ {"matrix": [5, 10], "x": 1, "y": 4},
+
+ {"matrix": [4, 0], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 3.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 4.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 9], "x": 6, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 12.25, "y": 4},
+ {"matrix": [4, 11], "x": 13.25, "y": 4},
+ {"matrix": [4, 7], "x": 14.25, "y": 4},
+ {"matrix": [4, 12], "x": 15.25, "y": 4},
+ {"matrix": [4, 13], "x": 16.25, "y": 4},
+ {"matrix": [4, 14], "x": 17.25, "y": 4}
+ ]
+ },
"LAYOUT_78_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}, {"x":16.25, "y":0}, {"x":17.25, "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.25, "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":17.25, "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.75}, {"x":16.25, "y":3}, {"x":17.25, "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}, {"x":13.25, "y":4}, {"x":14.25, "y":4}, {"x":15.25, "y":4}, {"x":16.25, "y":4}, {"x":17.25, "y":4}]
+ "layout": [
+ {"matrix": [5, 1], "x": 0, "y": 0},
+ {"matrix": [5, 2], "x": 1, "y": 0},
+
+ {"matrix": [0, 0], "x": 2.25, "y": 0},
+ {"matrix": [0, 1], "x": 3.25, "y": 0},
+ {"matrix": [0, 2], "x": 4.25, "y": 0},
+ {"matrix": [0, 3], "x": 5.25, "y": 0},
+ {"matrix": [0, 4], "x": 6.25, "y": 0},
+ {"matrix": [0, 5], "x": 7.25, "y": 0},
+ {"matrix": [0, 6], "x": 8.25, "y": 0},
+ {"matrix": [0, 7], "x": 9.25, "y": 0},
+ {"matrix": [0, 8], "x": 10.25, "y": 0},
+ {"matrix": [0, 9], "x": 11.25, "y": 0},
+ {"matrix": [0, 10], "x": 12.25, "y": 0},
+ {"matrix": [0, 11], "x": 13.25, "y": 0},
+ {"matrix": [0, 12], "x": 14.25, "y": 0},
+ {"matrix": [0, 13], "x": 15.25, "y": 0},
+ {"matrix": [2, 12], "x": 16.25, "y": 0},
+ {"matrix": [0, 14], "x": 17.25, "y": 0},
+
+ {"matrix": [5, 3], "x": 0, "y": 1},
+ {"matrix": [5, 4], "x": 1, "y": 1},
+
+ {"matrix": [1, 0], "x": 2.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3.75, "y": 1},
+ {"matrix": [1, 2], "x": 4.75, "y": 1},
+ {"matrix": [1, 3], "x": 5.75, "y": 1},
+ {"matrix": [1, 4], "x": 6.75, "y": 1},
+ {"matrix": [1, 5], "x": 7.75, "y": 1},
+ {"matrix": [1, 6], "x": 8.75, "y": 1},
+ {"matrix": [1, 7], "x": 9.75, "y": 1},
+ {"matrix": [1, 8], "x": 10.75, "y": 1},
+ {"matrix": [1, 9], "x": 11.75, "y": 1},
+ {"matrix": [1, 10], "x": 12.75, "y": 1},
+ {"matrix": [1, 11], "x": 13.75, "y": 1},
+ {"matrix": [1, 12], "x": 14.75, "y": 1},
+ {"matrix": [1, 14], "x": 16, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [5, 5], "x": 17.25, "y": 1},
+
+ {"matrix": [5, 6], "x": 0, "y": 2},
+ {"matrix": [2, 0], "x": 1, "y": 2},
+
+ {"matrix": [2, 1], "x": 2.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 4, "y": 2},
+ {"matrix": [2, 3], "x": 5, "y": 2},
+ {"matrix": [2, 4], "x": 6, "y": 2},
+ {"matrix": [2, 5], "x": 7, "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": [1, 13], "x": 14, "y": 2},
+ {"matrix": [2, 13], "x": 15, "y": 2},
+ {"matrix": [2, 14], "x": 17.25, "y": 2},
+
+ {"matrix": [5, 7], "x": 0, "y": 3},
+ {"matrix": [5, 8], "x": 1, "y": 3},
+
+ {"matrix": [3, 0], "x": 2.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 3.5, "y": 3},
+ {"matrix": [3, 2], "x": 4.5, "y": 3},
+ {"matrix": [3, 3], "x": 5.5, "y": 3},
+ {"matrix": [3, 4], "x": 6.5, "y": 3},
+ {"matrix": [3, 5], "x": 7.5, "y": 3},
+ {"matrix": [3, 6], "x": 8.5, "y": 3},
+ {"matrix": [3, 7], "x": 9.5, "y": 3},
+ {"matrix": [3, 8], "x": 10.5, "y": 3},
+ {"matrix": [3, 9], "x": 11.5, "y": 3},
+ {"matrix": [3, 10], "x": 12.5, "y": 3},
+ {"matrix": [3, 11], "x": 13.5, "y": 3},
+ {"matrix": [3, 12], "x": 14.5, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 16.25, "y": 3},
+ {"matrix": [3, 14], "x": 17.25, "y": 3},
+
+ {"matrix": [5, 9], "x": 0, "y": 4},
+ {"matrix": [5, 10], "x": 1, "y": 4},
+
+ {"matrix": [4, 0], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 3.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 4.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 9], "x": 6, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 12.25, "y": 4},
+ {"matrix": [4, 11], "x": 13.25, "y": 4},
+ {"matrix": [4, 7], "x": 14.25, "y": 4},
+ {"matrix": [4, 12], "x": 15.25, "y": 4},
+ {"matrix": [4, 13], "x": 16.25, "y": 4},
+ {"matrix": [4, 14], "x": 17.25, "y": 4}
+ ]
}
}
}
diff --git a/keyboards/redscarf_iiplus/verb/verb.h b/keyboards/redscarf_iiplus/verb/verb.h
deleted file mode 100755
index e444abad87..0000000000
--- a/keyboards/redscarf_iiplus/verb/verb.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * 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 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_78_ansi( \
- K51, K52, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2C, K0E, \
- K53, K54, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
- K55, K56, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \
- K57, K58, K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
- K59, K5A, K40, K41, K42, K49, K4A, K4B, K47, 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, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, K42, XXX, XXX, XXX, XXX, K47, XXX, K49, K4A, K4B, K4C, K4D, K4E }, \
- { XXX, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, XXX, XXX, XXX, XXX } \
-}
-#define LAYOUT_78_iso( \
- K51, K52, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2C, K0E, \
- K53, K54, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, \
- K55, K56, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K1D, K2D, K2E, \
- K57, K58, K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
- K59, K5A, K40, K41, K42, K49, K4A, K4B, K47, 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, XXX, K47, XXX, K49, K4A, K4B, K4C, K4D, K4E }, \
- { XXX, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, XXX, XXX, XXX, XXX } \
-}
diff --git a/keyboards/reviung/reviung34/info.json b/keyboards/reviung/reviung34/info.json
index 973a2e517b..e273b714ff 100755
--- a/keyboards/reviung/reviung34/info.json
+++ b/keyboards/reviung/reviung34/info.json
@@ -24,77 +24,91 @@
"layouts": {
"LAYOUT_reviung34": {
"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":6, "y":0},
- {"label":"K06", "x":7, "y":0},
- {"label":"K07", "x":8, "y":0},
- {"label":"K08", "x":9, "y":0},
- {"label":"K35", "x":10, "y":0},
- {"label":"K10", "x":0, "y":1},
- {"label":"K11", "x":1, "y":1},
- {"label":"K12", "x":2, "y":1},
- {"label":"K13", "x":3, "y":1},
- {"label":"K14", "x":4, "y":1},
- {"label":"K15", "x":6, "y":1},
- {"label":"K16", "x":7, "y":1},
- {"label":"K17", "x":8, "y":1},
- {"label":"K18", "x":9, "y":1},
- {"label":"K36", "x":10, "y":1},
- {"label":"K20", "x":0, "y":2},
- {"label":"K21", "x":1, "y":2},
- {"label":"K22", "x":2, "y":2},
- {"label":"K23", "x":3, "y":2},
- {"label":"K24", "x":4, "y":2},
- {"label":"K25", "x":6, "y":2},
- {"label":"K26", "x":7, "y":2},
- {"label":"K27", "x":8, "y":2},
- {"label":"K28", "x":9, "y":2},
- {"label":"K37", "x":10, "y":2},
- {"label":"K32", "x":2, "y":3},
- {"label":"K33", "x":3, "y":3},
- {"label":"K34", "x":4, "y":3},
- {"label":"K38", "x":6, "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": 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": [3, 5], "x": 10, "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": 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": [3, 6], "x": 10, "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": 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": [3, 7], "x": 10, "y": 2},
+
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+
+ {"matrix": [3, 8], "x": 6, "y": 3, "w": 2}
]
},
"LAYOUT_reviung34_2u": {
"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":6, "y":0},
- {"label":"K06", "x":7, "y":0},
- {"label":"K07", "x":8, "y":0},
- {"label":"K08", "x":9, "y":0},
- {"label":"K35", "x":10, "y":0},
- {"label":"K10", "x":0, "y":1},
- {"label":"K11", "x":1, "y":1},
- {"label":"K12", "x":2, "y":1},
- {"label":"K13", "x":3, "y":1},
- {"label":"K14", "x":4, "y":1},
- {"label":"K15", "x":6, "y":1},
- {"label":"K16", "x":7, "y":1},
- {"label":"K17", "x":8, "y":1},
- {"label":"K18", "x":9, "y":1},
- {"label":"K36", "x":10, "y":1},
- {"label":"K20", "x":0, "y":2},
- {"label":"K21", "x":1, "y":2},
- {"label":"K22", "x":2, "y":2},
- {"label":"K23", "x":3, "y":2},
- {"label":"K24", "x":4, "y":2},
- {"label":"K25", "x":6, "y":2},
- {"label":"K26", "x":7, "y":2},
- {"label":"K27", "x":8, "y":2},
- {"label":"K28", "x":9, "y":2},
- {"label":"K37", "x":10, "y":2},
- {"label":"K32", "x":2, "y":3},
- {"label":"K34", "x":3, "y":3, "w":2},
- {"label":"K38", "x":6, "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": 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": [3, 5], "x": 10, "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": 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": [3, 6], "x": 10, "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": 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": [3, 7], "x": 10, "y": 2},
+
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 4], "x": 3, "y": 3, "w": 2},
+
+ {"matrix": [3, 8], "x": 6, "y": 3, "w": 2}
]
}
}
diff --git a/keyboards/reviung/reviung34/reviung34.h b/keyboards/reviung/reviung34/reviung34.h
deleted file mode 100755
index 1ab783ec36..0000000000
--- a/keyboards/reviung/reviung34/reviung34.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright 2019 gtips
- *
- * 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 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_reviung34( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K35, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K36, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K37, \
- K32, K33, K34, K38 \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
- { KC_NO, KC_NO, K32, K33, K34, K35, K36, K37, K38 } \
-}
-
-#define LAYOUT_reviung34_2u( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K35, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K36, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K37, \
- K32, K34, K38 \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
- { KC_NO, KC_NO, K32, KC_NO, K34, K35, K36, K37, K38 } \
-}
diff --git a/keyboards/rominronin/katana60/rev2/info.json b/keyboards/rominronin/katana60/rev2/info.json
index 2dcc257e62..f069e415d9 100644
--- a/keyboards/rominronin/katana60/rev2/info.json
+++ b/keyboards/rominronin/katana60/rev2/info.json
@@ -18,572 +18,604 @@
"layouts": {
"LAYOUT_7u_a": {
"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":"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":"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.25},
- {"label":"k21","x":1.25,"y":2},
- {"label":"k22","x":2.25,"y":2},
- {"label":"k23","x":3.25,"y":2},
- {"label":"k24","x":4.25,"y":2},
- {"label":"k25","x":5.25,"y":2},
- {"label":"k26","x":6.25,"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},
- {"label":"k2e","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":"k3c","x":12,"y":3},
- {"label":"k3d","x":13,"y":3},
- {"label":"k3e","x":14,"y":3},
- {"label":"k41","x":0,"y":4,"w":1.5},
- {"label":"k42","x":1.5,"y":4},
- {"label":"k43","x":2.5,"y":4,"w":1.5},
- {"label":"k47","x":4,"y":4,"w":7},
- {"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": [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, 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.25},
+ {"matrix": [2, 1], "x": 1.25, "y": 2},
+ {"matrix": [2, 2], "x": 2.25, "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, 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": 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, 1], "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},
+ {"matrix": [4, 12], "x": 12, "y": 4},
+ {"matrix": [4, 13], "x": 13, "y": 4},
+ {"matrix": [4, 14], "x": 14, "y": 4}
]
},
"LAYOUT_7u_b": {
"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":"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":"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.25},
- {"label":"k21","x":1.25,"y":2},
- {"label":"k22","x":2.25,"y":2},
- {"label":"k23","x":3.25,"y":2},
- {"label":"k24","x":4.25,"y":2},
- {"label":"k25","x":5.25,"y":2},
- {"label":"k26","x":6.25,"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},
- {"label":"k2e","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":"k3c","x":12,"y":3},
- {"label":"k3d","x":13,"y":3},
- {"label":"k3e","x":14,"y":3},
- {"label":"k41","x":0,"y":4,"w":1.5},
- {"label":"k42","x":1.5,"y":4},
- {"label":"k43","x":2.5,"y":4,"w":1.5},
- {"label":"k47","x":4,"y":4,"w":7},
- {"label":"k17","x":11,"y":4,"w":1.5},
- {"label":"k27","x":12.5,"y":4},
- {"label":"k48","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": [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, 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.25},
+ {"matrix": [2, 1], "x": 1.25, "y": 2},
+ {"matrix": [2, 2], "x": 2.25, "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, 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": 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, 1], "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": [1, 7], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [2, 7], "x": 12.5, "y": 4},
+ {"matrix": [4, 8], "x": 13.5, "y": 4, "w": 1.5}
]
},
"LAYOUT_1_a": {
"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":"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":"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.25},
- {"label":"k21","x":1.25,"y":2},
- {"label":"k22","x":2.25,"y":2},
- {"label":"k23","x":3.25,"y":2},
- {"label":"k24","x":4.25,"y":2},
- {"label":"k25","x":5.25,"y":2},
- {"label":"k26","x":6.25,"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},
- {"label":"k2e","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":"k3c","x":12,"y":3},
- {"label":"k3d","x":13,"y":3},
- {"label":"k3e","x":14,"y":3},
- {"label":"k40","x":0,"y":4},
- {"label":"k41","x":1,"y":4,"w":1.25},
- {"label":"k42","x":2.25,"y":4,"w":1.25},
- {"label":"k43","x":3.5,"y":4,"w":1.25},
- {"label":"k44","x":4.75,"y":4,"w":2.25},
- {"label":"k47","x":7,"y":4},
- {"label":"k49","x":8,"y":4,"w":2},
- {"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": [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, 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.25},
+ {"matrix": [2, 1], "x": 1.25, "y": 2},
+ {"matrix": [2, 2], "x": 2.25, "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, 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": 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},
+ {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
+ {"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": 2.25},
+ {"matrix": [4, 7], "x": 7, "y": 4},
+ {"matrix": [4, 9], "x": 8, "y": 4, "w": 2},
+ {"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_1_b": {
"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":"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":"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.25},
- {"label":"k21","x":1.25,"y":2},
- {"label":"k22","x":2.25,"y":2},
- {"label":"k23","x":3.25,"y":2},
- {"label":"k24","x":4.25,"y":2},
- {"label":"k25","x":5.25,"y":2},
- {"label":"k26","x":6.25,"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},
- {"label":"k2e","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":"k3c","x":12,"y":3},
- {"label":"k3d","x":13,"y":3},
- {"label":"k3e","x":14,"y":3},
- {"label":"k40","x":0,"y":4},
- {"label":"k41","x":1,"y":4,"w":1.25},
- {"label":"k42","x":2.25,"y":4,"w":1.25},
- {"label":"k43","x":3.5,"y":4,"w":1.25},
- {"label":"k44","x":4.75,"y":4,"w":2.25},
- {"label":"k47","x":7,"y":4},
- {"label":"k49","x":8,"y":4,"w":2.75},
- {"label":"k17","x":10.75,"y":4,"w":2},
- {"label":"k48","x":12.75,"y":4,"w":2.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, 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.25},
+ {"matrix": [2, 1], "x": 1.25, "y": 2},
+ {"matrix": [2, 2], "x": 2.25, "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, 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": 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},
+ {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
+ {"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": 2.25},
+ {"matrix": [4, 7], "x": 7, "y": 4},
+ {"matrix": [4, 9], "x": 8, "y": 4, "w": 2.75},
+ {"matrix": [1, 7], "x": 10.75, "y": 4, "w": 2},
+ {"matrix": [4, 8], "x": 12.75, "y": 4, "w": 2.25}
]
},
"LAYOUT_1_c": {
"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":"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":"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.25},
- {"label":"k21","x":1.25,"y":2},
- {"label":"k22","x":2.25,"y":2},
- {"label":"k23","x":3.25,"y":2},
- {"label":"k24","x":4.25,"y":2},
- {"label":"k25","x":5.25,"y":2},
- {"label":"k26","x":6.25,"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},
- {"label":"k2e","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":"k3c","x":12,"y":3},
- {"label":"k3d","x":13,"y":3},
- {"label":"k3e","x":14,"y":3},
- {"label":"k40","x":0,"y":4},
- {"label":"k41","x":1,"y":4,"w":1.25},
- {"label":"k42","x":2.25,"y":4,"w":1.25},
- {"label":"k43","x":3.5,"y":4,"w":1.25},
- {"label":"k44","x":4.75,"y":4,"w":2.25},
- {"label":"k47","x":7,"y":4},
- {"label":"k49","x":8,"y":4,"w":2},
- {"label":"k45","x":10,"y":4,"w":1.5},
- {"label":"k27","x":11.5,"y":4,"w":1.25},
- {"label":"k48","x":12.75,"y":4,"w":2.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, 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.25},
+ {"matrix": [2, 1], "x": 1.25, "y": 2},
+ {"matrix": [2, 2], "x": 2.25, "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, 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": 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},
+ {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
+ {"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": 2.25},
+ {"matrix": [4, 7], "x": 7, "y": 4},
+ {"matrix": [4, 9], "x": 8, "y": 4, "w": 2},
+ {"matrix": [4, 5], "x": 10, "y": 4, "w": 1.5},
+ {"matrix": [2, 7], "x": 11.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 12.75, "y": 4, "w": 2.25}
]
},
"LAYOUT_2_a": {
"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":"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":"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.25},
- {"label":"k21","x":1.25,"y":2},
- {"label":"k22","x":2.25,"y":2},
- {"label":"k23","x":3.25,"y":2},
- {"label":"k24","x":4.25,"y":2},
- {"label":"k25","x":5.25,"y":2},
- {"label":"k26","x":6.25,"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},
- {"label":"k2e","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":"k3c","x":12,"y":3},
- {"label":"k3d","x":13,"y":3},
- {"label":"k3e","x":14,"y":3},
- {"label":"k41","x":0,"y":4,"w":1.5},
- {"label":"k42","x":1.5,"y":4,"w":1.25},
- {"label":"k43","x":2.75,"y":4,"w":1.5},
- {"label":"k44","x":4.25,"y":4,"w":2.75},
- {"label":"k47","x":7,"y":4},
- {"label":"k49","x":8,"y":4,"w":2},
- {"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": [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, 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.25},
+ {"matrix": [2, 1], "x": 1.25, "y": 2},
+ {"matrix": [2, 2], "x": 2.25, "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, 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": 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, 1], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 2.75, "y": 4, "w": 1.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4, "w": 2.75},
+ {"matrix": [4, 7], "x": 7, "y": 4},
+ {"matrix": [4, 9], "x": 8, "y": 4, "w": 2},
+ {"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_2_b": {
"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":"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":"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.25},
- {"label":"k21","x":1.25,"y":2},
- {"label":"k22","x":2.25,"y":2},
- {"label":"k23","x":3.25,"y":2},
- {"label":"k24","x":4.25,"y":2},
- {"label":"k25","x":5.25,"y":2},
- {"label":"k26","x":6.25,"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},
- {"label":"k2e","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":"k3c","x":12,"y":3},
- {"label":"k3d","x":13,"y":3},
- {"label":"k3e","x":14,"y":3},
- {"label":"k41","x":0,"y":4,"w":1.5},
- {"label":"k42","x":1.5,"y":4,"w":1.25},
- {"label":"k43","x":2.75,"y":4,"w":1.5},
- {"label":"k44","x":4.25,"y":4,"w":2.75},
- {"label":"k47","x":7,"y":4},
- {"label":"k49","x":8,"y":4,"w":2.75},
- {"label":"k17","x":10.75,"y":4,"w":2},
- {"label":"k48","x":12.75,"y":4,"w":2.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, 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.25},
+ {"matrix": [2, 1], "x": 1.25, "y": 2},
+ {"matrix": [2, 2], "x": 2.25, "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, 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": 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, 1], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 2.75, "y": 4, "w": 1.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4, "w": 2.75},
+ {"matrix": [4, 7], "x": 7, "y": 4},
+ {"matrix": [4, 9], "x": 8, "y": 4, "w": 2.75},
+ {"matrix": [1, 7], "x": 10.75, "y": 4, "w": 2},
+ {"matrix": [4, 8], "x": 12.75, "y": 4, "w": 2.25}
]
},
"LAYOUT_2_c": {
"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":"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":"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.25},
- {"label":"k21","x":1.25,"y":2},
- {"label":"k22","x":2.25,"y":2},
- {"label":"k23","x":3.25,"y":2},
- {"label":"k24","x":4.25,"y":2},
- {"label":"k25","x":5.25,"y":2},
- {"label":"k26","x":6.25,"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},
- {"label":"k2e","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":"k3c","x":12,"y":3},
- {"label":"k3d","x":13,"y":3},
- {"label":"k3e","x":14,"y":3},
- {"label":"k41","x":0,"y":4,"w":1.5},
- {"label":"k42","x":1.5,"y":4,"w":1.25},
- {"label":"k43","x":2.75,"y":4,"w":1.5},
- {"label":"k44","x":4.25,"y":4,"w":2.75},
- {"label":"k47","x":7,"y":4},
- {"label":"k49","x":8,"y":4,"w":2},
- {"label":"k45","x":10,"y":4,"w":1.5},
- {"label":"k27","x":11.5,"y":4,"w":1.25},
- {"label":"k48","x":12.75,"y":4,"w":2.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, 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.25},
+ {"matrix": [2, 1], "x": 1.25, "y": 2},
+ {"matrix": [2, 2], "x": 2.25, "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, 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": 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, 1], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 2.75, "y": 4, "w": 1.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4, "w": 2.75},
+ {"matrix": [4, 7], "x": 7, "y": 4},
+ {"matrix": [4, 9], "x": 8, "y": 4, "w": 2},
+ {"matrix": [4, 5], "x": 10, "y": 4, "w": 1.5},
+ {"matrix": [2, 7], "x": 11.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 12.75, "y": 4, "w": 2.25}
]
}
}
diff --git a/keyboards/rominronin/katana60/rev2/rev2.h b/keyboards/rominronin/katana60/rev2/rev2.h
deleted file mode 100644
index 35a45b438a..0000000000
--- a/keyboards/rominronin/katana60/rev2/rev2.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/* Copyright 2019 rominronin
- *
- * 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
-
-/* LAYOUT_7u_a
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │10 │11 │12 │13 │14 │15 │16 │18 │19 │1A │1B │1C │1D │1E │
- * ├────┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┤
- * │20 │21 │22 │23 │24 │25 │26 │ │28 │29 │2A │2B │2C │2D │2E │
- * ├───┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴─┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┤
- * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │
- * ├───┴─┬─┴─┬─┴───┼───┴───┴───┴───┴───┴───┴───┼───┼───┼───┼───┤
- * │41 │42 │43 │ 47 │4B │4C │4D │4E │
- * └─────┴───┴─────┴───────────────────────────┴───┴───┴───┴───┘
- */
-#define LAYOUT_7u_a( \
- Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, Q08, Q09, Q0A, Q0B, Q0C, Q0D, Q0E, \
- Q10, Q11, Q12, Q13, Q14, Q15, Q16, Q18, Q19, Q1A, Q1B, Q1C, Q1D, Q1E, \
- Q20, Q21, Q22, Q23, Q24, Q25, Q26, Q28, Q29, Q2A, Q2B, Q2C, Q2D, Q2E, \
- Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37, Q38, Q39, Q3A, Q3B, Q3C, Q3D, Q3E, \
- Q41, Q42, Q43, Q47, Q4B, Q4C, Q4D, Q4E \
-) { \
- { Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, Q08, Q09, Q0A, Q0B, Q0C, Q0D, Q0E }, \
- { Q10, Q11, Q12, Q13, Q14, Q15, Q16, XXX, Q18, Q19, Q1A, Q1B, Q1C, Q1D, Q1E }, \
- { Q20, Q21, Q22, Q23, Q24, Q25, Q26, XXX, Q28, Q29, Q2A, Q2B, Q2C, Q2D, Q2E }, \
- { Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37, Q38, Q39, Q3A, Q3B, Q3C, Q3D, Q3E }, \
- { XXX, Q41, Q42, Q43, XXX, XXX, XXX, Q47, XXX, XXX, XXX, Q4B, Q4C, Q4D, Q4E } \
-}
-
-/* LAYOUT_7u_b
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │10 │11 │12 │13 │14 │15 │16 │18 │19 │1A │1B │1C │1D │1E │
- * ├────┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┤
- * │20 │21 │22 │23 │24 │25 │26 │ │28 │29 │2A │2B │2C │2D │2E │
- * ├───┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴─┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┤
- * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │
- * ├───┴─┬─┴─┬─┴───┼───┴───┴───┴───┴───┴───┴───┼───┴─┬─┴─┬─┴───┤
- * │41 │42 │43 │ 47 │17 │27 │48 │
- * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
- */
-#define LAYOUT_7u_b( \
- Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, Q08, Q09, Q0A, Q0B, Q0C, Q0D, Q0E, \
- Q10, Q11, Q12, Q13, Q14, Q15, Q16, Q18, Q19, Q1A, Q1B, Q1C, Q1D, Q1E, \
- Q20, Q21, Q22, Q23, Q24, Q25, Q26, Q28, Q29, Q2A, Q2B, Q2C, Q2D, Q2E, \
- Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37, Q38, Q39, Q3A, Q3B, Q3C, Q3D, Q3E, \
- Q41, Q42, Q43, Q47, Q17, Q27, Q48 \
-) { \
- { Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, Q08, Q09, Q0A, Q0B, Q0C, Q0D, Q0E }, \
- { Q10, Q11, Q12, Q13, Q14, Q15, Q16, Q17, Q18, Q19, Q1A, Q1B, Q1C, Q1D, Q1E }, \
- { Q20, Q21, Q22, Q23, Q24, Q25, Q26, Q27, Q28, Q29, Q2A, Q2B, Q2C, Q2D, Q2E }, \
- { Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37, Q38, Q39, Q3A, Q3B, Q3C, Q3D, Q3E }, \
- { XXX, Q41, Q42, Q43, XXX, XXX, XXX, Q47, Q48, XXX, XXX, XXX, XXX, XXX, XXX } \
-}
-
-/* LAYOUT_1_a
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │10 │11 │12 │13 │14 │15 │16 │18 │19 │1A │1B │1C │1D │1E │
- * ├────┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┤
- * │20 │21 │22 │23 │24 │25 │26 │ │28 │29 │2A │2B │2C │2D │2E │
- * ├───┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴─┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┤
- * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │
- * ├───┼───┴┬──┴─┬─┴──┬┴───┴───┼───┼───┴───┼───┼───┼───┼───┼───┤
- * │40 │41 │42 │43 │ 44 │47 │ 49 │4A │4B │4C │4D │4E │
- * └───┴────┴────┴────┴────────┴───┴───────┴───┴───┴───┴───┴───┘
- */
-#define LAYOUT_1_a( \
- Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, Q08, Q09, Q0A, Q0B, Q0C, Q0D, Q0E, \
- Q10, Q11, Q12, Q13, Q14, Q15, Q16, Q18, Q19, Q1A, Q1B, Q1C, Q1D, Q1E, \
- Q20, Q21, Q22, Q23, Q24, Q25, Q26, Q28, Q29, Q2A, Q2B, Q2C, Q2D, Q2E, \
- Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37, Q38, Q39, Q3A, Q3B, Q3C, Q3D, Q3E, \
- Q40, Q41, Q42, Q43, Q44, Q47, Q49, Q4A, Q4B, Q4C, Q4D, Q4E \
-) { \
- { Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, Q08, Q09, Q0A, Q0B, Q0C, Q0D, Q0E }, \
- { Q10, Q11, Q12, Q13, Q14, Q15, Q16, XXX, Q18, Q19, Q1A, Q1B, Q1C, Q1D, Q1E }, \
- { Q20, Q21, Q22, Q23, Q24, Q25, Q26, XXX, Q28, Q29, Q2A, Q2B, Q2C, Q2D, Q2E }, \
- { Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37, Q38, Q39, Q3A, Q3B, Q3C, Q3D, Q3E }, \
- { Q40, Q41, Q42, Q43, Q44, XXX, XXX, Q47, XXX, Q49, Q4A, Q4B, Q4C, Q4D, Q4E } \
-}
-
-/* LAYOUT_1_b
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │10 │11 │12 │13 │14 │15 │16 │18 │19 │1A │1B │1C │1D │1E │
- * ├────┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┤
- * │20 │21 │22 │23 │24 │25 │26 │ │28 │29 │2A │2B │2C │2D │2E │
- * ├───┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴─┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┤
- * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │
- * ├───┼───┴┬──┴─┬─┴──┬┴───┴───┼───┼───┴───┴──┬┴───┴──┬┴───┴───┤
- * │40 │41 │42 │43 │ 44 │47 │ 49 │17 │48 │
- * └───┴────┴────┴────┴────────┴───┴──────────┴───────┴────────┘
- */
-#define LAYOUT_1_b( \
- Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, Q08, Q09, Q0A, Q0B, Q0C, Q0D, Q0E, \
- Q10, Q11, Q12, Q13, Q14, Q15, Q16, Q18, Q19, Q1A, Q1B, Q1C, Q1D, Q1E, \
- Q20, Q21, Q22, Q23, Q24, Q25, Q26, Q28, Q29, Q2A, Q2B, Q2C, Q2D, Q2E, \
- Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37, Q38, Q39, Q3A, Q3B, Q3C, Q3D, Q3E, \
- Q40, Q41, Q42, Q43, Q44, Q47, Q49, Q17, Q48 \
-) { \
- { Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, Q08, Q09, Q0A, Q0B, Q0C, Q0D, Q0E }, \
- { Q10, Q11, Q12, Q13, Q14, Q15, Q16, Q17, Q18, Q19, Q1A, Q1B, Q1C, Q1D, Q1E }, \
- { Q20, Q21, Q22, Q23, Q24, Q25, Q26, XXX, Q28, Q29, Q2A, Q2B, Q2C, Q2D, Q2E }, \
- { Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37, Q38, Q39, Q3A, Q3B, Q3C, Q3D, Q3E }, \
- { Q40, Q41, Q42, Q43, Q44, XXX, XXX, Q47, Q48, Q49, XXX, XXX, XXX, XXX, XXX } \
-}
-
-/* LAYOUT_1_c
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │10 │11 │12 │13 │14 │15 │16 │18 │19 │1A │1B │1C │1D │1E │
- * ├────┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┤
- * │20 │21 │22 │23 │24 │25 │26 │ │28 │29 │2A │2B │2C │2D │2E │
- * ├───┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴─┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┤
- * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │
- * ├───┼───┴┬──┴─┬─┴──┬┴───┴───┼───┼───┴───┼───┴─┬─┴──┬┴───┴───┤
- * │40 │41 │42 │43 │ 44 │47 │ 49 │45 │27 │48 │
- * └───┴────┴────┴────┴────────┴───┴───────┴─────┴────┴────────┘
- */
-#define LAYOUT_1_c( \
- Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, Q08, Q09, Q0A, Q0B, Q0C, Q0D, Q0E, \
- Q10, Q11, Q12, Q13, Q14, Q15, Q16, Q18, Q19, Q1A, Q1B, Q1C, Q1D, Q1E, \
- Q20, Q21, Q22, Q23, Q24, Q25, Q26, Q28, Q29, Q2A, Q2B, Q2C, Q2D, Q2E, \
- Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37, Q38, Q39, Q3A, Q3B, Q3C, Q3D, Q3E, \
- Q40, Q41, Q42, Q43, Q44, Q47, Q49, Q45, Q27, Q48 \
-) { \
- { Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, Q08, Q09, Q0A, Q0B, Q0C, Q0D, Q0E }, \
- { Q10, Q11, Q12, Q13, Q14, Q15, Q16, XXX, Q18, Q19, Q1A, Q1B, Q1C, Q1D, Q1E }, \
- { Q20, Q21, Q22, Q23, Q24, Q25, Q26, Q27, Q28, Q29, Q2A, Q2B, Q2C, Q2D, Q2E }, \
- { Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37, Q38, Q39, Q3A, Q3B, Q3C, Q3D, Q3E }, \
- { Q40, Q41, Q42, Q43, Q44, Q45, XXX, Q47, Q48, Q49, XXX, XXX, XXX, XXX, XXX } \
-}
-
-
-/* LAYOUT_2_a
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │10 │11 │12 │13 │14 │15 │16 │18 │19 │1A │1B │1C │1D │1E │
- * ├────┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┤
- * │20 │21 │22 │23 │24 │25 │26 │ │28 │29 │2A │2B │2C │2D │2E │
- * ├───┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴─┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┤
- * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │
- * ├───┴─┬─┴──┬┴───┴┬──┴───┴───┼───┼───┴───┼───┼───┼───┼───┼───┤
- * │41 │42 │43 │ 44 │47 │ 49 │4A │4B │4C │4D │4E │
- * └─────┴────┴─────┴──────────┴───┴───────┴───┴───┴───┴───┴───┘
- */
-#define LAYOUT_2_a( \
- Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, Q08, Q09, Q0A, Q0B, Q0C, Q0D, Q0E, \
- Q10, Q11, Q12, Q13, Q14, Q15, Q16, Q18, Q19, Q1A, Q1B, Q1C, Q1D, Q1E, \
- Q20, Q21, Q22, Q23, Q24, Q25, Q26, Q28, Q29, Q2A, Q2B, Q2C, Q2D, Q2E, \
- Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37, Q38, Q39, Q3A, Q3B, Q3C, Q3D, Q3E, \
- Q41, Q42, Q43, Q44, Q47, Q49, Q4A, Q4B, Q4C, Q4D, Q4E \
-) { \
- { Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, Q08, Q09, Q0A, Q0B, Q0C, Q0D, Q0E }, \
- { Q10, Q11, Q12, Q13, Q14, Q15, Q16, XXX, Q18, Q19, Q1A, Q1B, Q1C, Q1D, Q1E }, \
- { Q20, Q21, Q22, Q23, Q24, Q25, Q26, XXX, Q28, Q29, Q2A, Q2B, Q2C, Q2D, Q2E }, \
- { Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37, Q38, Q39, Q3A, Q3B, Q3C, Q3D, Q3E }, \
- { XXX, Q41, Q42, Q43, Q44, XXX, XXX, Q47, XXX, Q49, Q4A, Q4B, Q4C, Q4D, Q4E } \
-}
-
-
-
-/* LAYOUT_2_b
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │10 │11 │12 │13 │14 │15 │16 │18 │19 │1A │1B │1C │1D │1E │
- * ├────┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┤
- * │20 │21 │22 │23 │24 │25 │26 │ │28 │29 │2A │2B │2C │2D │2E │
- * ├───┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴─┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┤
- * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │
- * ├───┴─┬─┴──┬┴───┴┬──┴───┴───┼───┼───┴───┴──┬┴───┴──┬┴───┴───┤
- * │41 │42 │43 │ 44 │47 │ 49 │17 │48 │
- * └─────┴────┴─────┴──────────┴───┴──────────┴───────┴────────┘
- */
-#define LAYOUT_2_b( \
- Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, Q08, Q09, Q0A, Q0B, Q0C, Q0D, Q0E, \
- Q10, Q11, Q12, Q13, Q14, Q15, Q16, Q18, Q19, Q1A, Q1B, Q1C, Q1D, Q1E, \
- Q20, Q21, Q22, Q23, Q24, Q25, Q26, Q28, Q29, Q2A, Q2B, Q2C, Q2D, Q2E, \
- Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37, Q38, Q39, Q3A, Q3B, Q3C, Q3D, Q3E, \
- Q41, Q42, Q43, Q44, Q47, Q49, Q17, Q48 \
-) { \
- { Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, Q08, Q09, Q0A, Q0B, Q0C, Q0D, Q0E }, \
- { Q10, Q11, Q12, Q13, Q14, Q15, Q16, Q17, Q18, Q19, Q1A, Q1B, Q1C, Q1D, Q1E }, \
- { Q20, Q21, Q22, Q23, Q24, Q25, Q26, XXX, Q28, Q29, Q2A, Q2B, Q2C, Q2D, Q2E }, \
- { Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37, Q38, Q39, Q3A, Q3B, Q3C, Q3D, Q3E }, \
- { XXX, Q41, Q42, Q43, Q44, XXX, XXX, Q47, Q48, Q49, XXX, XXX, XXX, XXX, XXX } \
-}
-
-/* LAYOUT_2_c
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │10 │11 │12 │13 │14 │15 │16 │18 │19 │1A │1B │1C │1D │1E │
- * ├────┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┤
- * │20 │21 │22 │23 │24 │25 │26 │ │28 │29 │2A │2B │2C │2D │2E │
- * ├───┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴─┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┤
- * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │
- * ├───┼───┴┬──┴─┬─┴──┬┴───┴───┼───┼───┴───┼───┴─┬─┴──┬┴───┴───┤
- * │40 │41 │42 │43 │ 44 │47 │ 49 │45 │27 │48 │
- * └───┴────┴────┴────┴────────┴───┴───────┴─────┴────┴────────┘
- */
-#define LAYOUT_2_c( \
- Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, Q08, Q09, Q0A, Q0B, Q0C, Q0D, Q0E, \
- Q10, Q11, Q12, Q13, Q14, Q15, Q16, Q18, Q19, Q1A, Q1B, Q1C, Q1D, Q1E, \
- Q20, Q21, Q22, Q23, Q24, Q25, Q26, Q28, Q29, Q2A, Q2B, Q2C, Q2D, Q2E, \
- Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37, Q38, Q39, Q3A, Q3B, Q3C, Q3D, Q3E, \
- Q41, Q42, Q43, Q44, Q47, Q49, Q45, Q27, Q48 \
-) { \
- { Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, Q08, Q09, Q0A, Q0B, Q0C, Q0D, Q0E }, \
- { Q10, Q11, Q12, Q13, Q14, Q15, Q16, XXX, Q18, Q19, Q1A, Q1B, Q1C, Q1D, Q1E }, \
- { Q20, Q21, Q22, Q23, Q24, Q25, Q26, Q27, Q28, Q29, Q2A, Q2B, Q2C, Q2D, Q2E }, \
- { Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37, Q38, Q39, Q3A, Q3B, Q3C, Q3D, Q3E }, \
- { XXX, Q41, Q42, Q43, Q44, Q45, XXX, Q47, Q48, Q49, XXX, XXX, XXX, XXX, XXX } \
-}
diff --git a/keyboards/sck/m0116b/info.json b/keyboards/sck/m0116b/info.json
index 8a2c4d109a..b6ebf87311 100644
--- a/keyboards/sck/m0116b/info.json
+++ b/keyboards/sck/m0116b/info.json
@@ -21,175 +21,194 @@
"layouts": {
"LAYOUT_m0116_ansi": {
"layout": [
- {"label":"K06 (D1,B2)", "x":5, "y":0, "w":2},
- {"label":"K10 (F0,D5)", "x":0, "y":1.25},
- {"label":"K11 (F0,D3)", "x":1, "y":1.25},
- {"label":"K12 (F0,D2)", "x":2, "y":1.25},
- {"label":"K13 (F0,D0)", "x":3, "y":1.25},
- {"label":"K14 (F0,B7)", "x":4, "y":1.25},
- {"label":"K15 (F0,B3)", "x":5, "y":1.25},
- {"label":"K16 (F0,B2)", "x":6, "y":1.25},
- {"label":"K17 (F0,B1)", "x":7, "y":1.25},
- {"label":"K18 (F0,B0)", "x":8, "y":1.25},
- {"label":"K19 (F0,B5)", "x":9, "y":1.25},
- {"label":"K1A (F0,B6)", "x":10, "y":1.25},
- {"label":"K1B (F0,C6)", "x":11, "y":1.25},
- {"label":"K1C (F0,C7)", "x":12, "y":1.25},
- {"label":"K1D (F0,F7)", "x":13, "y":1.25, "w":1.5},
- {"label":"K1E (F0,D4)", "x":15.5, "y":1.25},
- {"label":"K1F (F0,D6)", "x":16.5, "y":1.25},
- {"label":"K1G (F0,D7)", "x":17.5, "y":1.25},
- {"label":"K1H (F0,B4)", "x":18.5, "y":1.25},
- {"label":"K20 (F1,D5)", "x":0, "y":2.25, "w":1.5},
- {"label":"K21 (F1,D3)", "x":1.5, "y":2.25},
- {"label":"K22 (F1,D2)", "x":2.5, "y":2.25},
- {"label":"K23 (F1,D0)", "x":3.5, "y":2.25},
- {"label":"K24 (F1,B7)", "x":4.5, "y":2.25},
- {"label":"K25 (F1,B3)", "x":5.5, "y":2.25},
- {"label":"K26 (F1,B2)", "x":6.5, "y":2.25},
- {"label":"K27 (F1,B1)", "x":7.5, "y":2.25},
- {"label":"K28 (F1,B0)", "x":8.5, "y":2.25},
- {"label":"K29 (F1,B5)", "x":9.5, "y":2.25},
- {"label":"K2A (F1,B6)", "x":10.5, "y":2.25},
- {"label":"K2B (F1,C6)", "x":11.5, "y":2.25},
- {"label":"K2C (F1,C7)", "x":12.5, "y":2.25},
- {"label":"K2D (F1,F7)", "x":13.5, "y":2.25, "h":2},
- {"label":"K2E (F1,D4)", "x":15.5, "y":2.25},
- {"label":"K2F (F1,D6)", "x":16.5, "y":2.25},
- {"label":"K2G (F1,D7)", "x":17.5, "y":2.25},
- {"label":"K2H (F1,B4)", "x":18.5, "y":2.25},
- {"label":"K30 (F4,D5)", "x":0, "y":3.25, "w":1.75},
- {"label":"K31 (F4,D3)", "x":1.75, "y":3.25},
- {"label":"K32 (F4,D2)", "x":2.75, "y":3.25},
- {"label":"K33 (F4,D0)", "x":3.75, "y":3.25},
- {"label":"K34 (F4,B7)", "x":4.75, "y":3.25},
- {"label":"K35 (F4,B3)", "x":5.75, "y":3.25},
- {"label":"K36 (F4,B2)", "x":6.75, "y":3.25},
- {"label":"K37 (F4,B1)", "x":7.75, "y":3.25},
- {"label":"K38 (F4,B0)", "x":8.75, "y":3.25},
- {"label":"K39 (F4,B5)", "x":9.75, "y":3.25},
- {"label":"K3A (F4,B6)", "x":10.75, "y":3.25},
- {"label":"K3B (F4,C6)", "x":11.75, "y":3.25},
- {"label":"K3C (F4,D4)", "x":15.5, "y":3.25},
- {"label":"K3D (F4,D6)", "x":16.5, "y":3.25},
- {"label":"K3E (F4,D7)", "x":17.5, "y":3.25},
- {"label":"K3F (F4,B4)", "x":18.5, "y":3.25},
- {"label":"K40 (F5,D5)", "x":0, "y":4.25, "w":2.25},
- {"label":"K42 (F5,D2)", "x":2.25, "y":4.25},
- {"label":"K43 (F5,D0)", "x":3.25, "y":4.25},
- {"label":"K44 (F5,B7)", "x":4.25, "y":4.25},
- {"label":"K45 (F5,B3)", "x":5.25, "y":4.25},
- {"label":"K46 (F5,B2)", "x":6.25, "y":4.25},
- {"label":"K47 (F5,B1)", "x":7.25, "y":4.25},
- {"label":"K48 (F5,B0)", "x":8.25, "y":4.25},
- {"label":"K49 (F5,B5)", "x":9.25, "y":4.25},
- {"label":"K4A (F5,B6)", "x":10.25, "y":4.25},
- {"label":"K4B (F5,C6)", "x":11.25, "y":4.25},
- {"label":"K4C (F5,C7)", "x":12.25, "y":4.25, "w":2.25},
- {"label":"K4E (F5,D4)", "x":15.5, "y":4.25},
- {"label":"K4F (F5,D6)", "x":16.5, "y":4.25},
- {"label":"K4G (F5,D7)", "x":17.5, "y":4.25},
- {"label":"K4H (F4,B4)", "x":18.5, "y":4.25, "h":2},
- {"label":"K50 (F6,D5)", "x":0, "y":5.25},
- {"label":"K51 (F6,D3)", "x":1, "y":5.25},
- {"label":"K52 (F6,D2)", "x":2, "y":5.25, "w":1.75},
- {"label":"K53 (F6,D0)", "x":3.75, "y":5.25},
- {"label":"K56 (F6,B2)", "x":4.75, "y":5.25, "w":4.75},
- {"label":"K59 (F6,B5)", "x":9.5, "y":5.25},
- {"label":"K5A (F6,B6)", "x":10.5, "y":5.25},
- {"label":"K5B (F6,C6)", "x":11.5, "y":5.25},
- {"label":"K5C (F6,C7)", "x":12.5, "y":5.25},
- {"label":"K5D (F6,F7)", "x":13.5, "y":5.25},
- {"label":"K5E (F6,D4)", "x":15.5, "y":5.25, "w":2},
- {"label":"K5G (F6,D7)", "x":17.5, "y":5.25}
+ {"matrix": [0, 6], "x": 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},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 1.5},
+
+ {"matrix": [1, 14], "x": 15.5, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.5, "y": 1.25},
+ {"matrix": [1, 16], "x": 17.5, "y": 1.25},
+ {"matrix": [1, 17], "x": 18.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, 13], "x": 13.5, "y": 2.25, "h": 2},
+
+ {"matrix": [2, 14], "x": 15.5, "y": 2.25},
+ {"matrix": [2, 15], "x": 16.5, "y": 2.25},
+ {"matrix": [2, 16], "x": 17.5, "y": 2.25},
+ {"matrix": [2, 17], "x": 18.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": 15.5, "y": 3.25},
+ {"matrix": [3, 15], "x": 16.5, "y": 3.25},
+ {"matrix": [3, 16], "x": 17.5, "y": 3.25},
+ {"matrix": [3, 17], "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, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.25},
+
+ {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+ {"matrix": [4, 15], "x": 16.5, "y": 4.25},
+ {"matrix": [4, 16], "x": 17.5, "y": 4.25},
+ {"matrix": [4, 17], "x": 18.5, "y": 4.25, "h": 2},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25},
+ {"matrix": [5, 1], "x": 1, "y": 5.25},
+ {"matrix": [5, 2], "x": 2, "y": 5.25, "w": 1.75},
+ {"matrix": [5, 3], "x": 3.75, "y": 5.25},
+ {"matrix": [5, 6], "x": 4.75, "y": 5.25, "w": 4.75},
+ {"matrix": [5, 9], "x": 9.5, "y": 5.25},
+ {"matrix": [5, 10], "x": 10.5, "y": 5.25},
+ {"matrix": [5, 11], "x": 11.5, "y": 5.25},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+ {"matrix": [5, 13], "x": 13.5, "y": 5.25},
+
+ {"matrix": [5, 14], "x": 15.5, "y": 5.25, "w": 2},
+ {"matrix": [5, 16], "x": 17.5, "y": 5.25}
]
},
"LAYOUT_m0118_iso": {
"layout": [
- {"label":"K06 (D1,B2)", "x":5, "y":0, "w":2},
- {"label":"K10 (F0,D5)", "x":0, "y":1.25},
- {"label":"K11 (F0,D3)", "x":1, "y":1.25},
- {"label":"K12 (F0,D2)", "x":2, "y":1.25},
- {"label":"K13 (F0,D0)", "x":3, "y":1.25},
- {"label":"K14 (F0,B7)", "x":4, "y":1.25},
- {"label":"K15 (F0,B3)", "x":5, "y":1.25},
- {"label":"K16 (F0,B2)", "x":6, "y":1.25},
- {"label":"K17 (F0,B1)", "x":7, "y":1.25},
- {"label":"K18 (F0,B0)", "x":8, "y":1.25},
- {"label":"K19 (F0,B5)", "x":9, "y":1.25},
- {"label":"K1A (F0,B6)", "x":10, "y":1.25},
- {"label":"K1B (F0,C6)", "x":11, "y":1.25},
- {"label":"K1C (F0,C7)", "x":12, "y":1.25},
- {"label":"K1D (F0,F7)", "x":13, "y":1.25, "w":1.5},
- {"label":"K1E (F0,D4)", "x":15.5, "y":1.25},
- {"label":"K1F (F0,D6)", "x":16.5, "y":1.25},
- {"label":"K1G(F0,D7)", "x":17.5, "y":1.25},
- {"label":"K1H (F0,B4)", "x":18.5, "y":1.25},
- {"label":"K20 (F1,D5)", "x":0, "y":2.25, "w":1.5},
- {"label":"K21 (F1,D3)", "x":1.5, "y":2.25},
- {"label":"K22 (F1,D2)", "x":2.5, "y":2.25},
- {"label":"K23 (F1,D0)", "x":3.5, "y":2.25},
- {"label":"K24 (F1,B7)", "x":4.5, "y":2.25},
- {"label":"K25 (F1,B3)", "x":5.5, "y":2.25},
- {"label":"K26 (F1,B2)", "x":6.5, "y":2.25},
- {"label":"K27 (F1,B1)", "x":7.5, "y":2.25},
- {"label":"K28 (F1,B0)", "x":8.5, "y":2.25},
- {"label":"K29 (F1,B5)", "x":9.5, "y":2.25},
- {"label":"K2A (F1,B6)", "x":10.5, "y":2.25},
- {"label":"K2B (F1,C6)", "x":11.5, "y":2.25},
- {"label":"K2C (F1,C7)", "x":12.5, "y":2.25},
- {"label":"K2D (F1,F7)", "x":13.75, "y":2.25, "w":0.75, "h":2},
- {"label":"K2E (F1,D4)", "x":15.5, "y":2.25},
- {"label":"K2F (F1,D6)", "x":16.5, "y":2.25},
- {"label":"K2G (F1,D7)", "x":17.5, "y":2.25},
- {"label":"K2H (F1,B4)", "x":18.5, "y":2.25},
- {"label":"K30 (F4,D5)", "x":0, "y":3.25, "w":1.75},
- {"label":"K31 (F4,D3)", "x":1.75, "y":3.25},
- {"label":"K32 (F4,D2)", "x":2.75, "y":3.25},
- {"label":"K33 (F4,D0)", "x":3.75, "y":3.25},
- {"label":"K34 (F4,B7)", "x":4.75, "y":3.25},
- {"label":"K35 (F4,B3)", "x":5.75, "y":3.25},
- {"label":"K36 (F4,B2)", "x":6.75, "y":3.25},
- {"label":"K37 (F4,B1)", "x":7.75, "y":3.25},
- {"label":"K38 (F4,B0)", "x":8.75, "y":3.25},
- {"label":"K39 (F4,B5)", "x":9.75, "y":3.25},
- {"label":"K3A (F4,B6)", "x":10.75, "y":3.25},
- {"label":"K3B (F4,C6)", "x":11.75, "y":3.25},
- {"label":"K3C (F4,C7)", "x":12.75, "y":3.25},
- {"label":"K3E (F4,D4)", "x":15.5, "y":3.25},
- {"label":"K3F (F4,D6)", "x":16.5, "y":3.25},
- {"label":"K3G (F4,D7)", "x":17.5, "y":3.25},
- {"label":"K3H (F4,B4)", "x":18.5, "y":3.25},
- {"label":"K40 (F5,D5)", "x":0, "y":4.25, "w":1.25},
- {"label":"K41 (F5,D3)", "x":1.25, "y":4.25},
- {"label":"K42 (F5,D2)", "x":2.25, "y":4.25},
- {"label":"K43 (F5,D0)", "x":3.25, "y":4.25},
- {"label":"K44 (F5,B7)", "x":4.25, "y":4.25},
- {"label":"K45 (F5,B3)", "x":5.25, "y":4.25},
- {"label":"K46 (F5,B2)", "x":6.25, "y":4.25},
- {"label":"K47 (F5,B1)", "x":7.25, "y":4.25},
- {"label":"K48 (F5,B0)", "x":8.25, "y":4.25},
- {"label":"K49 (F5,B5)", "x":9.25, "y":4.25},
- {"label":"K4A (F5,B6)", "x":10.25, "y":4.25},
- {"label":"K4B (F5,C6)", "x":11.25, "y":4.25},
- {"label":"K4C (F5,C7)", "x":12.25, "y":4.25, "w":1.25},
- {"label":"K4D (F5,F7)", "x":13.5, "y":4.25},
- {"label":"K4E (F5,D4)", "x":15.5, "y":4.25},
- {"label":"K4F (F5,D6)", "x":16.5, "y":4.25},
- {"label":"K4G (F5,D7)", "x":17.5, "y":4.25},
- {"label":"K4H (F5,B4)", "x":18.5, "y":4.25, "h":2},
- {"label":"K50 (F6,D5)", "x":0, "y":5.25, "w":1.25},
- {"label":"K51 (F6,D3)", "x":1.25, "y":5.25, "w":1.5},
- {"label":"K52 (F6,D2)", "x":2.75, "y":5.25, "w":1.75},
- {"label":"K56 (F6,B2)", "x":4.5, "y":5.25, "w":5.25},
- {"label":"K5A (F6,B6)", "x":9.75, "y":5.25, "w":1.75},
- {"label":"K5B (F6,C6)", "x":11.5, "y":5.25},
- {"label":"K5C (F6,C7)", "x":12.5, "y":5.25},
- {"label":"K5D (F6,F7)", "x":13.5, "y":5.25},
- {"label":"K5E (F6,D4)", "x":15.5, "y":5.25, "w":2},
- {"label":"K5G (F6,D7)", "x":17.5, "y":5.25}
+ {"matrix": [0, 6], "x": 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},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 1.5},
+
+ {"matrix": [1, 14], "x": 15.5, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.5, "y": 1.25},
+ {"matrix": [1, 16], "x": 17.5, "y": 1.25},
+ {"matrix": [1, 17], "x": 18.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, 13], "x": 13.75, "y": 2.25, "w": 0.75, "h": 2},
+
+ {"matrix": [2, 14], "x": 15.5, "y": 2.25},
+ {"matrix": [2, 15], "x": 16.5, "y": 2.25},
+ {"matrix": [2, 16], "x": 17.5, "y": 2.25},
+ {"matrix": [2, 17], "x": 18.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, 12], "x": 12.75, "y": 3.25},
+
+ {"matrix": [3, 14], "x": 15.5, "y": 3.25},
+ {"matrix": [3, 15], "x": 16.5, "y": 3.25},
+ {"matrix": [3, 16], "x": 17.5, "y": 3.25},
+ {"matrix": [3, 17], "x": 18.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, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.5, "y": 4.25},
+
+ {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+ {"matrix": [4, 15], "x": 16.5, "y": 4.25},
+ {"matrix": [4, 16], "x": 17.5, "y": 4.25},
+ {"matrix": [4, 17], "x": 18.5, "y": 4.25, "h": 2},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 2], "x": 2.75, "y": 5.25, "w": 1.75},
+ {"matrix": [5, 6], "x": 4.5, "y": 5.25, "w": 5.25},
+ {"matrix": [5, 10], "x": 9.75, "y": 5.25, "w": 1.75},
+ {"matrix": [5, 11], "x": 11.5, "y": 5.25},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+ {"matrix": [5, 13], "x": 13.5, "y": 5.25},
+
+ {"matrix": [5, 14], "x": 15.5, "y": 5.25, "w": 2},
+ {"matrix": [5, 16], "x": 17.5, "y": 5.25}
]
}
}
-
}
diff --git a/keyboards/sck/m0116b/m0116b.h b/keyboards/sck/m0116b/m0116b.h
deleted file mode 100644
index e315925121..0000000000
--- a/keyboards/sck/m0116b/m0116b.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright 2019 jrfhoutx
- *
- * 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 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_m0116_ansi( \
- K06, \
- 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, K3E, K3F, K3G, K3H, \
- K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4E, K4F, K4G, K4H, \
- K50, K51, K52, K53, K56, K59, K5A, K5B, K5C, K5D, K5E, K5G \
-) { \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K06, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { 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, KC_NO, KC_NO, K3E, K3F, K3G, K3H }, \
- { K40, KC_NO, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, KC_NO, K4E, K4F, K4G, K4H }, \
- { K50, K51, K52, K53, KC_NO, KC_NO, K56, KC_NO, KC_NO, K59, K5A, K5B, K5C, K5D, K5E, KC_NO, K5G, KC_NO }, \
- }
-
-#define LAYOUT_m0118_iso( \
- K06, \
- 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, 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, K56, K5A, K5B, K5C, K5D, K5E, K5G \
-) { \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K06, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { 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, KC_NO, 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, KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO, KC_NO, K5A, K5B, K5C, K5D, K5E, KC_NO, K5G, KC_NO }, \
- }
diff --git a/keyboards/sentraq/s65_plus/info.json b/keyboards/sentraq/s65_plus/info.json
index 7873b364ce..f9287f2507 100644
--- a/keyboards/sentraq/s65_plus/info.json
+++ b/keyboards/sentraq/s65_plus/info.json
@@ -28,167 +28,175 @@
"layouts": {
"LAYOUT_ansi": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"F2", "x":1, "y":0},
- {"label":"ESC", "x":2, "y":0},
- {"label":"1", "x":3, "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":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":"MINUS", "x":13, "y":0},
- {"label":"EQUAL", "x":14, "y":0},
- {"label":"BACKSPACE", "x":15, "y":0, "w":2},
- {"label":"DELETE", "x":17, "y":0},
- {"label":"F3", "x":0, "y":1},
- {"label":"F4", "x":1, "y":1},
- {"label":"TAB", "x":2, "y":1, "w":1.5},
- {"label":"Q", "x":3.5, "y":1},
- {"label":"W", "x":4.5, "y":1},
- {"label":"E", "x":5.5, "y":1},
- {"label":"R", "x":6.5, "y":1},
- {"label":"T", "x":7.5, "y":1},
- {"label":"Y", "x":8.5, "y":1},
- {"label":"U", "x":9.5, "y":1},
- {"label":"I", "x":10.5, "y":1},
- {"label":"O", "x":11.5, "y":1},
- {"label":"P", "x":12.5, "y":1},
- {"label":"LBRACKET", "x":13.5, "y":1},
- {"label":"RBRACKET", "x":14.5, "y":1},
- {"label":"BACKSLASH", "x":15.5, "y":1, "w":1.5},
- {"label":"PAGEUP", "x":17, "y":1},
- {"label":"F5", "x":0, "y":2},
- {"label":"F6", "x":1, "y":2},
- {"label":"CAPSLOCK", "x":2, "y":2, "w":1.75},
- {"label":"A", "x":3.75, "y":2},
- {"label":"S", "x":4.75, "y":2},
- {"label":"D", "x":5.75, "y":2},
- {"label":"F", "x":6.75, "y":2},
- {"label":"G", "x":7.75, "y":2},
- {"label":"H", "x":8.75, "y":2},
- {"label":"J", "x":9.75, "y":2},
- {"label":"K", "x":10.75, "y":2},
- {"label":"L", "x":11.75, "y":2},
- {"label":"SEMICOLON", "x":12.75, "y":2},
- {"label":"QUOTE", "x":13.75, "y":2},
- {"label":"ENTER", "x":14.75, "y":2, "w":2.25},
- {"label":"PAGEDOWN", "x":17, "y":2},
- {"label":"F7", "x":0, "y":3},
- {"label":"F8", "x":1, "y":3},
- {"label":"LSHIFT", "x":2, "y":3, "w":2.25},
- {"label":"Z", "x":4.25, "y":3},
- {"label":"X", "x":5.25, "y":3},
- {"label":"C", "x":6.25, "y":3},
- {"label":"V", "x":7.25, "y":3},
- {"label":"B", "x":8.25, "y":3},
- {"label":"N", "x":9.25, "y":3},
- {"label":"M", "x":10.25, "y":3},
- {"label":"COMMA", "x":11.25, "y":3},
- {"label":"PERIOD", "x":12.25, "y":3},
- {"label":"SLASH", "x":13.25, "y":3},
- {"label":"RSHIFT", "x":14.25, "y":3, "w":1.75},
- {"label":"UP", "x":16, "y":3},
- {"label":"END", "x":17, "y":3},
- {"label":"F9", "x":0, "y":4},
- {"label":"F10", "x":1, "y":4},
- {"label":"LCTRL", "x":2, "y":4, "w":1.25},
- {"label":"LGUI", "x":3.25, "y":4, "w":1.25},
- {"label":"LALT", "x":4.5, "y":4, "w":1.25},
- {"label":"SPACE", "x":5.75, "y":4, "w":6.25},
- {"label":"RALT", "x":12, "y":4},
- {"label":"FN", "x":13, "y":4},
- {"label":"RCTRL", "x":14, "y":4},
- {"label":"LEFT", "x":15, "y":4},
- {"label":"DOWN", "x":16, "y":4},
- {"label":"RIGHT", "x":17, "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": [0, 16], "x": 15, "y": 0, "w": 2},
+ {"matrix": [0, 17], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 15], "x": 14.5, "y": 1},
+ {"matrix": [1, 16], "x": 15.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 17], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2, "w": 1.75},
+ {"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": 2},
+ {"matrix": [2, 16], "x": 14.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 17], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 3], "x": 2, "y": 3, "w": 2.25},
+ {"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},
+ {"matrix": [3, 15], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 16], "x": 16, "y": 3},
+ {"matrix": [3, 17], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 5.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 12], "x": 12, "y": 4},
+ {"matrix": [4, 13], "x": 13, "y": 4},
+ {"matrix": [4, 14], "x": 14, "y": 4},
+ {"matrix": [4, 15], "x": 15, "y": 4},
+ {"matrix": [4, 16], "x": 16, "y": 4},
+ {"matrix": [4, 17], "x": 17, "y": 4}
]
},
"LAYOUT_iso": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"F2", "x":1, "y":0},
- {"label":"ESC", "x":2, "y":0},
- {"label":"1", "x":3, "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":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":"MINUS", "x":13, "y":0},
- {"label":"EQUAL", "x":14, "y":0},
- {"label":"BACKSPACE", "x":15, "y":0, "w":2},
- {"label":"DELETE", "x":17, "y":0},
- {"label":"F3", "x":0, "y":1},
- {"label":"F4", "x":1, "y":1},
- {"label":"TAB", "x":2, "y":1, "w":1.5},
- {"label":"Q", "x":3.5, "y":1},
- {"label":"W", "x":4.5, "y":1},
- {"label":"E", "x":5.5, "y":1},
- {"label":"R", "x":6.5, "y":1},
- {"label":"T", "x":7.5, "y":1},
- {"label":"Y", "x":8.5, "y":1},
- {"label":"U", "x":9.5, "y":1},
- {"label":"I", "x":10.5, "y":1},
- {"label":"O", "x":11.5, "y":1},
- {"label":"P", "x":12.5, "y":1},
- {"label":"LBRACKET", "x":13.5, "y":1},
- {"label":"RBRACKET", "x":14.5, "y":1},
- {"label":"PAGEUP", "x":17, "y":1},
- {"label":"F5", "x":0, "y":2},
- {"label":"F6", "x":1, "y":2},
- {"label":"CAPSLOCK", "x":2, "y":2, "w":1.75},
- {"label":"A", "x":3.75, "y":2},
- {"label":"S", "x":4.75, "y":2},
- {"label":"D", "x":5.75, "y":2},
- {"label":"F", "x":6.75, "y":2},
- {"label":"G", "x":7.75, "y":2},
- {"label":"H", "x":8.75, "y":2},
- {"label":"J", "x":9.75, "y":2},
- {"label":"K", "x":10.75, "y":2},
- {"label":"L", "x":11.75, "y":2},
- {"label":"SEMICOLON", "x":12.75, "y":2},
- {"label":"QUOTE", "x":13.75, "y":2},
- {"label":"ISOHASH", "x":14.75, "y":2},
- {"label":"ENTER", "x":15.75, "y":1, "w":1.25, "h":2},
- {"label":"PAGEDOWN", "x":17, "y":2},
- {"label":"F7", "x":0, "y":3},
- {"label":"F8", "x":1, "y":3},
- {"label":"LSHIFT", "x":2, "y":3, "w":1.25},
- {"label":"ISOBACKSLASH", "x":3.25, "y":3},
- {"label":"Z", "x":4.25, "y":3},
- {"label":"X", "x":5.25, "y":3},
- {"label":"C", "x":6.25, "y":3},
- {"label":"V", "x":7.25, "y":3},
- {"label":"B", "x":8.25, "y":3},
- {"label":"N", "x":9.25, "y":3},
- {"label":"M", "x":10.25, "y":3},
- {"label":"COMMA", "x":11.25, "y":3},
- {"label":"PERIOD", "x":12.25, "y":3},
- {"label":"SLASH", "x":13.25, "y":3},
- {"label":"RSHIFT", "x":14.25, "y":3, "w":1.75},
- {"label":"UP", "x":16, "y":3},
- {"label":"END", "x":17, "y":3},
- {"label":"F9", "x":0, "y":4},
- {"label":"F10", "x":1, "y":4},
- {"label":"LCTRL", "x":2, "y":4, "w":1.25},
- {"label":"LGUI", "x":3.25, "y":4, "w":1.25},
- {"label":"LALT", "x":4.5, "y":4, "w":1.25},
- {"label":"SPACE", "x":5.75, "y":4, "w":6.25},
- {"label":"RALT", "x":12, "y":4},
- {"label":"FN", "x":13, "y":4},
- {"label":"RCTRL", "x":14, "y":4},
- {"label":"LEFT", "x":15, "y":4},
- {"label":"DOWN", "x":16, "y":4},
- {"label":"RIGHT", "x":17, "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": [0, 16], "x": 15, "y": 0, "w": 2},
+ {"matrix": [0, 17], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 15], "x": 14.5, "y": 1},
+ {"matrix": [1, 17], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2, "w": 1.75},
+ {"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": 2},
+ {"matrix": [2, 15], "x": 14.75, "y": 2},
+ {"matrix": [1, 16], "x": 15.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [2, 17], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3, "w": 1.25},
+ {"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},
+ {"matrix": [3, 15], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 16], "x": 16, "y": 3},
+ {"matrix": [3, 17], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 5.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 12], "x": 12, "y": 4},
+ {"matrix": [4, 13], "x": 13, "y": 4},
+ {"matrix": [4, 14], "x": 14, "y": 4},
+ {"matrix": [4, 15], "x": 15, "y": 4},
+ {"matrix": [4, 16], "x": 16, "y": 4},
+ {"matrix": [4, 17], "x": 17, "y": 4}
]
}
}
diff --git a/keyboards/sentraq/s65_plus/s65_plus.h b/keyboards/sentraq/s65_plus/s65_plus.h
deleted file mode 100644
index 95d06122e0..0000000000
--- a/keyboards/sentraq/s65_plus/s65_plus.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ansi( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K016, K017, \
- K100, K101, K102, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, \
- K200, K201, K202, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K216, K217, \
- K300, K301, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K315, K316, K317, \
- K400, K401, K402, K403, K404, K408, K412, K413, K414, K415, K416, K417 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, KC_NO, K016, K017 }, \
- { K100, K101, K102, KC_NO, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117 }, \
- { K200, K201, K202, KC_NO, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, KC_NO, K216, K217 }, \
- { K300, K301, KC_NO, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, KC_NO, K315, K316, K317 }, \
- { K400, K401, K402, K403, K404, KC_NO, KC_NO, KC_NO, K408, KC_NO, KC_NO, KC_NO, K412, K413, K414, K415, K416, K417 } \
-}
-
-#define LAYOUT_iso( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K016, K017, \
- K100, K101, K102, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K117, \
- K200, K201, K202, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K116, K217, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K315, K316, K317, \
- K400, K401, K402, K403, K404, K408, K412, K413, K414, K415, K416, K417 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, KC_NO, K016, K017 }, \
- { K100, K101, K102, KC_NO, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117 }, \
- { K200, K201, K202, KC_NO, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, KC_NO, K217 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, KC_NO, K315, K316, K317 }, \
- { K400, K401, K402, K403, K404, KC_NO, KC_NO, KC_NO, K408, KC_NO, KC_NO, KC_NO, K412, K413, K414, K415, K416, K417 } \
-}
-
-void matrix_init_user(void);
-void matrix_scan_user(void);
diff --git a/keyboards/sirius/uni660/rev2/ansi/ansi.h b/keyboards/sirius/uni660/rev2/ansi/ansi.h
deleted file mode 100644
index 526b3cc724..0000000000
--- a/keyboards/sirius/uni660/rev2/ansi/ansi.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include "rev2.h"
-
-#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 XXX KC_NO
-
-#define LAYOUT_ansi( \
- k00, k01, k02, k03, k04, k05, k06, k46, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k3F,\
- k10, k11, k12, k13, k14, k15, k16, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k2F,\
- k20, k21, k22, k23, k24, k25, k26, k28, k29, k2A, k2B, k2C, k2D, k2E, \
- k30, k31, k32, k33, k34, k35, k36, k38, k39, k3A, k3B, k3C, k3D, k3E, \
- k40, k41, k42, k43, k44, k45, k48, k49, k4A, k4C, k4D, k4E, k4F \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, XXX, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
- { k10, k11, k12, k13, k14, k15, k16, XXX, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
- { k20, k21, k22, k23, k24, k25, k26, XXX, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
- { k30, k31, k32, k33, k34, k35, k36, XXX, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
- { k40, k41, k42, k43, k44, k45, k46, XXX, k48, k49, k4A, XXX, k4C, k4D, k4E, k4F } \
-}
diff --git a/keyboards/sirius/uni660/rev2/ansi/info.json b/keyboards/sirius/uni660/rev2/ansi/info.json
index 86b69d26ec..bc09b26080 100644
--- a/keyboards/sirius/uni660/rev2/ansi/info.json
+++ b/keyboards/sirius/uni660/rev2/ansi/info.json
@@ -13,98 +13,96 @@
"layouts": {
"LAYOUT_ansi": {
"layout": [
- {"x": 0, "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": 7.5, "y": 0},
-
- {"x": 9.5, "y": 0},
- {"x": 10.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": 18, "y": 0},
-
- {"x": 0, "y": 1},
-
- {"x": 1.5, "y": 1, "w": 1.5},
- {"x": 3, "y": 1},
- {"x": 4, "y": 1},
- {"x": 5, "y": 1},
- {"x": 6, "y": 1},
- {"x": 7, "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": 16, "y": 1, "w": 1.5},
-
- {"x": 18, "y": 1},
-
- {"x": 0, "y": 2},
-
- {"x": 1.5, "y": 2, "w": 1.75},
- {"x": 3.25, "y": 2},
- {"x": 4.25, "y": 2},
- {"x": 5.25, "y": 2},
- {"x": 6.25, "y": 2},
- {"x": 7.25, "y": 2},
-
- {"x": 9.25, "y": 2},
- {"x": 10.25, "y": 2},
- {"x": 11.25, "y": 2},
- {"x": 12.25, "y": 2},
- {"x": 13.25, "y": 2},
- {"x": 14.25, "y": 2},
- {"x": 15.25, "y": 2, "w": 2.25},
-
- {"x": 0, "y": 3},
-
- {"x": 1.5, "y": 3, "w": 2.25},
- {"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": 9.75, "y": 3},
- {"x": 10.75, "y": 3},
- {"x": 11.75, "y": 3},
- {"x": 12.75, "y": 3},
- {"x": 13.75, "y": 3},
- {"x": 14.75, "y": 3, "w": 2.25},
-
- {"x": 17, "y": 3},
-
- {"x": 0, "y": 4},
-
- {"x": 1.5, "y": 4, "w": 1.25},
- {"x": 2.75, "y": 4, "w": 1.25},
- {"x": 4, "y": 4, "w": 1.25},
- {"x": 5.25, "y": 4, "w": 2.25},
- {"x": 7.5, "y": 4},
-
- {"x": 9.5, "y": 4, "w": 2.75},
- {"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, "y": 4},
- {"x": 17, "y": 4},
- {"x": 18, "y": 4}
+ {"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": [4, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+ {"matrix": [0, 9], "x": 10.5, "y": 0},
+ {"matrix": [0, 10], "x": 11.5, "y": 0},
+ {"matrix": [0, 11], "x": 12.5, "y": 0},
+ {"matrix": [0, 12], "x": 13.5, "y": 0},
+ {"matrix": [0, 13], "x": 14.5, "y": 0},
+ {"matrix": [0, 14], "x": 15.5, "y": 0},
+ {"matrix": [0, 15], "x": 16.5, "y": 0},
+
+ {"matrix": [3, 15], "x": 18, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"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, 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": [2, 15], "x": 18, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.25, "y": 2},
+ {"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, 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": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "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, 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": 2.25},
+ {"matrix": [3, 14], "x": 17, "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, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25},
+ {"matrix": [4, 5], "x": 7.5, "y": 4},
+
+ {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+ {"matrix": [4, 9], "x": 12.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 13.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 14.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 16, "y": 4},
+ {"matrix": [4, 14], "x": 17, "y": 4},
+ {"matrix": [4, 15], "x": 18, "y": 4}
]
}
}
diff --git a/keyboards/sirius/uni660/rev2/iso/info.json b/keyboards/sirius/uni660/rev2/iso/info.json
index 9e9a8f2af8..af369f48da 100644
--- a/keyboards/sirius/uni660/rev2/iso/info.json
+++ b/keyboards/sirius/uni660/rev2/iso/info.json
@@ -13,99 +13,97 @@
"layouts": {
"LAYOUT_iso": {
"layout": [
- {"x": 0, "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": 7.5, "y": 0},
-
- {"x": 9.5, "y": 0},
- {"x": 10.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": 18, "y": 0},
-
- {"x": 0, "y": 1},
-
- {"x": 1.5, "y": 1, "w": 1.5},
- {"x": 3, "y": 1},
- {"x": 4, "y": 1},
- {"x": 5, "y": 1},
- {"x": 6, "y": 1},
- {"x": 7, "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": 18, "y": 1},
-
- {"x": 0, "y": 2},
-
- {"x": 1.5, "y": 2, "w": 1.75},
- {"x": 3.25, "y": 2},
- {"x": 4.25, "y": 2},
- {"x": 5.25, "y": 2},
- {"x": 6.25, "y": 2},
- {"x": 7.25, "y": 2},
-
- {"x": 9.25, "y": 2},
- {"x": 10.25, "y": 2},
- {"x": 11.25, "y": 2},
- {"x": 12.25, "y": 2},
- {"x": 13.25, "y": 2},
- {"x": 14.25, "y": 2},
- {"x": 15.25, "y": 2},
- {"x": 16.25, "y": 1, "w": 1.25, "h": 2},
-
- {"x": 0, "y": 3},
-
- {"x": 1.5, "y": 3, "w": 1.25},
- {"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": 9.75, "y": 3},
- {"x": 10.75, "y": 3},
- {"x": 11.75, "y": 3},
- {"x": 12.75, "y": 3},
- {"x": 13.75, "y": 3},
- {"x": 14.75, "y": 3, "w": 2.25},
-
- {"x": 17, "y": 3},
-
- {"x": 0, "y": 4},
-
- {"x": 1.5, "y": 4, "w": 1.25},
- {"x": 2.75, "y": 4, "w": 1.25},
- {"x": 4, "y": 4, "w": 1.25},
- {"x": 5.25, "y": 4, "w": 2.25},
- {"x": 7.5, "y": 4},
-
- {"x": 9.5, "y": 4, "w": 2.75},
- {"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, "y": 4},
- {"x": 17, "y": 4},
- {"x": 18, "y": 4}
+ {"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": [4, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+ {"matrix": [0, 9], "x": 10.5, "y": 0},
+ {"matrix": [0, 10], "x": 11.5, "y": 0},
+ {"matrix": [0, 11], "x": 12.5, "y": 0},
+ {"matrix": [0, 12], "x": 13.5, "y": 0},
+ {"matrix": [0, 13], "x": 14.5, "y": 0},
+ {"matrix": [0, 14], "x": 15.5, "y": 0},
+ {"matrix": [0, 15], "x": 16.5, "y": 0},
+
+ {"matrix": [3, 15], "x": 18, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"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, 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": [2, 15], "x": 18, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.25, "y": 2},
+ {"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, 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": [1, 15], "x": 15.25, "y": 2},
+ {"matrix": [2, 14], "x": 16.25, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 7], "x": 2.75, "y": 3},
+ {"matrix": [3, 2], "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, 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": 2.25},
+ {"matrix": [3, 14], "x": 17, "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, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25},
+ {"matrix": [4, 5], "x": 7.5, "y": 4},
+
+ {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+ {"matrix": [4, 9], "x": 12.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 13.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 14.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 16, "y": 4},
+ {"matrix": [4, 14], "x": 17, "y": 4},
+ {"matrix": [4, 15], "x": 18, "y": 4}
]
}
}
diff --git a/keyboards/sirius/uni660/rev2/iso/iso.h b/keyboards/sirius/uni660/rev2/iso/iso.h
deleted file mode 100644
index d9ed905d5b..0000000000
--- a/keyboards/sirius/uni660/rev2/iso/iso.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include "rev2.h"
-
-#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 XXX KC_NO
-
-#define LAYOUT_iso( \
- k00, k01, k02, k03, k04, k05, k06, k46, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k3F,\
- k10, k11, k12, k13, k14, k15, k16, k18, k19, k1A, k1B, k1C, k1D, k1E, k2F,\
- k20, k21, k22, k23, k24, k25, k26, k28, k29, k2A, k2B, k2C, k2D, k1F, k2E, \
- k30, k31, k37, k32, k33, k34, k35, k36, k38, k39, k3A, k3B, k3C, k3D, k3E, \
- k40, k41, k42, k43, k44, k45, k48, k49, k4A, k4C, k4D, k4E, k4F \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, XXX, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
- { k10, k11, k12, k13, k14, k15, k16, XXX, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
- { k20, k21, k22, k23, k24, k25, k26, XXX, 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, XXX, k48, k49, k4A, XXX, k4C, k4D, k4E, k4F } \
-}
diff --git a/keyboards/sirius/uni660/rev2/rev2.h b/keyboards/sirius/uni660/rev2/rev2.h
index cdd9c4e61b..06a7176fbd 100644
--- a/keyboards/sirius/uni660/rev2/rev2.h
+++ b/keyboards/sirius/uni660/rev2/rev2.h
@@ -2,12 +2,6 @@
#include "quantum.h"
-#if KEYBOARD_sirius_uni660_rev2_iso
-# include "iso.h"
-#elif KEYBOARD_sirius_uni660_rev2_ansi
-# include "ansi.h"
-#endif
-
#define red_led_off writePinHigh(F5)
#define red_led_on writePinLow(F5)
#define blu_led_off writePinHigh(F4)
diff --git a/keyboards/tetris/info.json b/keyboards/tetris/info.json
index 058226ba3f..c7d90ef148 100644
--- a/keyboards/tetris/info.json
+++ b/keyboards/tetris/info.json
@@ -26,7 +26,64 @@
"bootloader": "qmk-dfu",
"layouts": {
"LAYOUT_planck_mit": {
- "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":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}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":10, "y":4}, {"x":11, "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": [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},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+
+ {"matrix": [4, 10], "x": 10, "y": 4},
+ {"matrix": [4, 11], "x": 11, "y": 4}
+ ]
}
+ }
}
diff --git a/keyboards/tetris/tetris.h b/keyboards/tetris/tetris.h
deleted file mode 100755
index 56f4ecbfc7..0000000000
--- a/keyboards/tetris/tetris.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_planck_mit( \
- 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, k37, k38, k39, k3A, k3B, \
- k40, k41, k4A, k4B \
-) { \
- { 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, XXX, k37, k38, k39, k3A, k3B }, \
- { k40, k41, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k4A, k4B } \
-}
diff --git a/keyboards/the_royal/liminal/info.json b/keyboards/the_royal/liminal/info.json
index eadbb7a027..c62699df84 100644
--- a/keyboards/the_royal/liminal/info.json
+++ b/keyboards/the_royal/liminal/info.json
@@ -21,58 +21,61 @@
"layouts": {
"LAYOUT_base_kit_all": {
"layout": [
- {"label":"k01", "x":0, "y":0},
- {"label":"k02", "x":1, "y":0, "w":1.5},
- {"label":"k03", "x":2.5, "y":0},
- {"label":"k04", "x":3.5, "y":0},
- {"label":"k05", "x":4.5, "y":0},
- {"label":"k06", "x":5.5, "y":0},
- {"label":"k07", "x":6.5, "y":0},
- {"label":"k08", "x":7.5, "y":0},
- {"label":"k09", "x":8.5, "y":0},
- {"label":"k010", "x":9.5, "y":0},
- {"label":"k011", "x":10.5, "y":0},
- {"label":"k012", "x":11.5, "y":0},
- {"label":"k013", "x":12.5, "y":0},
- {"label":"k014", "x":13.5, "y":0, "w":1.5},
- {"label":"k11", "x":0, "y":1},
- {"label":"k12", "x":1, "y":1, "w":1.75},
- {"label":"k13", "x":2.75, "y":1},
- {"label":"k14", "x":3.75, "y":1},
- {"label":"k15", "x":4.75, "y":1},
- {"label":"k16", "x":5.75, "y":1},
- {"label":"k17", "x":6.75, "y":1},
- {"label":"k18", "x":7.75, "y":1},
- {"label":"k19", "x":8.75, "y":1},
- {"label":"k110", "x":9.75, "y":1},
- {"label":"k111", "x":10.75, "y":1},
- {"label":"k112", "x":11.75, "y":1},
- {"label":"k113", "x":12.75, "y":1},
- {"label":"k114", "x":13.75, "y":1, "w":1.25},
- {"label":"k21", "x":0, "y":2},
- {"label":"k22", "x":1, "y":2, "w":1.25},
- {"label":"k23", "x":2.25, "y":2},
- {"label":"k24", "x":3.25, "y":2},
- {"label":"k25", "x":4.25, "y":2},
- {"label":"k26", "x":5.25, "y":2},
- {"label":"k27", "x":6.25, "y":2},
- {"label":"k28", "x":7.25, "y":2},
- {"label":"k29", "x":8.25, "y":2},
- {"label":"k210", "x":9.25, "y":2},
- {"label":"k211", "x":10.25, "y":2},
- {"label":"k212", "x":11.25, "y":2},
- {"label":"k213", "x":12.25, "y":2},
- {"label":"k214", "x":13.25, "y":2, "w":1.75},
- {"label":"k31", "x":0, "y":3},
- {"label":"k32", "x":1, "y":3, "w":1.5},
- {"label":"k33", "x":2.5, "y":3, "w":1.25},
- {"label":"k34", "x":3.75, "y":3, "w":1.5},
- {"label":"k35", "x":5.25, "y":3, "w":2},
- {"label":"k38", "x":7.25, "y":3, "w":2.25},
- {"label":"k310", "x":9.5, "y":3, "w":1.5},
- {"label":"k311", "x":11, "y":3, "w":1.25},
- {"label":"k313", "x":12.25, "y":3, "w":1.25},
- {"label":"k314", "x":13.5, "y":3, "w":1.5}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0, "w": 1.5},
+ {"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, "w": 1.5},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1, "w": 1.75},
+ {"matrix": [1, 2], "x": 2.75, "y": 1},
+ {"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, "w": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2, "w": 1.25},
+ {"matrix": [2, 2], "x": 2.25, "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, 7], "x": 7.25, "y": 2},
+ {"matrix": [2, 8], "x": 8.25, "y": 2},
+ {"matrix": [2, 9], "x": 9.25, "y": 2},
+ {"matrix": [2, 10], "x": 10.25, "y": 2},
+ {"matrix": [2, 11], "x": 11.25, "y": 2},
+ {"matrix": [2, 12], "x": 12.25, "y": 2},
+ {"matrix": [2, 13], "x": 13.25, "y": 2, "w": 1.75},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3, "w": 1.5},
+ {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3, "w": 1.5},
+ {"matrix": [3, 5], "x": 5.25, "y": 3, "w": 2},
+ {"matrix": [3, 7], "x": 7.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.5},
+ {"matrix": [3, 10], "x": 11, "y": 3, "w": 1.25},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.5}
]
}
}
diff --git a/keyboards/the_royal/liminal/liminal.h b/keyboards/the_royal/liminal/liminal.h
deleted file mode 100644
index ba53b17011..0000000000
--- a/keyboards/the_royal/liminal/liminal.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_base_kit_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, k2C, k2D, \
- k30, k31, k32, k33, k35, k37, k39, k3A, 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, k1C, k1D }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \
- { k30, k31, k32, k33, XXX, k35, XXX, k37, XXX, k39, k3A, XXX, k3C, k3D } \
-}
-
diff --git a/keyboards/the_royal/schwann/info.json b/keyboards/the_royal/schwann/info.json
index 85b6afb369..df765f747c 100644
--- a/keyboards/the_royal/schwann/info.json
+++ b/keyboards/the_royal/schwann/info.json
@@ -19,148 +19,155 @@
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
- "LAYOUT_mit": {
+ "LAYOUT_mit": {
"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":"BSPC", "x":11, "y":0},
- {"label":"LCtl", "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":6, "y":1},
- {"label":"J", "x":7, "y":1},
- {"label":"K", "x":8, "y":1},
- {"label":"L", "x":9, "y":1},
- {"label":"SCLN", "x":10, "y":1},
- {"label":"QUOT", "x":11, "y":1},
- {"label":"LSFT", "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":6, "y":2},
- {"label":"M", "x":7, "y":2},
- {"label":"COMM", "x":8, "y":2},
- {"label":"DOT", "x":9, "y":2},
- {"label":"SLSH", "x":10, "y":2},
- {"label":"ENTER", "x":11, "y":2},
- {"label":"DEL", "x":1, "y":3},
- {"label":"LGUI", "x":2, "y":3},
- {"label":"LALT", "x":3, "y":3},
- {"label":"LOWER", "x":4, "y":3},
- {"label":" ", "x":5, "y":3, "w":2},
- {"label":"RAISE", "x":7, "y":3},
- {"label":"RALT", "x":8, "y":3},
- {"label":"MENU", "x":9, "y":3},
- {"label":"RCTL", "x":10, "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": [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, 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, 6], "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}
]
},
-
"LAYOUT_full_ortho": {
- "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":"BSPC", "x":11, "y":0},
- {"label":"LCtl", "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":6, "y":1},
- {"label":"J", "x":7, "y":1},
- {"label":"K", "x":8, "y":1},
- {"label":"L", "x":9, "y":1},
- {"label":"SCLN", "x":10, "y":1},
- {"label":"QUOT", "x":11, "y":1},
- {"label":"LSFT", "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":6, "y":2},
- {"label":"M", "x":7, "y":2},
- {"label":"COMM", "x":8, "y":2},
- {"label":"DOT", "x":9, "y":2},
- {"label":"SLSH", "x":10, "y":2},
- {"label":"ENTER", "x":11, "y":2},
- {"label":"DEL", "x":1, "y":3},
- {"label":"LGUI", "x":2, "y":3},
- {"label":"LALT", "x":3, "y":3},
- {"label":"LOWER", "x":4, "y":3},
- {"label":" ", "x":5, "y":3},
- {"label":" ", "x":6, "y":3},
- {"label":"RAISE", "x":7, "y":3},
- {"label":"RALT", "x":8, "y":3},
- {"label":"MENU", "x":9, "y":3},
- {"label":"RCTL", "x":10, "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": [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, 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}
]
},
-
"LAYOUT_big_boy": {
- "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":"BSPC", "x":11, "y":0},
- {"label":"LCtl", "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":6, "y":1},
- {"label":"J", "x":7, "y":1},
- {"label":"K", "x":8, "y":1},
- {"label":"L", "x":9, "y":1},
- {"label":"SCLN", "x":10, "y":1},
- {"label":"QUOT", "x":11, "y":1},
- {"label":"LSFT", "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":6, "y":2},
- {"label":"M", "x":7, "y":2},
- {"label":"COMM", "x":8, "y":2},
- {"label":"DOT", "x":9, "y":2},
- {"label":"SLSH", "x":10, "y":2},
- {"label":"ENTER", "x":11, "y":2},
- {"label":"LOWER", "x":1, "y":3, "w":1.5},
- {"label":" ", "x":2.5, "y":3, "w":7},
- {"label":"RAISE", "x":9.5, "y":3, "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": [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, 1], "x": 1, "y": 3, "w": 1.5},
+ {"matrix": [3, 6], "x": 2.5, "y": 3, "w": 7},
+ {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.5}
]
}
}
diff --git a/keyboards/the_royal/schwann/schwann.h b/keyboards/the_royal/schwann/schwann.h
deleted file mode 100644
index 933e903ec2..0000000000
--- a/keyboards/the_royal/schwann/schwann.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_mit( \
- 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, \
- k31, k32, k33, k34, k36, k37, k38, k39, k3A \
-) \
-{ \
- {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}, \
- {XXX, k31, k32, k33, k34, XXX, k36, k37, k38, k39, k3A, XXX} \
-}
-
-#define LAYOUT_full_ortho( \
- 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, \
- k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A \
-) \
-{ \
- {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}, \
- {XXX, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, XXX} \
-}
-
-#define LAYOUT_big_boy( \
- 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, \
- k31, k36, k3A \
-) \
-{ \
- {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}, \
- {XXX, k31, XXX, XXX, XXX, XXX, k36, XXX, XXX, XXX, k3A, XXX} \
-}
diff --git a/keyboards/tokyokeyboard/alix40/alix40.h b/keyboards/tokyokeyboard/alix40/alix40.h
deleted file mode 100644
index 4a322a10b4..0000000000
--- a/keyboards/tokyokeyboard/alix40/alix40.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-Copyright 2021 quadcube <james@quadcube.xyz>
-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_40_alix( \
- 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, K33, K34, K35, K36, K37, K38, 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, KC_NO, K33, K34, K35, K36, K37, K38, KC_NO, K3A, K3B } \
-}
diff --git a/keyboards/tokyokeyboard/alix40/info.json b/keyboards/tokyokeyboard/alix40/info.json
index d314896095..6109d52078 100644
--- a/keyboards/tokyokeyboard/alix40/info.json
+++ b/keyboards/tokyokeyboard/alix40/info.json
@@ -25,236 +25,60 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_40_alix": {
- "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": 7.5,
- "y": 0
- },
- {
- "label": "U",
- "x": 8.5,
- "y": 0
- },
- {
- "label": "I",
- "x": 9.5,
- "y": 0
- },
- {
- "label": "O",
- "x": 10.5,
- "y": 0
- },
- {
- "label": "P",
- "x": 11.5,
- "y": 0
- },
- {
- "label": "`",
- "x": 12.5,
- "y": 0
- },
- {
- "label": "Esc",
- "x": 0.25,
- "y": 1
- },
- {
- "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": 7.75,
- "y": 1
- },
- {
- "label": "J",
- "x": 8.75,
- "y": 1
- },
- {
- "label": "K",
- "x": 9.75,
- "y": 1
- },
- {
- "label": "L",
- "x": 10.75,
- "y": 1
- },
- {
- "label": ";",
- "x": 11.75,
- "y": 1
- },
- {
- "label": "'",
- "x": 12.75,
- "y": 1
- },
- {
- "label": "Shift",
- "x": 0.75,
- "y": 2
- },
- {
- "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": "Enter",
- "x": 7.25,
- "y": 2
- },
- {
- "label": "N",
- "x": 8.25,
- "y": 2
- },
- {
- "label": "M",
- "x": 9.25,
- "y": 2
- },
- {
- "label": ",",
- "x": 10.25,
- "y": 2
- },
- {
- "label": ".",
- "x": 11.25,
- "y": 2
- },
- {
- "label": "/",
- "x": 12.25,
- "y": 2
- },
- {
- "label": "Ctrl",
- "x": 0.5,
- "y": 3
- },
- {
- "label": "Alt",
- "x": 1.5,
- "y": 3
- },
- {
- "label": "Gui",
- "x": 3.75,
- "y": 3
- },
- {
- "label": "NO",
- "x": 4.75,
- "y": 3
- },
- {
- "label": "Bksp",
- "x": 5.75,
- "y": 3
- },
- {
- "label": "Space",
- "x": 7.25,
- "y": 3
- },
- {
- "label": "NO",
- "x": 8.25,
- "y": 3
- },
- {
- "label": "Gui",
- "x": 9.25,
- "y": 3
- },
- {
- "label": "[",
- "x": 11.5,
- "y": 3
- },
- {
- "label": "]",
- "x": 12.5,
- "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": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+ {"matrix": [0, 9], "x": 10.5, "y": 0},
+ {"matrix": [0, 10], "x": 11.5, "y": 0},
+ {"matrix": [0, 11], "x": 12.5, "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": 7.75, "y": 1},
+ {"matrix": [1, 7], "x": 8.75, "y": 1},
+ {"matrix": [1, 8], "x": 9.75, "y": 1},
+ {"matrix": [1, 9], "x": 10.75, "y": 1},
+ {"matrix": [1, 10], "x": 11.75, "y": 1},
+ {"matrix": [1, 11], "x": 12.75, "y": 1},
+
+ {"matrix": [2, 0], "x": 0.75, "y": 2},
+ {"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": 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": [3, 0], "x": 0.5, "y": 3},
+ {"matrix": [3, 1], "x": 1.5, "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": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.5, "y": 3},
+ {"matrix": [3, 11], "x": 12.5, "y": 3}
]
}
}
diff --git a/keyboards/tominabox1/underscore33/rev1/info.json b/keyboards/tominabox1/underscore33/rev1/info.json
index 7c7cd4a186..c52c1b1373 100644
--- a/keyboards/tominabox1/underscore33/rev1/info.json
+++ b/keyboards/tominabox1/underscore33/rev1/info.json
@@ -16,12 +16,87 @@
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
- "LAYOUT_33_big_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},{"label":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1}, {"label":"H", "x":5, "y":1}, {"label":"J", "x":6, "y":1}, {"label":"K", "x":7, "y":1}, {"label":"L", "x":8, "y":1}, {"label":";", "x":9, "y":1}, {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"B", "x":4, "y":2}, {"label":"N", "x":5, "y":2}, {"label":"M", "x":6, "y":2}, {"label":"<", "x":7, "y":2}, {"label":">", "x":8, "y":2}, {"label":"?", "x":9, "y":2}, {"label":"", "x":0.65, "y":3, "w":1.25}, {"label":"", "x":1.9, "y":3, "w":6.25}, {"label":"", "x":8.15, "y":3, "w":1.25}]
- },
+ "LAYOUT_33_big_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": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
- "LAYOUT_33_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}, {"label":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1}, {"label":"H", "x":5, "y":1}, {"label":"J", "x":6, "y":1}, {"label":"K", "x":7, "y":1}, {"label":"L", "x":8, "y":1}, {"label":";", "x":9, "y":1}, {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"B", "x":4, "y":2}, {"label":"N", "x":5, "y":2}, {"label":"M", "x":6, "y":2}, {"label":"<", "x":7, "y":2}, {"label":">", "x":8, "y":2}, {"label":"?", "x":9, "y":2}, {"label":"", "x":0.65, "y":3, "w":1.25}, {"label":"", "x":1.9, "y":3, "w":2.25}, {"label":"", "x":4.15, "y":3, "w":1.75}, {"label":"", "x":5.9, "y":3, "w":2.25}, {"label":"", "x":8.15, "y":3, "w":1.25}]
- }
+ {"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, 1], "x": 0.65, "y": 3, "w": 1.25},
+ {"matrix": [3, 4], "x": 1.9, "y": 3, "w": 6.25},
+ {"matrix": [3, 8], "x": 8.15, "y": 3, "w": 1.25}
+ ]
+ },
+ "LAYOUT_33_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": [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, 1], "x": 0.65, "y": 3, "w": 1.25},
+ {"matrix": [3, 2], "x": 1.9, "y": 3, "w": 2.25},
+ {"matrix": [3, 4], "x": 4.15, "y": 3, "w": 1.75},
+ {"matrix": [3, 6], "x": 5.9, "y": 3, "w": 2.25},
+ {"matrix": [3, 8], "x": 8.15, "y": 3, "w": 1.25}
+ ]
+ }
}
}
diff --git a/keyboards/tominabox1/underscore33/rev1/rev1.h b/keyboards/tominabox1/underscore33/rev1/rev1.h
deleted file mode 100644
index 12cc7d9fd8..0000000000
--- a/keyboards/tominabox1/underscore33/rev1/rev1.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2020 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_33_big_space( \
- 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, \
- K31, K34, K38 \
-) \
-{ \
- { 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 }, \
- { XXX, K31, XXX, XXX, K34, XXX, XXX, XXX, K38, XXX } \
-}
-
-#define LAYOUT_33_split_space( \
- 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, \
- K31, K32, K34, K36, K38 \
-) \
-{ \
- { 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 }, \
- { XXX, K31, K32, XXX, K34, XXX, K36, XXX, K38, XXX } \
-}
diff --git a/keyboards/tominabox1/underscore33/rev2/info.json b/keyboards/tominabox1/underscore33/rev2/info.json
index f8c1587bb7..2b93047d41 100644
--- a/keyboards/tominabox1/underscore33/rev2/info.json
+++ b/keyboards/tominabox1/underscore33/rev2/info.json
@@ -19,12 +19,88 @@
"processor": "atmega32u2",
"bootloader": "atmel-dfu",
"layouts": {
- "LAYOUT_33_big_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},{"label":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1}, {"label":"H", "x":5, "y":1}, {"label":"J", "x":6, "y":1}, {"label":"K", "x":7, "y":1}, {"label":"L", "x":8, "y":1}, {"label":";", "x":9, "y":1}, {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"B", "x":4, "y":2}, {"label":"N", "x":5, "y":2}, {"label":"M", "x":6, "y":2}, {"label":"<", "x":7, "y":2}, {"label":">", "x":8, "y":2}, {"label":"?", "x":9, "y":2}, {"label":"", "x":0.65, "y":3, "w":1.25}, {"label":"", "x":1.9, "y":3, "w":6.25}, {"label":"", "x":8.15, "y":3, "w":1.25}]
- },
+ "LAYOUT_33_big_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": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
- "LAYOUT_33_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},{"label":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1}, {"label":"H", "x":5, "y":1}, {"label":"J", "x":6, "y":1}, {"label":"K", "x":7, "y":1}, {"label":"L", "x":8, "y":1}, {"label":";", "x":9, "y":1}, {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"B", "x":4, "y":2}, {"label":"N", "x":5, "y":2}, {"label":"M", "x":6, "y":2}, {"label":"<", "x":7, "y":2}, {"label":">", "x":8, "y":2}, {"label":"?", "x":9, "y":2}, {"label":"", "x":0.65, "y":3}, {"label":"", "x":1.65, "y":3, "w":1.25}, {"label":"", "x":2.9, "y":3, "w":2.25}, {"label":"", "x":5.15, "y":3, "w":2}, {"label":"", "x":7.15, "y":3, "w":1.25}, {"label":"", "x":8.4, "y":3}]
- }
+ {"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, 1], "x": 0.65, "y": 3, "w": 1.25},
+ {"matrix": [3, 4], "x": 1.9, "y": 3, "w": 6.25},
+ {"matrix": [3, 8], "x": 8.15, "y": 3, "w": 1.25}
+ ]
+ },
+ "LAYOUT_33_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": [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, 1], "x": 0.65, "y": 3},
+ {"matrix": [3, 2], "x": 1.65, "y": 3, "w": 1.25},
+ {"matrix": [3, 3], "x": 2.9, "y": 3, "w": 2.25},
+ {"matrix": [3, 5], "x": 5.15, "y": 3, "w": 2},
+ {"matrix": [3, 7], "x": 7.15, "y": 3, "w": 1.25},
+ {"matrix": [3, 8], "x": 8.4, "y": 3}
+ ]
+ }
}
}
diff --git a/keyboards/tominabox1/underscore33/rev2/rev2.h b/keyboards/tominabox1/underscore33/rev2/rev2.h
deleted file mode 100644
index 34e6e6b7a9..0000000000
--- a/keyboards/tominabox1/underscore33/rev2/rev2.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2020 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_33_big_space( \
- 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, \
- K31, K34, K38 \
-) \
-{ \
- { 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 }, \
- { XXX, K31, XXX, XXX, K34, XXX, XXX, XXX, K38, XXX } \
-}
-
-#define LAYOUT_33_split_space( \
- 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, \
- K31, K32, K33, K35, K37, K38 \
-) \
-{ \
- { 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 }, \
- { XXX, K31, K32, K33, XXX, K35, XXX, K37, K38, XXX } \
-}
diff --git a/keyboards/walletburner/cajal/cajal.h b/keyboards/walletburner/cajal/cajal.h
deleted file mode 100644
index 33976d6571..0000000000
--- a/keyboards/walletburner/cajal/cajal.h
+++ /dev/null
@@ -1,43 +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_stagger( \
- 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, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2c, \
- K30, K31, K32, K33, K36, K38, K39, 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, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, KC_NO, K2c, KC_NO }, \
- { K30, K31, K32, K33, KC_NO, KC_NO, K36, KC_NO, K38, K39, KC_NO, K3b, K3c, K3d } \
-}
-
-#define LAYOUT_ortho( \
- 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, \
- K30, K31, K32, K33, K34, K35, K36, K37, 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, K1c, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, KC_NO }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d } \
-}
diff --git a/keyboards/walletburner/cajal/info.json b/keyboards/walletburner/cajal/info.json
index f73195f06f..36b6647465 100644
--- a/keyboards/walletburner/cajal/info.json
+++ b/keyboards/walletburner/cajal/info.json
@@ -25,10 +25,126 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_stagger": {
- "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":"Back Space", "x":12, "y":0}, {"label":"RGB", "x":13.25, "y":0.5}, {"label":"", "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":"Return", "x":11.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, "w":1.25}, {"label":"&uarr;", "x":12.25, "y":2.25}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Alt", "x":1.25, "y":3}, {"label":"Super", "x":2.25, "y":3, "w":1.25}, {"x":3.5, "y":3, "w":2.25}, {"x":5.75, "y":3, "w":2.75}, {"label":"Ctrl", "x":8.5, "y":3, "w":1.25}, {"label":"Del", "x":9.75, "y":3, "w":1.25}, {"label":"&larr;", "x":11.25, "y":3.25}, {"label":"&darr;", "x":12.25, "y":3.25}, {"label":"&rarr;", "x":13.25, "y":3.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.25, "y": 0.5},
+
+ {"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.75},
+
+ {"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},
+
+ {"matrix": [2, 12], "x": 12.25, "y": 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, "w": 1.25},
+ {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 6], "x": 5.75, "y": 3, "w": 2.75},
+ {"matrix": [3, 8], "x": 8.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3, "w": 1.25},
+
+ {"matrix": [3, 11], "x": 11.25, "y": 3.25},
+ {"matrix": [3, 12], "x": 12.25, "y": 3.25},
+ {"matrix": [3, 13], "x": 13.25, "y": 3.25}
+ ]
},
"LAYOUT_ortho": {
- "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":"Back Space", "x":12, "y":0}, {"label":"Knob", "x":13.25, "y":0.5}, {"label":"", "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":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Return", "x":12, "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":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Shift", "x":11, "y":2}, {"label":"&uarr;", "x":12.25, "y":2.25}, {"label":"Menu", "x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"label":"&dArr;", "x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"label":"&uArr;", "x":7, "y":3}, {"label":"Alt", "x":8, "y":3}, {"label":"Ctrl", "x":9, "y":3}, {"label":"Del", "x":10, "y":3}, {"label":"&larr;", "x":11.25, "y":3.25}, {"label":"&darr;", "x":12.25, "y":3.25}, {"label":"&rarr;", "x":13.25, "y":3.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.25, "y": 0.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": [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": [2, 12], "x": 12.25, "y": 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.25, "y": 3.25},
+ {"matrix": [3, 12], "x": 12.25, "y": 3.25},
+ {"matrix": [3, 13], "x": 13.25, "y": 3.25}
+ ]
}
}
}
diff --git a/keyboards/wavtype/foundation/foundation.h b/keyboards/wavtype/foundation/foundation.h
deleted file mode 100644
index aad9f50d5b..0000000000
--- a/keyboards/wavtype/foundation/foundation.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2022 wavtype (@wavtype)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define _x_ KC_NO
-
-#include "quantum.h"
-
-/*
- * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐ ┌───────┐
- * │00 │ │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │2e │ │0f │0g │0h │ │0e │ 2u Backspace
- * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤ └─┬─────┤
- * │10 │ │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │ │1f │1g │1h │ │ │
- * 2.25u ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ ┌──┴┐1e │ ISO Enter
- * LShift │20 │ │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │ │2d │ │
- * ┌────────┐ ├───┤ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌───┐ ┌─┴───┴────┤
- * │31 │ │30 │ │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │3d │3e │ │3g │ │3d │ 2.75u RShift
- * └────────┘ ├───┤ ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───┐ └──────────┘
- * │40 │ │41 │42 │43 │47 │4b │4c │4d │4e │ │4f │4g │4h │
- * └───┘ └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
- * ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
- * │41 │42 │43 │47 │4c │4d │4e │ Tsangan/WKL
- * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
- */
-
-#define LAYOUT_ansi_split_bs( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k2e, 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, \
- k30, k31, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3g, \
- k40, k41, k42, k43, k47, k4b, k4c, k4d, k4e, k4f, 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, k1f, k1g, k1h }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, _x_, _x_, _x_ }, \
- { k30, k31, _x_, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, _x_, _x_, k3g, _x_ }, \
- { k40, k41, k42, k43, _x_, _x_, _x_, k47, _x_, _x_, _x_, k4b, k4c, k4d, k4e, k4f, k4g, k4h } \
-}
-
-#define LAYOUT_ansi_tsangan_split_bs( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k2e, 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, \
- k30, k31, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3g, \
- k40, k41, k42, k43, k47, k4c, k4d, k4e, k4f, 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, k1f, k1g, k1h }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, _x_, _x_, _x_ }, \
- { k30, k31, _x_, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, _x_, _x_, k3g, _x_ }, \
- { k40, k41, k42, k43, _x_, _x_, _x_, k47, _x_, _x_, _x_, _x_, k4c, k4d, k4e, k4f, k4g, k4h } \
-}
-
-#define LAYOUT_iso_split_bs_rshift( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k2e, k0f, k0g, k0h, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1f, k1g, k1h, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k1e, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3g, \
- k40, k41, k42, k43, k47, k4b, k4c, k4d, k4e, k4f, 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, k1f, k1g, k1h }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, _x_, _x_, _x_ }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, _x_, k3g, _x_ }, \
- { k40, k41, k42, k43, _x_, _x_, _x_, k47, _x_, _x_, _x_, k4b, k4c, k4d, k4e, k4f, k4g, k4h } \
-}
-
-#define LAYOUT_iso_tsangan_split_bs_rshift( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k2e, k0f, k0g, k0h, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1f, k1g, k1h, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k1e, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3g, \
- k40, k41, k42, k43, k47, k4c, k4d, k4e, k4f, 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, k1f, k1g, k1h }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, _x_, _x_, _x_ }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, _x_, k3g, _x_ }, \
- { k40, k41, k42, k43, _x_, _x_, _x_, k47, _x_, _x_, _x_, _x_, k4c, k4d, k4e, k4f, k4g, k4h } \
-}
diff --git a/keyboards/wavtype/foundation/info.json b/keyboards/wavtype/foundation/info.json
index c03550e885..ea0adf2ee5 100644
--- a/keyboards/wavtype/foundation/info.json
+++ b/keyboards/wavtype/foundation/info.json
@@ -30,344 +30,380 @@
"layouts": {
"LAYOUT_ansi_split_bs": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "x":1.5, "y":0},
- {"label":"1!", "x":2.5, "y":0},
- {"label":"2@", "x":3.5, "y":0},
- {"label":"3#", "x":4.5, "y":0},
- {"label":"4$", "x":5.5, "y":0},
- {"label":"5%", "x":6.5, "y":0},
- {"label":"6^", "x":7.5, "y":0},
- {"label":"7&", "x":8.5, "y":0},
- {"label":"8*", "x":9.5, "y":0},
- {"label":"9(", "x":10.5, "y":0},
- {"label":"0)", "x":11.5, "y":0},
- {"label":"-_", "x":12.5, "y":0},
- {"label":"=+", "x":13.5, "y":0},
- {"label":"Backspace", "x":14.5, "y":0},
- {"label":"Split Backspace", "x":15.5, "y":0},
- {"label":"Insert", "x":17, "y":0},
- {"label":"Home", "x":18, "y":0},
- {"label":"Page Up", "x":19, "y":0},
-
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":1.5, "y":1, "w":1.5},
- {"label":"Q", "x":3, "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":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":"]}", "x":14, "y":1},
- {"label":"\\|", "x":15, "y":1, "w":1.5},
- {"label":"Delete", "x":17, "y":1},
- {"label":"End", "x":18, "y":1},
- {"label":"Page Down", "x":19, "y":1},
-
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":1.5, "y":2, "w":1.25},
- {"label":"A", "x":3.25, "y":2},
- {"label":"S", "x":4.25, "y":2},
- {"label":"D", "x":5.25, "y":2},
- {"label":"F", "x":6.25, "y":2},
- {"label":"G", "x":7.25, "y":2},
- {"label":"H", "x":8.25, "y":2},
- {"label":"J", "x":9.25, "y":2},
- {"label":"K", "x":10.25, "y":2},
- {"label":"L", "x":11.25, "y":2},
- {"label":";:", "x":12.25, "y":2},
- {"label":"'\"", "x":13.25, "y":2},
- {"label":"Enter", "x":14.25, "y":2, "w":2.25},
-
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":1.5, "y":3, "w":2.25},
- {"label":"Z", "x":3.75, "y":3},
- {"label":"X", "x":4.75, "y":3},
- {"label":"C", "x":5.75, "y":3},
- {"label":"V", "x":6.75, "y":3},
- {"label":"B", "x":7.75, "y":3},
- {"label":"N", "x":8.75, "y":3},
- {"label":"M", "x":9.75, "y":3},
- {"label":",<", "x":10.75, "y":3},
- {"label":".>", "x":11.75, "y":3},
- {"label":"/?", "x":12.75, "y":3},
- {"label":"Shift", "x":13.75, "y":3, "w":2.75},
- {"label":"\u2191", "x":18, "y":3},
-
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":1.5, "y":4, "w":1.25},
- {"label":"Win", "x":2.75, "y":4, "w":1.25},
- {"label":"Alt", "x":4, "y":4, "w":1.25},
- {"label":"Space", "x":5.25, "y":4, "w":6.25},
- {"label":"Alt", "x":11.5, "y":4, "w":1.25},
- {"label":"Win", "x":12.75, "y":4, "w":1.25},
- {"label":"Fn", "x":14, "y":4, "w":1.25},
- {"label":"Ctrl", "x":15.25, "y":4, "w":1.25},
- {"label":"\u2190", "x":17, "y":4},
- {"label":"\u2193", "x":18, "y":4},
- {"label":"\u2192", "x":19, "y":4}
+ {"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": [0, 12], "x": 12.5, "y": 0},
+ {"matrix": [0, 13], "x": 13.5, "y": 0},
+ {"matrix": [0, 14], "x": 14.5, "y": 0},
+ {"matrix": [2, 14], "x": 15.5, "y": 0},
+
+ {"matrix": [0, 15], "x": 17, "y": 0},
+ {"matrix": [0, 16], "x": 18, "y": 0},
+ {"matrix": [0, 17], "x": 19, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"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.5},
+
+ {"matrix": [1, 15], "x": 17, "y": 1},
+ {"matrix": [1, 16], "x": 18, "y": 1},
+ {"matrix": [1, 17], "x": 19, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.25},
+ {"matrix": [2, 2], "x": 3.25, "y": 2},
+ {"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, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
+ {"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": 2.75},
+
+ {"matrix": [3, 16], "x": 18, "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, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 5.25, "y": 4, "w": 6.25},
+ {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 14, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 15.25, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 15], "x": 17, "y": 4},
+ {"matrix": [4, 16], "x": 18, "y": 4},
+ {"matrix": [4, 17], "x": 19, "y": 4}
]
},
"LAYOUT_ansi_tsangan_split_bs": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "x":1.5, "y":0},
- {"label":"1!", "x":2.5, "y":0},
- {"label":"2@", "x":3.5, "y":0},
- {"label":"3#", "x":4.5, "y":0},
- {"label":"4$", "x":5.5, "y":0},
- {"label":"5%", "x":6.5, "y":0},
- {"label":"6^", "x":7.5, "y":0},
- {"label":"7&", "x":8.5, "y":0},
- {"label":"8*", "x":9.5, "y":0},
- {"label":"9(", "x":10.5, "y":0},
- {"label":"0)", "x":11.5, "y":0},
- {"label":"-_", "x":12.5, "y":0},
- {"label":"=+", "x":13.5, "y":0},
- {"label":"Backspace", "x":14.5, "y":0},
- {"label":"Split Backspace", "x":15.5, "y":0},
- {"label":"Insert", "x":17, "y":0},
- {"label":"Home", "x":18, "y":0},
- {"label":"Page Up", "x":19, "y":0},
-
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":1.5, "y":1, "w":1.5},
- {"label":"Q", "x":3, "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":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":"]}", "x":14, "y":1},
- {"label":"\\|", "x":15, "y":1, "w":1.5},
- {"label":"Delete", "x":17, "y":1},
- {"label":"End", "x":18, "y":1},
- {"label":"Page Down", "x":19, "y":1},
-
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":1.5, "y":2, "w":1.25},
- {"label":"A", "x":3.25, "y":2},
- {"label":"S", "x":4.25, "y":2},
- {"label":"D", "x":5.25, "y":2},
- {"label":"F", "x":6.25, "y":2},
- {"label":"G", "x":7.25, "y":2},
- {"label":"H", "x":8.25, "y":2},
- {"label":"J", "x":9.25, "y":2},
- {"label":"K", "x":10.25, "y":2},
- {"label":"L", "x":11.25, "y":2},
- {"label":";:", "x":12.25, "y":2},
- {"label":"'\"", "x":13.25, "y":2},
- {"label":"Enter", "x":14.25, "y":2, "w":2.25},
-
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":1.5, "y":3, "w":2.25},
- {"label":"Z", "x":3.75, "y":3},
- {"label":"X", "x":4.75, "y":3},
- {"label":"C", "x":5.75, "y":3},
- {"label":"V", "x":6.75, "y":3},
- {"label":"B", "x":7.75, "y":3},
- {"label":"N", "x":8.75, "y":3},
- {"label":"M", "x":9.75, "y":3},
- {"label":",<", "x":10.75, "y":3},
- {"label":".>", "x":11.75, "y":3},
- {"label":"/?", "x":12.75, "y":3},
- {"label":"Shift", "x":13.75, "y":3, "w":2.75},
- {"label":"\u2191", "x":18, "y":3},
-
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":1.5, "y":4, "w":1.5},
- {"label":"Win", "x":3, "y":4},
- {"label":"Alt", "x":4, "y":4, "w":1.5},
- {"label":"Space", "x":5.5, "y":4, "w":7},
- {"label":"Alt", "x":12.5, "y":4, "w":1.5},
- {"label":"Fn", "x":14, "y":4},
- {"label":"Ctrl", "x":15, "y":4, "w":1.5},
- {"label":"\u2190", "x":17, "y":4},
- {"label":"\u2193", "x":18, "y":4},
- {"label":"\u2192", "x":19, "y":4}
+ {"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": [0, 12], "x": 12.5, "y": 0},
+ {"matrix": [0, 13], "x": 13.5, "y": 0},
+ {"matrix": [0, 14], "x": 14.5, "y": 0},
+ {"matrix": [2, 14], "x": 15.5, "y": 0},
+
+ {"matrix": [0, 15], "x": 17, "y": 0},
+ {"matrix": [0, 16], "x": 18, "y": 0},
+ {"matrix": [0, 17], "x": 19, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"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.5},
+
+ {"matrix": [1, 15], "x": 17, "y": 1},
+ {"matrix": [1, 16], "x": 18, "y": 1},
+ {"matrix": [1, 17], "x": 19, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.25},
+ {"matrix": [2, 2], "x": 3.25, "y": 2},
+ {"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, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
+ {"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": 2.75},
+
+ {"matrix": [3, 16], "x": 18, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 3, "y": 4},
+ {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 5.5, "y": 4, "w": 7},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 15], "x": 17, "y": 4},
+ {"matrix": [4, 16], "x": 18, "y": 4},
+ {"matrix": [4, 17], "x": 19, "y": 4}
]
},
"LAYOUT_iso_split_bs_rshift": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "x":1.5, "y":0},
- {"label":"1!", "x":2.5, "y":0},
- {"label":"2\"", "x":3.5, "y":0},
- {"label":"3#", "x":4.5, "y":0},
- {"label":"4\u00a3", "x":5.5, "y":0},
- {"label":"5%", "x":6.5, "y":0},
- {"label":"6^", "x":7.5, "y":0},
- {"label":"7&", "x":8.5, "y":0},
- {"label":"8*", "x":9.5, "y":0},
- {"label":"9(", "x":10.5, "y":0},
- {"label":"0)", "x":11.5, "y":0},
- {"label":"-_", "x":12.5, "y":0},
- {"label":"=+", "x":13.5, "y":0},
- {"label":"Backspace", "x":14.5, "y":0},
- {"label":"Split Backspace", "x":15.5, "y":0},
- {"label":"Insert", "x":17, "y":0},
- {"label":"Home", "x":18, "y":0},
- {"label":"Page Up", "x":19, "y":0},
-
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":1.5, "y":1, "w":1.5},
- {"label":"Q", "x":3, "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":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":"]}", "x":14, "y":1},
- {"label":"Delete", "x":17, "y":1},
- {"label":"End", "x":18, "y":1},
- {"label":"Page Down", "x":19, "y":1},
-
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":1.5, "y":2, "w":1.25},
- {"label":"A", "x":3.25, "y":2},
- {"label":"S", "x":4.25, "y":2},
- {"label":"D", "x":5.25, "y":2},
- {"label":"F", "x":6.25, "y":2},
- {"label":"G", "x":7.25, "y":2},
- {"label":"H", "x":8.25, "y":2},
- {"label":"J", "x":9.25, "y":2},
- {"label":"K", "x":10.25, "y":2},
- {"label":"L", "x":11.25, "y":2},
- {"label":";:", "x":12.25, "y":2},
- {"label":"'@", "x":13.25, "y":2},
- {"label":"#~", "x":14.25, "y":2},
- {"label":"Enter", "x":15.25, "y":1, "w":1.25, "h":2},
-
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":1.5, "y":3, "w":1.25},
- {"label":"\\|", "x":2.75, "y":3},
- {"label":"Z", "x":3.75, "y":3},
- {"label":"X", "x":4.75, "y":3},
- {"label":"C", "x":5.75, "y":3},
- {"label":"V", "x":6.75, "y":3},
- {"label":"B", "x":7.75, "y":3},
- {"label":"N", "x":8.75, "y":3},
- {"label":"M", "x":9.75, "y":3},
- {"label":",<", "x":10.75, "y":3},
- {"label":".>", "x":11.75, "y":3},
- {"label":"/?", "x":12.75, "y":3},
- {"label":"Shift", "x":13.75, "y":3, "w":1.75},
- {"label":"Shift 2", "x":15.5, "y":3},
- {"label":"\u2191", "x":18, "y":3},
-
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":1.5, "y":4, "w":1.25},
- {"label":"Win", "x":2.75, "y":4, "w":1.25},
- {"label":"Alt", "x":4, "y":4, "w":1.25},
- {"label":"Space", "x":5.25, "y":4, "w":6.25},
- {"label":"Alt", "x":11.5, "y":4, "w":1.25},
- {"label":"Fn", "x":12.75, "y":4, "w":1.25},
- {"label":"Win", "x":14, "y":4, "w":1.25},
- {"label":"Ctrl", "x":15.25, "y":4, "w":1.25},
- {"label":"\u2190", "x":17, "y":4},
- {"label":"\u2193", "x":18, "y":4},
- {"label":"\u2192", "x":19, "y":4}
+ {"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": [0, 12], "x": 12.5, "y": 0},
+ {"matrix": [0, 13], "x": 13.5, "y": 0},
+ {"matrix": [0, 14], "x": 14.5, "y": 0},
+ {"matrix": [2, 14], "x": 15.5, "y": 0},
+
+ {"matrix": [0, 15], "x": 17, "y": 0},
+ {"matrix": [0, 16], "x": 18, "y": 0},
+ {"matrix": [0, 17], "x": 19, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"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, 15], "x": 17, "y": 1},
+ {"matrix": [1, 16], "x": 18, "y": 1},
+ {"matrix": [1, 17], "x": 19, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.25},
+ {"matrix": [2, 2], "x": 3.25, "y": 2},
+ {"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": [1, 14], "x": 15.25, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 1.25},
+ {"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.75},
+ {"matrix": [3, 14], "x": 15.5, "y": 3},
+
+ {"matrix": [3, 16], "x": 18, "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, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 5.25, "y": 4, "w": 6.25},
+ {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 14, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 15.25, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 15], "x": 17, "y": 4},
+ {"matrix": [4, 16], "x": 18, "y": 4},
+ {"matrix": [4, 17], "x": 19, "y": 4}
]
},
"LAYOUT_iso_tsangan_split_bs_rshift": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Esc", "x":1.5, "y":0},
- {"label":"1!", "x":2.5, "y":0},
- {"label":"2\"", "x":3.5, "y":0},
- {"label":"3#", "x":4.5, "y":0},
- {"label":"4\u00a3", "x":5.5, "y":0},
- {"label":"5%", "x":6.5, "y":0},
- {"label":"6^", "x":7.5, "y":0},
- {"label":"7&", "x":8.5, "y":0},
- {"label":"8*", "x":9.5, "y":0},
- {"label":"9(", "x":10.5, "y":0},
- {"label":"0)", "x":11.5, "y":0},
- {"label":"-_", "x":12.5, "y":0},
- {"label":"=+", "x":13.5, "y":0},
- {"label":"Backspace", "x":14.5, "y":0},
- {"label":"Split Backspace", "x":15.5, "y":0},
- {"label":"Insert", "x":17, "y":0},
- {"label":"Home", "x":18, "y":0},
- {"label":"Page Up", "x":19, "y":0},
-
- {"label":"F2", "x":0, "y":1},
- {"label":"Tab", "x":1.5, "y":1, "w":1.5},
- {"label":"Q", "x":3, "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":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":"]}", "x":14, "y":1},
- {"label":"Delete", "x":17, "y":1},
- {"label":"End", "x":18, "y":1},
- {"label":"Page Down", "x":19, "y":1},
-
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":1.5, "y":2, "w":1.25},
- {"label":"A", "x":3.25, "y":2},
- {"label":"S", "x":4.25, "y":2},
- {"label":"D", "x":5.25, "y":2},
- {"label":"F", "x":6.25, "y":2},
- {"label":"G", "x":7.25, "y":2},
- {"label":"H", "x":8.25, "y":2},
- {"label":"J", "x":9.25, "y":2},
- {"label":"K", "x":10.25, "y":2},
- {"label":"L", "x":11.25, "y":2},
- {"label":";:", "x":12.25, "y":2},
- {"label":"'@", "x":13.25, "y":2},
- {"label":"#~", "x":14.25, "y":2},
- {"label":"Enter", "x":15.25, "y":1, "w":1.25, "h":2},
-
- {"label":"F4", "x":0, "y":3},
- {"label":"Shift", "x":1.5, "y":3, "w":1.25},
- {"label":"\\|", "x":2.75, "y":3},
- {"label":"Z", "x":3.75, "y":3},
- {"label":"X", "x":4.75, "y":3},
- {"label":"C", "x":5.75, "y":3},
- {"label":"V", "x":6.75, "y":3},
- {"label":"B", "x":7.75, "y":3},
- {"label":"N", "x":8.75, "y":3},
- {"label":"M", "x":9.75, "y":3},
- {"label":",<", "x":10.75, "y":3},
- {"label":".>", "x":11.75, "y":3},
- {"label":"/?", "x":12.75, "y":3},
- {"label":"Shift", "x":13.75, "y":3, "w":1.75},
- {"label":"Shift2", "x":15.5, "y":3},
- {"label":"\u2191", "x":18, "y":3},
-
- {"label":"F5", "x":0, "y":4},
- {"label":"Ctrl", "x":1.5, "y":4, "w":1.5},
- {"label":"Win", "x":3, "y":4},
- {"label":"Alt", "x":4, "y":4, "w":1.5},
- {"label":"Space", "x":5.5, "y":4, "w":7},
- {"label":"Alt", "x":12.5, "y":4, "w":1.5},
- {"label":"Fn", "x":14, "y":4},
- {"label":"Ctrl", "x":15, "y":4, "w":1.5},
- {"label":"\u2190", "x":17, "y":4},
- {"label":"\u2193", "x":18, "y":4},
- {"label":"\u2192", "x":19, "y":4}
+ {"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": [0, 12], "x": 12.5, "y": 0},
+ {"matrix": [0, 13], "x": 13.5, "y": 0},
+ {"matrix": [0, 14], "x": 14.5, "y": 0},
+ {"matrix": [2, 14], "x": 15.5, "y": 0},
+
+ {"matrix": [0, 15], "x": 17, "y": 0},
+ {"matrix": [0, 16], "x": 18, "y": 0},
+ {"matrix": [0, 17], "x": 19, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"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, 15], "x": 17, "y": 1},
+ {"matrix": [1, 16], "x": 18, "y": 1},
+ {"matrix": [1, 17], "x": 19, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.25},
+ {"matrix": [2, 2], "x": 3.25, "y": 2},
+ {"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": [1, 14], "x": 15.25, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 1.25},
+ {"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.75},
+ {"matrix": [3, 14], "x": 15.5, "y": 3},
+
+ {"matrix": [3, 16], "x": 18, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 3, "y": 4},
+ {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 5.5, "y": 4, "w": 7},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 15], "x": 17, "y": 4},
+ {"matrix": [4, 16], "x": 18, "y": 4},
+ {"matrix": [4, 17], "x": 19, "y": 4}
]
}
}
diff --git a/keyboards/westfoxtrot/aanzee/aanzee.h b/keyboards/westfoxtrot/aanzee/aanzee.h
deleted file mode 100644
index 1cfa1784fb..0000000000
--- a/keyboards/westfoxtrot/aanzee/aanzee.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright 2019 westfoxtrot
-*
-* 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"
-
-/* 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_ansi( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0F, 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, k49, k4A, k4C, k4D, k4E \
-) { \
- { 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, ___ }, \
- { 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, ___, ___, k49, k4A, ___, k4C, k4D, k4E, ___ } \
-}
-
-#define LAYOUT_iso( \
- 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, k49, k4A, 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, ___, 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, ___, ___, k49, k4A, ___, k4C, k4D, k4E, ___ } \
-}
-
-void matrix_init_user(void);
-void matrix_scan_user(void);
diff --git a/keyboards/westfoxtrot/aanzee/info.json b/keyboards/westfoxtrot/aanzee/info.json
index 0038e1f7e5..9dd3fcb2a4 100644
--- a/keyboards/westfoxtrot/aanzee/info.json
+++ b/keyboards/westfoxtrot/aanzee/info.json
@@ -29,10 +29,158 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_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}, {"x":13, "y":0}, {"x":14, "y":0}, {"label":"Home", "x":15, "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":"PgUp", "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":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgDn", "x":15, "y":2}, {"label":"\u21e7 Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"Fn", "x":15, "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":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "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, 15], "x": 13, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+ {"matrix": [0, 14], "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": [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, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "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": [{"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":"Home", "x":15, "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}, {"x":13.75, "y":1, "w":1.25, "h":2}, {"label":"PgUp", "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}, {"x":12.75, "y":2}, {"label":"PgDn", "x":15, "y":2}, {"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}, {"label":"\u2191", "x":14, "y":3}, {"label":"Fn", "x":15, "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":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "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, "w": 2},
+ {"matrix": [0, 14], "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": [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": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [2, 0], "x": 15, "y": 1},
+
+ {"matrix": [2, 1], "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": 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, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "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}
+ ]
}
}
}
diff --git a/keyboards/westfoxtrot/cypher/rev1/info.json b/keyboards/westfoxtrot/cypher/rev1/info.json
index 217d979c41..d6e5689df9 100644
--- a/keyboards/westfoxtrot/cypher/rev1/info.json
+++ b/keyboards/westfoxtrot/cypher/rev1/info.json
@@ -21,202 +21,201 @@
"layouts": {
"LAYOUT_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},
- {"label":"~","x":14,"y":0},
-
- {"label":"Num Lock","x":15.5,"y":0},
- {"label":"/","x":16.5,"y":0},
- {"label":"*","x":17.5,"y":0},
- {"label":"-","x":18.5,"y":0},
-
- {"label":"Tab","x":0,"y":1,"w":1.5},
- {"label":"Q","x":1.5,"y":1},
- {"label":"W","x":2.5,"y":1},
- {"label":"E","x":3.5,"y":1},
- {"label":"R","x":4.5,"y":1},
- {"label":"T","x":5.5,"y":1},
- {"label":"Y","x":6.5,"y":1},
- {"label":"U","x":7.5,"y":1},
- {"label":"I","x":8.5,"y":1},
- {"label":"O","x":9.5,"y":1},
- {"label":"P","x":10.5,"y":1},
- {"label":"{","x":11.5,"y":1},
- {"label":"}","x":12.5,"y":1},
- {"label":"|","x":13.5,"y":1,"w":1.5},
-
- {"label":"7","x":15.5,"y":1},
- {"label":"8","x":16.5,"y":1},
- {"label":"9","x":17.5,"y":1},
- {"label":"+","x":18.5,"y":1},
-
- {"label":"Caps Lock","x":0,"y":2,"w":1.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":"4","x":15.5,"y":2},
- {"label":"5","x":16.5,"y":2},
- {"label":"6","x":17.5,"y":2},
- {"label":"=","x":18.5,"y":2},
-
- {"label":"Shift","x":0,"y":3,"w":2.25},
- {"label":"Z","x":2.25,"y":3},
- {"label":"X","x":3.25,"y":3},
- {"label":"C","x":4.25,"y":3},
- {"label":"V","x":5.25,"y":3},
- {"label":"B","x":6.25,"y":3},
- {"label":"N","x":7.25,"y":3},
- {"label":"M","x":8.25,"y":3},
- {"label":"<","x":9.25,"y":3},
- {"label":">","x":10.25,"y":3},
- {"label":"?","x":11.25,"y":3},
- {"label":"Shift","x":12.25,"y":3,"w":1.75},
-
- {"label":"Up","x":14.25,"y":3.25},
-
- {"label":"1","x":15.5,"y":3},
- {"label":"2","x":16.5,"y":3},
- {"label":"3","x":17.5,"y":3},
- {"label":"Enter","x":18.5,"y":3},
-
- {"label":"Ctrl","x":0,"y":4,"w":1.25},
- {"label":"Win","x":1.25,"y":4},
- {"label":"Alt","x":2.25,"y":4,"w":1.25},
- {"label":"Space","x":3.5,"y":4,"w":6},
- {"label":"Alt","x":9.5,"y":4,"w":1.25},
- {"label":"Win","x":10.75,"y":4},
- {"label":"Ctrl","x":11.75,"y":4,"w":1.25},
-
- {"label":"Left","x":13.25,"y":4.25},
- {"label":"Down","x":14.25,"y":4.25},
- {"label":"Right","x":15.25,"y":4.25},
-
- {"label":"0","x":16.5,"y":4},
- {"label":".","x":17.5,"y":4},
- {"label":"Backspace","x":18.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": [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.5, "y": 0},
+ {"matrix": [5, 6], "x": 16.5, "y": 0},
+ {"matrix": [5, 7], "x": 17.5, "y": 0},
+ {"matrix": [5, 8], "x": 18.5, "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": [6, 0], "x": 10.5, "y": 1},
+ {"matrix": [6, 1], "x": 11.5, "y": 1},
+ {"matrix": [6, 2], "x": 12.5, "y": 1},
+ {"matrix": [6, 3], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [6, 5], "x": 15.5, "y": 1},
+ {"matrix": [6, 6], "x": 16.5, "y": 1},
+ {"matrix": [6, 7], "x": 17.5, "y": 1},
+ {"matrix": [6, 8], "x": 18.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": [7, 0], "x": 10.75, "y": 2},
+ {"matrix": [7, 1], "x": 11.75, "y": 2},
+ {"matrix": [7, 3], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [7, 5], "x": 15.5, "y": 2},
+ {"matrix": [7, 6], "x": 16.5, "y": 2},
+ {"matrix": [7, 7], "x": 17.5, "y": 2},
+ {"matrix": [7, 8], "x": 18.5, "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": [8, 0], "x": 10.25, "y": 3},
+ {"matrix": [8, 1], "x": 11.25, "y": 3},
+ {"matrix": [8, 2], "x": 12.25, "y": 3, "w": 1.75},
+
+ {"matrix": [8, 3], "x": 14.25, "y": 3.25},
+
+ {"matrix": [8, 5], "x": 15.5, "y": 3},
+ {"matrix": [8, 6], "x": 16.5, "y": 3},
+ {"matrix": [8, 7], "x": 17.5, "y": 3},
+ {"matrix": [8, 8], "x": 18.5, "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, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.5, "y": 4, "w": 6},
+ {"matrix": [4, 9], "x": 9.5, "y": 4, "w": 1.25},
+ {"matrix": [9, 0], "x": 10.75, "y": 4},
+ {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.25},
+
+ {"matrix": [9, 2], "x": 13.25, "y": 4.25},
+ {"matrix": [9, 3], "x": 14.25, "y": 4.25},
+ {"matrix": [9, 5], "x": 15.25, "y": 4.25},
+
+ {"matrix": [9, 6], "x": 16.5, "y": 4},
+ {"matrix": [9, 7], "x": 17.5, "y": 4},
+ {"matrix": [9, 8], "x": 18.5, "y": 4}
]
},
-
"LAYOUT_iso": {
"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},
- {"label":"~","x":14,"y":0},
-
- {"label":"Num Lock","x":15.5,"y":0},
- {"label":"/","x":16.5,"y":0},
- {"label":"*","x":17.5,"y":0},
- {"label":"-","x":18.5,"y":0},
-
- {"label":"Tab","x":0,"y":1,"w":1.5},
- {"label":"Q","x":1.5,"y":1},
- {"label":"W","x":2.5,"y":1},
- {"label":"E","x":3.5,"y":1},
- {"label":"R","x":4.5,"y":1},
- {"label":"T","x":5.5,"y":1},
- {"label":"Y","x":6.5,"y":1},
- {"label":"U","x":7.5,"y":1},
- {"label":"I","x":8.5,"y":1},
- {"label":"O","x":9.5,"y":1},
- {"label":"P","x":10.5,"y":1},
- {"label":"{","x":11.5,"y":1},
- {"label":"}","x":12.5,"y":1},
-
- {"label":"7","x":15.5,"y":1},
- {"label":"8","x":16.5,"y":1},
- {"label":"9","x":17.5,"y":1},
- {"label":"+","x":18.5,"y":1},
-
- {"label":"Caps Lock","x":0,"y":2,"w":1.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":"4","x":15.5,"y":2},
- {"label":"5","x":16.5,"y":2},
- {"label":"6","x":17.5,"y":2},
- {"label":"=","x":18.5,"y":2},
-
- {"label":"Shift","x":0,"y":3,"w":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":"Up","x":14.25,"y":3.25},
-
- {"label":"1","x":15.5,"y":3},
- {"label":"2","x":16.5,"y":3},
- {"label":"3","x":17.5,"y":3},
- {"label":"Enter","x":18.5,"y":3},
-
- {"label":"Ctrl","x":0,"y":4,"w":1.25},
- {"label":"Win","x":1.25,"y":4},
- {"label":"Alt","x":2.25,"y":4,"w":1.25},
- {"label":"Space","x":3.5,"y":4,"w":6},
- {"label":"Alt","x":9.5,"y":4,"w":1.25},
- {"label":"Win","x":10.75,"y":4},
- {"label":"Ctrl","x":11.75,"y":4,"w":1.25},
-
- {"label":"Left","x":13.25,"y":4.25},
- {"label":"Down","x":14.25,"y":4.25},
- {"label":"Right","x":15.25,"y":4.25},
-
- {"label":"0","x":16.5,"y":4},
- {"label":".","x":17.5,"y":4},
- {"label":"Backspace","x":18.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": [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.5, "y": 0},
+ {"matrix": [5, 6], "x": 16.5, "y": 0},
+ {"matrix": [5, 7], "x": 17.5, "y": 0},
+ {"matrix": [5, 8], "x": 18.5, "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": [6, 0], "x": 10.5, "y": 1},
+ {"matrix": [6, 1], "x": 11.5, "y": 1},
+ {"matrix": [6, 2], "x": 12.5, "y": 1},
+
+ {"matrix": [6, 5], "x": 15.5, "y": 1},
+ {"matrix": [6, 6], "x": 16.5, "y": 1},
+ {"matrix": [6, 7], "x": 17.5, "y": 1},
+ {"matrix": [6, 8], "x": 18.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": [7, 0], "x": 10.75, "y": 2},
+ {"matrix": [7, 1], "x": 11.75, "y": 2},
+ {"matrix": [7, 2], "x": 12.75, "y": 2},
+ {"matrix": [7, 3], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [7, 5], "x": 15.5, "y": 2},
+ {"matrix": [7, 6], "x": 16.5, "y": 2},
+ {"matrix": [7, 7], "x": 17.5, "y": 2},
+ {"matrix": [7, 8], "x": 18.5, "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": [8, 0], "x": 10.25, "y": 3},
+ {"matrix": [8, 1], "x": 11.25, "y": 3},
+ {"matrix": [8, 2], "x": 12.25, "y": 3, "w": 1.75},
+
+ {"matrix": [8, 3], "x": 14.25, "y": 3.25},
+
+ {"matrix": [8, 5], "x": 15.5, "y": 3},
+ {"matrix": [8, 6], "x": 16.5, "y": 3},
+ {"matrix": [8, 7], "x": 17.5, "y": 3},
+ {"matrix": [8, 8], "x": 18.5, "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, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.5, "y": 4, "w": 6},
+ {"matrix": [4, 9], "x": 9.5, "y": 4, "w": 1.25},
+ {"matrix": [9, 0], "x": 10.75, "y": 4},
+ {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.25},
+
+ {"matrix": [9, 2], "x": 13.25, "y": 4.25},
+ {"matrix": [9, 3], "x": 14.25, "y": 4.25},
+ {"matrix": [9, 5], "x": 15.25, "y": 4.25},
+
+ {"matrix": [9, 6], "x": 16.5, "y": 4},
+ {"matrix": [9, 7], "x": 17.5, "y": 4},
+ {"matrix": [9, 8], "x": 18.5, "y": 4}
]
}
}
diff --git a/keyboards/westfoxtrot/cypher/rev1/rev1.c b/keyboards/westfoxtrot/cypher/rev1/rev1.c
index 78b4b6b46e..b6736f97a7 100644
--- a/keyboards/westfoxtrot/cypher/rev1/rev1.c
+++ b/keyboards/westfoxtrot/cypher/rev1/rev1.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 "rev1.h"
+#include "quantum.h"
bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
diff --git a/keyboards/westfoxtrot/cypher/rev1/rev1.h b/keyboards/westfoxtrot/cypher/rev1/rev1.h
deleted file mode 100644
index fdff12e9b1..0000000000
--- a/keyboards/westfoxtrot/cypher/rev1/rev1.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright 2019 westfoxtrot
- *
- * 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"
-
-/* 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_ansi( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, K51, K52, K53, K54, K55, K56, K57, K58,\
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K60, K61, K62, K63, K65, K66, K67, K68, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K70, K71, K73, K75, K76, K77, K78, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K80, K81, K82, K83, K85, K86, K87, K88, \
- K40, K41, K42, K46, K49, K90, K91, K92, K93, K95, K96, K97, K98 \
-) \
-{ \
- { 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, ___, K32, K33, K34, K35, K36, K37, K38, K39 }, \
- { K40, K41, K42, ___, ___, ___, K46, ___, ___, K49 }, \
- { K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \
- { K60, K61, K62, K63, ___, K65, K66, K67, K68 }, \
- { K70, K71, ___, K73, ___, K75, K76, K77, K78 }, \
- { K80, K81, K82, K83, ___, K85, K86, K87, K88 }, \
- { K90, K91, K92, K93, ___, K95, K96, K97, K98 } \
-}
-
-#define LAYOUT_iso( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, K51, K52, K53, K54, K55, K56, K57, K58,\
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K60, K61, K62, K65, K66, K67, K68, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K70, K71, K72, K73, K75, K76, K77, K78, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K80, K81, K82, K83, K85, K86, K87, K88, \
- K40, K41, K42, K46, K49, K90, K91, K92, K93, K95, K96, K97, K98 \
-) \
-{ \
- { 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, ___, ___, ___, K46, ___, ___, K49 }, \
- { K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \
- { K60, K61, K62, ___, ___, K65, K66, K67, K68 }, \
- { K70, K71, K72, K73, ___, K75, K76, K77, K78 }, \
- { K80, K81, K82, K83, ___, K85, K86, K87, K88 }, \
- { K90, K91, K92, K93, ___, K95, K96, K97, K98 } \
-}
diff --git a/keyboards/westm/westm9/info.json b/keyboards/westm/westm9/info.json
index ed0b994805..ab3d86899c 100644
--- a/keyboards/westm/westm9/info.json
+++ b/keyboards/westm/westm9/info.json
@@ -17,15 +17,17 @@
"layouts": {
"LAYOUT_macropad": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2}
]
}
}
diff --git a/keyboards/westm/westm9/rev1/rev1.c b/keyboards/westm/westm9/rev1/rev1.c
index ba81fe6d0b..cf84b5c52e 100644
--- a/keyboards/westm/westm9/rev1/rev1.c
+++ b/keyboards/westm/westm9/rev1/rev1.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "westm9.h"
+#include "quantum.h"
void board_init(void) {
// Purely for fixing problem on prototype board
diff --git a/keyboards/westm/westm9/rev2/rev2.c b/keyboards/westm/westm9/rev2/rev2.c
index d04d193105..7524ca6690 100644
--- a/keyboards/westm/westm9/rev2/rev2.c
+++ b/keyboards/westm/westm9/rev2/rev2.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "westm9.h"
+#include "quantum.h"
void board_init(void) {
SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP; // DMA re-map, you may not need this depending on your
diff --git a/keyboards/westm/westm9/westm9.h b/keyboards/westm/westm9/westm9.h
deleted file mode 100644
index a88aeb8573..0000000000
--- a/keyboards/westm/westm9/westm9.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2021 WestM
- *
- * 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_macropad( \
- K00, K01, K02, \
- K10, K11, K12, \
- K20, K21, K22 \
-) \
-{ \
- { K00, K01, K02 }, \
- { K10, K11, K12 }, \
- { K20, K21, K22 }, \
-}
diff --git a/keyboards/xelus/rs108/info.json b/keyboards/xelus/rs108/info.json
index d15a543e53..a9436d4d14 100644
--- a/keyboards/xelus/rs108/info.json
+++ b/keyboards/xelus/rs108/info.json
@@ -23,114 +23,133 @@
"layouts": {
"LAYOUT_108_fullsize_ansi": {
"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": "Num Lock", "x": 18.5, "y": 0 },
- { "label": "MUTE", "x": 19.5, "y": 0 },
- { "label": "VOLD", "x": 20.5, "y": 0 },
- { "label": "VOLU", "x": 21.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": "Home", "x": 16.25, "y": 1.25 },
- { "label": "PgUp", "x": 17.25, "y": 1.25 },
- { "label": "Num Lock", "x": 18.5, "y": 1.25 },
- { "label": "/", "x": 19.5, "y": 1.25 },
- { "label": "*", "x": 20.5, "y": 1.25 },
- { "label": "-", "x": 21.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": "End", "x": 16.25, "y": 2.25 },
- { "label": "PgDn", "x": 17.25, "y": 2.25 },
- { "label": "7", "x": 18.5, "y": 2.25 },
- { "label": "8", "x": 19.5, "y": 2.25 },
- { "label": "9", "x": 20.5, "y": 2.25 },
- { "label": "+", "x": 21.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": 18.5, "y": 3.25 },
- { "label": "5", "x": 19.5, "y": 3.25 },
- { "label": "6", "x": 20.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": 16.25, "y": 4.25 },
- { "label": "1", "x": 18.5, "y": 4.25 },
- { "label": "2", "x": 19.5, "y": 4.25 },
- { "label": "3", "x": 20.5, "y": 4.25 },
- { "label": "Enter", "x": 21.5, "y": 4.25, "h": 2 },
- { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
- { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
- { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
- { "x": 3.75, "y": 5.25, "w": 6.25 },
- { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
- { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
- { "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25 },
- { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
- { "label": "\u2190", "x": 15.25, "y": 5.25 },
- { "label": "\u2193", "x": 16.25, "y": 5.25 },
- { "label": "\u2192", "x": 17.25, "y": 5.25 },
- { "label": "0", "x": 18.5, "y": 5.25, "w": 2 },
- { "label": ".", "x": 20.5, "y": 5.25 }
+ {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
+ {"matrix": [1, 3], "x": 7.5, "y": 0},
+ {"matrix": [0, 4], "x": 8.5, "y": 0},
+ {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 5], "x": 11, "y": 0},
+ {"matrix": [1, 5], "x": 12, "y": 0},
+ {"matrix": [0, 6], "x": 13, "y": 0},
+ {"matrix": [1, 6], "x": 14, "y": 0},
+
+ {"matrix": [0, 7], "x": 15.25, "y": 0},
+ {"matrix": [1, 7], "x": 16.25, "y": 0},
+ {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 8], "x": 18.5, "y": 0},
+ {"matrix": [0, 9], "x": 19.5, "y": 0},
+ {"matrix": [1, 9], "x": 20.5, "y": 0},
+ {"matrix": [0, 10], "x": 21.5, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1.25},
+ {"matrix": [3, 0], "x": 1, "y": 1.25},
+ {"matrix": [2, 1], "x": 2, "y": 1.25},
+ {"matrix": [3, 1], "x": 3, "y": 1.25},
+ {"matrix": [2, 2], "x": 4, "y": 1.25},
+ {"matrix": [3, 2], "x": 5, "y": 1.25},
+ {"matrix": [2, 3], "x": 6, "y": 1.25},
+ {"matrix": [3, 3], "x": 7, "y": 1.25},
+ {"matrix": [2, 4], "x": 8, "y": 1.25},
+ {"matrix": [3, 4], "x": 9, "y": 1.25},
+ {"matrix": [2, 5], "x": 10, "y": 1.25},
+ {"matrix": [3, 5], "x": 11, "y": 1.25},
+ {"matrix": [2, 6], "x": 12, "y": 1.25},
+ {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+ {"matrix": [2, 7], "x": 15.25, "y": 1.25},
+ {"matrix": [3, 7], "x": 16.25, "y": 1.25},
+ {"matrix": [2, 8], "x": 17.25, "y": 1.25},
+
+ {"matrix": [3, 8], "x": 18.5, "y": 1.25},
+ {"matrix": [2, 9], "x": 19.5, "y": 1.25},
+ {"matrix": [3, 9], "x": 20.5, "y": 1.25},
+ {"matrix": [2, 10], "x": 21.5, "y": 1.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+ {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+ {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+ {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+ {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+ {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+ {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+ {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+ {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+ {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+ {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+ {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+ {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+ {"matrix": [5, 7], "x": 16.25, "y": 2.25},
+ {"matrix": [4, 8], "x": 17.25, "y": 2.25},
+
+ {"matrix": [5, 8], "x": 18.5, "y": 2.25},
+ {"matrix": [4, 9], "x": 19.5, "y": 2.25},
+ {"matrix": [5, 9], "x": 20.5, "y": 2.25},
+ {"matrix": [6, 0], "x": 21.5, "y": 2.25, "h": 2},
+
+ {"matrix": [7, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [6, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [7, 1], "x": 2.75, "y": 3.25},
+ {"matrix": [6, 2], "x": 3.75, "y": 3.25},
+ {"matrix": [7, 2], "x": 4.75, "y": 3.25},
+ {"matrix": [6, 3], "x": 5.75, "y": 3.25},
+ {"matrix": [7, 3], "x": 6.75, "y": 3.25},
+ {"matrix": [6, 4], "x": 7.75, "y": 3.25},
+ {"matrix": [7, 4], "x": 8.75, "y": 3.25},
+ {"matrix": [6, 5], "x": 9.75, "y": 3.25},
+ {"matrix": [7, 5], "x": 10.75, "y": 3.25},
+ {"matrix": [7, 6], "x": 11.75, "y": 3.25},
+ {"matrix": [7, 8], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [6, 9], "x": 18.5, "y": 3.25},
+ {"matrix": [7, 9], "x": 19.5, "y": 3.25},
+ {"matrix": [6, 10], "x": 20.5, "y": 3.25},
+
+ {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [9, 0], "x": 2.25, "y": 4.25},
+ {"matrix": [8, 1], "x": 3.25, "y": 4.25},
+ {"matrix": [9, 1], "x": 4.25, "y": 4.25},
+ {"matrix": [8, 2], "x": 5.25, "y": 4.25},
+ {"matrix": [9, 2], "x": 6.25, "y": 4.25},
+ {"matrix": [8, 3], "x": 7.25, "y": 4.25},
+ {"matrix": [9, 3], "x": 8.25, "y": 4.25},
+ {"matrix": [8, 4], "x": 9.25, "y": 4.25},
+ {"matrix": [9, 4], "x": 10.25, "y": 4.25},
+ {"matrix": [8, 5], "x": 11.25, "y": 4.25},
+ {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+ {"matrix": [9, 7], "x": 16.25, "y": 4.25},
+
+ {"matrix": [9, 8], "x": 18.5, "y": 4.25},
+ {"matrix": [8, 9], "x": 19.5, "y": 4.25},
+ {"matrix": [9, 9], "x": 20.5, "y": 4.25},
+ {"matrix": [10, 0], "x": 21.5, "y": 4.25, "h": 2},
+
+ {"matrix": [11, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [11, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [11, 4], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 6], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [11, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+ {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+ {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+ {"matrix": [10, 9], "x": 17.25, "y": 5.25},
+
+ {"matrix": [11, 9], "x": 18.5, "y": 5.25, "w": 2},
+ {"matrix": [10, 10], "x": 20.5, "y": 5.25}
]
}
}
diff --git a/keyboards/xelus/rs108/rs108.h b/keyboards/xelus/rs108/rs108.h
deleted file mode 100644
index 5ba9d70ce8..0000000000
--- a/keyboards/xelus/rs108/rs108.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2022 Harrison Chan (Xelus)
- *
- * 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 XXXXX KC_NO
-
-#define LAYOUT_108_fullsize_ansi( \
- K0000, K0001, K0101, K0002, K0102, K0003, K0103, K0004, K0104, K0005, K0105, K0006, K0106, K0007, K0107, K0008, K0108, K0009, K0109, K0010, \
- K0200, K0300, K0201, K0301, K0202, K0302, K0203, K0303, K0204, K0304, K0205, K0305, K0206, K0306, K0207, K0307, K0208, K0308, K0209, K0309, K0210, \
- K0400, K0500, K0401, K0501, K0402, K0502, K0403, K0503, K0404, K0504, K0405, K0505, K0406, K0506, K0407, K0507, K0408, K0508, K0409, K0509, \
- K0600, K0700, K0601, K0701, K0602, K0702, K0603, K0703, K0604, K0704, K0605, K0705, K0706, K0708, K0609, K0709, K0610, \
- K0800, K0900, K0801, K0901, K0802, K0902, K0803, K0903, K0804, K0904, K0805, K0906, K0907, K0908, K0809, K0909, \
- K1000, K1100, K1001, K1102, K1104, K1005, K1006, K1106, K1007, K1107, K1008, K1009, K1109, K1010 \
-) { \
- { K0000, K0001, K0002, K0003, K0004, K0005, K0006, K0007, K0008, K0009, K0010 }, \
- { XXXXX, K0101, K0102, K0103, K0104, K0105, K0106, K0107, K0108, K0109, XXXXX }, \
- { K0200, K0201, K0202, K0203, K0204, K0205, K0206, K0207, K0208, K0209, K0210 }, \
- { K0300, K0301, K0302, K0303, K0304, K0305, K0306, K0307, K0308, K0309, XXXXX }, \
- { K0400, K0401, K0402, K0403, K0404, K0405, K0406, K0407, K0408, K0409, XXXXX }, \
- { K0500, K0501, K0502, K0503, K0504, K0505, K0506, K0507, K0508, K0509, XXXXX }, \
- { K0600, K0601, K0602, K0603, K0604, K0605, XXXXX, XXXXX, XXXXX, K0609, K0610 }, \
- { K0700, K0701, K0702, K0703, K0704, K0705, K0706, XXXXX, K0708, K0709, XXXXX }, \
- { K0800, K0801, K0802, K0803, K0804, K0805, XXXXX, XXXXX, XXXXX, K0809, XXXXX }, \
- { K0900, K0901, K0902, K0903, K0904, XXXXX, K0906, K0907, K0908, K0909, XXXXX }, \
- { K1000, K1001, XXXXX, XXXXX, XXXXX, K1005, K1006, K1007, K1008, K1009, K1010 }, \
- { K1100, XXXXX, K1102, XXXXX, K1104, XXXXX, K1106, K1107, XXXXX, K1109, XXXXX }, \
-}
diff --git a/keyboards/xelus/xs108/info.json b/keyboards/xelus/xs108/info.json
index d138c3ed65..ab9bf597dd 100644
--- a/keyboards/xelus/xs108/info.json
+++ b/keyboards/xelus/xs108/info.json
@@ -23,119 +23,138 @@
"layouts": {
"LAYOUT_108_ansi": {
"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": "Num Lock", "x": 18.5, "y": 0 },
- { "label": "MUTE", "x": 19.5, "y": 0 },
- { "label": "VOLD", "x": 20.5, "y": 0 },
- { "label": "VOLU", "x": 21.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 },
- { "label": "Backspace", "x": 14, "y": 1.25 },
- { "label": "Insert", "x": 15.25, "y": 1.25 },
- { "label": "Home", "x": 16.25, "y": 1.25 },
- { "label": "PgUp", "x": 17.25, "y": 1.25 },
- { "label": "Num Lock", "x": 18.5, "y": 1.25 },
- { "label": "/", "x": 19.5, "y": 1.25 },
- { "label": "*", "x": 20.5, "y": 1.25 },
- { "label": "-", "x": 21.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": "End", "x": 16.25, "y": 2.25 },
- { "label": "PgDn", "x": 17.25, "y": 2.25 },
- { "label": "7", "x": 18.5, "y": 2.25 },
- { "label": "8", "x": 19.5, "y": 2.25 },
- { "label": "9", "x": 20.5, "y": 2.25 },
- { "label": "+", "x": 21.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": 18.5, "y": 3.25 },
- { "label": "5", "x": 19.5, "y": 3.25 },
- { "label": "6", "x": 20.5, "y": 3.25 },
- { "label": "+", "x": 21.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": 1.75 },
- { "label": "Shift", "x": 14, "y": 4.25 },
- { "label": "\u2191", "x": 16.25, "y": 4.25 },
- { "label": "1", "x": 18.5, "y": 4.25 },
- { "label": "2", "x": 19.5, "y": 4.25 },
- { "label": "3", "x": 20.5, "y": 4.25 },
- { "label": "Enter", "x": 21.5, "y": 4.25 },
- { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
- { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
- { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
- { "x": 3.75, "y": 5.25, "w": 6.25 },
- { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
- { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
- { "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25 },
- { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
- { "label": "\u2190", "x": 15.25, "y": 5.25 },
- { "label": "\u2193", "x": 16.25, "y": 5.25 },
- { "label": "\u2192", "x": 17.25, "y": 5.25 },
- { "label": "0", "x": 18.5, "y": 5.25 },
- { "label": "0", "x": 19.5, "y": 5.25 },
- { "label": ".", "x": 20.5, "y": 5.25 },
- { "label": "Enter", "x": 21.5, "y": 5.25 }
+ {"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": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+ {"matrix": [0, 18], "x": 19.5, "y": 0},
+ {"matrix": [0, 19], "x": 20.5, "y": 0},
+ {"matrix": [0, 20], "x": 21.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": [3, 13], "x": 14, "y": 1.25},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"matrix": [1, 17], "x": 18.5, "y": 1.25},
+ {"matrix": [1, 18], "x": 19.5, "y": 1.25},
+ {"matrix": [1, 19], "x": 20.5, "y": 1.25},
+ {"matrix": [1, 20], "x": 21.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, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+ {"matrix": [2, 17], "x": 18.5, "y": 2.25},
+ {"matrix": [2, 18], "x": 19.5, "y": 2.25},
+ {"matrix": [2, 19], "x": 20.5, "y": 2.25},
+ {"matrix": [2, 20], "x": 21.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, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [3, 17], "x": 18.5, "y": 3.25},
+ {"matrix": [3, 18], "x": 19.5, "y": 3.25},
+ {"matrix": [3, 19], "x": 20.5, "y": 3.25},
+ {"matrix": [3, 20], "x": 21.5, "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, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+ {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"matrix": [4, 17], "x": 18.5, "y": 4.25},
+ {"matrix": [4, 18], "x": 19.5, "y": 4.25},
+ {"matrix": [4, 19], "x": 20.5, "y": 4.25},
+ {"matrix": [4, 20], "x": 21.5, "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, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"matrix": [5, 16], "x": 17.25, "y": 5.25},
+
+ {"matrix": [5, 17], "x": 18.5, "y": 5.25},
+ {"matrix": [5, 18], "x": 19.5, "y": 5.25},
+ {"matrix": [5, 19], "x": 20.5, "y": 5.25},
+ {"matrix": [5, 20], "x": 21.5, "y": 5.25}
]
}
}
diff --git a/keyboards/xelus/xs108/xs108.h b/keyboards/xelus/xs108/xs108.h
deleted file mode 100644
index 765f5ea68d..0000000000
--- a/keyboards/xelus/xs108/xs108.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright 2022 Harrison Chan (Xelus)
- *
- * 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
-
-/* hotswap
- #define LAYOUT_108_ansi( \
- K000, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, K019, K020, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, K118, K119, K120, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217, K218, K219, K320, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K317, K318, K319, \
- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K412, K415, K417, K418, K419, K520, \
- K500, K501, K502, K505, K509, K510, K512, K513, K514, K515, K516, K518, K519 \
-) { \
- { K000, ____, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, K019, K020 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, K118, K119, K120 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217, K218, K219, ____ }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, ____, K313, ____, ____, ____, K317, K318, K319, K320 }, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, ____, K412, ____, ____, K415, ____, K417, K418, K419, ____ }, \
- { K500, K501, K502, ____, ____, K505, ____, ____, ____, K509, K510, ____, K512, K513, K514, K515, K516, ____, K518, K519, K520 } \
-}
-*/
-
-// soldered
-#define LAYOUT_108_ansi( \
- K000, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, K019, K020, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K313, K114, K115, K116, K117, K118, K119, K120, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217, K218, K219, K220, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K317, K318, K319, K320, \
- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K412, K413, K415, K417, K418, K419, K420, \
- K500, K501, K502, K505, K509, K510, K512, K513, K514, K515, K516, K517, K518, K519, K520 \
-) { \
- { K000, ____, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, K019, K020 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, K118, K119, K120 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217, K218, K219, K220 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, ____, ____, ____, K317, K318, K319, K320 }, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, ____, K412, K413, ____, K415, ____, K417, K418, K419, K420 }, \
- { K500, K501, K502, ____, ____, K505, ____, ____, ____, K509, K510, ____, K512, K513, K514, K515, K516, K517, K518, K519, K520 } \
-}
diff --git a/keyboards/ydkb/yd68/info.json b/keyboards/ydkb/yd68/info.json
index ee5d43fb8e..b552f9e2cf 100644
--- a/keyboards/ydkb/yd68/info.json
+++ b/keyboards/ydkb/yd68/info.json
@@ -24,7 +24,80 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_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}, {"x":15, "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}, {"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":"Enter", "x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "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":"Win", "x":11, "y":4}, {"x":12, "y":4}, {"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": [4, 8], "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": [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, 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},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
}
}
}
diff --git a/keyboards/ydkb/yd68/yd68.c b/keyboards/ydkb/yd68/yd68.c
index 22f75f7f81..0e6d5b82d5 100644
--- a/keyboards/ydkb/yd68/yd68.c
+++ b/keyboards/ydkb/yd68/yd68.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 "yd68.h"
+#include "quantum.h"
void keyboard_pre_init_kb(void) {
//Backlight LEDs Output Low
diff --git a/keyboards/ydkb/yd68/yd68.h b/keyboards/ydkb/yd68/yd68.h
deleted file mode 100644
index 3303bd899e..0000000000
--- a/keyboards/ydkb/yd68/yd68.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2018 Ryan "Izzy" Bales
- *
- * 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 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.
- */
-/* YD68 ANSI layout
- * ,----------------------------------------------------------------.
- * | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0e | 48 |
- * |----------------------------------------------------------------|
- * | 10 | 11| 12| 13| 14| 15| 16| 17| 18| 19| 1a| 1b| 1c| 1d | 1e |
- * |----------------------------------------------------------------|
- * | 20 | 21| 22| 23| 24| 25| 26| 27| 28| 29| 2a| 2b| 2d | 2e |
- * |----------------------------------------------------------------|
- * | 30 | 32| 33| 34| 35| 36| 37| 38| 39| 3a| 3b| 3c | 3d| 3e |
- * |----------------------------------------------------------------|
- * | 40 | 41 | 42 | 46 | 49| 4a| 4b| 4c| 4d| 4e |
- * `----------------------------------------------------------------'
- */
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define LAYOUT_ansi( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k48, \
- 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, k49, k4A, k4B, k4C, k4D, k4E \
-) { \
- { 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, 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, k48, k49, k4A, k4B, k4C, k4D, k4E } \
-}