summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keyboards/bacca70/bacca70.h65
-rw-r--r--keyboards/bacca70/info.json338
-rw-r--r--keyboards/basketweave/basketweave.h35
-rw-r--r--keyboards/basketweave/info.json148
-rw-r--r--keyboards/basketweave/keymaps/default/keymap.c2
-rw-r--r--keyboards/cannonkeys/chimera65/chimera65.h17
-rw-r--r--keyboards/cannonkeys/chimera65/info.json140
-rw-r--r--keyboards/cannonkeys/gentoo_hs/gentoo_hs.h34
-rw-r--r--keyboards/cannonkeys/gentoo_hs/info.json140
-rw-r--r--keyboards/cannonkeys/instant65/info.json75
-rw-r--r--keyboards/cannonkeys/instant65/instant65.h17
-rw-r--r--keyboards/cannonkeys/iron165/info.json78
-rw-r--r--keyboards/cannonkeys/iron165/iron165.h17
-rw-r--r--keyboards/cannonkeys/malicious_ergo/info.json89
-rw-r--r--keyboards/cannonkeys/malicious_ergo/malicious_ergo.h34
-rw-r--r--keyboards/cannonkeys/practice65/info.json78
-rw-r--r--keyboards/cannonkeys/practice65/practice65.h19
-rw-r--r--keyboards/cannonkeys/sagittarius/info.json88
-rw-r--r--keyboards/cannonkeys/sagittarius/sagittarius.h38
-rw-r--r--keyboards/cannonkeys/satisfaction75/prototype/info.json193
-rw-r--r--keyboards/cannonkeys/satisfaction75/prototype/prototype.h36
-rw-r--r--keyboards/cannonkeys/satisfaction75/rev1/info.json599
-rw-r--r--keyboards/cannonkeys/satisfaction75/rev1/rev1.h108
-rw-r--r--keyboards/cannonkeys/satisfaction75/satisfaction75.h6
-rw-r--r--keyboards/cannonkeys/tmov2/info.json61
-rw-r--r--keyboards/cannonkeys/tmov2/tmov2.h15
-rw-r--r--keyboards/cannonkeys/tsukuyomi/info.json88
-rw-r--r--keyboards/cannonkeys/tsukuyomi/tsukuyomi.h33
-rw-r--r--keyboards/cannonkeys/vicious40/info.json52
-rw-r--r--keyboards/cannonkeys/vicious40/vicious40.h33
-rw-r--r--keyboards/chalice/chalice.h60
-rw-r--r--keyboards/chalice/info.json305
-rw-r--r--keyboards/checkerboards/ud40_ortho_alt/info.json251
-rw-r--r--keyboards/checkerboards/ud40_ortho_alt/ud40_ortho_alt.h81
-rw-r--r--keyboards/cipulot/kallos/info.json505
-rw-r--r--keyboards/cipulot/kallos/kallos.h35
-rw-r--r--keyboards/daji/seis_cinco/info.json276
-rw-r--r--keyboards/daji/seis_cinco/seis_cinco.h55
-rw-r--r--keyboards/dztech/dz96/dz96.h97
-rw-r--r--keyboards/dztech/dz96/info.json845
-rw-r--r--keyboards/function96/v2/info.json1073
-rw-r--r--keyboards/function96/v2/v2.h104
-rw-r--r--keyboards/handwired/axon/axon.h85
-rw-r--r--keyboards/handwired/axon/info.json310
-rw-r--r--keyboards/keyhive/absinthe/absinthe.h68
-rw-r--r--keyboards/keyhive/absinthe/info.json298
-rw-r--r--keyboards/kv/revt/info.json244
-rw-r--r--keyboards/kv/revt/revt.c2
-rw-r--r--keyboards/kv/revt/revt.h36
-rw-r--r--keyboards/ll3macorn/bongopad/bongopad.c2
-rw-r--r--keyboards/ll3macorn/bongopad/bongopad.h18
-rw-r--r--keyboards/ll3macorn/bongopad/info.json22
-rw-r--r--keyboards/lyso1/lck75/info.json716
-rw-r--r--keyboards/lyso1/lck75/lck75.c2
-rw-r--r--keyboards/lyso1/lck75/lck75.h143
-rw-r--r--keyboards/lyso1/lefishe/info.json364
-rw-r--r--keyboards/lyso1/lefishe/lefishe.h76
-rw-r--r--keyboards/mb44/info.json370
-rw-r--r--keyboards/mb44/mb44.h84
-rwxr-xr-xkeyboards/mechkeys/espectro/espectro.h163
-rw-r--r--keyboards/mechkeys/espectro/info.json815
-rw-r--r--keyboards/mino/hotswap/hotswap.h40
-rw-r--r--keyboards/mino/hotswap/info.json92
-rw-r--r--keyboards/nightmare/info.json632
-rw-r--r--keyboards/nightmare/nightmare.h51
-rw-r--r--keyboards/pegasus/info.json176
-rw-r--r--keyboards/pegasus/pegasus.c2
-rw-r--r--keyboards/pegasus/pegasus.h57
-rw-r--r--keyboards/program_yoink/staggered/info.json204
-rw-r--r--keyboards/program_yoink/staggered/staggered.h55
-rw-r--r--keyboards/qpockets/eggman/eggman.h39
-rw-r--r--keyboards/qpockets/eggman/info.json84
-rw-r--r--keyboards/qpockets/space_space/rev1/info.json160
-rw-r--r--keyboards/qpockets/space_space/rev1/rev1.h45
-rw-r--r--keyboards/qpockets/space_space/rev2/info.json160
-rw-r--r--keyboards/qpockets/space_space/rev2/rev2.c2
-rw-r--r--keyboards/qpockets/space_space/rev2/rev2.h49
-rw-r--r--keyboards/qpockets/wanten/info.json281
-rw-r--r--keyboards/qpockets/wanten/wanten.h65
-rw-r--r--keyboards/sowbug/68keys/68keys.c4
-rw-r--r--keyboards/sowbug/68keys/68keys.h32
-rw-r--r--keyboards/sowbug/68keys/info.json147
-rw-r--r--keyboards/sowbug/ansi_tkl/ansi_tkl.c4
-rw-r--r--keyboards/sowbug/ansi_tkl/ansi_tkl.h33
-rw-r--r--keyboards/sowbug/ansi_tkl/info.json190
-rw-r--r--keyboards/synapse/info.json180
-rw-r--r--keyboards/synapse/synapse.c3
-rw-r--r--keyboards/synapse/synapse.h48
-rw-r--r--keyboards/viktus/styrka/info.json288
-rw-r--r--keyboards/viktus/styrka/styrka.h90
-rw-r--r--keyboards/ymdk/ymd96/info.json325
-rw-r--r--keyboards/ymdk/ymd96/ymd96.h75
92 files changed, 7103 insertions, 6691 deletions
diff --git a/keyboards/bacca70/bacca70.h b/keyboards/bacca70/bacca70.h
deleted file mode 100644
index 0583fd8043..0000000000
--- a/keyboards/bacca70/bacca70.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright 2022 keebnewb
- *
- * 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_default( \
- k00, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k17, \
- k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, \
- k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k47, \
- k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k67, \
- k80, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k96, k87, \
- ka0, ka1, ka3, kb5, ka7 \
-){ \
- { k00, k01, k02, k03, k04, k05, k06, ___ }, \
- { ___, k11, k12, k13, k14, k15, k16, k17 }, \
- { k20, k21, k22, k23, k24, k25, k26, k27 }, \
- { k30, k31, k32, k33, k34, k35, k36, ___ }, \
- { k40, k41, k42, k43, k44, k45, k46, k47 }, \
- { k50, k51, k52, k53, k54, k55, ___, ___ }, \
- { k60, k61, k62, k63, k64, k65, ___, k67 }, \
- { k70, k71, k72, k73, k74, k75, ___, ___ }, \
- { k80, k81, k82, k83, k84, k85, ___, k87 }, \
- { ___, k91, k92, k93, k94, k95, k96, ___ }, \
- { ka0, ka1, ___, ka3, ___, ___, ___, ka7 }, \
- { ___, ___, ___, ___, ___, kb5, ___, ___ } \
-}
-
-#define LAYOUT_debaccabean( \
- k00, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k17, \
- k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, \
- k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, \
- k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k67, \
- k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86, k96, k87, \
- ka0, ka1, ka2, ka3, ka4, kb5, ka7 \
-){ \
- { k00, k01, k02, k03, k04, k05, k06, ___ }, \
- { ___, k11, k12, k13, k14, k15, k16, k17 }, \
- { k20, k21, k22, k23, k24, k25, k26, k27 }, \
- { k30, k31, k32, k33, k34, k35, k36, ___ }, \
- { k40, k41, k42, k43, k44, k45, k46, k47 }, \
- { k50, k51, k52, k53, k54, k55, k56, ___ }, \
- { k60, k61, k62, k63, k64, k65, k66, k67 }, \
- { k70, k71, k72, k73, k74, k75, k76, ___ }, \
- { k80, k81, k82, k83, k84, k85, k86, k87 }, \
- { k90, k91, k92, k93, k94, k95, k96, ___ }, \
- { ka0, ka1, ka2, ka3, ka4, ___, ___, ka7 }, \
- { ___, ___, ___, ___, ___, kb5, ___, ___ } \
-}
diff --git a/keyboards/bacca70/info.json b/keyboards/bacca70/info.json
index 737ea0b4fd..143c19d987 100644
--- a/keyboards/bacca70/info.json
+++ b/keyboards/bacca70/info.json
@@ -17,167 +17,185 @@
"bootloader": "stm32-dfu",
"layouts": {
"LAYOUT_default": {
- "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":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":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":1.75},
- {"x":14, "y":4.25},
- {"x":0, "y":5.25, "w":1.5},
- {"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":13.5, "y":5.25, "w":1.5}
- ]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [1, 1], "x": 2.25, "y": 0},
+ {"matrix": [0, 2], "x": 3.25, "y": 0},
+ {"matrix": [1, 2], "x": 4.25, "y": 0},
+
+ {"matrix": [0, 3], "x": 5.5, "y": 0},
+ {"matrix": [1, 3], "x": 6.5, "y": 0},
+ {"matrix": [0, 4], "x": 7.5, "y": 0},
+ {"matrix": [1, 4], "x": 8.5, "y": 0},
+
+ {"matrix": [0, 5], "x": 9.75, "y": 0},
+ {"matrix": [1, 5], "x": 10.75, "y": 0},
+ {"matrix": [0, 6], "x": 11.75, "y": 0},
+ {"matrix": [1, 6], "x": 12.75, "y": 0},
+
+ {"matrix": [1, 7], "x": 14, "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},
+ {"matrix": [2, 7], "x": 14, "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": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+ {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+ {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+ {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+ {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+ {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+ {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+ {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+ {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+ {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+ {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+ {"matrix": [6, 7], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+ {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+ {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+ {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+ {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+ {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+ {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+ {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+ {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+ {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+ {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"matrix": [8, 7], "x": 14, "y": 4.25},
+
+ {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"matrix": [10, 3], "x": 4, "y": 5.25, "w": 7},
+ {"matrix": [11, 5], "x": 11, "y": 5.25, "w": 1.5},
+ {"matrix": [10, 7], "x": 13.5, "y": 5.25, "w": 1.5}
+ ]
},
"LAYOUT_debaccabean": {
- "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":0, "y":2.25},
- {"x":1, "y":2.25},
- {"x":2, "y":2.25},
- {"x":3, "y":2.25},
- {"x":4, "y":2.25},
- {"x":5, "y":2.25},
- {"x":6, "y":2.25},
- {"x":7, "y":2.25},
- {"x":8, "y":2.25},
- {"x":9, "y":2.25},
- {"x":10, "y":2.25},
- {"x":11, "y":2.25},
- {"x":12, "y":2.25},
- {"x":13, "y":2.25},
- {"x":14, "y":2.25},
- {"x":0, "y":3.25},
- {"x":1, "y":3.25},
- {"x":2, "y":3.25},
- {"x":3, "y":3.25},
- {"x":4, "y":3.25},
- {"x":5, "y":3.25},
- {"x":6, "y":3.25},
- {"x":7, "y":3.25},
- {"x":8, "y":3.25},
- {"x":9, "y":3.25},
- {"x":10, "y":3.25},
- {"x":11, "y":3.25},
- {"x":12, "y":3.25},
- {"x":13, "y":3.25},
- {"x":14, "y":3.25},
- {"x":0, "y":4.25},
- {"x":1, "y":4.25},
- {"x":2, "y":4.25},
- {"x":3, "y":4.25},
- {"x":4, "y":4.25},
- {"x":5, "y":4.25},
- {"x":6, "y":4.25},
- {"x":7, "y":4.25},
- {"x":8, "y":4.25},
- {"x":9, "y":4.25},
- {"x":10, "y":4.25},
- {"x":11, "y":4.25},
- {"x":12, "y":4.25},
- {"x":13, "y":4.25},
- {"x":14, "y":4.25},
- {"x":0, "y":5.25, "w":1.5},
- {"x":2.5, "y":5.25, "w":1.5},
- {"x":4, "y":5.25, "w":3},
- {"x":7, "y":5.25},
- {"x":8, "y":5.25, "w":3},
- {"x":11, "y":5.25, "w":1.5},
- {"x":13.5, "y":5.25, "w":1.5}
- ]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [1, 1], "x": 2.25, "y": 0},
+ {"matrix": [0, 2], "x": 3.25, "y": 0},
+ {"matrix": [1, 2], "x": 4.25, "y": 0},
+
+ {"matrix": [0, 3], "x": 5.5, "y": 0},
+ {"matrix": [1, 3], "x": 6.5, "y": 0},
+ {"matrix": [0, 4], "x": 7.5, "y": 0},
+ {"matrix": [1, 4], "x": 8.5, "y": 0},
+
+ {"matrix": [0, 5], "x": 9.75, "y": 0},
+ {"matrix": [1, 5], "x": 10.75, "y": 0},
+ {"matrix": [0, 6], "x": 11.75, "y": 0},
+ {"matrix": [1, 6], "x": 12.75, "y": 0},
+
+ {"matrix": [1, 7], "x": 14, "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},
+ {"matrix": [2, 7], "x": 14, "y": 1.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 2.25},
+ {"matrix": [5, 0], "x": 1, "y": 2.25},
+ {"matrix": [4, 1], "x": 2, "y": 2.25},
+ {"matrix": [5, 1], "x": 3, "y": 2.25},
+ {"matrix": [4, 2], "x": 4, "y": 2.25},
+ {"matrix": [5, 2], "x": 5, "y": 2.25},
+ {"matrix": [4, 3], "x": 6, "y": 2.25},
+ {"matrix": [5, 3], "x": 7, "y": 2.25},
+ {"matrix": [4, 4], "x": 8, "y": 2.25},
+ {"matrix": [5, 4], "x": 9, "y": 2.25},
+ {"matrix": [4, 5], "x": 10, "y": 2.25},
+ {"matrix": [5, 5], "x": 11, "y": 2.25},
+ {"matrix": [4, 6], "x": 12, "y": 2.25},
+ {"matrix": [5, 6], "x": 13, "y": 2.25},
+ {"matrix": [4, 7], "x": 14, "y": 2.25},
+
+ {"matrix": [6, 0], "x": 0, "y": 3.25},
+ {"matrix": [7, 0], "x": 1, "y": 3.25},
+ {"matrix": [6, 1], "x": 2, "y": 3.25},
+ {"matrix": [7, 1], "x": 3, "y": 3.25},
+ {"matrix": [6, 2], "x": 4, "y": 3.25},
+ {"matrix": [7, 2], "x": 5, "y": 3.25},
+ {"matrix": [6, 3], "x": 6, "y": 3.25},
+ {"matrix": [7, 3], "x": 7, "y": 3.25},
+ {"matrix": [6, 4], "x": 8, "y": 3.25},
+ {"matrix": [7, 4], "x": 9, "y": 3.25},
+ {"matrix": [6, 5], "x": 10, "y": 3.25},
+ {"matrix": [7, 5], "x": 11, "y": 3.25},
+ {"matrix": [6, 6], "x": 12, "y": 3.25},
+ {"matrix": [7, 6], "x": 13, "y": 3.25},
+ {"matrix": [6, 7], "x": 14, "y": 3.25},
+
+ {"matrix": [8, 0], "x": 0, "y": 4.25},
+ {"matrix": [9, 0], "x": 1, "y": 4.25},
+ {"matrix": [8, 1], "x": 2, "y": 4.25},
+ {"matrix": [9, 1], "x": 3, "y": 4.25},
+ {"matrix": [8, 2], "x": 4, "y": 4.25},
+ {"matrix": [9, 2], "x": 5, "y": 4.25},
+ {"matrix": [8, 3], "x": 6, "y": 4.25},
+ {"matrix": [9, 3], "x": 7, "y": 4.25},
+ {"matrix": [8, 4], "x": 8, "y": 4.25},
+ {"matrix": [9, 4], "x": 9, "y": 4.25},
+ {"matrix": [8, 5], "x": 10, "y": 4.25},
+ {"matrix": [9, 5], "x": 11, "y": 4.25},
+ {"matrix": [8, 6], "x": 12, "y": 4.25},
+ {"matrix": [9, 6], "x": 13, "y": 4.25},
+ {"matrix": [8, 7], "x": 14, "y": 4.25},
+
+ {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"matrix": [10, 2], "x": 4, "y": 5.25, "w": 3},
+ {"matrix": [10, 3], "x": 7, "y": 5.25},
+ {"matrix": [10, 4], "x": 8, "y": 5.25, "w": 3},
+ {"matrix": [11, 5], "x": 11, "y": 5.25, "w": 1.5},
+ {"matrix": [10, 7], "x": 13.5, "y": 5.25, "w": 1.5}
+ ]
}
- }
+ }
}
diff --git a/keyboards/basketweave/basketweave.h b/keyboards/basketweave/basketweave.h
deleted file mode 100644
index b08254406c..0000000000
--- a/keyboards/basketweave/basketweave.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 null-ll
- *
- * 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_default( \
- 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, K414, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \
- K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K214, \
- K401, K402, K404, K406, K408, K410, K411, K412, K413, K314 \
-) { \
- { 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 }, \
- { ____, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
- { ____, K401, K402, ____, K404, ____, K406, ____, K408, ____, K410, K411, K412, K413, K414 } \
-}
diff --git a/keyboards/basketweave/info.json b/keyboards/basketweave/info.json
index f635d80fff..825364424b 100644
--- a/keyboards/basketweave/info.json
+++ b/keyboards/basketweave/info.json
@@ -23,75 +23,85 @@
"layouts": {
"LAYOUT_default": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"~", "x":1.5, "y":0},
- {"label":"!", "x":2.5, "y":0},
- {"label":"@", "x":3.5, "y":0},
- {"label":"#", "x":4.5, "y":0},
- {"label":"$", "x":5.5, "y":0},
- {"label":"%", "x":6.5, "y":0},
- {"label":"^", "x":7.5, "y":0},
- {"label":"&", "x":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":"Backspace", "x":16.5, "y":0, "w":2},
- {"label":"Insert", "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":10, "y":1},
- {"label":"U", "x":11, "y":1},
- {"label":"I", "x":12, "y":1},
- {"label":"O", "x":13, "y":1},
- {"label":"P", "x":14, "y":1},
- {"label":"{", "x":15, "y":1},
- {"label":"}", "x":16, "y":1},
- {"label":"|", "x":17, "y":1, "w":1.5},
- {"label":"Mute", "x":19, "y":0.5},
- {"label":"Delete", "x":0, "y":2},
- {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75},
- {"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":10.25, "y":2},
- {"label":"J", "x":11.25, "y":2},
- {"label":"K", "x":12.25, "y":2},
- {"label":"L", "x":13.25, "y":2},
- {"label":":", "x":14.25, "y":2},
- {"label":"\"", "x":15.25, "y":2},
- {"label":"Enter", "x":16.25, "y":2, "w":2.25},
- {"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":"B", "x":9.75, "y":3},
- {"label":"N", "x":10.75, "y":3},
- {"label":"M", "x":11.75, "y":3},
- {"label":"<", "x":12.75, "y":3},
- {"label":">", "x":13.75, "y":3},
- {"label":"?", "x":14.75, "y":3},
- {"label":"Shift", "x":15.75, "y":3, "w":1.75},
- {"label":"Up", "x":17.75, "y":3.25},
- {"label":"Ctrl", "x":1.5, "y":4, "w":1.5},
- {"label":"Alt", "x":4.5, "y":4, "w":1.5},
- {"label":"Space", "x":6, "y":4, "w":2},
- {"label":"Fn", "x":8, "y":4},
- {"label":"Space", "x":9.75, "y":4, "w":2.75},
- {"label":"Alt", "x":12.5, "y":4, "w":1.5},
- {"label":"Ctrl", "x":15, "y":4, "w":1.5},
- {"label":"Left", "x":16.75, "y":4.25},
- {"label":"Down", "x":17.75, "y":4.25},
- {"label":"Right", "x":18.75, "y":4.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.5, "y": 0},
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 10.5, "y": 0},
+ {"matrix": [0, 9], "x": 11.5, "y": 0},
+ {"matrix": [0, 10], "x": 12.5, "y": 0},
+ {"matrix": [0, 11], "x": 13.5, "y": 0},
+ {"matrix": [0, 12], "x": 14.5, "y": 0},
+ {"matrix": [0, 13], "x": 15.5, "y": 0},
+ {"matrix": [0, 14], "x": 16.5, "y": 0, "w": 2},
+
+ {"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": 10, "y": 1},
+ {"matrix": [1, 8], "x": 11, "y": 1},
+ {"matrix": [1, 9], "x": 12, "y": 1},
+ {"matrix": [1, 10], "x": 13, "y": 1},
+ {"matrix": [1, 11], "x": 14, "y": 1},
+ {"matrix": [1, 12], "x": 15, "y": 1},
+ {"matrix": [1, 13], "x": 16, "y": 1},
+ {"matrix": [1, 14], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [4, 14], "x": 19, "y": 0.5},
+
+ {"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, 7], "x": 10.25, "y": 2},
+ {"matrix": [2, 8], "x": 11.25, "y": 2},
+ {"matrix": [2, 9], "x": 12.25, "y": 2},
+ {"matrix": [2, 10], "x": 13.25, "y": 2},
+ {"matrix": [2, 11], "x": 14.25, "y": 2},
+ {"matrix": [2, 12], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"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, 7], "x": 9.75, "y": 3},
+ {"matrix": [3, 8], "x": 10.75, "y": 3},
+ {"matrix": [3, 9], "x": 11.75, "y": 3},
+ {"matrix": [3, 10], "x": 12.75, "y": 3},
+ {"matrix": [3, 11], "x": 13.75, "y": 3},
+ {"matrix": [3, 12], "x": 14.75, "y": 3},
+ {"matrix": [3, 13], "x": 15.75, "y": 3, "w": 1.75},
+
+ {"matrix": [2, 14], "x": 17.75, "y": 3.25},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 4], "x": 6, "y": 4, "w": 2},
+ {"matrix": [4, 6], "x": 8, "y": 4},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 15, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 12], "x": 16.75, "y": 4.25},
+ {"matrix": [4, 13], "x": 17.75, "y": 4.25},
+ {"matrix": [3, 14], "x": 18.75, "y": 4.25}
]
}
}
diff --git a/keyboards/basketweave/keymaps/default/keymap.c b/keyboards/basketweave/keymaps/default/keymap.c
index 379c9f7985..efe70b32ec 100644
--- a/keyboards/basketweave/keymaps/default/keymap.c
+++ b/keyboards/basketweave/keymaps/default/keymap.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "basketweave.h"
+#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/cannonkeys/chimera65/chimera65.h b/keyboards/cannonkeys/chimera65/chimera65.h
deleted file mode 100644
index 81532f3f19..0000000000
--- a/keyboards/cannonkeys/chimera65/chimera65.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_default( \
- 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, K215, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K315, \
- K400, K401, K402, K406, K409, K410, K411, K412, K413, K415 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, KC_NO }, \
- { 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, KC_NO, K215 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, KC_NO, K315 }, \
- { K400, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, K409, K410, K411, K412, K413, KC_NO, K415 } \
-}
diff --git a/keyboards/cannonkeys/chimera65/info.json b/keyboards/cannonkeys/chimera65/info.json
index e5b30d6ea3..e9881750d9 100644
--- a/keyboards/cannonkeys/chimera65/info.json
+++ b/keyboards/cannonkeys/chimera65/info.json
@@ -23,85 +23,85 @@
"layouts": {
"LAYOUT_default": {
"layout": [
- {"x": 0, "y": 0},
- {"x": 1, "y": 0},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0},
- {"x": 4, "y": 0},
- {"x": 5, "y": 0},
- {"x": 6, "y": 0},
- {"x": 7, "y": 0},
- {"x": 8, "y": 0},
- {"x": 9, "y": 0},
- {"x": 10, "y": 0},
- {"x": 11, "y": 0},
- {"x": 12, "y": 0},
- {"x": 13, "y": 0},
- {"x": 14, "y": 0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
- {"x": 0, "y": 1, "w": 1.5},
- {"x": 1.5, "y": 1},
- {"x": 2.5, "y": 1},
- {"x": 3.5, "y": 1},
- {"x": 4.5, "y": 1},
- {"x": 5.5, "y": 1},
- {"x": 6.5, "y": 1},
- {"x": 7.5, "y": 1},
- {"x": 8.5, "y": 1},
- {"x": 9.5, "y": 1},
- {"x": 10.5, "y": 1},
- {"x": 11.5, "y": 1},
- {"x": 12.5, "y": 1},
- {"x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"x": 15.5, "y": 1},
+ {"matrix": [1, 15], "x": 15.5, "y": 1},
- {"x": 0, "y": 2, "w": 1.75},
- {"x": 1.75, "y": 2},
- {"x": 2.75, "y": 2},
- {"x": 3.75, "y": 2},
- {"x": 4.75, "y": 2},
- {"x": 5.75, "y": 2},
- {"x": 6.75, "y": 2},
- {"x": 7.75, "y": 2},
- {"x": 8.75, "y": 2},
- {"x": 9.75, "y": 2},
- {"x": 10.75, "y": 2},
- {"x": 11.75, "y": 2},
- {"x": 12.75, "y": 2},
- {"x": 13.75, "y": 2, "w": 1.25},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
- {"x": 15.5, "y": 2},
+ {"matrix": [2, 15], "x": 15.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, "w": 1.75},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"x": 14.25, "y": 3.25},
+ {"matrix": [3, 13], "x": 14.25, "y": 3.25},
- {"x": 15.5, "y": 3},
+ {"matrix": [3, 15], "x": 15.5, "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},
- {"x": 11, "y": 4},
- {"x": 12, "y": 4},
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4},
+ {"matrix": [4, 10], "x": 11, "y": 4},
+ {"matrix": [4, 11], "x": 12, "y": 4},
- {"x": 13.25, "y": 4.25},
- {"x": 14.25, "y": 4.25},
- {"x": 15.25, "y": 4.25}
+ {"matrix": [4, 12], "x": 13.25, "y": 4.25},
+ {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+ {"matrix": [4, 15], "x": 15.25, "y": 4.25}
]
}
}
diff --git a/keyboards/cannonkeys/gentoo_hs/gentoo_hs.h b/keyboards/cannonkeys/gentoo_hs/gentoo_hs.h
deleted file mode 100644
index 681de34985..0000000000
--- a/keyboards/cannonkeys/gentoo_hs/gentoo_hs.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2022 Andrew Kannan
- *
- * 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_default( \
- 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, K213, K214, \
- K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
- K400, K401, K402, K406, K410, K411, K412, K413, 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, ____, K213, K214 }, \
- { K300, ____, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
- { K400, K401, K402, ____, ____, ____, K406, ____, ____, ____, K410, K411, K412, K413, K414 } \
-}
diff --git a/keyboards/cannonkeys/gentoo_hs/info.json b/keyboards/cannonkeys/gentoo_hs/info.json
index f42bb88baa..95e0c09aed 100644
--- a/keyboards/cannonkeys/gentoo_hs/info.json
+++ b/keyboards/cannonkeys/gentoo_hs/info.json
@@ -22,77 +22,83 @@
"layouts": {
"LAYOUT_default": {
"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":"Del", "x":15.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},
+ {"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},
- {"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.5, "y":1},
+ {"matrix": [0, 14], "x": 15.5, "y": 0},
- {"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.5, "y":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},
- {"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":"Fn", "x":15.5, "y":3},
+ {"matrix": [1, 14], "x": 15.5, "y": 1},
- {"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":"Ctrl", "x":11.5, "y":4, "w":1.5},
- {"label":"Left", "x":13.25, "y":4.25},
- {"label":"Down", "x":14.25, "y":4.25},
- {"label":"Right", "x":15.25, "y":4.25}
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [2, 14], "x": 15.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": 1.75},
+
+ {"matrix": [3, 13], "x": 14.25, "y": 3.25},
+
+ {"matrix": [3, 14], "x": 15.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, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 12], "x": 13.25, "y": 4.25},
+ {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+ {"matrix": [4, 14], "x": 15.25, "y": 4.25}
]
}
}
diff --git a/keyboards/cannonkeys/instant65/info.json b/keyboards/cannonkeys/instant65/info.json
index cd98c81c6d..23b667cf6c 100644
--- a/keyboards/cannonkeys/instant65/info.json
+++ b/keyboards/cannonkeys/instant65/info.json
@@ -26,7 +26,80 @@
"bootloader": "stm32-dfu",
"layouts": {
"LAYOUT_default": {
- "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, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "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, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
}
}
}
diff --git a/keyboards/cannonkeys/instant65/instant65.h b/keyboards/cannonkeys/instant65/instant65.h
deleted file mode 100644
index 0e2d4ae372..0000000000
--- a/keyboards/cannonkeys/instant65/instant65.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_default( \
- 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, K213, K214, \
- K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
- K400, K401, K402, K406, K410, K411, K412, K413, 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, KC_NO, K213, K214 }, \
- { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
- { K400, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, K412, K413, K414 } \
-}
diff --git a/keyboards/cannonkeys/iron165/info.json b/keyboards/cannonkeys/iron165/info.json
index 39eaa70731..3ec67e95b6 100644
--- a/keyboards/cannonkeys/iron165/info.json
+++ b/keyboards/cannonkeys/iron165/info.json
@@ -22,8 +22,82 @@
"bootloader": "stm32-dfu",
"layouts": {
"LAYOUT_default": {
- "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"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":"Enter", "x":13.75, "y":2, "w":1.25}, {"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}, {"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.25}, {"label":"Ctrl", "x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 15], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+ {"matrix": [2, 15], "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, 15], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 15], "x": 15, "y": 4}
+ ]
}
}
-
}
diff --git a/keyboards/cannonkeys/iron165/iron165.h b/keyboards/cannonkeys/iron165/iron165.h
deleted file mode 100644
index d5579a09a4..0000000000
--- a/keyboards/cannonkeys/iron165/iron165.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_default( \
- 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, K215, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K315, \
- K400, K401, K402, K406, K410, K411, K412, K413, K415 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, KC_NO }, \
- { 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, KC_NO, K215 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, KC_NO, K315 }, \
- { K400, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, K412, K413, KC_NO, K415 } \
-}
diff --git a/keyboards/cannonkeys/malicious_ergo/info.json b/keyboards/cannonkeys/malicious_ergo/info.json
index bd34061f68..3b54ee75b6 100644
--- a/keyboards/cannonkeys/malicious_ergo/info.json
+++ b/keyboards/cannonkeys/malicious_ergo/info.json
@@ -32,7 +32,94 @@
"bootloader": "stm32-dfu",
"layouts": {
"LAYOUT_default": {
- "layout": [{"x":0.5, "y":0}, {"x":1.75, "y":0}, {"x":2.75, "y":0}, {"x":3.75, "y":0}, {"x":4.75, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":9.75, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":12.75, "y":0}, {"x":13.75, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":16.75, "y":0}, {"x":18, "y":0}, {"x":0.25, "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.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1}, {"x":14.5, "y":1}, {"x":15.5, "y":1}, {"x":16.5, "y":1, "w":1.5}, {"x":18.25, "y":1}, {"x":0, "y":2}, {"x":1.375, "y":2, "w":1.75}, {"x":3.125, "y":2}, {"x":4.13, "y":2}, {"x":5.13, "y":2}, {"x":6.13, "y":2}, {"x":7.13, "y":2}, {"x":9.88, "y":2}, {"x":10.88, "y":2}, {"x":11.88, "y":2}, {"x":12.88, "y":2}, {"x":13.88, "y":2}, {"x":14.88, "y":2}, {"x":15.88, "y":2, "w":2.25}, {"x":18.5, "y":2}, {"x":1.25, "y":3, "w":2.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":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}, {"x":15.5, "y":3, "w":1.75}, {"x":17.25, "y":3}, {"x":1.5, "y":4, "w":1.5}, {"x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2}, {"x":7.75, "y":4, "w":1.25}, {"x":9.5, "y":4, "w":2.75}, {"x":12.25, "y":4, "w":1.5}, {"x":14.25, "y":4, "w":1.5}, {"x":16.25, "y":4}, {"x":17.25, "y":4}, {"x":18.25, "y":4}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.75, "y": 0},
+ {"matrix": [0, 2], "x": 2.75, "y": 0},
+ {"matrix": [0, 3], "x": 3.75, "y": 0},
+ {"matrix": [0, 4], "x": 4.75, "y": 0},
+ {"matrix": [0, 5], "x": 5.75, "y": 0},
+ {"matrix": [0, 6], "x": 6.75, "y": 0},
+ {"matrix": [0, 7], "x": 7.75, "y": 0},
+
+ {"matrix": [0, 8], "x": 9.75, "y": 0},
+ {"matrix": [0, 9], "x": 10.75, "y": 0},
+ {"matrix": [0, 10], "x": 11.75, "y": 0},
+ {"matrix": [0, 11], "x": 12.75, "y": 0},
+ {"matrix": [0, 12], "x": 13.75, "y": 0},
+ {"matrix": [0, 13], "x": 14.75, "y": 0},
+ {"matrix": [0, 14], "x": 15.75, "y": 0},
+ {"matrix": [0, 15], "x": 16.75, "y": 0},
+
+ {"matrix": [0, 16], "x": 18, "y": 0},
+
+ {"matrix": [1, 0], "x": 0.25, "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.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},
+ {"matrix": [1, 15], "x": 16.5, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 16], "x": 18.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.375, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.125, "y": 2},
+ {"matrix": [2, 3], "x": 4.13, "y": 2},
+ {"matrix": [2, 4], "x": 5.13, "y": 2},
+ {"matrix": [2, 5], "x": 6.13, "y": 2},
+ {"matrix": [2, 6], "x": 7.13, "y": 2},
+
+ {"matrix": [2, 8], "x": 9.88, "y": 2},
+ {"matrix": [2, 9], "x": 10.88, "y": 2},
+ {"matrix": [2, 10], "x": 11.88, "y": 2},
+ {"matrix": [2, 11], "x": 12.88, "y": 2},
+ {"matrix": [2, 12], "x": 13.88, "y": 2},
+ {"matrix": [2, 13], "x": 14.88, "y": 2},
+ {"matrix": [2, 15], "x": 15.88, "y": 2, "w": 2.25},
+
+ {"matrix": [2, 16], "x": 18.5, "y": 2},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.5, "y": 3},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 6.5, "y": 3},
+ {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [3, 8], "x": 9.5, "y": 3},
+ {"matrix": [3, 9], "x": 10.5, "y": 3},
+ {"matrix": [3, 10], "x": 11.5, "y": 3},
+ {"matrix": [3, 11], "x": 12.5, "y": 3},
+ {"matrix": [3, 12], "x": 13.5, "y": 3},
+ {"matrix": [3, 13], "x": 14.5, "y": 3},
+ {"matrix": [3, 14], "x": 15.5, "y": 3, "w": 1.75},
+ {"matrix": [3, 15], "x": 17.25, "y": 3},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2},
+ {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 9], "x": 9.5, "y": 4, "w": 2.75},
+ {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 14.25, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 14], "x": 16.25, "y": 4},
+ {"matrix": [4, 15], "x": 17.25, "y": 4},
+ {"matrix": [4, 16], "x": 18.25, "y": 4}
+ ]
}
}
}
diff --git a/keyboards/cannonkeys/malicious_ergo/malicious_ergo.h b/keyboards/cannonkeys/malicious_ergo/malicious_ergo.h
deleted file mode 100644
index 191baf768f..0000000000
--- a/keyboards/cannonkeys/malicious_ergo/malicious_ergo.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2022 Andrew Kannan
- *
- * 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_default( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G,\
- K10, K11, K12, K13, K14, K15, K16, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G,\
- K20, K21, K22, K23, K24, K25, K26, K28, K29, K2A, K2B, K2C, K2D, K2F, K2G,\
- K31, K32, K33, K34, K35, K36, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \
- K41, K43, K44, K46, K49, K4B, K4D, K4E, K4F, K3G \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
- { K10, K11, K12, K13, K14, K15, K16, ___, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
- { K20, K21, K22, K23, K24, K25, K26, ___, K28, K29, K2A, K2B, K2C, K2D, ___, K2F, K2G }, \
- { ___, K31, K32, K33, K34, K35, K36, ___, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, ___ }, \
- { ___, K41, ___, K43, K44, ___, K46, ___, ___, K49, ___, K4B, ___, K4D, K4E, K4F, K3G } \
-}
diff --git a/keyboards/cannonkeys/practice65/info.json b/keyboards/cannonkeys/practice65/info.json
index b8339846f9..28841b48a6 100644
--- a/keyboards/cannonkeys/practice65/info.json
+++ b/keyboards/cannonkeys/practice65/info.json
@@ -24,9 +24,83 @@
},
"processor": "STM32F103",
"bootloader": "stm32duino",
- "layouts": {
+ "layouts": {
"LAYOUT_default": {
- "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}, {"x":10, "y":4}, {"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, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 15], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "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, "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, 15], "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, 15], "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, 15], "x": 15, "y": 4}
+ ]
}
}
}
diff --git a/keyboards/cannonkeys/practice65/practice65.h b/keyboards/cannonkeys/practice65/practice65.h
deleted file mode 100644
index dec02af936..0000000000
--- a/keyboards/cannonkeys/practice65/practice65.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define KNO KC_NO
-
-#define LAYOUT_default( \
- 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, K2F, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, \
- K40, K41, K42, K46, K49, K4A, K4B, K4C, K4D, 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, KC_NO , K1F }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO, K2F }, \
- { K30, KNO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO, K3F }, \
- { K40, K41, K42, KNO, KC_NO, KC_NO, K46, KC_NO, KC_NO, K49, K4A, K4B, K4C, K4D, KC_NO, K4F } \
-}
diff --git a/keyboards/cannonkeys/sagittarius/info.json b/keyboards/cannonkeys/sagittarius/info.json
index ba45d388fd..0980cb4275 100644
--- a/keyboards/cannonkeys/sagittarius/info.json
+++ b/keyboards/cannonkeys/sagittarius/info.json
@@ -31,7 +31,93 @@
"bootloader": "stm32-dfu",
"layouts": {
"LAYOUT_default": {
- "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":10.75, "y":0}, {"x":11.75, "y":0}, {"x":12.75, "y":0}, {"x":13.75, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":16.75, "y":0}, {"x":17.75, "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":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}, {"x":16.75, "y":1}, {"x":17.75, "y":1, "w":1.5}, {"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":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":17, "y":2}, {"x":18, "y":2, "w":1.25}, {"x":19.25, "y":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":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":16, "y":3, "w":1.25}, {"x":17.25, "y":3}, {"x":18.25, "y":3}, {"x":1.5, "y":4, "w":1.25}, {"x":2.75, "y":4, "w":1.25}, {"x":5.5, "y":4}, {"x":6.5, "y":4, "w":2.25}, {"x":11, "y":4, "w":1.75}, {"x":12.75, "y":4}, {"x":16.25, "y":4}, {"x":17.25, "y":4}, {"x":18.25, "y":4}]
+ "layout": [
+ {"label": "k11", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "k12", "matrix": [0, 1], "x": 1.5, "y": 0},
+ {"label": "k13", "matrix": [0, 2], "x": 2.5, "y": 0},
+ {"label": "k14", "matrix": [0, 3], "x": 3.5, "y": 0},
+ {"label": "k15", "matrix": [0, 4], "x": 4.5, "y": 0},
+ {"label": "k16", "matrix": [0, 5], "x": 5.5, "y": 0},
+ {"label": "k17", "matrix": [0, 6], "x": 6.5, "y": 0},
+ {"label": "k18", "matrix": [0, 7], "x": 7.5, "y": 0},
+
+ {"label": "k69", "matrix": [5, 8], "x": 10.75, "y": 0},
+ {"label": "k610", "matrix": [5, 9], "x": 11.75, "y": 0},
+ {"label": "k611", "matrix": [5, 10], "x": 12.75, "y": 0},
+ {"label": "k612", "matrix": [5, 11], "x": 13.75, "y": 0},
+ {"label": "k613", "matrix": [5, 12], "x": 14.75, "y": 0},
+ {"label": "k614", "matrix": [5, 13], "x": 15.75, "y": 0},
+ {"label": "k615", "matrix": [5, 14], "x": 16.75, "y": 0},
+ {"label": "k616", "matrix": [5, 15], "x": 17.75, "y": 0},
+
+ {"label": "k21", "matrix": [1, 0], "x": 0, "y": 1},
+
+ {"label": "k22", "matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+ {"label": "k23", "matrix": [1, 2], "x": 3, "y": 1},
+ {"label": "k24", "matrix": [1, 3], "x": 4, "y": 1},
+ {"label": "k25", "matrix": [1, 4], "x": 5, "y": 1},
+ {"label": "k26", "matrix": [1, 5], "x": 6, "y": 1},
+ {"label": "k27", "matrix": [1, 6], "x": 7, "y": 1},
+
+ {"label": "k78", "matrix": [6, 7], "x": 10.75, "y": 1},
+ {"label": "k79", "matrix": [6, 8], "x": 11.75, "y": 1},
+ {"label": "k710", "matrix": [6, 9], "x": 12.75, "y": 1},
+ {"label": "k711", "matrix": [6, 10], "x": 13.75, "y": 1},
+ {"label": "k712", "matrix": [6, 11], "x": 14.75, "y": 1},
+ {"label": "k713", "matrix": [6, 12], "x": 15.75, "y": 1},
+ {"label": "k714", "matrix": [6, 13], "x": 16.75, "y": 1},
+ {"label": "k715", "matrix": [6, 14], "x": 17.75, "y": 1, "w": 1.5},
+
+ {"label": "k31", "matrix": [2, 0], "x": 0, "y": 2},
+
+ {"label": "k32", "matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+ {"label": "k33", "matrix": [2, 2], "x": 3.25, "y": 2},
+ {"label": "k34", "matrix": [2, 3], "x": 4.25, "y": 2},
+ {"label": "k35", "matrix": [2, 4], "x": 5.25, "y": 2},
+ {"label": "k36", "matrix": [2, 5], "x": 6.25, "y": 2},
+ {"label": "k37", "matrix": [2, 6], "x": 7.25, "y": 2},
+
+ {"label": "k88", "matrix": [7, 7], "x": 11, "y": 2},
+ {"label": "k89", "matrix": [7, 8], "x": 12, "y": 2},
+ {"label": "k810", "matrix": [7, 9], "x": 13, "y": 2},
+ {"label": "k811", "matrix": [7, 10], "x": 14, "y": 2},
+ {"label": "k812", "matrix": [7, 11], "x": 15, "y": 2},
+ {"label": "k813", "matrix": [7, 12], "x": 16, "y": 2},
+ {"label": "k814", "matrix": [7, 13], "x": 17, "y": 2},
+ {"label": "k815", "matrix": [7, 14], "x": 18, "y": 2, "w": 1.25},
+ {"label": "k816", "matrix": [7, 15], "x": 19.25, "y": 2},
+
+ {"label": "k41", "matrix": [3, 0], "x": 0, "y": 3},
+
+ {"label": "k42", "matrix": [3, 1], "x": 1.5, "y": 3, "w": 1.25},
+ {"label": "k43", "matrix": [3, 2], "x": 2.75, "y": 3},
+ {"label": "k44", "matrix": [3, 3], "x": 3.75, "y": 3},
+ {"label": "k45", "matrix": [3, 4], "x": 4.75, "y": 3},
+ {"label": "k46", "matrix": [3, 5], "x": 5.75, "y": 3},
+ {"label": "k47", "matrix": [3, 6], "x": 6.75, "y": 3},
+ {"label": "k48", "matrix": [3, 7], "x": 7.75, "y": 3},
+
+ {"label": "k99", "matrix": [8, 8], "x": 11, "y": 3},
+ {"label": "k910", "matrix": [8, 9], "x": 12, "y": 3},
+ {"label": "k911", "matrix": [8, 10], "x": 13, "y": 3},
+ {"label": "k912", "matrix": [8, 11], "x": 14, "y": 3},
+ {"label": "k913", "matrix": [8, 12], "x": 15, "y": 3},
+ {"label": "k914", "matrix": [8, 13], "x": 16, "y": 3, "w": 1.25},
+ {"label": "k915", "matrix": [8, 14], "x": 17.25, "y": 3},
+ {"label": "k916", "matrix": [8, 15], "x": 18.25, "y": 3},
+
+ {"label": "k51", "matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+ {"label": "k52", "matrix": [4, 1], "x": 2.75, "y": 4, "w": 1.25},
+ {"label": "k57", "matrix": [4, 6], "x": 5.5, "y": 4},
+ {"label": "k58", "matrix": [4, 7], "x": 6.5, "y": 4, "w": 2.25},
+
+ {"label": "k109", "matrix": [9, 8], "x": 11, "y": 4, "w": 1.75},
+ {"label": "k1010", "matrix": [9, 9], "x": 12.75, "y": 4},
+ {"label": "k1014", "matrix": [9, 13], "x": 16.25, "y": 4},
+ {"label": "k1015", "matrix": [9, 14], "x": 17.25, "y": 4},
+ {"label": "k1016", "matrix": [9, 15], "x": 18.25, "y": 4}
+ ]
}
}
}
diff --git a/keyboards/cannonkeys/sagittarius/sagittarius.h b/keyboards/cannonkeys/sagittarius/sagittarius.h
deleted file mode 100644
index ba2fb2bc18..0000000000
--- a/keyboards/cannonkeys/sagittarius/sagittarius.h
+++ /dev/null
@@ -1,38 +0,0 @@
- /* Copyright 2020 Andrew Kannan
- *
- * 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_default( \
- k11, k12, k13, k14, k15, k16, k17, k18, k69, k610, k611, k612, k613, k614, k615, k616, \
- k21, k22, k23, k24, k25, k26, k27, k78, k79, k710, k711, k712, k713, k714, k715, \
- k31, k32, k33, k34, k35, k36, k37, k88, k89, k810, k811, k812, k813, k814, k815, k816, \
- k41, k42, k43, k44, k45, k46, k47, k48, k99, k910, k911, k912, k913, k914, k915, k916, \
- k51, k52, k57, k58, k109, k1010, k1014, k1015, k1016 \
-) { \
- { k11, k12, k13, k14, k15, k16, k17, k18, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { k21, k22, k23, k24, k25, k26, k27, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { k31, k32, k33, k34, k35, k36, k37, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { k41, k42, k43, k44, k45, k46, k47, k48, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { k51, k52, KC_NO, KC_NO, KC_NO, KC_NO, k57, k58, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k69, k610, k611, k612, k613, k614, k615, k616 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k78, k79, k710, k711, k712, k713, k714, k715, KC_NO }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k88, k89, k810, k811, k812, k813, k814, k815, k816 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k99, k910, k911, k912, k913, k914, k915, k916 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k109, k1010, KC_NO, KC_NO, KC_NO, k1014, k1015, k1016 }\
-}
diff --git a/keyboards/cannonkeys/satisfaction75/prototype/info.json b/keyboards/cannonkeys/satisfaction75/prototype/info.json
index 9fad4142aa..af184cf1a9 100644
--- a/keyboards/cannonkeys/satisfaction75/prototype/info.json
+++ b/keyboards/cannonkeys/satisfaction75/prototype/info.json
@@ -1,7 +1,198 @@
{
"layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"label": "K000", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "K002", "matrix": [0, 2], "x": 1, "y": 0},
+ {"label": "K003", "matrix": [0, 3], "x": 2, "y": 0},
+ {"label": "K004", "matrix": [0, 4], "x": 3, "y": 0},
+ {"label": "K005", "matrix": [0, 5], "x": 4, "y": 0},
+ {"label": "K006", "matrix": [0, 6], "x": 5, "y": 0},
+ {"label": "K007", "matrix": [0, 7], "x": 6, "y": 0},
+ {"label": "K008", "matrix": [0, 8], "x": 7, "y": 0},
+ {"label": "K009", "matrix": [0, 9], "x": 8, "y": 0},
+ {"label": "K010", "matrix": [0, 10], "x": 9, "y": 0},
+ {"label": "K011", "matrix": [0, 11], "x": 10, "y": 0},
+ {"label": "K012", "matrix": [0, 12], "x": 11, "y": 0},
+ {"label": "K013", "matrix": [0, 13], "x": 12, "y": 0},
+
+ {"label": "K100", "matrix": [1, 0], "x": 13, "y": 0},
+ {"label": "K101", "matrix": [1, 1], "x": 14, "y": 0},
+ {"label": "K102", "matrix": [1, 2], "x": 15, "y": 0},
+ {"label": "K103", "matrix": [1, 3], "x": 16, "y": 0},
+ {"label": "K104", "matrix": [1, 4], "x": 17, "y": 0},
+ {"label": "K105", "matrix": [1, 5], "x": 18, "y": 0},
+ {"label": "K106", "matrix": [1, 6], "x": 19, "y": 0},
+ {"label": "K107", "matrix": [1, 7], "x": 20, "y": 0},
+ {"label": "K108", "matrix": [1, 8], "x": 21, "y": 0},
+ {"label": "K109", "matrix": [1, 9], "x": 22, "y": 0},
+ {"label": "K110", "matrix": [1, 10], "x": 23, "y": 0},
+ {"label": "K111", "matrix": [1, 11], "x": 24, "y": 0},
+ {"label": "K112", "matrix": [1, 12], "x": 25, "y": 0},
+ {"label": "K113", "matrix": [1, 13], "x": 26, "y": 0},
+ {"label": "K114", "matrix": [1, 14], "x": 27, "y": 0},
+ {"label": "K115", "matrix": [1, 15], "x": 28, "y": 0},
+
+ {"label": "K200", "matrix": [2, 0], "x": 29, "y": 0},
+ {"label": "K201", "matrix": [2, 1], "x": 30, "y": 0},
+ {"label": "K202", "matrix": [2, 2], "x": 31, "y": 0},
+ {"label": "K203", "matrix": [2, 3], "x": 32, "y": 0},
+ {"label": "K204", "matrix": [2, 4], "x": 33, "y": 0},
+ {"label": "K205", "matrix": [2, 5], "x": 34, "y": 0},
+ {"label": "K206", "matrix": [2, 6], "x": 35, "y": 0},
+ {"label": "K207", "matrix": [2, 7], "x": 36, "y": 0},
+ {"label": "K208", "matrix": [2, 8], "x": 37, "y": 0},
+ {"label": "K209", "matrix": [2, 9], "x": 38, "y": 0},
+ {"label": "K210", "matrix": [2, 10], "x": 39, "y": 0},
+ {"label": "K211", "matrix": [2, 11], "x": 40, "y": 0},
+ {"label": "K212", "matrix": [2, 12], "x": 41, "y": 0},
+ {"label": "K213", "matrix": [2, 13], "x": 42, "y": 0},
+ {"label": "K215", "matrix": [2, 15], "x": 43, "y": 0},
+
+ {"label": "K300", "matrix": [3, 0], "x": 44, "y": 0},
+ {"label": "K301", "matrix": [3, 1], "x": 45, "y": 0},
+ {"label": "K302", "matrix": [3, 2], "x": 46, "y": 0},
+ {"label": "K303", "matrix": [3, 3], "x": 47, "y": 0},
+ {"label": "K304", "matrix": [3, 4], "x": 48, "y": 0},
+ {"label": "K305", "matrix": [3, 5], "x": 49, "y": 0},
+ {"label": "K306", "matrix": [3, 6], "x": 50, "y": 0},
+ {"label": "K307", "matrix": [3, 7], "x": 51, "y": 0},
+ {"label": "K308", "matrix": [3, 8], "x": 52, "y": 0},
+ {"label": "K309", "matrix": [3, 9], "x": 53, "y": 0},
+ {"label": "K310", "matrix": [3, 10], "x": 54, "y": 0},
+ {"label": "K311", "matrix": [3, 11], "x": 55, "y": 0},
+ {"label": "K312", "matrix": [3, 12], "x": 56, "y": 0},
+ {"label": "K313", "matrix": [3, 13], "x": 57, "y": 0},
+ {"label": "K315", "matrix": [3, 15], "x": 58, "y": 0},
+
+ {"label": "K400", "matrix": [4, 0], "x": 59, "y": 0},
+ {"label": "K401", "matrix": [4, 1], "x": 60, "y": 0},
+ {"label": "K402", "matrix": [4, 2], "x": 61, "y": 0},
+ {"label": "K403", "matrix": [4, 3], "x": 62, "y": 0},
+ {"label": "K404", "matrix": [4, 4], "x": 63, "y": 0},
+ {"label": "K405", "matrix": [4, 5], "x": 64, "y": 0},
+ {"label": "K406", "matrix": [4, 6], "x": 65, "y": 0},
+ {"label": "K407", "matrix": [4, 7], "x": 66, "y": 0},
+ {"label": "K408", "matrix": [4, 8], "x": 67, "y": 0},
+ {"label": "K409", "matrix": [4, 9], "x": 68, "y": 0},
+ {"label": "K410", "matrix": [4, 10], "x": 69, "y": 0},
+ {"label": "K411", "matrix": [4, 11], "x": 70, "y": 0},
+ {"label": "K412", "matrix": [4, 12], "x": 71, "y": 0},
+ {"label": "K413", "matrix": [4, 13], "x": 72, "y": 0},
+ {"label": "K415", "matrix": [4, 15], "x": 73, "y": 0},
+
+ {"label": "K500", "matrix": [5, 0], "x": 74, "y": 0},
+ {"label": "K501", "matrix": [5, 1], "x": 75, "y": 0},
+ {"label": "K502", "matrix": [5, 2], "x": 76, "y": 0},
+ {"label": "K503", "matrix": [5, 3], "x": 77, "y": 0},
+ {"label": "K505", "matrix": [5, 5], "x": 78, "y": 0},
+ {"label": "K507", "matrix": [5, 7], "x": 79, "y": 0},
+ {"label": "K509", "matrix": [5, 9], "x": 80, "y": 0},
+ {"label": "K510", "matrix": [5, 10], "x": 81, "y": 0},
+ {"label": "K511", "matrix": [5, 11], "x": 82, "y": 0},
+ {"label": "K512", "matrix": [5, 12], "x": 83, "y": 0},
+ {"label": "K513", "matrix": [5, 13], "x": 84, "y": 0},
+ {"label": "K515", "matrix": [5, 15], "x": 85, "y": 0}
+ ]
+ },
"LAYOUT_default": {
- "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.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "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.5, "y":1}, {"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.5, "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.5, "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.75}, {"x":14.25, "y":4.5}, {"x":15.5, "y":4.25}, {"x":0, "y":5.25, "w":1.25}, {"x":1.25, "y":5.25, "w":1.25}, {"x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"x":10, "y":5.25}, {"x":11, "y":5.25}, {"x":12, "y":5.25}, {"x":13.25, "y":5.5}, {"x":14.25, "y":5.5}, {"x":15.25, "y":5.5}]
+ "layout": [
+ {"label": "K000", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "K002", "matrix": [0, 2], "x": 1.5, "y": 0},
+ {"label": "K003", "matrix": [0, 3], "x": 2.5, "y": 0},
+ {"label": "K004", "matrix": [0, 4], "x": 3.5, "y": 0},
+ {"label": "K005", "matrix": [0, 5], "x": 4.5, "y": 0},
+
+ {"label": "K006", "matrix": [0, 6], "x": 5.75, "y": 0},
+ {"label": "K007", "matrix": [0, 7], "x": 6.75, "y": 0},
+ {"label": "K008", "matrix": [0, 8], "x": 7.75, "y": 0},
+ {"label": "K009", "matrix": [0, 9], "x": 8.75, "y": 0},
+
+ {"label": "K010", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "K011", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "K012", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "K013", "matrix": [0, 13], "x": 13, "y": 0},
+
+ {"label": "K100", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "K101", "matrix": [1, 1], "x": 1, "y": 1.25},
+ {"label": "K102", "matrix": [1, 2], "x": 2, "y": 1.25},
+ {"label": "K103", "matrix": [1, 3], "x": 3, "y": 1.25},
+ {"label": "K104", "matrix": [1, 4], "x": 4, "y": 1.25},
+ {"label": "K105", "matrix": [1, 5], "x": 5, "y": 1.25},
+ {"label": "K106", "matrix": [1, 6], "x": 6, "y": 1.25},
+ {"label": "K107", "matrix": [1, 7], "x": 7, "y": 1.25},
+ {"label": "K108", "matrix": [1, 8], "x": 8, "y": 1.25},
+ {"label": "K109", "matrix": [1, 9], "x": 9, "y": 1.25},
+ {"label": "K110", "matrix": [1, 10], "x": 10, "y": 1.25},
+ {"label": "K111", "matrix": [1, 11], "x": 11, "y": 1.25},
+ {"label": "K112", "matrix": [1, 12], "x": 12, "y": 1.25},
+ {"label": "K113", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+ {"label": "K115", "matrix": [1, 15], "x": 15.5, "y": 1},
+
+ {"label": "K200", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"label": "K201", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"label": "K202", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "K203", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "K204", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "K205", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "K206", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"label": "K207", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"label": "K208", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"label": "K209", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"label": "K210", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"label": "K211", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"label": "K212", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"label": "K213", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"label": "K215", "matrix": [2, 15], "x": 15.5, "y": 2.25},
+
+ {"label": "K300", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"label": "K301", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"label": "K302", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"label": "K303", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"label": "K304", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"label": "K305", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"label": "K306", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"label": "K307", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"label": "K308", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"label": "K309", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"label": "K310", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"label": "K311", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"label": "K312", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"label": "K315", "matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+ {"label": "K400", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"label": "K401", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+ {"label": "K402", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+ {"label": "K403", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+ {"label": "K404", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+ {"label": "K405", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+ {"label": "K406", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+ {"label": "K407", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+ {"label": "K408", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+ {"label": "K409", "matrix": [4, 9], "x": 10.25, "y": 4.25},
+ {"label": "K410", "matrix": [4, 10], "x": 11.25, "y": 4.25},
+ {"label": "K411", "matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+
+ {"label": "K413", "matrix": [4, 13], "x": 14.25, "y": 4.5},
+
+ {"label": "K415", "matrix": [4, 15], "x": 15.5, "y": 4.25},
+
+ {"label": "K500", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"label": "K501", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"label": "K502", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"label": "K505", "matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"label": "K509", "matrix": [5, 9], "x": 10, "y": 5.25},
+ {"label": "K510", "matrix": [5, 10], "x": 11, "y": 5.25},
+ {"label": "K511", "matrix": [5, 11], "x": 12, "y": 5.25},
+
+ {"label": "K512", "matrix": [5, 12], "x": 13.25, "y": 5.5},
+ {"label": "K513", "matrix": [5, 13], "x": 14.25, "y": 5.5},
+ {"label": "K515", "matrix": [5, 15], "x": 15.25, "y": 5.5}
+ ]
}
}
}
diff --git a/keyboards/cannonkeys/satisfaction75/prototype/prototype.h b/keyboards/cannonkeys/satisfaction75/prototype/prototype.h
deleted file mode 100644
index ed4c7d793d..0000000000
--- a/keyboards/cannonkeys/satisfaction75/prototype/prototype.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#pragma once
-
-#include "satisfaction75.h"
-
-#define LAYOUT_default( \
- K000, 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, K115, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K215, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K315, \
- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K413, K415, \
- K500, K501, K502, K505, K509, K510, K511, K512, K513, K515 \
-) { \
- { K000, KC_NO, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, KC_NO, KC_NO }, \
- { 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, KC_NO, K215 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO, KC_NO, K315 }, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, KC_NO, K413, KC_NO, K415 }, \
- { K500, K501, K502, KC_NO, KC_NO, K505, KC_NO, KC_NO, KC_NO, K509, K510, K511, K512, K513, KC_NO, K515 } \
-}
-
-// Expose All Keys - Split backspace - ISO Extra keys - Split space bottom row
-#define LAYOUT_all( \
- K000, 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, 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, K315, \
- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K415, \
- K500, K501, K502, K503, K505, K507, K509, K510, K511, K512, K513, K515 \
-) { \
- { K000, KC_NO, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, KC_NO, KC_NO }, \
- { 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, KC_NO, K215 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, KC_NO, K315 }, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, KC_NO, K415 }, \
- { K500, K501, K502, K503, KC_NO, K505, KC_NO, K507, KC_NO, K509, K510, K511, K512, K513, KC_NO, K515 } \
-}
diff --git a/keyboards/cannonkeys/satisfaction75/rev1/info.json b/keyboards/cannonkeys/satisfaction75/rev1/info.json
index 15986435c5..cc4ad80d42 100644
--- a/keyboards/cannonkeys/satisfaction75/rev1/info.json
+++ b/keyboards/cannonkeys/satisfaction75/rev1/info.json
@@ -1,27 +1,604 @@
{
"layouts": {
"LAYOUT_default": {
- "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.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "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.5, "y":1}, {"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.5, "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.5, "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.75}, {"x":14.25, "y":4.5}, {"x":15.5, "y":4.25}, {"x":0, "y":5.25, "w":1.25}, {"x":1.25, "y":5.25, "w":1.25}, {"x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"x":10, "y":5.25}, {"x":11, "y":5.25}, {"x":12, "y":5.25}, {"x":13.25, "y":5.5}, {"x":14.25, "y":5.5}, {"x":15.25, "y":5.5}]
- },
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
- "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.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "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.5, "y":1}, {"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":15.5, "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":13.75, "y":2.25, "w":1.25, "h":2}, {"x":15.5, "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.75}, {"x":14.25, "y":4.5}, {"x":15.5, "y":4.25}, {"x":0, "y":5.25, "w":1.25}, {"x":1.25, "y":5.25, "w":1.25}, {"x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"x":10, "y":5.25}, {"x":11, "y":5.25}, {"x":12, "y":5.25}, {"x":13.25, "y":5.5}, {"x":14.25, "y":5.5}, {"x":15.25, "y":5.5}]
+ {"matrix": [0, 2], "x": 1.5, "y": 0},
+ {"matrix": [0, 3], "x": 2.5, "y": 0},
+ {"matrix": [0, 4], "x": 3.5, "y": 0},
+ {"matrix": [0, 5], "x": 4.5, "y": 0},
+
+ {"matrix": [0, 6], "x": 5.75, "y": 0},
+ {"matrix": [0, 7], "x": 6.75, "y": 0},
+ {"matrix": [0, 8], "x": 7.75, "y": 0},
+ {"matrix": [0, 9], "x": 8.75, "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.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},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 15], "x": 15.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, 15], "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": 14.25, "y": 4.5},
+
+ {"matrix": [4, 15], "x": 15.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},
+ {"matrix": [5, 10], "x": 11, "y": 5.25},
+ {"matrix": [5, 11], "x": 12, "y": 5.25},
+
+ {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+ {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+ {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+ ]
},
+ "LAYOUT_iso": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
- "LAYOUT_3x2": {
- "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.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "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.5, "y":1}, {"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.5, "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.5, "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.75}, {"x":14.25, "y":4.5}, {"x":15.5, "y":4.25}, {"x":0, "y":5.25, "w":1.25}, {"x":1.25, "y":5.25, "w":1.25}, {"x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"x":10, "y":5.25, "w":1.5}, {"x":11.5, "y":5.25, "w":1.5}, {"x":13.25, "y":5.5}, {"x":14.25, "y":5.5}, {"x":15.25, "y":5.5}]
+ {"matrix": [0, 2], "x": 1.5, "y": 0},
+ {"matrix": [0, 3], "x": 2.5, "y": 0},
+ {"matrix": [0, 4], "x": 3.5, "y": 0},
+ {"matrix": [0, 5], "x": 4.5, "y": 0},
+
+ {"matrix": [0, 6], "x": 5.75, "y": 0},
+ {"matrix": [0, 7], "x": 6.75, "y": 0},
+ {"matrix": [0, 8], "x": 7.75, "y": 0},
+ {"matrix": [0, 9], "x": 8.75, "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.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},
+
+ {"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, 15], "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, 12], "x": 12.75, "y": 3.25},
+ {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 15], "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": 14.25, "y": 4.5},
+
+ {"matrix": [4, 15], "x": 15.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},
+ {"matrix": [5, 10], "x": 11, "y": 5.25},
+ {"matrix": [5, 11], "x": 12, "y": 5.25},
+
+ {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+ {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+ {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+ ]
},
+ "LAYOUT_3x2": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
- "LAYOUT_2x2": {
- "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.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "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.5, "y":1}, {"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.5, "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.5, "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.75}, {"x":14.25, "y":4.5}, {"x":15.5, "y":4.25}, {"x":0, "y":5.25, "w":1.5}, {"x":1.5, "y":5.25, "w":1.5}, {"x":3, "y":5.25, "w":7}, {"x":10, "y":5.25, "w":1.5}, {"x":11.5, "y":5.25, "w":1.5}, {"x":13.25, "y":5.5}, {"x":14.25, "y":5.5}, {"x":15.25, "y":5.5}]
+ {"matrix": [0, 2], "x": 1.5, "y": 0},
+ {"matrix": [0, 3], "x": 2.5, "y": 0},
+ {"matrix": [0, 4], "x": 3.5, "y": 0},
+ {"matrix": [0, 5], "x": 4.5, "y": 0},
+
+ {"matrix": [0, 6], "x": 5.75, "y": 0},
+ {"matrix": [0, 7], "x": 6.75, "y": 0},
+ {"matrix": [0, 8], "x": 7.75, "y": 0},
+ {"matrix": [0, 9], "x": 8.75, "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.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},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 15], "x": 15.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, 15], "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": 14.25, "y": 4.5},
+
+ {"matrix": [4, 15], "x": 15.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.5},
+ {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+
+ {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+ {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+ {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+ ]
},
+ "LAYOUT_2x2": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
- "LAYOUT_split_space": {
- "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.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "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.5, "y":1}, {"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.5, "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.5, "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.75}, {"x":14.25, "y":4.5}, {"x":15.5, "y":4.25}, {"x":0, "y":5.25, "w":1.25}, {"x":1.25, "y":5.25, "w":1.25}, {"x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":2.25}, {"x":6, "y":5.25, "w":1.25}, {"x":7.25, "y":5.25, "w":2.75}, {"x":10, "y":5.25}, {"x":11, "y":5.25}, {"x":12, "y":5.25}, {"x":13.25, "y":5.5}, {"x":14.25, "y":5.5}, {"x":15.25, "y":5.5}]
+ {"matrix": [0, 2], "x": 1.5, "y": 0},
+ {"matrix": [0, 3], "x": 2.5, "y": 0},
+ {"matrix": [0, 4], "x": 3.5, "y": 0},
+ {"matrix": [0, 5], "x": 4.5, "y": 0},
+
+ {"matrix": [0, 6], "x": 5.75, "y": 0},
+ {"matrix": [0, 7], "x": 6.75, "y": 0},
+ {"matrix": [0, 8], "x": 7.75, "y": 0},
+ {"matrix": [0, 9], "x": 8.75, "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.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},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 15], "x": 15.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, 15], "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": 14.25, "y": 4.5},
+
+ {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 5], "x": 3, "y": 5.25, "w": 7},
+ {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+
+ {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+ {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+ {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+ ]
},
+ "LAYOUT_split_space": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 2], "x": 1.5, "y": 0},
+ {"matrix": [0, 3], "x": 2.5, "y": 0},
+ {"matrix": [0, 4], "x": 3.5, "y": 0},
+ {"matrix": [0, 5], "x": 4.5, "y": 0},
+
+ {"matrix": [0, 6], "x": 5.75, "y": 0},
+ {"matrix": [0, 7], "x": 6.75, "y": 0},
+ {"matrix": [0, 8], "x": 7.75, "y": 0},
+ {"matrix": [0, 9], "x": 8.75, "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.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},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 15], "x": 15.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, 15], "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": 14.25, "y": 4.5},
+
+ {"matrix": [4, 15], "x": 15.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, 3], "x": 3.75, "y": 5.25, "w": 2.25},
+ {"matrix": [5, 5], "x": 6, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 7], "x": 7.25, "y": 5.25, "w": 2.75},
+ {"matrix": [5, 9], "x": 10, "y": 5.25},
+ {"matrix": [5, 10], "x": 11, "y": 5.25},
+ {"matrix": [5, 11], "x": 12, "y": 5.25},
+
+ {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+ {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+ {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+ ]
+ },
"LAYOUT_all": {
- "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.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "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.5, "y":1}, {"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.5, "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":13.75, "y":3.25, "w":1.25}, {"x":15.5, "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.75}, {"x":14.25, "y":4.5}, {"x":15.5, "y":4.25}, {"x":0, "y":5.25, "w":1.25}, {"x":1.25, "y":5.25, "w":1.25}, {"x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":2.25}, {"x":6, "y":5.25, "w":1.25}, {"x":7.25, "y":5.25, "w":2.75}, {"x":10, "y":5.25}, {"x":11, "y":5.25}, {"x":12, "y":5.25}, {"x":13.25, "y":5.5}, {"x":14.25, "y":5.5}, {"x":15.25, "y":5.5}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 2], "x": 1.5, "y": 0},
+ {"matrix": [0, 3], "x": 2.5, "y": 0},
+ {"matrix": [0, 4], "x": 3.5, "y": 0},
+ {"matrix": [0, 5], "x": 4.5, "y": 0},
+
+ {"matrix": [0, 6], "x": 5.75, "y": 0},
+ {"matrix": [0, 7], "x": 6.75, "y": 0},
+ {"matrix": [0, 8], "x": 7.75, "y": 0},
+ {"matrix": [0, 9], "x": 8.75, "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.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},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 15], "x": 15.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, 13], "x": 13.75, "y": 3.25, "w": 1.25},
+
+ {"matrix": [3, 15], "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": 14.25, "y": 4.5},
+
+ {"matrix": [4, 15], "x": 15.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, 3], "x": 3.75, "y": 5.25, "w": 2.25},
+ {"matrix": [5, 5], "x": 6, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 7], "x": 7.25, "y": 5.25, "w": 2.75},
+ {"matrix": [5, 9], "x": 10, "y": 5.25},
+ {"matrix": [5, 10], "x": 11, "y": 5.25},
+ {"matrix": [5, 11], "x": 12, "y": 5.25},
+
+ {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+ {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+ {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+ ]
}
}
}
diff --git a/keyboards/cannonkeys/satisfaction75/rev1/rev1.h b/keyboards/cannonkeys/satisfaction75/rev1/rev1.h
deleted file mode 100644
index 65ff16b985..0000000000
--- a/keyboards/cannonkeys/satisfaction75/rev1/rev1.h
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma once
-
-#include "satisfaction75.h"
-
-// This layout is the default - it's what's in VIA
-// ANSI, bottom row 1.25/1.25/1.25/6.25/1/1/1
-#define LAYOUT_default( \
- K000, 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, 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, K313, K315, \
- K400, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K415, \
- K500, K501, K502, K505, K509, K510, K511, K512, K513, K515 \
-) { \
- { K000, KC_NO, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, KC_NO, KC_NO }, \
- { 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, KC_NO, K215 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, KC_NO, K315 }, \
- { K400, KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, KC_NO, K415 }, \
- { K500, K501, K502, KC_NO, KC_NO, K505, KC_NO, KC_NO, KC_NO, K509, K510, K511, K512, K513, KC_NO, K515 } \
-}
-
-// ISO, bottom row 1.25/1.25/1.25/6.25/1/1/1
-#define LAYOUT_iso( \
- K000, 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, K115, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K215, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K315, \
- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K415, \
- K500, K501, K502, K505, K509, K510, K511, K512, K513, K515 \
-) { \
- { K000, KC_NO, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, KC_NO, KC_NO }, \
- { 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, KC_NO, K215 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, KC_NO, K315 }, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, KC_NO, K415 }, \
- { K500, K501, K502, KC_NO, KC_NO, K505, KC_NO, KC_NO, KC_NO, K509, K510, K511, K512, K513, KC_NO, K515 } \
-}
-
-// ANSI, bottom row 1.25/1.25/1.25/6.25/1.5/1.5
-#define LAYOUT_3x2( \
- K000, 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, 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, K313, K315, \
- K400, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K415, \
- K500, K501, K502, K505, K509, K511, K512, K513, K515 \
-) { \
- { K000, KC_NO, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, KC_NO, KC_NO }, \
- { 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, KC_NO, K215 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, KC_NO, K315 }, \
- { K400, KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, KC_NO, K415 }, \
- { K500, K501, K502, KC_NO, KC_NO, K505, KC_NO, KC_NO, KC_NO, K509, KC_NO, K511, K512, K513, KC_NO, K515 } \
-}
-
-// ANSI, WKL bottom row 1.5/1.5/7/1.5/1.5, Split Backspace
-#define LAYOUT_2x2( \
- K000, 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, 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, K313, K315, \
- K400, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K415, \
- K500, K501, K505, K509, K511, K512, K513, K515 \
-) { \
- { K000, KC_NO, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, KC_NO, KC_NO }, \
- { 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, KC_NO, K215 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, KC_NO, K315 }, \
- { K400, KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, KC_NO, K415 }, \
- { K500, K501, KC_NO, KC_NO, KC_NO, K505, KC_NO, KC_NO, KC_NO, K509, KC_NO, K511, K512, K513, KC_NO, K515 } \
-}
-
-// ANSI, bottom row 1.25/1.25/1.25/2.25/1.25/2.75/1/1/1
-// ANSI, bottom row 1.25/1.25/1.25/2.75/1.25/2.25/1/1/1
-#define LAYOUT_split_space( \
- K000, 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, 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, K313, K315, \
- K400, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K415, \
- K500, K501, K502, K503, K505, K507, K509, K510, K511, K512, K513, K515 \
-) { \
- { K000, KC_NO, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, KC_NO, KC_NO }, \
- { 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, KC_NO, K215 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, KC_NO, K315 }, \
- { K400, KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, KC_NO, K415 }, \
- { K500, K501, K502, K503, KC_NO, K505, KC_NO, K507, KC_NO, K509, K510, K511, K512, K513, KC_NO, K515 } \
-}
-
-
-// Expose All Keys - Split backspace - ISO Extra keys - Split space bottom row
-#define LAYOUT_all( \
- K000, 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, 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, K315, \
- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K415, \
- K500, K501, K502, K503, K505, K507, K509, K510, K511, K512, K513, K515 \
-) { \
- { K000, KC_NO, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, KC_NO, KC_NO }, \
- { 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, KC_NO, K215 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, KC_NO, K315 }, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, KC_NO, K415 }, \
- { K500, K501, K502, K503, KC_NO, K505, KC_NO, K507, KC_NO, K509, K510, K511, K512, K513, KC_NO, K515 } \
-}
diff --git a/keyboards/cannonkeys/satisfaction75/satisfaction75.h b/keyboards/cannonkeys/satisfaction75/satisfaction75.h
index 9e28bb32a1..157eff902e 100644
--- a/keyboards/cannonkeys/satisfaction75/satisfaction75.h
+++ b/keyboards/cannonkeys/satisfaction75/satisfaction75.h
@@ -2,12 +2,6 @@
#include "quantum.h"
-#ifdef KEYBOARD_cannonkeys_satisfaction75_prototype
- #include "prototype.h"
-#else
- #include "rev1.h"
-#endif
-
#include "via.h" // only for EEPROM address
#define EEPROM_ENABLED_ENCODER_MODES (VIA_EEPROM_CUSTOM_CONFIG_ADDR)
#define EEPROM_CUSTOM_BACKLIGHT (VIA_EEPROM_CUSTOM_CONFIG_ADDR+1)
diff --git a/keyboards/cannonkeys/tmov2/info.json b/keyboards/cannonkeys/tmov2/info.json
index 25d17bd15b..4d5d564e66 100644
--- a/keyboards/cannonkeys/tmov2/info.json
+++ b/keyboards/cannonkeys/tmov2/info.json
@@ -26,7 +26,66 @@
"bootloader": "stm32-dfu",
"layouts": {
"LAYOUT_default": {
- "layout": [{"x":0, "y":0}, {"label":"Tab", "x":1.25, "y":0, "w":1.5}, {"label":"Q", "x":2.75, "y":0}, {"label":"W", "x":3.75, "y":0}, {"label":"E", "x":4.75, "y":0}, {"label":"R", "x":5.75, "y":0}, {"label":"T", "x":6.75, "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":"{", "x":12.75, "y":0}, {"label":"}", "x":13.75, "y":0}, {"label":"Backspace", "x":14.75, "y":0}, {"x":0, "y":1}, {"label":"Caps Lock", "x":1.25, "y":1, "w":1.75}, {"label":"A", "x":3, "y":1}, {"label":"S", "x":4, "y":1}, {"label":"D", "x":5, "y":1}, {"label":"F", "x":6, "y":1}, {"label":"G", "x":7, "y":1}, {"label":"H", "x":8, "y":1}, {"label":"J", "x":9, "y":1}, {"label":"K", "x":10, "y":1}, {"label":"L", "x":11, "y":1}, {"label":":", "x":12, "y":1}, {"label":"\"", "x":13, "y":1}, {"label":"Enter", "x":14, "y":1, "w":1.75}, {"x":0, "y":2}, {"label":"Shift", "x":1.25, "y":2, "w":1.25}, {"label":"ISO \\", "x":2.5, "y":2}, {"label":"Z", "x":3.5, "y":2}, {"label":"X", "x":4.5, "y":2}, {"label":"C", "x":5.5, "y":2}, {"label":"V", "x":6.5, "y":2}, {"label":"B", "x":7.5, "y":2}, {"label":"N", "x":8.5, "y":2}, {"label":"M", "x":9.5, "y":2}, {"label":"<", "x":10.5, "y":2}, {"label":">", "x":11.5, "y":2}, {"label":"?", "x":12.5, "y":2}, {"label":"Shift", "x":13.5, "y":2, "w":1.25}, {"x":14.75, "y":2}, {"x":0, "y":3}, {"label":"Win", "x":3.25, "y":3}, {"label":"Alt", "x":4.25, "y":3, "w":1.5}, {"x":5.75, "y":3, "w":2.25}, {"x":8, "y":3, "w":2.75}, {"label":"Alt", "x":10.75, "y":3, "w":1.5}, {"label":"Menu", "x":12.25, "y":3}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.25, "y": 0, "w": 1.5},
+ {"matrix": [0, 3], "x": 2.75, "y": 0},
+ {"matrix": [0, 4], "x": 3.75, "y": 0},
+ {"matrix": [0, 5], "x": 4.75, "y": 0},
+ {"matrix": [0, 6], "x": 5.75, "y": 0},
+ {"matrix": [0, 7], "x": 6.75, "y": 0},
+ {"matrix": [0, 8], "x": 7.75, "y": 0},
+ {"matrix": [0, 9], "x": 8.75, "y": 0},
+ {"matrix": [0, 10], "x": 9.75, "y": 0},
+ {"matrix": [0, 11], "x": 10.75, "y": 0},
+ {"matrix": [0, 12], "x": 11.75, "y": 0},
+ {"matrix": [0, 13], "x": 12.75, "y": 0},
+ {"matrix": [0, 14], "x": 13.75, "y": 0},
+ {"matrix": [0, 15], "x": 14.75, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.75},
+ {"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, "w": 1.75},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.25},
+ {"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.25},
+ {"matrix": [2, 14], "x": 14.75, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3, "w": 1.5},
+ {"matrix": [3, 6], "x": 5.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 8], "x": 8, "y": 3, "w": 2.75},
+ {"matrix": [3, 10], "x": 10.75, "y": 3, "w": 1.5},
+ {"matrix": [3, 11], "x": 12.25, "y": 3}
+ ]
}
}
}
diff --git a/keyboards/cannonkeys/tmov2/tmov2.h b/keyboards/cannonkeys/tmov2/tmov2.h
deleted file mode 100644
index f1f3920403..0000000000
--- a/keyboards/cannonkeys/tmov2/tmov2.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_default( \
- K000, K001, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
- K100, K101, 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, K303, K304, K306, K308, K310, K311 \
-) { \
- { K000, K001, KC_NO, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015 }, \
- { K100, K101, KC_NO, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, KC_NO }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, KC_NO }, \
- { K300, KC_NO, KC_NO, K303, K304, KC_NO, K306, KC_NO, K308, KC_NO, K310, K311, KC_NO, KC_NO, KC_NO, KC_NO } \
-}
diff --git a/keyboards/cannonkeys/tsukuyomi/info.json b/keyboards/cannonkeys/tsukuyomi/info.json
index 99736d7aa5..e370e1acc0 100644
--- a/keyboards/cannonkeys/tsukuyomi/info.json
+++ b/keyboards/cannonkeys/tsukuyomi/info.json
@@ -26,7 +26,93 @@
"bootloader": "stm32-dfu",
"layouts": {
"LAYOUT_default": {
- "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":8.25, "y":0}, {"label":"*", "x":9.25, "y":0}, {"label":"(", "x":10.25, "y":0}, {"label":")", "x":11.25, "y":0}, {"label":"_", "x":12.25, "y":0}, {"label":"+", "x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":7.75, "y":1}, {"label":"U", "x":8.75, "y":1}, {"label":"I", "x":9.75, "y":1}, {"label":"O", "x":10.75, "y":1}, {"label":"P", "x":11.75, "y":1}, {"label":"{", "x":12.75, "y":1}, {"label":"}", "x":13.75, "y":1}, {"label":"|", "x":14.75, "y":1, "w":1.5}, {"x":16.25, "y":1}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":8, "y":2}, {"label":"J", "x":9, "y":2}, {"label":"K", "x":10, "y":2}, {"label":"L", "x":11, "y":2}, {"label":":", "x":12, "y":2}, {"label":"\"", "x":13, "y":2}, {"x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":1.25}, {"x":16.25, "y":2}, {"x":0, "y":3}, {"x":1.25, "y":3, "w":1.25}, {"x":2.5, "y":3}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"N", "x":8.5, "y":3}, {"label":"M", "x":9.5, "y":3}, {"label":"<", "x":10.5, "y":3}, {"label":">", "x":11.5, "y":3}, {"label":"?", "x":12.5, "y":3}, {"label":"Shift", "x":13.5, "y":3, "w":1.75}, {"x":15.25, "y":3}, {"x":16.25, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Win", "x":2.5, "y":4, "w":1.25}, {"label":"Alt", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":6.25}, {"label":"Alt", "x":11.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":12.5, "y":4, "w":1.25}, {"x":14.25, "y":4}, {"x":15.25, "y":4}, {"x":16.25, "y":4}]
+ "layout": [
+ {"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.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [0, 8], "x": 8.25, "y": 0},
+ {"matrix": [0, 9], "x": 9.25, "y": 0},
+ {"matrix": [0, 10], "x": 10.25, "y": 0},
+ {"matrix": [0, 11], "x": 11.25, "y": 0},
+ {"matrix": [0, 12], "x": 12.25, "y": 0},
+ {"matrix": [0, 13], "x": 13.25, "y": 0},
+ {"matrix": [0, 14], "x": 14.25, "y": 0},
+ {"matrix": [0, 15], "x": 15.25, "y": 0},
+ {"matrix": [0, 16], "x": 16.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+ {"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},
+ {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+ {"matrix": [1, 16], "x": 16.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 9], "x": 10, "y": 2},
+ {"matrix": [2, 10], "x": 11, "y": 2},
+ {"matrix": [2, 11], "x": 12, "y": 2},
+ {"matrix": [2, 12], "x": 13, "y": 2},
+ {"matrix": [2, 13], "x": 14, "y": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2, "w": 1.25},
+ {"matrix": [2, 16], "x": 16.25, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.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},
+ {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 15.25, "y": 3},
+ {"matrix": [3, 16], "x": 16.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"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": 1.25},
+ {"matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 13], "x": 14.25, "y": 4},
+ {"matrix": [4, 14], "x": 15.25, "y": 4},
+ {"matrix": [4, 16], "x": 16.25, "y": 4}
+ ]
}
}
}
diff --git a/keyboards/cannonkeys/tsukuyomi/tsukuyomi.h b/keyboards/cannonkeys/tsukuyomi/tsukuyomi.h
deleted file mode 100644
index 46c55413e1..0000000000
--- a/keyboards/cannonkeys/tsukuyomi/tsukuyomi.h
+++ /dev/null
@@ -1,33 +0,0 @@
- /* Copyright 2020 Andrew Kannan
- *
- * 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_default( \
- K00M, K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
- K10M, K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K115, \
- K20M, K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K215, \
- K30M, K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K315, \
- K40M, K400, K401, K402, K406, K410, K411, K412, K413, K415 \
-) { \
- { K00M, K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015 }, \
- { K10M, K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, KC_NO, K115 }, \
- { K20M, K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, KC_NO, K215 }, \
- { K30M, K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, KC_NO, K315 }, \
- { K40M, K400, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, K412, K413, KC_NO, K415 } \
-}
diff --git a/keyboards/cannonkeys/vicious40/info.json b/keyboards/cannonkeys/vicious40/info.json
index d995250980..d6669155cf 100644
--- a/keyboards/cannonkeys/vicious40/info.json
+++ b/keyboards/cannonkeys/vicious40/info.json
@@ -22,7 +22,57 @@
"bootloader": "stm32-dfu",
"layouts": {
"LAYOUT_default": {
- "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Backspace", "x":11, "y":0, "w":1.75}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"Up", "x":10.75, "y":2}, {"label":"?", "x":11.75, "y":2}, {"label":"Ctrl", "x":0, "y":3}, {"label":"Super", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Space", "x":3, "y":3, "w":2.25}, {"label":"Space", "x":5.25, "y":3, "w":1.25}, {"label":"Space", "x":6.5, "y":3, "w":2.75}, {"label":"Left", "x":9.75, "y":3}, {"label":"Down", "x":10.75, "y":3}, {"label":"Right", "x":11.75, "y":3}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [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, "w": 2.25},
+ {"matrix": [3, 4], "x": 5.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 6], "x": 6.5, "y": 3, "w": 2.75},
+
+ {"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/cannonkeys/vicious40/vicious40.h b/keyboards/cannonkeys/vicious40/vicious40.h
deleted file mode 100644
index fd48716748..0000000000
--- a/keyboards/cannonkeys/vicious40/vicious40.h
+++ /dev/null
@@ -1,33 +0,0 @@
- /* Copyright 2021 Andrew Kannan
- *
- * 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_default( \
- 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, 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, XXXX, K306, XXXX, XXXX, K309, K310, K311 } \
-}
diff --git a/keyboards/chalice/chalice.h b/keyboards/chalice/chalice.h
deleted file mode 100644
index c55cd4ba0b..0000000000
--- a/keyboards/chalice/chalice.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright 2020 null-ll
- * Copyright 2021 Jels, Josh Johnson
- *
- * 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_default( \
- K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K46, \
- K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K56, \
- K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K66, K76, \
- K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K86, K96, \
- K80, K91, K82, K92, K83, K93, K84, K94, K85, K95 \
-) { \
- { 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, K71, K72, K73, K74, K75, K76 }, \
- { K80, ___, K82, K83, K84, K85, K86 }, \
- { ___, K91, K92, K93, K94, K95, K96 } \
-}
-
-#define LAYOUT_split_bs( \
- K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K46, K81, \
- K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K56, \
- K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K66, K76, \
- K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K86, K96, \
- K80, K91, K82, K92, K83, K93, K84, K94, K85, K95 \
-) { \
- { 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, K71, K72, K73, K74, K75, K76 }, \
- { K80, K81, K82, K83, K84, K85, K86 }, \
- { ___, K91, K92, K93, K94, K95, K96 } \
-}
diff --git a/keyboards/chalice/info.json b/keyboards/chalice/info.json
index af24b81ed6..6b447c1fe6 100644
--- a/keyboards/chalice/info.json
+++ b/keyboards/chalice/info.json
@@ -21,155 +21,170 @@
"layouts": {
"LAYOUT_default": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"`~", "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":10.5, "y":0},
- {"label":"8*", "x":11.5, "y":0},
- {"label":"9(", "x":12.5, "y":0},
- {"label":"0)", "x":13.5, "y":0},
- {"label":"-_", "x":14.5, "y":0},
- {"label":"=+", "x":15.5, "y":0},
- {"label":"Backspace", "x":16.5, "y":0, "w":2},
-
- {"label":"Insert", "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":10, "y":1},
- {"label":"U", "x":11, "y":1},
- {"label":"I", "x":12, "y":1},
- {"label":"O", "x":13, "y":1},
- {"label":"P", "x":14, "y":1},
- {"label":"[{", "x":15, "y":1},
- {"label":"]}", "x":16, "y":1},
- {"label":"\\|", "x":17, "y":1, "w":1.5},
-
- {"label":"Delete", "x":0, "y":2},
- {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75},
- {"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":10.25, "y":2},
- {"label":"J", "x":11.25, "y":2},
- {"label":"K", "x":12.25, "y":2},
- {"label":"L", "x":13.25, "y":2},
- {"label":";:", "x":14.25, "y":2},
- {"label":"'\"", "x":15.25, "y":2},
- {"label":"Enter", "x":16.25, "y":2, "w":2.25},
-
- {"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":"B", "x":9.75, "y":3},
- {"label":"N", "x":10.75, "y":3},
- {"label":"M", "x":11.75, "y":3},
- {"label":",<", "x":12.75, "y":3},
- {"label":".>", "x":13.75, "y":3},
- {"label":"/?", "x":14.75, "y":3},
- {"label":"Shift", "x":15.75, "y":3, "w":1.75},
- {"label":"Up", "x":17.5, "y":3},
-
- {"label":"Ctrl", "x":1.5, "y":4, "w":1.5},
- {"label":"Alt", "x":4.5, "y":4, "w":1.5},
- {"label":"Space", "x":6, "y":4, "w":2.25},
- {"label":"Fn", "x":8.25, "y":4},
- {"label":"Space", "x":9.75, "y":4, "w":2.75},
- {"label":"Alt", "x":12.5, "y":4, "w":1.5},
- {"label":"Ctrl", "x":15, "y":4, "w":1.5},
- {"label":"Left", "x":16.5, "y":4},
- {"label":"Down", "x":17.5, "y":4},
- {"label":"Right", "x":18.5, "y":4}
+ {"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": [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": 10.5, "y": 0},
+ {"matrix": [1, 4], "x": 11.5, "y": 0},
+ {"matrix": [0, 5], "x": 12.5, "y": 0},
+ {"matrix": [1, 5], "x": 13.5, "y": 0},
+ {"matrix": [0, 6], "x": 14.5, "y": 0},
+ {"matrix": [1, 6], "x": 15.5, "y": 0},
+ {"matrix": [4, 6], "x": 16.5, "y": 0, "w": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 1},
+
+ {"matrix": [3, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [2, 1], "x": 3, "y": 1},
+ {"matrix": [3, 1], "x": 4, "y": 1},
+ {"matrix": [2, 2], "x": 5, "y": 1},
+ {"matrix": [3, 2], "x": 6, "y": 1},
+ {"matrix": [2, 3], "x": 7, "y": 1},
+
+ {"matrix": [3, 3], "x": 10, "y": 1},
+ {"matrix": [2, 4], "x": 11, "y": 1},
+ {"matrix": [3, 4], "x": 12, "y": 1},
+ {"matrix": [2, 5], "x": 13, "y": 1},
+ {"matrix": [3, 5], "x": 14, "y": 1},
+ {"matrix": [2, 6], "x": 15, "y": 1},
+ {"matrix": [3, 6], "x": 16, "y": 1},
+ {"matrix": [5, 6], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 2},
+
+ {"matrix": [5, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [4, 1], "x": 3.25, "y": 2},
+ {"matrix": [5, 1], "x": 4.25, "y": 2},
+ {"matrix": [4, 2], "x": 5.25, "y": 2},
+ {"matrix": [5, 2], "x": 6.25, "y": 2},
+ {"matrix": [4, 3], "x": 7.25, "y": 2},
+ {"matrix": [5, 3], "x": 10.25, "y": 2},
+ {"matrix": [4, 4], "x": 11.25, "y": 2},
+ {"matrix": [5, 4], "x": 12.25, "y": 2},
+ {"matrix": [4, 5], "x": 13.25, "y": 2},
+ {"matrix": [5, 5], "x": 14.25, "y": 2},
+ {"matrix": [6, 6], "x": 15.25, "y": 2},
+ {"matrix": [7, 6], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [6, 0], "x": 1.5, "y": 3, "w": 2.25},
+ {"matrix": [7, 0], "x": 3.75, "y": 3},
+ {"matrix": [6, 1], "x": 4.75, "y": 3},
+ {"matrix": [7, 1], "x": 5.75, "y": 3},
+ {"matrix": [6, 2], "x": 6.75, "y": 3},
+ {"matrix": [7, 2], "x": 7.75, "y": 3},
+
+ {"matrix": [6, 3], "x": 9.75, "y": 3},
+ {"matrix": [7, 3], "x": 10.75, "y": 3},
+ {"matrix": [6, 4], "x": 11.75, "y": 3},
+ {"matrix": [7, 4], "x": 12.75, "y": 3},
+ {"matrix": [6, 5], "x": 13.75, "y": 3},
+ {"matrix": [7, 5], "x": 14.75, "y": 3},
+ {"matrix": [8, 6], "x": 15.75, "y": 3, "w": 1.75},
+ {"matrix": [9, 6], "x": 17.5, "y": 3},
+
+ {"matrix": [8, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [9, 1], "x": 4.5, "y": 4, "w": 1.5},
+ {"matrix": [8, 2], "x": 6, "y": 4, "w": 2.25},
+ {"matrix": [9, 2], "x": 8.25, "y": 4},
+
+ {"matrix": [8, 3], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [9, 3], "x": 12.5, "y": 4, "w": 1.5},
+ {"matrix": [8, 4], "x": 15, "y": 4, "w": 1.5},
+ {"matrix": [9, 4], "x": 16.5, "y": 4},
+ {"matrix": [8, 5], "x": 17.5, "y": 4},
+ {"matrix": [9, 5], "x": 18.5, "y": 4}
]
},
"LAYOUT_split_bs": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"`~", "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":10.5, "y":0},
- {"label":"8*", "x":11.5, "y":0},
- {"label":"9(", "x":12.5, "y":0},
- {"label":"0)", "x":13.5, "y":0},
- {"label":"-_", "x":14.5, "y":0},
- {"label":"=+", "x":15.5, "y":0},
- {"label":"Backspace", "x":16.5, "y":0},
- {"label":"Backspace", "x":17.5, "y":0},
-
- {"label":"Insert", "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":10, "y":1},
- {"label":"U", "x":11, "y":1},
- {"label":"I", "x":12, "y":1},
- {"label":"O", "x":13, "y":1},
- {"label":"P", "x":14, "y":1},
- {"label":"[{", "x":15, "y":1},
- {"label":"]}", "x":16, "y":1},
- {"label":"\\|", "x":17, "y":1, "w":1.5},
-
- {"label":"Delete", "x":0, "y":2},
- {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75},
- {"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":10.25, "y":2},
- {"label":"J", "x":11.25, "y":2},
- {"label":"K", "x":12.25, "y":2},
- {"label":"L", "x":13.25, "y":2},
- {"label":";:", "x":14.25, "y":2},
- {"label":"'\"", "x":15.25, "y":2},
- {"label":"Enter", "x":16.25, "y":2, "w":2.25},
-
- {"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":"B", "x":9.75, "y":3},
- {"label":"N", "x":10.75, "y":3},
- {"label":"M", "x":11.75, "y":3},
- {"label":",<", "x":12.75, "y":3},
- {"label":".>", "x":13.75, "y":3},
- {"label":"/?", "x":14.75, "y":3},
- {"label":"Shift", "x":15.75, "y":3, "w":1.75},
- {"label":"Up", "x":17.5, "y":3},
-
- {"label":"Ctrl", "x":1.5, "y":4, "w":1.5},
- {"label":"Alt", "x":4.5, "y":4, "w":1.5},
- {"label":"Space", "x":6, "y":4, "w":2.25},
- {"label":"Fn", "x":8.25, "y":4},
- {"label":"Space", "x":9.75, "y":4, "w":2.75},
- {"label":"Alt", "x":12.5, "y":4, "w":1.5},
- {"label":"Ctrl", "x":15, "y":4, "w":1.5},
- {"label":"Left", "x":16.5, "y":4},
- {"label":"Down", "x":17.5, "y":4},
- {"label":"Right", "x":18.5, "y":4}
+ {"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": [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": 10.5, "y": 0},
+ {"matrix": [1, 4], "x": 11.5, "y": 0},
+ {"matrix": [0, 5], "x": 12.5, "y": 0},
+ {"matrix": [1, 5], "x": 13.5, "y": 0},
+ {"matrix": [0, 6], "x": 14.5, "y": 0},
+ {"matrix": [1, 6], "x": 15.5, "y": 0},
+ {"matrix": [4, 6], "x": 16.5, "y": 0},
+ {"matrix": [8, 1], "x": 17.5, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1},
+
+ {"matrix": [3, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [2, 1], "x": 3, "y": 1},
+ {"matrix": [3, 1], "x": 4, "y": 1},
+ {"matrix": [2, 2], "x": 5, "y": 1},
+ {"matrix": [3, 2], "x": 6, "y": 1},
+ {"matrix": [2, 3], "x": 7, "y": 1},
+
+ {"matrix": [3, 3], "x": 10, "y": 1},
+ {"matrix": [2, 4], "x": 11, "y": 1},
+ {"matrix": [3, 4], "x": 12, "y": 1},
+ {"matrix": [2, 5], "x": 13, "y": 1},
+ {"matrix": [3, 5], "x": 14, "y": 1},
+ {"matrix": [2, 6], "x": 15, "y": 1},
+ {"matrix": [3, 6], "x": 16, "y": 1},
+ {"matrix": [5, 6], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 2},
+
+ {"matrix": [5, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [4, 1], "x": 3.25, "y": 2},
+ {"matrix": [5, 1], "x": 4.25, "y": 2},
+ {"matrix": [4, 2], "x": 5.25, "y": 2},
+ {"matrix": [5, 2], "x": 6.25, "y": 2},
+ {"matrix": [4, 3], "x": 7.25, "y": 2},
+
+ {"matrix": [5, 3], "x": 10.25, "y": 2},
+ {"matrix": [4, 4], "x": 11.25, "y": 2},
+ {"matrix": [5, 4], "x": 12.25, "y": 2},
+ {"matrix": [4, 5], "x": 13.25, "y": 2},
+ {"matrix": [5, 5], "x": 14.25, "y": 2},
+ {"matrix": [6, 6], "x": 15.25, "y": 2},
+ {"matrix": [7, 6], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [6, 0], "x": 1.5, "y": 3, "w": 2.25},
+ {"matrix": [7, 0], "x": 3.75, "y": 3},
+ {"matrix": [6, 1], "x": 4.75, "y": 3},
+ {"matrix": [7, 1], "x": 5.75, "y": 3},
+ {"matrix": [6, 2], "x": 6.75, "y": 3},
+ {"matrix": [7, 2], "x": 7.75, "y": 3},
+
+ {"matrix": [6, 3], "x": 9.75, "y": 3},
+ {"matrix": [7, 3], "x": 10.75, "y": 3},
+ {"matrix": [6, 4], "x": 11.75, "y": 3},
+ {"matrix": [7, 4], "x": 12.75, "y": 3},
+ {"matrix": [6, 5], "x": 13.75, "y": 3},
+ {"matrix": [7, 5], "x": 14.75, "y": 3},
+ {"matrix": [8, 6], "x": 15.75, "y": 3, "w": 1.75},
+ {"matrix": [9, 6], "x": 17.5, "y": 3},
+
+ {"matrix": [8, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [9, 1], "x": 4.5, "y": 4, "w": 1.5},
+ {"matrix": [8, 2], "x": 6, "y": 4, "w": 2.25},
+ {"matrix": [9, 2], "x": 8.25, "y": 4},
+
+ {"matrix": [8, 3], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [9, 3], "x": 12.5, "y": 4, "w": 1.5},
+ {"matrix": [8, 4], "x": 15, "y": 4, "w": 1.5},
+ {"matrix": [9, 4], "x": 16.5, "y": 4},
+ {"matrix": [8, 5], "x": 17.5, "y": 4},
+ {"matrix": [9, 5], "x": 18.5, "y": 4}
]
}
}
diff --git a/keyboards/checkerboards/ud40_ortho_alt/info.json b/keyboards/checkerboards/ud40_ortho_alt/info.json
index 7573cb74d8..7d49bdb5b4 100644
--- a/keyboards/checkerboards/ud40_ortho_alt/info.json
+++ b/keyboards/checkerboards/ud40_ortho_alt/info.json
@@ -20,19 +20,250 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_default": {
- "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}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.25}, {"x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":2.25}, {"x":6, "y":3, "w":2.25}, {"x":8.25, "y":3, "w":1.25}, {"x":9.5, "y":3, "w":1.25}, {"x":10.75, "y":3, "w":1.25}]
- },
- "LAYOUT_2x3u_alt": {
- "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}, {"x":0, "y":3, "w":1.5}, {"x":1.5, "y":3, "w":1.5}, {"x":3, "y":3, "w":3}, {"x":6, "y":3, "w":3}, {"x":9, "y":3, "w":1.5}, {"x":10.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, 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_2x3u_alt": {
+ "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.5},
+ {"matrix": [3, 3], "x": 1.5, "y": 3, "w": 1.5},
+ {"matrix": [3, 4], "x": 3, "y": 3, "w": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3, "w": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3, "w": 1.5},
+ {"matrix": [3, 11], "x": 10.5, "y": 3, "w": 1.5}
+ ]
+ },
"LAYOUT_600u": {
- "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}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3, "w":6}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "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, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 3], "x": 2, "y": 3},
+ {"matrix": [3, 6], "x": 3, "y": 3, "w": 6},
+ {"matrix": [3, 8], "x": 9, "y": 3},
+ {"matrix": [3, 9], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3}
+ ]
+ },
"LAYOUT_600u_alt": {
- "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}, {"x":0, "y":3, "w":1.5}, {"x":1.5, "y":3, "w":1.5}, {"x":3, "y":3, "w":6}, {"x":9, "y":3, "w":1.5}, {"x":10.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, 0], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [3, 3], "x": 1.5, "y": 3, "w": 1.5},
+ {"matrix": [3, 6], "x": 3, "y": 3, "w": 6},
+ {"matrix": [3, 9], "x": 9, "y": 3, "w": 1.5},
+ {"matrix": [3, 11], "x": 10.5, "y": 3, "w": 1.5}
+ ]
+ },
"LAYOUT_700u": {
- "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}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.25}, {"x":2.5, "y":3, "w":7}, {"x":9.5, "y":3, "w":1.25}, {"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, 6], "x": 2.5, "y": 3, "w": 7},
+ {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25}
+ ]
}
}
}
diff --git a/keyboards/checkerboards/ud40_ortho_alt/ud40_ortho_alt.h b/keyboards/checkerboards/ud40_ortho_alt/ud40_ortho_alt.h
deleted file mode 100644
index 9a0bb6b608..0000000000
--- a/keyboards/checkerboards/ud40_ortho_alt/ud40_ortho_alt.h
+++ /dev/null
@@ -1,81 +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_default( \
- 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 \
-) { \
- { 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, k32, k33, XXX, k34, XXX, k35, k36, XXX, k37 } \
-}
-
-#define LAYOUT_2x3u_alt( \
- 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 \
-) { \
- { 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, XXX, XXX, k31, k32, XXX, k33, XXX, XXX, k34, XXX, k35 } \
-}
-
-#define LAYOUT_600u( \
- 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 \
-) { \
- { 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, k32, XXX, XXX, k33, XXX, k34, k35, XXX, k36 } \
-}
-
-#define LAYOUT_600u_alt( \
- 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 \
-) { \
- { 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, XXX, XXX, k31, XXX, XXX, k32, XXX, XXX, k33, XXX, k34 } \
-}
-
-#define LAYOUT_700u( \
- 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 \
-) { \
- { 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, XXX, XXX, XXX, k32, XXX, XXX, k33, XXX, k34 } \
-}
diff --git a/keyboards/cipulot/kallos/info.json b/keyboards/cipulot/kallos/info.json
index 40eb07f80e..f9fd74acfe 100644
--- a/keyboards/cipulot/kallos/info.json
+++ b/keyboards/cipulot/kallos/info.json
@@ -21,417 +21,100 @@
"layouts": {
"LAYOUT_default": {
"layout": [
- {
- "label": "0,0",
- "x": 0,
- "y": 0
- },
- {
- "label": "0,1",
- "x": 1.25,
- "y": 0
- },
- {
- "label": "0,2",
- "x": 2.25,
- "y": 0
- },
- {
- "label": "0,3",
- "x": 3.25,
- "y": 0
- },
- {
- "label": "0,4",
- "x": 4.25,
- "y": 0
- },
- {
- "label": "0,5",
- "x": 5.5,
- "y": 0
- },
- {
- "label": "0,6",
- "x": 6.5,
- "y": 0
- },
- {
- "label": "0,7",
- "x": 7.5,
- "y": 0
- },
- {
- "label": "0,8",
- "x": 8.5,
- "y": 0
- },
- {
- "label": "0,9",
- "x": 9.75,
- "y": 0
- },
- {
- "label": "0,10",
- "x": 10.75,
- "y": 0
- },
- {
- "label": "0,11",
- "x": 11.75,
- "y": 0
- },
- {
- "label": "0,12",
- "x": 12.75,
- "y": 0
- },
- {
- "label": "0,13",
- "x": 14,
- "y": 0
- },
- {
- "label": "0,14",
- "x": 15.25,
- "y": 0
- },
- {
- "label": "1,0",
- "x": 0,
- "y": 1.25
- },
- {
- "label": "1,1",
- "x": 1,
- "y": 1.25
- },
- {
- "label": "1,2",
- "x": 2,
- "y": 1.25
- },
- {
- "label": "1,3",
- "x": 3,
- "y": 1.25
- },
- {
- "label": "1,4",
- "x": 4,
- "y": 1.25
- },
- {
- "label": "1,5",
- "x": 5,
- "y": 1.25
- },
- {
- "label": "1,6",
- "x": 6,
- "y": 1.25
- },
- {
- "label": "1,7",
- "x": 7,
- "y": 1.25
- },
- {
- "label": "1,8",
- "x": 8,
- "y": 1.25
- },
- {
- "label": "1,9",
- "x": 9,
- "y": 1.25
- },
- {
- "label": "1,10",
- "x": 10,
- "y": 1.25
- },
- {
- "label": "1,11",
- "x": 11,
- "y": 1.25
- },
- {
- "label": "1,12",
- "x": 12,
- "y": 1.25
- },
- {
- "label": "1,13",
- "x": 13,
- "y": 1.25
- },
- {
- "label": "1,14",
- "x": 14,
- "y": 1.25
- },
- {
- "label": "2,14",
- "x": 15.25,
- "y": 1.25
- },
- {
- "label": "2,0",
- "x": 0,
- "y": 2.25,
- "w": 1.5
- },
- {
- "label": "2,1",
- "x": 1.5,
- "y": 2.25
- },
- {
- "label": "2,2",
- "x": 2.5,
- "y": 2.25
- },
- {
- "label": "2,3",
- "x": 3.5,
- "y": 2.25
- },
- {
- "label": "2,4",
- "x": 4.5,
- "y": 2.25
- },
- {
- "label": "2,5",
- "x": 5.5,
- "y": 2.25
- },
- {
- "label": "2,6",
- "x": 6.5,
- "y": 2.25
- },
- {
- "label": "2,7",
- "x": 7.5,
- "y": 2.25
- },
- {
- "label": "2,8",
- "x": 8.5,
- "y": 2.25
- },
- {
- "label": "2,9",
- "x": 9.5,
- "y": 2.25
- },
- {
- "label": "2,10",
- "x": 10.5,
- "y": 2.25
- },
- {
- "label": "2,11",
- "x": 11.5,
- "y": 2.25
- },
- {
- "label": "2,12",
- "x": 12.5,
- "y": 2.25
- },
- {
- "label": "2,13",
- "x": 13.5,
- "y": 2.25,
- "w": 1.5
- },
- {
- "label": "3,14",
- "x": 15.25,
- "y": 2.25
- },
- {
- "label": "3,0",
- "x": 0,
- "y": 3.25,
- "w": 1.75
- },
- {
- "label": "3,1",
- "x": 1.75,
- "y": 3.25
- },
- {
- "label": "3,2",
- "x": 2.75,
- "y": 3.25
- },
- {
- "label": "3,3",
- "x": 3.75,
- "y": 3.25
- },
- {
- "label": "3,4",
- "x": 4.75,
- "y": 3.25
- },
- {
- "label": "3,5",
- "x": 5.75,
- "y": 3.25
- },
- {
- "label": "3,6",
- "x": 6.75,
- "y": 3.25
- },
- {
- "label": "3,7",
- "x": 7.75,
- "y": 3.25
- },
- {
- "label": "3,8",
- "x": 8.75,
- "y": 3.25
- },
- {
- "label": "3,9",
- "x": 9.75,
- "y": 3.25
- },
- {
- "label": "3,10",
- "x": 10.75,
- "y": 3.25
- },
- {
- "label": "3,11",
- "x": 11.75,
- "y": 3.25
- },
- {
- "label": "3,13",
- "x": 12.75,
- "y": 3.25,
- "w": 2.25
- },
- {
- "label": "4,0",
- "x": 0,
- "y": 4.25,
- "w": 2.25
- },
- {
- "label": "4,1",
- "x": 2.25,
- "y": 4.25
- },
- {
- "label": "4,2",
- "x": 3.25,
- "y": 4.25
- },
- {
- "label": "4,3",
- "x": 4.25,
- "y": 4.25
- },
- {
- "label": "4,4",
- "x": 5.25,
- "y": 4.25
- },
- {
- "label": "4,5",
- "x": 6.25,
- "y": 4.25
- },
- {
- "label": "4,6",
- "x": 7.25,
- "y": 4.25
- },
- {
- "label": "4,7",
- "x": 8.25,
- "y": 4.25
- },
- {
- "label": "4,8",
- "x": 9.25,
- "y": 4.25
- },
- {
- "label": "4,9",
- "x": 10.25,
- "y": 4.25
- },
- {
- "label": "4,10",
- "x": 11.25,
- "y": 4.25
- },
- {
- "label": "4,12",
- "x": 12.25,
- "y": 4.25,
- "w": 1.75
- },
- {
- "label": "4,13",
- "x": 14.25,
- "y": 4.5
- },
- {
- "label": "5,0",
- "x": 0,
- "y": 5.25,
- "w": 1.25
- },
- {
- "label": "5,1",
- "x": 2.13,
- "y": 5.25,
- "w": 1.25
- },
- {
- "label": "5,6",
- "x": 3.38,
- "y": 5.25,
- "w": 6.25
- },
- {
- "label": "5,9",
- "x": 9.63,
- "y": 5.25,
- "w": 1.25
- },
- {
- "label": "5,10",
- "x": 11.75,
- "y": 5.25,
- "w": 1.25
- },
- {
- "label": "5,12",
- "x": 13.25,
- "y": 5.5
- },
- {
- "label": "5,13",
- "x": 14.25,
- "y": 5.5
- },
- {
- "label": "5,14",
- "x": 15.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": [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, 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": [2, 14], "x": 15.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": [3, 14], "x": 15.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, 13], "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, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+ {"matrix": [4, 13], "x": 14.25, "y": 4.5},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 2.13, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.38, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 9], "x": 9.63, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 10], "x": 11.75, "y": 5.25, "w": 1.25},
+
+ {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+ {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+ {"matrix": [5, 14], "x": 15.25, "y": 5.5}
]
}
}
diff --git a/keyboards/cipulot/kallos/kallos.h b/keyboards/cipulot/kallos/kallos.h
deleted file mode 100644
index bf71b6becf..0000000000
--- a/keyboards/cipulot/kallos/kallos.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2022 Cipulot
- *
- * 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_default( \
- 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, k214, \
- k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k314, \
- k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k313, \
- k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k412, k413, \
- k500, k501, k506, k509, k510, 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, KC_NO }, \
- { k500, k501, KC_NO, KC_NO, KC_NO, KC_NO, k506, KC_NO, KC_NO, k509, k510, KC_NO, k512, k513, k514 } \
-}
diff --git a/keyboards/daji/seis_cinco/info.json b/keyboards/daji/seis_cinco/info.json
index 61304e85fa..3e56106188 100644
--- a/keyboards/daji/seis_cinco/info.json
+++ b/keyboards/daji/seis_cinco/info.json
@@ -18,143 +18,153 @@
"layouts": {
"LAYOUT_default": {
"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":"Del", "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", "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":"LShift", "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":"RShift", "x":12.25, "y":3, "w":1.75},
- {"label":"Up", "x":14, "y":3},
- {"label":"Fn", "x":15, "y":3},
- {"label":"LCtl", "x":0, "y":4, "w":1.5},
- {"label":"LGui", "x":1.5, "y":4},
- {"label":"LAlt", "x":2.5, "y":4, "w":1.5},
- {"label":"Space", "x":4, "y":4, "w":7},
- {"label":"RAlt", "x":11, "y":4, "w":1.5},
- {"label":"Left", "x":13, "y":4},
- {"label":"Down", "x":14, "y":4},
- {"label":"Right", "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, 15], "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, 15], "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, 15], "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, 15], "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, 7], "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, 15], "x": 15, "y": 4}
]
},
"LAYOUT_all": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"!", "x":1, "y":0},
- {"label":"@", "x":2, "y":0},
- {"label":"#", "x":3, "y":0},
- {"label":"$", "x":4, "y":0},
- {"label":"%", "x":5, "y":0},
- {"label":"^", "x":6, "y":0},
- {"label":"&", "x":7, "y":0},
- {"label":"*", "x":8, "y":0},
- {"label":"(", "x":9, "y":0},
- {"label":")", "x":10, "y":0},
- {"label":"-", "x":11, "y":0},
- {"label":"=", "x":12, "y":0},
- {"label":"|", "x":13, "y":0},
- {"label":"~", "x":14, "y":0},
- {"label":"Del", "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":"Backspace", "x":13.5, "y":1, "w":1.5},
- {"label":"PgUp", "x":15, "y":1},
- {"label":"Caps", "x":0, "y":2, "w":1.75},
- {"label":"A", "x":1.75, "y":2},
- {"label":"S", "x":2.75, "y":2},
- {"label":"D", "x":3.75, "y":2},
- {"label":"F", "x":4.75, "y":2},
- {"label":"G", "x":5.75, "y":2},
- {"label":"H", "x":6.75, "y":2},
- {"label":"J", "x":7.75, "y":2},
- {"label":"K", "x":8.75, "y":2},
- {"label":"L", "x":9.75, "y":2},
- {"label":";", "x":10.75, "y":2},
- {"label":"'", "x":11.75, "y":2},
- {"label":"Enter", "x":12.75, "y":2, "w":2.25},
- {"label":"PgDn", "x":15, "y":2},
- {"label":"LShift", "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":"RShift", "x":12.25, "y":3, "w":1.75},
- {"label":"Up", "x":14, "y":3},
- {"label":"Fn", "x":15, "y":3},
- {"label":"LCtl", "x":0, "y":4, "w":1.5},
- {"label":"LGui", "x":1.5, "y":4},
- {"label":"LAlt", "x":2.5, "y":4, "w":1.5},
- {"label":"Space", "x":4, "y":4, "w":7},
- {"label":"RAlt", "x":11, "y":4, "w":1.5},
- {"label":"Left", "x":13, "y":4},
- {"label":"Down", "x":14, "y":4},
- {"label":"Right", "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": [0, 15], "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, 15], "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, 15], "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, 15], "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, 7], "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, 15], "x": 15, "y": 4}
]
}
}
diff --git a/keyboards/daji/seis_cinco/seis_cinco.h b/keyboards/daji/seis_cinco/seis_cinco.h
deleted file mode 100644
index 056aa3756b..0000000000
--- a/keyboards/daji/seis_cinco/seis_cinco.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright 2021 B. Fletcher
- *
- * 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
-
-/* Default layout with full backspace
- */
-#define LAYOUT_default( \
- 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, K1F, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2F, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, \
- K40, K41, K42, K47, K4B, K4C, K4D, K4F \
-) \
-{ \
- {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, ___, K1F}, \
- {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, ___, K2F}, \
- {K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, K3F}, \
- {K40, K41, K42, ___, ___, ___, ___, K47, ___, ___, ___, K4B, K4C, K4D, ___, K4F} \
-}
-
-/* Default layout with split backspace
- */
-#define LAYOUT_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2F, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, \
- K40, K41, K42, K47, K4B, K4C, K4D, 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, ___, K1F}, \
- {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, ___, K2F}, \
- {K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, K3F}, \
- {K40, K41, K42, ___, ___, ___, ___, K47, ___, ___, ___, K4B, K4C, K4D, ___, K4F} \
-}
diff --git a/keyboards/dztech/dz96/dz96.h b/keyboards/dztech/dz96/dz96.h
deleted file mode 100644
index bf84dfc3aa..0000000000
--- a/keyboards/dztech/dz96/dz96.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* Copyright 2020 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"
-
-//Arrow keys and 1.75u right shift
-#define LAYOUT_default( \
- K00, K01, K02, K03, K04, K60, K61, K62, K63, K05, K06, K07, K08, K72, K09, K0A, K0B, K0C, K7C, \
- K10, K11, K12, K13, K14, K64, K65, K66, K67, K15, K16, K17, K18, K71, K19, K1A, K1B, K1C, \
- K20, K21, K22, K23, K24, K68, K69, K6A, K6B, K25, K26, K27, K28, K73, K29, K2A, K2B, K2C, \
- K30, K31, K32, K33, K34, K6C, K75, K76, K77, K35, K36, K37, K38, K39, K3A, K3B, \
- K40, K42, K43, K44, K78, K79, K7A, K7B, K45, K46, K47, K48, K74, K49, K4A, K4B, K4C, \
- K50, K51, K52, K59, K55, K56, K57, K58, K53, K54, K5A, K5B \
-) { \
- { 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, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO }, \
- { K40, KC_NO, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C }, \
- { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, KC_NO }, \
- { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C }, \
- { KC_NO, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C } \
-}
-
-// Split backspace 1.5u right mods
-#define LAYOUT_split_bs_joined_right( \
- K00, K01, K02, K03, K04, K60, K61, K62, K63, K05, K06, K07, K08, K72, K09, K0A, K0B, K0C, K7C, \
- K10, K11, K12, K13, K14, K64, K65, K66, K67, K15, K16, K17, K18, K70, K71, K19, K1A, K1B, K1C, \
- K20, K21, K22, K23, K24, K68, K69, K6A, K6B, K25, K26, K27, K28, K73, K29, K2A, K2B, K2C, \
- K30, K31, K32, K33, K34, K6C, K75, K76, K77, K35, K36, K37, K38, K39, K3A, K3B, \
- K40, K42, K43, K44, K78, K79, K7A, K7B, K45, K46, K47, K48, K74, K49, K4A, K4B, K4C, \
- K50, K51, K52, K59, K55, K57, K58, K53, K54, K5A, K5B \
-) { \
- { 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, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO }, \
- { K40, KC_NO, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C }, \
- { K50, K51, K52, K53, K54, K55, KC_NO, K57, K58, K59, K5A, K5B, KC_NO }, \
- { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C }, \
- { K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C }, \
-}
-
-// Split numpad (enter, 0), split shifts (right, left), split backspace
-// This layout contains every possible keycode placement
-#define LAYOUT_split_shift_and_bs( \
- K00, K01, K02, K03, K04, K60, K61, K62, K63, K05, K06, K07, K08, K72, K09, K0A, K0B, K0C, K7C, \
- K10, K11, K12, K13, K14, K64, K65, K66, K67, K15, K16, K17, K18, K70, K71, K19, K1A, K1B, K1C, \
- K20, K21, K22, K23, K24, K68, K69, K6A, K6B, K25, K26, K27, K28, K73, K29, K2A, K2B, K2C, \
- K30, K31, K32, K33, K34, K6C, K75, K76, K77, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
- K40, K41, K42, K43, K44, K78, K79, K7A, K7B, K45, K46, K47, K48, K74, K49, K4A, K4B, K4C, \
- K50, K51, K52, K59, K55, K56, K57, K58, K53, K54, K5A, K5B, K5C \
-) { \
- { 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, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C }, \
- { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C }, \
- { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C }, \
- { K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C }, \
-}
-
-// ISO Layout
-#define LAYOUT_iso( \
- K00, K01, K02, K03, K04, K60, K61, K62, K63, K05, K06, K07, K08, K72, K09, K0A, K0B, K0C, K7C, \
- K10, K11, K12, K13, K14, K64, K65, K66, K67, K15, K16, K17, K18, K71, K19, K1A, K1B, K1C, \
- K20, K21, K22, K23, K24, K68, K69, K6A, K6B, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
- K30, K31, K32, K33, K34, K6C, K75, K76, K77, K35, K36, K37, K73, K38, K39, K3A, K3B, \
- K40, K41, K42, K43, K44, K78, K79, K7A, K7B, K45, K46, K47, K48, K74, K49, K4A, K4B, K4C, \
- K50, K51, K52, K59, K55, K56, K57, K58, K53, K54, K5A, K5B \
-) { \
- { 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, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C }, \
- { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, KC_NO }, \
- { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C }, \
- { KC_NO, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C } \
-}
diff --git a/keyboards/dztech/dz96/info.json b/keyboards/dztech/dz96/info.json
index a7229ce131..47ceaebcd2 100644
--- a/keyboards/dztech/dz96/info.json
+++ b/keyboards/dztech/dz96/info.json
@@ -26,449 +26,446 @@
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
- "LAYOUT_default": {
- "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":"HOME", "x":14, "y":0},
- {"label":"END", "x":15, "y":0},
- {"label":"PAGE UP", "x":16, "y":0},
- {"label":"PAGE DOWN", "x":17, "y":0},
- {"label":"DELETE", "x":18, "y":0},
+ "LAYOUT_default": {
+ "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": [6, 0], "x": 5, "y": 0},
+ {"matrix": [6, 1], "x": 6, "y": 0},
+ {"matrix": [6, 2], "x": 7, "y": 0},
+ {"matrix": [6, 3], "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": [7, 2], "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": [0, 12], "x": 17, "y": 0},
+ {"matrix": [7, 12], "x": 18, "y": 0},
- {"label":"GRAVE", "x":0, "y":1},
- {"label":"1", "x":1, "y":1},
- {"label":"2", "x":2, "y":1},
- {"label":"3", "x":3, "y":1},
- {"label":"4", "x":4, "y":1},
- {"label":"5", "x":5, "y":1},
- {"label":"6", "x":6, "y":1},
- {"label":"7", "x":7, "y":1},
- {"label":"8", "x":8, "y":1},
- {"label":"9", "x":9, "y":1},
- {"label":"0", "x":10, "y":1},
- {"label":"MINUS", "x":11, "y":1},
- {"label":"EQUAL", "x":12, "y":1},
- {"label":"BACKSPACE", "x":13, "y":1, "w":2},
- {"label":"NUM LOCK", "x":15, "y":1},
- {"label":"KEYPAD /", "x":16, "y":1},
- {"label":"KEYPAD *", "x":17, "y":1},
- {"label":"KEYPAD -", "x":18, "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": [6, 4], "x": 5, "y": 1},
+ {"matrix": [6, 5], "x": 6, "y": 1},
+ {"matrix": [6, 6], "x": 7, "y": 1},
+ {"matrix": [6, 7], "x": 8, "y": 1},
+ {"matrix": [1, 5], "x": 9, "y": 1},
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [7, 1], "x": 13, "y": 1, "w": 2},
+ {"matrix": [1, 9], "x": 15, "y": 1},
+ {"matrix": [1, 10], "x": 16, "y": 1},
+ {"matrix": [1, 11], "x": 17, "y": 1},
+ {"matrix": [1, 12], "x": 18, "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":"LBRACKET", "x":11.5, "y":2},
- {"label":"RBRACKET", "x":12.5, "y":2},
- {"label":"BACKSLASH", "x":13.5, "y":2, "w":1.5},
- {"label":"KEYPAD 7", "x":15, "y":2},
- {"label":"KEYPAD 8", "x":16, "y":2},
- {"label":"KEYPAD 9", "x":17, "y":2},
- {"label":"KEYPAD +", "x":18, "y":2, "h":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": [6, 8], "x": 5.5, "y": 2},
+ {"matrix": [6, 9], "x": 6.5, "y": 2},
+ {"matrix": [6, 10], "x": 7.5, "y": 2},
+ {"matrix": [6, 11], "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": [7, 3], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [2, 9], "x": 15, "y": 2},
+ {"matrix": [2, 10], "x": 16, "y": 2},
+ {"matrix": [2, 11], "x": 17, "y": 2},
+ {"matrix": [2, 12], "x": 18, "y": 2, "h": 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":"SEMICOLON", "x":10.75, "y":3},
- {"label":"QUOTE", "x":11.75, "y":3},
- {"label":"ENTER", "x":12.75, "y":3, "w":2.25},
- {"label":"KEYPAD 4", "x":15, "y":3},
- {"label":"KEYPAD 5", "x":16, "y":3},
- {"label":"KEYPAD 6", "x":17, "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": [6, 12], "x": 5.75, "y": 3},
+ {"matrix": [7, 5], "x": 6.75, "y": 3},
+ {"matrix": [7, 6], "x": 7.75, "y": 3},
+ {"matrix": [7, 7], "x": 8.75, "y": 3},
+ {"matrix": [3, 5], "x": 9.75, "y": 3},
+ {"matrix": [3, 6], "x": 10.75, "y": 3},
+ {"matrix": [3, 7], "x": 11.75, "y": 3},
+ {"matrix": [3, 8], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 9], "x": 15, "y": 3},
+ {"matrix": [3, 10], "x": 16, "y": 3},
+ {"matrix": [3, 11], "x": 17, "y": 3},
- {"label":"LSHIFT", "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":"COMMA", "x":9.25, "y":4},
- {"label":"PERIOD", "x":10.25, "y":4},
- {"label":"SLASH", "x":11.25, "y":4},
- {"label":"RSHIFT", "x":12.25, "y":4, "w":1.75},
- {"label":"UP", "x":14, "y":4},
- {"label":"KEYPAD 1", "x":15, "y":4},
- {"label":"KEYPAD 2", "x":16, "y":4},
- {"label":"KEYPAD 3", "x":17, "y":4},
- {"label":"KEYPAD ENTER", "x":18, "y":4, "h":2},
+ {"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": [7, 8], "x": 5.25, "y": 4},
+ {"matrix": [7, 9], "x": 6.25, "y": 4},
+ {"matrix": [7, 10], "x": 7.25, "y": 4},
+ {"matrix": [7, 11], "x": 8.25, "y": 4},
+ {"matrix": [4, 5], "x": 9.25, "y": 4},
+ {"matrix": [4, 6], "x": 10.25, "y": 4},
+ {"matrix": [4, 7], "x": 11.25, "y": 4},
+ {"matrix": [4, 8], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [7, 4], "x": 14, "y": 4},
+ {"matrix": [4, 9], "x": 15, "y": 4},
+ {"matrix": [4, 10], "x": 16, "y": 4},
+ {"matrix": [4, 11], "x": 17, "y": 4},
+ {"matrix": [4, 12], "x": 18, "y": 4, "h": 2},
- {"label":"LCTRL", "x":0, "y":5, "w":1.25},
- {"label":"LGUI", "x":1.25, "y":5, "w":1.25},
- {"label":"LALT", "x":2.5, "y":5, "w":1.25},
- {"label":"SPACE", "x":3.75, "y":5, "w":6.25},
- {"label":"RALT", "x":10, "y":5},
- {"label":"RCTRL", "x":11, "y":5},
- {"label":"FN", "x":12, "y":5},
- {"label":"LEFT", "x":13, "y":5},
- {"label":"DOWN", "x":14, "y":5},
- {"label":"RIGHT", "x":15, "y":5},
- {"label":"KEYPAD 0", "x":16, "y":5},
- {"label":"KEYPAD .", "x":17, "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, 9], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 5], "x": 10, "y": 5},
+ {"matrix": [5, 6], "x": 11, "y": 5},
+ {"matrix": [5, 7], "x": 12, "y": 5},
+ {"matrix": [5, 8], "x": 13, "y": 5},
+ {"matrix": [5, 3], "x": 14, "y": 5},
+ {"matrix": [5, 4], "x": 15, "y": 5},
+ {"matrix": [5, 10], "x": 16, "y": 5},
+ {"matrix": [5, 11], "x": 17, "y": 5}
+ ]
+ },
+ "LAYOUT_split_bs_joined_right": {
+ "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": [6, 0], "x": 5, "y": 0},
+ {"matrix": [6, 1], "x": 6, "y": 0},
+ {"matrix": [6, 2], "x": 7, "y": 0},
+ {"matrix": [6, 3], "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": [7, 2], "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": [0, 12], "x": 17, "y": 0},
+ {"matrix": [7, 12], "x": 18, "y": 0},
- "LAYOUT_split_bs_joined_right": {
- "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": "K60", "x": 5, "y": 0},
- {"label": "K61", "x": 6, "y": 0},
- {"label": "K62", "x": 7, "y": 0},
- {"label": "K63", "x": 8, "y": 0},
- {"label": "K05", "x": 9, "y": 0},
- {"label": "K06", "x": 10, "y": 0},
- {"label": "K07", "x": 11, "y": 0},
- {"label": "K08", "x": 12, "y": 0},
- {"label": "K72", "x": 13, "y": 0},
- {"label": "K09", "x": 14, "y": 0},
- {"label": "K0A", "x": 15, "y": 0},
- {"label": "K0B", "x": 16, "y": 0},
- {"label": "K0C", "x": 17, "y": 0},
- {"label": "K7C", "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": [6, 4], "x": 5, "y": 1},
+ {"matrix": [6, 5], "x": 6, "y": 1},
+ {"matrix": [6, 6], "x": 7, "y": 1},
+ {"matrix": [6, 7], "x": 8, "y": 1},
+ {"matrix": [1, 5], "x": 9, "y": 1},
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [7, 0], "x": 13, "y": 1},
+ {"matrix": [7, 1], "x": 14, "y": 1},
+ {"matrix": [1, 9], "x": 15, "y": 1},
+ {"matrix": [1, 10], "x": 16, "y": 1},
+ {"matrix": [1, 11], "x": 17, "y": 1},
+ {"matrix": [1, 12], "x": 18, "y": 1},
- {"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": "K64", "x": 5, "y": 1},
- {"label": "K65", "x": 6, "y": 1},
- {"label": "K66", "x": 7, "y": 1},
- {"label": "K67", "x": 8, "y": 1},
- {"label": "K15", "x": 9, "y": 1},
- {"label": "K16", "x": 10, "y": 1},
- {"label": "K17", "x": 11, "y": 1},
- {"label": "K18", "x": 12, "y": 1},
- {"label": "K70", "x": 13, "y": 1},
- {"label": "K71", "x": 14, "y": 1},
- {"label": "K19", "x": 15, "y": 1},
- {"label": "K1A", "x": 16, "y": 1},
- {"label": "K1B", "x": 17, "y": 1},
- {"label": "K1C", "x": 18, "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": [6, 8], "x": 5.5, "y": 2},
+ {"matrix": [6, 9], "x": 6.5, "y": 2},
+ {"matrix": [6, 10], "x": 7.5, "y": 2},
+ {"matrix": [6, 11], "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": [7, 3], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [2, 9], "x": 15, "y": 2},
+ {"matrix": [2, 10], "x": 16, "y": 2},
+ {"matrix": [2, 11], "x": 17, "y": 2},
+ {"matrix": [2, 12], "x": 18, "y": 2, "h": 2},
- {"label": "K20", "x": 0, "y": 2, "w": 1.5},
- {"label": "K21", "x": 1.5, "y": 2},
- {"label": "K22", "x": 2.5, "y": 2},
- {"label": "K23", "x": 3.5, "y": 2},
- {"label": "K24", "x": 4.5, "y": 2},
- {"label": "K68", "x": 5.5, "y": 2},
- {"label": "K69", "x": 6.5, "y": 2},
- {"label": "K6A", "x": 7.5, "y": 2},
- {"label": "K6B", "x": 8.5, "y": 2},
- {"label": "K25", "x": 9.5, "y": 2},
- {"label": "K26", "x": 10.5, "y": 2},
- {"label": "K27", "x": 11.5, "y": 2},
- {"label": "K28", "x": 12.5, "y": 2},
- {"label": "K73", "x": 13.5, "y": 2, "w": 1.5},
- {"label": "K29", "x": 15, "y": 2},
- {"label": "K2A", "x": 16, "y": 2},
- {"label": "K2B", "x": 17, "y": 2},
- {"label": "K2C", "x": 18, "y": 2, "h": 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": [6, 12], "x": 5.75, "y": 3},
+ {"matrix": [7, 5], "x": 6.75, "y": 3},
+ {"matrix": [7, 6], "x": 7.75, "y": 3},
+ {"matrix": [7, 7], "x": 8.75, "y": 3},
+ {"matrix": [3, 5], "x": 9.75, "y": 3},
+ {"matrix": [3, 6], "x": 10.75, "y": 3},
+ {"matrix": [3, 7], "x": 11.75, "y": 3},
+ {"matrix": [3, 8], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 9], "x": 15, "y": 3},
+ {"matrix": [3, 10], "x": 16, "y": 3},
+ {"matrix": [3, 11], "x": 17, "y": 3},
- {"label": "K30", "x": 0, "y": 3, "w": 1.75},
- {"label": "K31", "x": 1.75, "y": 3},
- {"label": "K32", "x": 2.75, "y": 3},
- {"label": "K33", "x": 3.75, "y": 3},
- {"label": "K34", "x": 4.75, "y": 3},
- {"label": "K6C", "x": 5.75, "y": 3},
- {"label": "K75", "x": 6.75, "y": 3},
- {"label": "K76", "x": 7.75, "y": 3},
- {"label": "K77", "x": 8.75, "y": 3},
- {"label": "K35", "x": 9.75, "y": 3},
- {"label": "K36", "x": 10.75, "y": 3},
- {"label": "K37", "x": 11.75, "y": 3},
- {"label": "K38", "x": 12.75, "y": 3, "w": 2.25},
- {"label": "K39", "x": 15, "y": 3},
- {"label": "K3A", "x": 16, "y": 3},
- {"label": "K3B", "x": 17, "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": [7, 8], "x": 5.25, "y": 4},
+ {"matrix": [7, 9], "x": 6.25, "y": 4},
+ {"matrix": [7, 10], "x": 7.25, "y": 4},
+ {"matrix": [7, 11], "x": 8.25, "y": 4},
+ {"matrix": [4, 5], "x": 9.25, "y": 4},
+ {"matrix": [4, 6], "x": 10.25, "y": 4},
+ {"matrix": [4, 7], "x": 11.25, "y": 4},
+ {"matrix": [4, 8], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [7, 4], "x": 14, "y": 4},
+ {"matrix": [4, 9], "x": 15, "y": 4},
+ {"matrix": [4, 10], "x": 16, "y": 4},
+ {"matrix": [4, 11], "x": 17, "y": 4},
+ {"matrix": [4, 12], "x": 18, "y": 4, "h": 2},
- {"label": "K40", "x": 0, "y": 4, "w": 2.25},
- {"label": "K42", "x": 2.25, "y": 4},
- {"label": "K43", "x": 3.25, "y": 4},
- {"label": "K44", "x": 4.25, "y": 4},
- {"label": "K78", "x": 5.25, "y": 4},
- {"label": "K79", "x": 6.25, "y": 4},
- {"label": "K7A", "x": 7.25, "y": 4},
- {"label": "K7B", "x": 8.25, "y": 4},
- {"label": "K45", "x": 9.25, "y": 4},
- {"label": "K46", "x": 10.25, "y": 4},
- {"label": "K47", "x": 11.25, "y": 4},
- {"label": "K48", "x": 12.25, "y": 4, "w": 1.75},
- {"label": "K74", "x": 14, "y": 4},
- {"label": "K49", "x": 15, "y": 4},
- {"label": "K4A", "x": 16, "y": 4},
- {"label": "K4B", "x": 17, "y": 4},
- {"label": "K4C", "x": 18, "y": 4, "h": 2},
+ {"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, 9], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 5], "x": 10, "y": 5, "w": 1.5},
+ {"matrix": [5, 7], "x": 11.5, "y": 5, "w": 1.5},
+ {"matrix": [5, 8], "x": 13, "y": 5},
+ {"matrix": [5, 3], "x": 14, "y": 5},
+ {"matrix": [5, 4], "x": 15, "y": 5},
+ {"matrix": [5, 10], "x": 16, "y": 5},
+ {"matrix": [5, 11], "x": 17, "y": 5}
+ ]
+ },
+ "LAYOUT_split_shift_and_bs": {
+ "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": [6, 0], "x": 5, "y": 0},
+ {"matrix": [6, 1], "x": 6, "y": 0},
+ {"matrix": [6, 2], "x": 7, "y": 0},
+ {"matrix": [6, 3], "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": [7, 2], "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": [0, 12], "x": 17, "y": 0},
+ {"matrix": [7, 12], "x": 18, "y": 0},
- {"label": "K50", "x": 0, "y": 5, "w": 1.25},
- {"label": "K51", "x": 1.25, "y": 5, "w": 1.25},
- {"label": "K52", "x": 2.5, "y": 5, "w": 1.25},
- {"label": "K59", "x": 3.75, "y": 5, "w": 6.25},
- {"label": "K55", "x": 10, "y": 5, "w": 1.5},
- {"label": "K57", "x": 11.5, "y": 5, "w": 1.5},
- {"label": "K58", "x": 13, "y": 5},
- {"label": "K53", "x": 14, "y": 5},
- {"label": "K54", "x": 15, "y": 5},
- {"label": "K5A", "x": 16, "y": 5},
- {"label": "K5B", "x": 17, "y": 5}
- ]
- },
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [6, 4], "x": 5, "y": 1},
+ {"matrix": [6, 5], "x": 6, "y": 1},
+ {"matrix": [6, 6], "x": 7, "y": 1},
+ {"matrix": [6, 7], "x": 8, "y": 1},
+ {"matrix": [1, 5], "x": 9, "y": 1},
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [7, 0], "x": 13, "y": 1},
+ {"matrix": [7, 1], "x": 14, "y": 1},
+ {"matrix": [1, 9], "x": 15, "y": 1},
+ {"matrix": [1, 10], "x": 16, "y": 1},
+ {"matrix": [1, 11], "x": 17, "y": 1},
+ {"matrix": [1, 12], "x": 18, "y": 1},
- "LAYOUT_split_shift_and_bs": {
- "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":"HOME", "x":14, "y":0},
- {"label":"END", "x":15, "y":0},
- {"label":"PAGE UP", "x":16, "y":0},
- {"label":"PAGE DOWN", "x":17, "y":0},
- {"label":"DELETE", "x":18, "y":0},
+ {"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": [6, 8], "x": 5.5, "y": 2},
+ {"matrix": [6, 9], "x": 6.5, "y": 2},
+ {"matrix": [6, 10], "x": 7.5, "y": 2},
+ {"matrix": [6, 11], "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": [7, 3], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [2, 9], "x": 15, "y": 2},
+ {"matrix": [2, 10], "x": 16, "y": 2},
+ {"matrix": [2, 11], "x": 17, "y": 2},
+ {"matrix": [2, 12], "x": 18, "y": 2},
- {"label":"GRAVE", "x":0, "y":1},
- {"label":"1", "x":1, "y":1},
- {"label":"2", "x":2, "y":1},
- {"label":"3", "x":3, "y":1},
- {"label":"4", "x":4, "y":1},
- {"label":"5", "x":5, "y":1},
- {"label":"6", "x":6, "y":1},
- {"label":"7", "x":7, "y":1},
- {"label":"8", "x":8, "y":1},
- {"label":"9", "x":9, "y":1},
- {"label":"0", "x":10, "y":1},
- {"label":"MINUS", "x":11, "y":1},
- {"label":"EQUAL", "x":12, "y":1},
- {"label":"BACKSPACE", "x":13, "y":1},
- {"label":"BACKSPACE", "x":14, "y":1},
- {"label":"NUM LOCK", "x":15, "y":1},
- {"label":"KEYPAD /", "x":16, "y":1},
- {"label":"KEYPAD *", "x":17, "y":1},
- {"label":"KEYPAD -", "x":18, "y":1},
+ {"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": [6, 12], "x": 5.75, "y": 3},
+ {"matrix": [7, 5], "x": 6.75, "y": 3},
+ {"matrix": [7, 6], "x": 7.75, "y": 3},
+ {"matrix": [7, 7], "x": 8.75, "y": 3},
+ {"matrix": [3, 5], "x": 9.75, "y": 3},
+ {"matrix": [3, 6], "x": 10.75, "y": 3},
+ {"matrix": [3, 7], "x": 11.75, "y": 3},
+ {"matrix": [3, 8], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 9], "x": 15, "y": 3},
+ {"matrix": [3, 10], "x": 16, "y": 3},
+ {"matrix": [3, 11], "x": 17, "y": 3},
+ {"matrix": [3, 12], "x": 18, "y": 3},
- {"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":"LBRACKET", "x":11.5, "y":2},
- {"label":"RBRACKET", "x":12.5, "y":2},
- {"label":"BACKSLASH", "x":13.5, "y":2, "w":1.5},
- {"label":"KEYPAD 7", "x":15, "y":2},
- {"label":"KEYPAD 8", "x":16, "y":2},
- {"label":"KEYPAD 9", "x":17, "y":2},
- {"label":"KEYPAD +", "x":18, "y":2},
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [7, 8], "x": 5.25, "y": 4},
+ {"matrix": [7, 9], "x": 6.25, "y": 4},
+ {"matrix": [7, 10], "x": 7.25, "y": 4},
+ {"matrix": [7, 11], "x": 8.25, "y": 4},
+ {"matrix": [4, 5], "x": 9.25, "y": 4},
+ {"matrix": [4, 6], "x": 10.25, "y": 4},
+ {"matrix": [4, 7], "x": 11.25, "y": 4},
+ {"matrix": [4, 8], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [7, 4], "x": 14, "y": 4},
+ {"matrix": [4, 9], "x": 15, "y": 4},
+ {"matrix": [4, 10], "x": 16, "y": 4},
+ {"matrix": [4, 11], "x": 17, "y": 4},
+ {"matrix": [4, 12], "x": 18, "y": 4},
- {"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":"SEMICOLON", "x":10.75, "y":3},
- {"label":"QUOTE", "x":11.75, "y":3},
- {"label":"ENTER", "x":12.75, "y":3, "w":2.25},
- {"label":"KEYPAD 4", "x":15, "y":3},
- {"label":"KEYPAD 5", "x":16, "y":3},
- {"label":"KEYPAD 6", "x":17, "y":3},
- {"label":"KEYPAD +", "x":18, "y":3},
+ {"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, 9], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 5], "x": 10, "y": 5},
+ {"matrix": [5, 6], "x": 11, "y": 5},
+ {"matrix": [5, 7], "x": 12, "y": 5},
+ {"matrix": [5, 8], "x": 13, "y": 5},
+ {"matrix": [5, 3], "x": 14, "y": 5},
+ {"matrix": [5, 4], "x": 15, "y": 5},
+ {"matrix": [5, 10], "x": 16, "y": 5},
+ {"matrix": [5, 11], "x": 17, "y": 5},
+ {"matrix": [5, 12], "x": 18, "y": 5}
+ ]
+ },
+ "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": [6, 0], "x": 5, "y": 0},
+ {"matrix": [6, 1], "x": 6, "y": 0},
+ {"matrix": [6, 2], "x": 7, "y": 0},
+ {"matrix": [6, 3], "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": [7, 2], "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": [0, 12], "x": 17, "y": 0},
+ {"matrix": [7, 12], "x": 18, "y": 0},
- {"label":"LSHIFT", "x":0, "y":4, "w":1.25},
- {"label":"ISO BACKSLASH", "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":"COMMA", "x":9.25, "y":4},
- {"label":"PERIOD", "x":10.25, "y":4},
- {"label":"SLASH", "x":11.25, "y":4},
- {"label":"RSHIFT", "x":12.25, "y":4, "w":1.75},
- {"label":"UP", "x":14, "y":4},
- {"label":"KEYPAD 1", "x":15, "y":4},
- {"label":"KEYPAD 2", "x":16, "y":4},
- {"label":"KEYPAD 3", "x":17, "y":4},
- {"label":"KEYPAD ENTER", "x":18, "y":4},
+ {"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": [6, 4], "x": 5, "y": 1},
+ {"matrix": [6, 5], "x": 6, "y": 1},
+ {"matrix": [6, 6], "x": 7, "y": 1},
+ {"matrix": [6, 7], "x": 8, "y": 1},
+ {"matrix": [1, 5], "x": 9, "y": 1},
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [7, 1], "x": 13, "y": 1, "w": 2},
+ {"matrix": [1, 9], "x": 15, "y": 1},
+ {"matrix": [1, 10], "x": 16, "y": 1},
+ {"matrix": [1, 11], "x": 17, "y": 1},
+ {"matrix": [1, 12], "x": 18, "y": 1},
- {"label":"LCTRL", "x":0, "y":5, "w":1.25},
- {"label":"LGUI", "x":1.25, "y":5, "w":1.25},
- {"label":"LALT", "x":2.5, "y":5, "w":1.25},
- {"label":"SPACE", "x":3.75, "y":5, "w":6.25},
- {"label":"RALT", "x":10, "y":5},
- {"label":"MENU", "x":11, "y":5},
- {"label":"RCTRL", "x":12, "y":5},
- {"label":"LEFT", "x":13, "y":5},
- {"label":"DOWN", "x":14, "y":5},
- {"label":"RIGHT", "x":15, "y":5},
- {"label":"KEYPAD 0", "x":16, "y":5},
- {"label":"KEYPAD .", "x":17, "y":5},
- {"label":"KEYPAD ENTER", "x":18, "y":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": [6, 8], "x": 5.5, "y": 2},
+ {"matrix": [6, 9], "x": 6.5, "y": 2},
+ {"matrix": [6, 10], "x": 7.5, "y": 2},
+ {"matrix": [6, 11], "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": 15, "y": 2},
+ {"matrix": [2, 10], "x": 16, "y": 2},
+ {"matrix": [2, 11], "x": 17, "y": 2},
+ {"matrix": [2, 12], "x": 18, "y": 2, "h": 2},
- "LAYOUT_iso": {
- "layout": [
- {"label":"ESC", "x":0, "y":0},
- {"label":"F1", "x":1, "y":0},
- {"label":"F2", "x":2, "y":0},
- {"label":"F3", "x":3, "y":0},
- {"label":"F4", "x":4, "y":0},
- {"label":"F5", "x":5, "y":0},
- {"label":"F6", "x":6, "y":0},
- {"label":"F7", "x":7, "y":0},
- {"label":"F8", "x":8, "y":0},
- {"label":"F9", "x":9, "y":0},
- {"label":"F10", "x":10, "y":0},
- {"label":"F11", "x":11, "y":0},
- {"label":"F12", "x":12, "y":0},
- {"label":"PRINT SCREEN", "x":13, "y":0},
- {"label":"HOME", "x":14, "y":0},
- {"label":"END", "x":15, "y":0},
- {"label":"PAGE UP", "x":16, "y":0},
- {"label":"PAGE DOWN", "x":17, "y":0},
- {"label":"DELETE", "x":18, "y":0},
+ {"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": [6, 12], "x": 5.75, "y": 3},
+ {"matrix": [7, 5], "x": 6.75, "y": 3},
+ {"matrix": [7, 6], "x": 7.75, "y": 3},
+ {"matrix": [7, 7], "x": 8.75, "y": 3},
+ {"matrix": [3, 5], "x": 9.75, "y": 3},
+ {"matrix": [3, 6], "x": 10.75, "y": 3},
+ {"matrix": [3, 7], "x": 11.75, "y": 3},
+ {"matrix": [7, 3], "x": 12.75, "y": 3},
+ {"matrix": [3, 8], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+ {"matrix": [3, 9], "x": 15, "y": 3},
+ {"matrix": [3, 10], "x": 16, "y": 3},
+ {"matrix": [3, 11], "x": 17, "y": 3},
- {"label":"GRAVE", "x":0, "y":1},
- {"label":"1", "x":1, "y":1},
- {"label":"2", "x":2, "y":1},
- {"label":"3", "x":3, "y":1},
- {"label":"4", "x":4, "y":1},
- {"label":"5", "x":5, "y":1},
- {"label":"6", "x":6, "y":1},
- {"label":"7", "x":7, "y":1},
- {"label":"8", "x":8, "y":1},
- {"label":"9", "x":9, "y":1},
- {"label":"0", "x":10, "y":1},
- {"label":"MINUS", "x":11, "y":1},
- {"label":"EQUAL", "x":12, "y":1},
- {"label":"BACKSPACE", "x":13, "y":1, "w":2},
- {"label":"NUM LOCK", "x":15, "y":1},
- {"label":"KEYPAD /", "x":16, "y":1},
- {"label":"KEYPAD *", "x":17, "y":1},
- {"label":"KEYPAD -", "x":18, "y":1},
+ {"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": [7, 8], "x": 5.25, "y": 4},
+ {"matrix": [7, 9], "x": 6.25, "y": 4},
+ {"matrix": [7, 10], "x": 7.25, "y": 4},
+ {"matrix": [7, 11], "x": 8.25, "y": 4},
+ {"matrix": [4, 5], "x": 9.25, "y": 4},
+ {"matrix": [4, 6], "x": 10.25, "y": 4},
+ {"matrix": [4, 7], "x": 11.25, "y": 4},
+ {"matrix": [4, 8], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [7, 4], "x": 14, "y": 4},
+ {"matrix": [4, 9], "x": 15, "y": 4},
+ {"matrix": [4, 10], "x": 16, "y": 4},
+ {"matrix": [4, 11], "x": 17, "y": 4},
+ {"matrix": [4, 12], "x": 18, "y": 4, "h": 2},
- {"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":"LBRACKET", "x":11.5, "y":2},
- {"label":"RBRACKET", "x":12.5, "y":2},
- {"label":"KEYPAD 7", "x":15, "y":2},
- {"label":"KEYPAD 8", "x":16, "y":2},
- {"label":"KEYPAD 9", "x":17, "y":2},
- {"label":"KEYPAD +", "x":18, "y":2, "h":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":"SEMICOLON", "x":10.75, "y":3},
- {"label":"QUOTE", "x":11.75, "y":3},
- {"label":"ISO HASH", "x":12.75, "y":3},
- {"label":"ENTER", "x":13.75, "y":2, "w":1.25, "h":2},
- {"label":"KEYPAD 4", "x":15, "y":3},
- {"label":"KEYPAD 5", "x":16, "y":3},
- {"label":"KEYPAD 6", "x":17, "y":3},
-
- {"label":"LSHIFT", "x":0, "y":4, "w":1.25},
- {"label":"ISO BACKSLASH", "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":"COMMA", "x":9.25, "y":4},
- {"label":"PERIOD", "x":10.25, "y":4},
- {"label":"SLASH", "x":11.25, "y":4},
- {"label":"RSHIFT", "x":12.25, "y":4, "w":1.75},
- {"label":"UP", "x":14, "y":4},
- {"label":"KEYPAD 1", "x":15, "y":4},
- {"label":"KEYPAD 2", "x":16, "y":4},
- {"label":"KEYPAD 3", "x":17, "y":4},
- {"label":"KEYPAD ENTER", "x":18, "y":4, "h":2},
-
- {"label":"LCTRL", "x":0, "y":5, "w":1.25},
- {"label":"LGUI", "x":1.25, "y":5, "w":1.25},
- {"label":"LALT", "x":2.5, "y":5, "w":1.25},
- {"label":"SPACE", "x":3.75, "y":5, "w":6.25},
- {"label":"RALT", "x":10, "y":5},
- {"label":"MENU", "x":11, "y":5},
- {"label":"RCTRL", "x":12, "y":5},
- {"label":"LEFT", "x":13, "y":5},
- {"label":"DOWN", "x":14, "y":5},
- {"label":"RIGHT", "x":15, "y":5},
- {"label":"KEYPAD 0", "x":16, "y":5},
- {"label":"KEYPAD .", "x":17, "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, 9], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 5], "x": 10, "y": 5},
+ {"matrix": [5, 6], "x": 11, "y": 5},
+ {"matrix": [5, 7], "x": 12, "y": 5},
+ {"matrix": [5, 8], "x": 13, "y": 5},
+ {"matrix": [5, 3], "x": 14, "y": 5},
+ {"matrix": [5, 4], "x": 15, "y": 5},
+ {"matrix": [5, 10], "x": 16, "y": 5},
+ {"matrix": [5, 11], "x": 17, "y": 5}
+ ]
+ }
}
}
diff --git a/keyboards/function96/v2/info.json b/keyboards/function96/v2/info.json
index 8dd0f575c7..88d54b5147 100644
--- a/keyboards/function96/v2/info.json
+++ b/keyboards/function96/v2/info.json
@@ -18,547 +18,570 @@
"layouts": {
"LAYOUT_all": {
"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":"Del", "x":14, "y":0},
- {"label":"Prev", "x":15, "y":0},
- {"label":"Next", "x":16, "y":0},
- {"label":"Vol -", "x":17, "y":0},
- {"label":"Vol +", "x":18, "y":0},
-
- {"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":"Play", "x":15, "y":1},
- {"label":"/", "x":16, "y":1},
- {"label":"*", "x":17, "y":1},
- {"label":"-", "x":18, "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":"7", "x":15, "y":2},
- {"label":"8", "x":16, "y":2},
- {"label":"9", "x":17, "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":3, "w":1.25},
- {"label":"4", "x":15, "y":3},
- {"label":"5", "x":16, "y":3},
- {"label":"6", "x":17, "y":3},
- {"label":"+", "x":18, "y":2, "h":2},
-
- {"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":"1", "x":15, "y":4},
- {"label":"2", "x":16, "y":4},
- {"label":"3", "x":17, "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.25},
- {"label":"Layer", "x":6, "y":5, "w":1.25},
- {"label":"Space", "x":7.25, "y":5, "w":2.75},
- {"label":"Alt", "x":10, "y":5, "w":1.25},
- {"label":"Win", "x":11.25, "y":5, "w":1.25},
- {"label":"\u2190", "x":13, "y":5},
- {"label":"\u2193", "x":14, "y":5},
- {"label":"\u2192", "x":15, "y":5},
- {"label":"0", "x":16, "y":5},
- {"label":".", "x":17, "y":5},
- {"label":"Enter", "x":18, "y":4, "h":2}
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+ {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+ {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+ {"label": "F5", "matrix": [0, 6], "x": 5.5, "y": 0},
+ {"label": "F6", "matrix": [0, 7], "x": 6.5, "y": 0},
+ {"label": "F7", "matrix": [0, 8], "x": 7.5, "y": 0},
+ {"label": "F8", "matrix": [0, 9], "x": 8.5, "y": 0},
+
+ {"label": "F9", "matrix": [0, 10], "x": 9.75, "y": 0},
+ {"label": "F10", "matrix": [0, 11], "x": 10.75, "y": 0},
+ {"label": "F11", "matrix": [0, 12], "x": 11.75, "y": 0},
+ {"label": "F12", "matrix": [0, 13], "x": 12.75, "y": 0},
+
+ {"label": "Del", "matrix": [0, 14], "x": 14, "y": 0},
+ {"label": "Prev", "matrix": [0, 15], "x": 15, "y": 0},
+ {"label": "Next", "matrix": [0, 16], "x": 16, "y": 0},
+ {"label": "Vol -", "matrix": [0, 17], "x": 17, "y": 0},
+ {"label": "Vol +", "matrix": [0, 18], "x": 18, "y": 0},
+
+ {"label": "\u00ac", "matrix": [1, 0], "x": 0, "y": 1},
+ {"label": "!", "matrix": [1, 1], "x": 1, "y": 1},
+ {"label": "\"", "matrix": [1, 2], "x": 2, "y": 1},
+ {"label": "\u00a3", "matrix": [1, 3], "x": 3, "y": 1},
+ {"label": "$", "matrix": [1, 4], "x": 4, "y": 1},
+ {"label": "%", "matrix": [1, 5], "x": 5, "y": 1},
+ {"label": "^", "matrix": [1, 6], "x": 6, "y": 1},
+ {"label": "&", "matrix": [1, 7], "x": 7, "y": 1},
+ {"label": "*", "matrix": [1, 8], "x": 8, "y": 1},
+ {"label": "(", "matrix": [1, 9], "x": 9, "y": 1},
+ {"label": ")", "matrix": [1, 10], "x": 10, "y": 1},
+ {"label": "_", "matrix": [1, 11], "x": 11, "y": 1},
+ {"label": "+", "matrix": [1, 12], "x": 12, "y": 1},
+ {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+ {"label": "Play", "matrix": [1, 15], "x": 15, "y": 1},
+ {"label": "/", "matrix": [1, 16], "x": 16, "y": 1},
+ {"label": "*", "matrix": [1, 17], "x": 17, "y": 1},
+ {"label": "-", "matrix": [1, 18], "x": 18, "y": 1},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"label": "Q", "matrix": [2, 2], "x": 1.5, "y": 2},
+ {"label": "W", "matrix": [2, 3], "x": 2.5, "y": 2},
+ {"label": "E", "matrix": [2, 4], "x": 3.5, "y": 2},
+ {"label": "R", "matrix": [2, 5], "x": 4.5, "y": 2},
+ {"label": "T", "matrix": [2, 6], "x": 5.5, "y": 2},
+ {"label": "Y", "matrix": [2, 7], "x": 6.5, "y": 2},
+ {"label": "U", "matrix": [2, 8], "x": 7.5, "y": 2},
+ {"label": "I", "matrix": [2, 9], "x": 8.5, "y": 2},
+ {"label": "O", "matrix": [2, 10], "x": 9.5, "y": 2},
+ {"label": "P", "matrix": [2, 11], "x": 10.5, "y": 2},
+ {"label": "{", "matrix": [2, 12], "x": 11.5, "y": 2},
+ {"label": "}", "matrix": [2, 13], "x": 12.5, "y": 2},
+ {"label": "|", "matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+ {"label": "7", "matrix": [2, 15], "x": 15, "y": 2},
+ {"label": "8", "matrix": [2, 16], "x": 16, "y": 2},
+ {"label": "9", "matrix": [2, 17], "x": 17, "y": 2},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"label": "A", "matrix": [3, 2], "x": 1.75, "y": 3},
+ {"label": "S", "matrix": [3, 3], "x": 2.75, "y": 3},
+ {"label": "D", "matrix": [3, 4], "x": 3.75, "y": 3},
+ {"label": "F", "matrix": [3, 5], "x": 4.75, "y": 3},
+ {"label": "G", "matrix": [3, 6], "x": 5.75, "y": 3},
+ {"label": "H", "matrix": [3, 7], "x": 6.75, "y": 3},
+ {"label": "J", "matrix": [3, 8], "x": 7.75, "y": 3},
+ {"label": "K", "matrix": [3, 9], "x": 8.75, "y": 3},
+ {"label": "L", "matrix": [3, 10], "x": 9.75, "y": 3},
+ {"label": ":", "matrix": [3, 11], "x": 10.75, "y": 3},
+ {"label": "@", "matrix": [3, 12], "x": 11.75, "y": 3},
+ {"label": "~", "matrix": [3, 13], "x": 12.75, "y": 3},
+ {"label": "Enter", "matrix": [3, 14], "x": 13.75, "y": 3, "w": 1.25},
+ {"label": "4", "matrix": [3, 15], "x": 15, "y": 3},
+ {"label": "5", "matrix": [3, 16], "x": 16, "y": 3},
+ {"label": "6", "matrix": [3, 17], "x": 17, "y": 3},
+ {"label": "+", "matrix": [3, 18], "x": 18, "y": 2, "h": 2},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "|", "matrix": [4, 1], "x": 1.25, "y": 4},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
+ {"label": "<", "matrix": [4, 9], "x": 9.25, "y": 4},
+ {"label": ">", "matrix": [4, 10], "x": 10.25, "y": 4},
+ {"label": "?", "matrix": [4, 11], "x": 11.25, "y": 4},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"label": "\u2191", "matrix": [4, 14], "x": 14, "y": 4},
+ {"label": "1", "matrix": [4, 15], "x": 15, "y": 4},
+ {"label": "2", "matrix": [4, 16], "x": 16, "y": 4},
+ {"label": "3", "matrix": [4, 17], "x": 17, "y": 4},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"label": "Space", "matrix": [5, 4], "x": 3.75, "y": 5, "w": 2.25},
+ {"label": "Layer", "matrix": [5, 6], "x": 6, "y": 5, "w": 1.25},
+ {"label": "Space", "matrix": [5, 8], "x": 7.25, "y": 5, "w": 2.75},
+ {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5, "w": 1.25},
+ {"label": "Win", "matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25},
+
+ {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5},
+ {"label": "\u2193", "matrix": [5, 14], "x": 14, "y": 5},
+ {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5},
+ {"label": "0", "matrix": [5, 16], "x": 16, "y": 5},
+ {"label": ".", "matrix": [5, 17], "x": 17, "y": 5},
+ {"label": "Enter", "matrix": [5, 18], "x": 18, "y": 4, "h": 2}
]
},
"LAYOUT_default": {
"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":"Del", "x":14, "y":0},
- {"label":"Prev", "x":15, "y":0},
- {"label":"Next", "x":16, "y":0},
- {"label":"Vol -", "x":17, "y":0},
- {"label":"Vol +", "x":18, "y":0},
-
- {"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":"Play", "x":15, "y":1},
- {"label":"/", "x":16, "y":1},
- {"label":"*", "x":17, "y":1},
- {"label":"-", "x":18, "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":"7", "x":15, "y":2},
- {"label":"8", "x":16, "y":2},
- {"label":"9", "x":17, "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":"4", "x":15, "y":3},
- {"label":"5", "x":16, "y":3},
- {"label":"6", "x":17, "y":3},
- {"label":"+", "x":18, "y":2, "h":2},
-
- {"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":"1", "x":15, "y":4},
- {"label":"2", "x":16, "y":4},
- {"label":"3", "x":17, "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":"6.25Space", "x":3.75, "y":5, "w":6.25},
- {"label":"Alt", "x":10, "y":5, "w":1.25},
- {"label":"Win", "x":11.25, "y":5, "w":1.25},
- {"label":"\u2190", "x":13, "y":5},
- {"label":"\u2193", "x":14, "y":5},
- {"label":"\u2192", "x":15, "y":5},
- {"label":"0", "x":16, "y":5},
- {"label":".", "x":17, "y":5},
- {"label":"Enter", "x":18, "y":4, "h":2}
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+ {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+ {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+ {"label": "F5", "matrix": [0, 6], "x": 5.5, "y": 0},
+ {"label": "F6", "matrix": [0, 7], "x": 6.5, "y": 0},
+ {"label": "F7", "matrix": [0, 8], "x": 7.5, "y": 0},
+ {"label": "F8", "matrix": [0, 9], "x": 8.5, "y": 0},
+
+ {"label": "F9", "matrix": [0, 10], "x": 9.75, "y": 0},
+ {"label": "F10", "matrix": [0, 11], "x": 10.75, "y": 0},
+ {"label": "F11", "matrix": [0, 12], "x": 11.75, "y": 0},
+ {"label": "F12", "matrix": [0, 13], "x": 12.75, "y": 0},
+
+ {"label": "Del", "matrix": [0, 14], "x": 14, "y": 0},
+ {"label": "Prev", "matrix": [0, 15], "x": 15, "y": 0},
+ {"label": "Next", "matrix": [0, 16], "x": 16, "y": 0},
+ {"label": "Vol -", "matrix": [0, 17], "x": 17, "y": 0},
+ {"label": "Vol +", "matrix": [0, 18], "x": 18, "y": 0},
+
+ {"label": "\u00ac", "matrix": [1, 0], "x": 0, "y": 1},
+ {"label": "!", "matrix": [1, 1], "x": 1, "y": 1},
+ {"label": "\"", "matrix": [1, 2], "x": 2, "y": 1},
+ {"label": "\u00a3", "matrix": [1, 3], "x": 3, "y": 1},
+ {"label": "$", "matrix": [1, 4], "x": 4, "y": 1},
+ {"label": "%", "matrix": [1, 5], "x": 5, "y": 1},
+ {"label": "^", "matrix": [1, 6], "x": 6, "y": 1},
+ {"label": "&", "matrix": [1, 7], "x": 7, "y": 1},
+ {"label": "*", "matrix": [1, 8], "x": 8, "y": 1},
+ {"label": "(", "matrix": [1, 9], "x": 9, "y": 1},
+ {"label": ")", "matrix": [1, 10], "x": 10, "y": 1},
+ {"label": "_", "matrix": [1, 11], "x": 11, "y": 1},
+ {"label": "+", "matrix": [1, 12], "x": 12, "y": 1},
+ {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+ {"label": "Play", "matrix": [1, 15], "x": 15, "y": 1},
+ {"label": "/", "matrix": [1, 16], "x": 16, "y": 1},
+ {"label": "*", "matrix": [1, 17], "x": 17, "y": 1},
+ {"label": "-", "matrix": [1, 18], "x": 18, "y": 1},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"label": "Q", "matrix": [2, 2], "x": 1.5, "y": 2},
+ {"label": "W", "matrix": [2, 3], "x": 2.5, "y": 2},
+ {"label": "E", "matrix": [2, 4], "x": 3.5, "y": 2},
+ {"label": "R", "matrix": [2, 5], "x": 4.5, "y": 2},
+ {"label": "T", "matrix": [2, 6], "x": 5.5, "y": 2},
+ {"label": "Y", "matrix": [2, 7], "x": 6.5, "y": 2},
+ {"label": "U", "matrix": [2, 8], "x": 7.5, "y": 2},
+ {"label": "I", "matrix": [2, 9], "x": 8.5, "y": 2},
+ {"label": "O", "matrix": [2, 10], "x": 9.5, "y": 2},
+ {"label": "P", "matrix": [2, 11], "x": 10.5, "y": 2},
+ {"label": "{", "matrix": [2, 12], "x": 11.5, "y": 2},
+ {"label": "}", "matrix": [2, 13], "x": 12.5, "y": 2},
+ {"label": "|", "matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+ {"label": "7", "matrix": [2, 15], "x": 15, "y": 2},
+ {"label": "8", "matrix": [2, 16], "x": 16, "y": 2},
+ {"label": "9", "matrix": [2, 17], "x": 17, "y": 2},
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"label": "A", "matrix": [3, 2], "x": 1.75, "y": 3},
+ {"label": "S", "matrix": [3, 3], "x": 2.75, "y": 3},
+ {"label": "D", "matrix": [3, 4], "x": 3.75, "y": 3},
+ {"label": "F", "matrix": [3, 5], "x": 4.75, "y": 3},
+ {"label": "G", "matrix": [3, 6], "x": 5.75, "y": 3},
+ {"label": "H", "matrix": [3, 7], "x": 6.75, "y": 3},
+ {"label": "J", "matrix": [3, 8], "x": 7.75, "y": 3},
+ {"label": "K", "matrix": [3, 9], "x": 8.75, "y": 3},
+ {"label": "L", "matrix": [3, 10], "x": 9.75, "y": 3},
+ {"label": ":", "matrix": [3, 11], "x": 10.75, "y": 3},
+ {"label": "@", "matrix": [3, 12], "x": 11.75, "y": 3},
+ {"label": "Enter", "matrix": [3, 14], "x": 12.75, "y": 3, "w": 2.25},
+ {"label": "4", "matrix": [3, 15], "x": 15, "y": 3},
+ {"label": "5", "matrix": [3, 16], "x": 16, "y": 3},
+ {"label": "6", "matrix": [3, 17], "x": 17, "y": 3},
+ {"label": "+", "matrix": [3, 18], "x": 18, "y": 2, "h": 2},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
+ {"label": "<", "matrix": [4, 9], "x": 9.25, "y": 4},
+ {"label": ">", "matrix": [4, 10], "x": 10.25, "y": 4},
+ {"label": "?", "matrix": [4, 11], "x": 11.25, "y": 4},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"label": "\u2191", "matrix": [4, 14], "x": 14, "y": 4},
+ {"label": "1", "matrix": [4, 15], "x": 15, "y": 4},
+ {"label": "2", "matrix": [4, 16], "x": 16, "y": 4},
+ {"label": "3", "matrix": [4, 17], "x": 17, "y": 4},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"label": "6.25Space", "matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+ {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5, "w": 1.25},
+ {"label": "Win", "matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25},
+
+ {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5},
+ {"label": "\u2193", "matrix": [5, 14], "x": 14, "y": 5},
+ {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5},
+ {"label": "0", "matrix": [5, 16], "x": 16, "y": 5},
+ {"label": ".", "matrix": [5, 17], "x": 17, "y": 5},
+ {"label": "Enter", "matrix": [5, 18], "x": 18, "y": 4, "h": 2}
]
},
"LAYOUT_ansi_splitspace": {
"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":"Del", "x":14, "y":0},
- {"label":"Prev", "x":15, "y":0},
- {"label":"Next", "x":16, "y":0},
- {"label":"Vol -", "x":17, "y":0},
- {"label":"Vol +", "x":18, "y":0},
-
- {"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":"Play", "x":15, "y":1},
- {"label":"/", "x":16, "y":1},
- {"label":"*", "x":17, "y":1},
- {"label":"-", "x":18, "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":"7", "x":15, "y":2},
- {"label":"8", "x":16, "y":2},
- {"label":"9", "x":17, "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":"4", "x":15, "y":3},
- {"label":"5", "x":16, "y":3},
- {"label":"6", "x":17, "y":3},
- {"label":"+", "x":18, "y":2, "h":2},
-
- {"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":"1", "x":15, "y":4},
- {"label":"2", "x":16, "y":4},
- {"label":"3", "x":17, "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.25},
- {"label":"Layer", "x":6, "y":5, "w":1.25},
- {"label":"Space", "x":7.25, "y":5, "w":2.75},
- {"label":"Alt", "x":10, "y":5, "w":1.25},
- {"label":"Win", "x":11.25, "y":5, "w":1.25},
- {"label":"\u2190", "x":13, "y":5},
- {"label":"\u2193", "x":14, "y":5},
- {"label":"\u2192", "x":15, "y":5},
- {"label":"0", "x":16, "y":5},
- {"label":".", "x":17, "y":5},
- {"label":"Enter", "x":18, "y":4, "h":2}
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+ {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+ {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+ {"label": "F5", "matrix": [0, 6], "x": 5.5, "y": 0},
+ {"label": "F6", "matrix": [0, 7], "x": 6.5, "y": 0},
+ {"label": "F7", "matrix": [0, 8], "x": 7.5, "y": 0},
+ {"label": "F8", "matrix": [0, 9], "x": 8.5, "y": 0},
+
+ {"label": "F9", "matrix": [0, 10], "x": 9.75, "y": 0},
+ {"label": "F10", "matrix": [0, 11], "x": 10.75, "y": 0},
+ {"label": "F11", "matrix": [0, 12], "x": 11.75, "y": 0},
+ {"label": "F12", "matrix": [0, 13], "x": 12.75, "y": 0},
+
+ {"label": "Del", "matrix": [0, 14], "x": 14, "y": 0},
+ {"label": "Prev", "matrix": [0, 15], "x": 15, "y": 0},
+ {"label": "Next", "matrix": [0, 16], "x": 16, "y": 0},
+ {"label": "Vol -", "matrix": [0, 17], "x": 17, "y": 0},
+ {"label": "Vol +", "matrix": [0, 18], "x": 18, "y": 0},
+
+ {"label": "\u00ac", "matrix": [1, 0], "x": 0, "y": 1},
+ {"label": "!", "matrix": [1, 1], "x": 1, "y": 1},
+ {"label": "\"", "matrix": [1, 2], "x": 2, "y": 1},
+ {"label": "\u00a3", "matrix": [1, 3], "x": 3, "y": 1},
+ {"label": "$", "matrix": [1, 4], "x": 4, "y": 1},
+ {"label": "%", "matrix": [1, 5], "x": 5, "y": 1},
+ {"label": "^", "matrix": [1, 6], "x": 6, "y": 1},
+ {"label": "&", "matrix": [1, 7], "x": 7, "y": 1},
+ {"label": "*", "matrix": [1, 8], "x": 8, "y": 1},
+ {"label": "(", "matrix": [1, 9], "x": 9, "y": 1},
+ {"label": ")", "matrix": [1, 10], "x": 10, "y": 1},
+ {"label": "_", "matrix": [1, 11], "x": 11, "y": 1},
+ {"label": "+", "matrix": [1, 12], "x": 12, "y": 1},
+ {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+ {"label": "Play", "matrix": [1, 15], "x": 15, "y": 1},
+ {"label": "/", "matrix": [1, 16], "x": 16, "y": 1},
+ {"label": "*", "matrix": [1, 17], "x": 17, "y": 1},
+ {"label": "-", "matrix": [1, 18], "x": 18, "y": 1},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"label": "Q", "matrix": [2, 2], "x": 1.5, "y": 2},
+ {"label": "W", "matrix": [2, 3], "x": 2.5, "y": 2},
+ {"label": "E", "matrix": [2, 4], "x": 3.5, "y": 2},
+ {"label": "R", "matrix": [2, 5], "x": 4.5, "y": 2},
+ {"label": "T", "matrix": [2, 6], "x": 5.5, "y": 2},
+ {"label": "Y", "matrix": [2, 7], "x": 6.5, "y": 2},
+ {"label": "U", "matrix": [2, 8], "x": 7.5, "y": 2},
+ {"label": "I", "matrix": [2, 9], "x": 8.5, "y": 2},
+ {"label": "O", "matrix": [2, 10], "x": 9.5, "y": 2},
+ {"label": "P", "matrix": [2, 11], "x": 10.5, "y": 2},
+ {"label": "{", "matrix": [2, 12], "x": 11.5, "y": 2},
+ {"label": "}", "matrix": [2, 13], "x": 12.5, "y": 2},
+ {"label": "|", "matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+ {"label": "7", "matrix": [2, 15], "x": 15, "y": 2},
+ {"label": "8", "matrix": [2, 16], "x": 16, "y": 2},
+ {"label": "9", "matrix": [2, 17], "x": 17, "y": 2},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"label": "A", "matrix": [3, 2], "x": 1.75, "y": 3},
+ {"label": "S", "matrix": [3, 3], "x": 2.75, "y": 3},
+ {"label": "D", "matrix": [3, 4], "x": 3.75, "y": 3},
+ {"label": "F", "matrix": [3, 5], "x": 4.75, "y": 3},
+ {"label": "G", "matrix": [3, 6], "x": 5.75, "y": 3},
+ {"label": "H", "matrix": [3, 7], "x": 6.75, "y": 3},
+ {"label": "J", "matrix": [3, 8], "x": 7.75, "y": 3},
+ {"label": "K", "matrix": [3, 9], "x": 8.75, "y": 3},
+ {"label": "L", "matrix": [3, 10], "x": 9.75, "y": 3},
+ {"label": ":", "matrix": [3, 11], "x": 10.75, "y": 3},
+ {"label": "@", "matrix": [3, 12], "x": 11.75, "y": 3},
+ {"label": "Enter", "matrix": [3, 14], "x": 12.75, "y": 3, "w": 2.25},
+ {"label": "4", "matrix": [3, 15], "x": 15, "y": 3},
+ {"label": "5", "matrix": [3, 16], "x": 16, "y": 3},
+ {"label": "6", "matrix": [3, 17], "x": 17, "y": 3},
+ {"label": "+", "matrix": [3, 18], "x": 18, "y": 2, "h": 2},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
+ {"label": "<", "matrix": [4, 9], "x": 9.25, "y": 4},
+ {"label": ">", "matrix": [4, 10], "x": 10.25, "y": 4},
+ {"label": "?", "matrix": [4, 11], "x": 11.25, "y": 4},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"label": "\u2191", "matrix": [4, 14], "x": 14, "y": 4},
+ {"label": "1", "matrix": [4, 15], "x": 15, "y": 4},
+ {"label": "2", "matrix": [4, 16], "x": 16, "y": 4},
+ {"label": "3", "matrix": [4, 17], "x": 17, "y": 4},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"label": "Space", "matrix": [5, 4], "x": 3.75, "y": 5, "w": 2.25},
+ {"label": "Layer", "matrix": [5, 6], "x": 6, "y": 5, "w": 1.25},
+ {"label": "Space", "matrix": [5, 8], "x": 7.25, "y": 5, "w": 2.75},
+ {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5, "w": 1.25},
+ {"label": "Win", "matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25},
+
+ {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5},
+ {"label": "\u2193", "matrix": [5, 14], "x": 14, "y": 5},
+ {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5},
+ {"label": "0", "matrix": [5, 16], "x": 16, "y": 5},
+ {"label": ".", "matrix": [5, 17], "x": 17, "y": 5},
+ {"label": "Enter", "matrix": [5, 18], "x": 18, "y": 4, "h": 2}
]
},
"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":"Del", "x":14, "y":0},
- {"label":"Prev", "x":15, "y":0},
- {"label":"Next", "x":16, "y":0},
- {"label":"Vol -", "x":17, "y":0},
- {"label":"Vol +", "x":18, "y":0},
-
- {"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":"Play", "x":15, "y":1},
- {"label":"/", "x":16, "y":1},
- {"label":"*", "x":17, "y":1},
- {"label":"-", "x":18, "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":"7", "x":15, "y":2},
- {"label":"8", "x":16, "y":2},
- {"label":"9", "x":17, "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":"4", "x":15, "y":3},
- {"label":"5", "x":16, "y":3},
- {"label":"6", "x":17, "y":3},
- {"label":"+", "x":18, "y":2, "h":2},
-
- {"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":"1", "x":15, "y":4},
- {"label":"2", "x":16, "y":4},
- {"label":"3", "x":17, "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":"6.25Space", "x":3.75, "y":5, "w":6.25},
- {"label":"Alt", "x":10, "y":5, "w":1.25},
- {"label":"Win", "x":11.25, "y":5, "w":1.25},
- {"label":"\u2190", "x":13, "y":5},
- {"label":"\u2193", "x":14, "y":5},
- {"label":"\u2192", "x":15, "y":5},
- {"label":"0", "x":16, "y":5},
- {"label":".", "x":17, "y":5},
- {"label":"Enter", "x":18, "y":4, "h":2}
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+ {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+ {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+ {"label": "F5", "matrix": [0, 6], "x": 5.5, "y": 0},
+ {"label": "F6", "matrix": [0, 7], "x": 6.5, "y": 0},
+ {"label": "F7", "matrix": [0, 8], "x": 7.5, "y": 0},
+ {"label": "F8", "matrix": [0, 9], "x": 8.5, "y": 0},
+
+ {"label": "F9", "matrix": [0, 10], "x": 9.75, "y": 0},
+ {"label": "F10", "matrix": [0, 11], "x": 10.75, "y": 0},
+ {"label": "F11", "matrix": [0, 12], "x": 11.75, "y": 0},
+ {"label": "F12", "matrix": [0, 13], "x": 12.75, "y": 0},
+
+ {"label": "Del", "matrix": [0, 14], "x": 14, "y": 0},
+ {"label": "Prev", "matrix": [0, 15], "x": 15, "y": 0},
+ {"label": "Next", "matrix": [0, 16], "x": 16, "y": 0},
+ {"label": "Vol -", "matrix": [0, 17], "x": 17, "y": 0},
+ {"label": "Vol +", "matrix": [0, 18], "x": 18, "y": 0},
+
+ {"label": "\u00ac", "matrix": [1, 0], "x": 0, "y": 1},
+ {"label": "!", "matrix": [1, 1], "x": 1, "y": 1},
+ {"label": "\"", "matrix": [1, 2], "x": 2, "y": 1},
+ {"label": "\u00a3", "matrix": [1, 3], "x": 3, "y": 1},
+ {"label": "$", "matrix": [1, 4], "x": 4, "y": 1},
+ {"label": "%", "matrix": [1, 5], "x": 5, "y": 1},
+ {"label": "^", "matrix": [1, 6], "x": 6, "y": 1},
+ {"label": "&", "matrix": [1, 7], "x": 7, "y": 1},
+ {"label": "*", "matrix": [1, 8], "x": 8, "y": 1},
+ {"label": "(", "matrix": [1, 9], "x": 9, "y": 1},
+ {"label": ")", "matrix": [1, 10], "x": 10, "y": 1},
+ {"label": "_", "matrix": [1, 11], "x": 11, "y": 1},
+ {"label": "+", "matrix": [1, 12], "x": 12, "y": 1},
+ {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+ {"label": "Play", "matrix": [1, 15], "x": 15, "y": 1},
+ {"label": "/", "matrix": [1, 16], "x": 16, "y": 1},
+ {"label": "*", "matrix": [1, 17], "x": 17, "y": 1},
+ {"label": "-", "matrix": [1, 18], "x": 18, "y": 1},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"label": "Q", "matrix": [2, 2], "x": 1.5, "y": 2},
+ {"label": "W", "matrix": [2, 3], "x": 2.5, "y": 2},
+ {"label": "E", "matrix": [2, 4], "x": 3.5, "y": 2},
+ {"label": "R", "matrix": [2, 5], "x": 4.5, "y": 2},
+ {"label": "T", "matrix": [2, 6], "x": 5.5, "y": 2},
+ {"label": "Y", "matrix": [2, 7], "x": 6.5, "y": 2},
+ {"label": "U", "matrix": [2, 8], "x": 7.5, "y": 2},
+ {"label": "I", "matrix": [2, 9], "x": 8.5, "y": 2},
+ {"label": "O", "matrix": [2, 10], "x": 9.5, "y": 2},
+ {"label": "P", "matrix": [2, 11], "x": 10.5, "y": 2},
+ {"label": "{", "matrix": [2, 12], "x": 11.5, "y": 2},
+ {"label": "}", "matrix": [2, 13], "x": 12.5, "y": 2},
+ {"label": "7", "matrix": [2, 15], "x": 15, "y": 2},
+ {"label": "8", "matrix": [2, 16], "x": 16, "y": 2},
+ {"label": "9", "matrix": [2, 17], "x": 17, "y": 2},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"label": "A", "matrix": [3, 2], "x": 1.75, "y": 3},
+ {"label": "S", "matrix": [3, 3], "x": 2.75, "y": 3},
+ {"label": "D", "matrix": [3, 4], "x": 3.75, "y": 3},
+ {"label": "F", "matrix": [3, 5], "x": 4.75, "y": 3},
+ {"label": "G", "matrix": [3, 6], "x": 5.75, "y": 3},
+ {"label": "H", "matrix": [3, 7], "x": 6.75, "y": 3},
+ {"label": "J", "matrix": [3, 8], "x": 7.75, "y": 3},
+ {"label": "K", "matrix": [3, 9], "x": 8.75, "y": 3},
+ {"label": "L", "matrix": [3, 10], "x": 9.75, "y": 3},
+ {"label": ":", "matrix": [3, 11], "x": 10.75, "y": 3},
+ {"label": "@", "matrix": [3, 12], "x": 11.75, "y": 3},
+ {"label": "~", "matrix": [3, 13], "x": 12.75, "y": 3},
+ {"label": "Enter", "matrix": [3, 14], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+ {"label": "4", "matrix": [3, 15], "x": 15, "y": 3},
+ {"label": "5", "matrix": [3, 16], "x": 16, "y": 3},
+ {"label": "6", "matrix": [3, 17], "x": 17, "y": 3},
+ {"label": "+", "matrix": [3, 18], "x": 18, "y": 2, "h": 2},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "|", "matrix": [4, 1], "x": 1.25, "y": 4},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
+ {"label": "<", "matrix": [4, 9], "x": 9.25, "y": 4},
+ {"label": ">", "matrix": [4, 10], "x": 10.25, "y": 4},
+ {"label": "?", "matrix": [4, 11], "x": 11.25, "y": 4},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"label": "\u2191", "matrix": [4, 14], "x": 14, "y": 4},
+ {"label": "1", "matrix": [4, 15], "x": 15, "y": 4},
+ {"label": "2", "matrix": [4, 16], "x": 16, "y": 4},
+ {"label": "3", "matrix": [4, 17], "x": 17, "y": 4},
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"label": "6.25Space", "matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+ {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5, "w": 1.25},
+ {"label": "Win", "matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25},
+
+ {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5},
+ {"label": "\u2193", "matrix": [5, 14], "x": 14, "y": 5},
+ {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5},
+ {"label": "0", "matrix": [5, 16], "x": 16, "y": 5},
+ {"label": ".", "matrix": [5, 17], "x": 17, "y": 5},
+ {"label": "Enter", "matrix": [5, 18], "x": 18, "y": 4, "h": 2}
]
},
"LAYOUT_iso_splitspace": {
"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":"Del", "x":14, "y":0},
- {"label":"Prev", "x":15, "y":0},
- {"label":"Next", "x":16, "y":0},
- {"label":"Vol -", "x":17, "y":0},
- {"label":"Vol +", "x":18, "y":0},
-
- {"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":"Play", "x":15, "y":1},
- {"label":"/", "x":16, "y":1},
- {"label":"*", "x":17, "y":1},
- {"label":"-", "x":18, "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":"7", "x":15, "y":2},
- {"label":"8", "x":16, "y":2},
- {"label":"9", "x":17, "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":"4", "x":15, "y":3},
- {"label":"5", "x":16, "y":3},
- {"label":"6", "x":17, "y":3},
- {"label":"+", "x":18, "y":2, "h":2},
-
- {"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":"1", "x":15, "y":4},
- {"label":"2", "x":16, "y":4},
- {"label":"3", "x":17, "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.25},
- {"label":"Layer", "x":6, "y":5, "w":1.25},
- {"label":"Space", "x":7.25, "y":5, "w":2.75},
- {"label":"Alt", "x":10, "y":5, "w":1.25},
- {"label":"Win", "x":11.25, "y":5, "w":1.25},
- {"label":"\u2190", "x":13, "y":5},
- {"label":"\u2193", "x":14, "y":5},
- {"label":"\u2192", "x":15, "y":5},
- {"label":"0", "x":16, "y":5},
- {"label":".", "x":17, "y":5},
- {"label":"Enter", "x":18, "y":4, "h":2}
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+ {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+ {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+ {"label": "F5", "matrix": [0, 6], "x": 5.5, "y": 0},
+ {"label": "F6", "matrix": [0, 7], "x": 6.5, "y": 0},
+ {"label": "F7", "matrix": [0, 8], "x": 7.5, "y": 0},
+ {"label": "F8", "matrix": [0, 9], "x": 8.5, "y": 0},
+
+ {"label": "F9", "matrix": [0, 10], "x": 9.75, "y": 0},
+ {"label": "F10", "matrix": [0, 11], "x": 10.75, "y": 0},
+ {"label": "F11", "matrix": [0, 12], "x": 11.75, "y": 0},
+ {"label": "F12", "matrix": [0, 13], "x": 12.75, "y": 0},
+
+ {"label": "Del", "matrix": [0, 14], "x": 14, "y": 0},
+ {"label": "Prev", "matrix": [0, 15], "x": 15, "y": 0},
+ {"label": "Next", "matrix": [0, 16], "x": 16, "y": 0},
+ {"label": "Vol -", "matrix": [0, 17], "x": 17, "y": 0},
+ {"label": "Vol +", "matrix": [0, 18], "x": 18, "y": 0},
+
+ {"label": "\u00ac", "matrix": [1, 0], "x": 0, "y": 1},
+ {"label": "!", "matrix": [1, 1], "x": 1, "y": 1},
+ {"label": "\"", "matrix": [1, 2], "x": 2, "y": 1},
+ {"label": "\u00a3", "matrix": [1, 3], "x": 3, "y": 1},
+ {"label": "$", "matrix": [1, 4], "x": 4, "y": 1},
+ {"label": "%", "matrix": [1, 5], "x": 5, "y": 1},
+ {"label": "^", "matrix": [1, 6], "x": 6, "y": 1},
+ {"label": "&", "matrix": [1, 7], "x": 7, "y": 1},
+ {"label": "*", "matrix": [1, 8], "x": 8, "y": 1},
+ {"label": "(", "matrix": [1, 9], "x": 9, "y": 1},
+ {"label": ")", "matrix": [1, 10], "x": 10, "y": 1},
+ {"label": "_", "matrix": [1, 11], "x": 11, "y": 1},
+ {"label": "+", "matrix": [1, 12], "x": 12, "y": 1},
+ {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+ {"label": "Play", "matrix": [1, 15], "x": 15, "y": 1},
+ {"label": "/", "matrix": [1, 16], "x": 16, "y": 1},
+ {"label": "*", "matrix": [1, 17], "x": 17, "y": 1},
+ {"label": "-", "matrix": [1, 18], "x": 18, "y": 1},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"label": "Q", "matrix": [2, 2], "x": 1.5, "y": 2},
+ {"label": "W", "matrix": [2, 3], "x": 2.5, "y": 2},
+ {"label": "E", "matrix": [2, 4], "x": 3.5, "y": 2},
+ {"label": "R", "matrix": [2, 5], "x": 4.5, "y": 2},
+ {"label": "T", "matrix": [2, 6], "x": 5.5, "y": 2},
+ {"label": "Y", "matrix": [2, 7], "x": 6.5, "y": 2},
+ {"label": "U", "matrix": [2, 8], "x": 7.5, "y": 2},
+ {"label": "I", "matrix": [2, 9], "x": 8.5, "y": 2},
+ {"label": "O", "matrix": [2, 10], "x": 9.5, "y": 2},
+ {"label": "P", "matrix": [2, 11], "x": 10.5, "y": 2},
+ {"label": "{", "matrix": [2, 12], "x": 11.5, "y": 2},
+ {"label": "}", "matrix": [2, 13], "x": 12.5, "y": 2},
+ {"label": "7", "matrix": [2, 15], "x": 15, "y": 2},
+ {"label": "8", "matrix": [2, 16], "x": 16, "y": 2},
+ {"label": "9", "matrix": [2, 17], "x": 17, "y": 2},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"label": "A", "matrix": [3, 2], "x": 1.75, "y": 3},
+ {"label": "S", "matrix": [3, 3], "x": 2.75, "y": 3},
+ {"label": "D", "matrix": [3, 4], "x": 3.75, "y": 3},
+ {"label": "F", "matrix": [3, 5], "x": 4.75, "y": 3},
+ {"label": "G", "matrix": [3, 6], "x": 5.75, "y": 3},
+ {"label": "H", "matrix": [3, 7], "x": 6.75, "y": 3},
+ {"label": "J", "matrix": [3, 8], "x": 7.75, "y": 3},
+ {"label": "K", "matrix": [3, 9], "x": 8.75, "y": 3},
+ {"label": "L", "matrix": [3, 10], "x": 9.75, "y": 3},
+ {"label": ":", "matrix": [3, 11], "x": 10.75, "y": 3},
+ {"label": "@", "matrix": [3, 12], "x": 11.75, "y": 3},
+ {"label": "~", "matrix": [3, 13], "x": 12.75, "y": 3},
+ {"label": "Enter", "matrix": [3, 14], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+ {"label": "4", "matrix": [3, 15], "x": 15, "y": 3},
+ {"label": "5", "matrix": [3, 16], "x": 16, "y": 3},
+ {"label": "6", "matrix": [3, 17], "x": 17, "y": 3},
+ {"label": "+", "matrix": [3, 18], "x": 18, "y": 2, "h": 2},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "|", "matrix": [4, 1], "x": 1.25, "y": 4},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
+ {"label": "<", "matrix": [4, 9], "x": 9.25, "y": 4},
+ {"label": ">", "matrix": [4, 10], "x": 10.25, "y": 4},
+ {"label": "?", "matrix": [4, 11], "x": 11.25, "y": 4},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"label": "\u2191", "matrix": [4, 14], "x": 14, "y": 4},
+ {"label": "1", "matrix": [4, 15], "x": 15, "y": 4},
+ {"label": "2", "matrix": [4, 16], "x": 16, "y": 4},
+ {"label": "3", "matrix": [4, 17], "x": 17, "y": 4},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"label": "Space", "matrix": [5, 4], "x": 3.75, "y": 5, "w": 2.25},
+ {"label": "Layer", "matrix": [5, 6], "x": 6, "y": 5, "w": 1.25},
+ {"label": "Space", "matrix": [5, 8], "x": 7.25, "y": 5, "w": 2.75},
+ {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5, "w": 1.25},
+ {"label": "Win", "matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25},
+
+ {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5},
+ {"label": "\u2193", "matrix": [5, 14], "x": 14, "y": 5},
+ {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5},
+ {"label": "0", "matrix": [5, 16], "x": 16, "y": 5},
+ {"label": ".", "matrix": [5, 17], "x": 17, "y": 5},
+ {"label": "Enter", "matrix": [5, 18], "x": 18, "y": 4, "h": 2}
]
}
}
diff --git a/keyboards/function96/v2/v2.h b/keyboards/function96/v2/v2.h
deleted file mode 100644
index 4e93d99b35..0000000000
--- a/keyboards/function96/v2/v2.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* Copyright 2020 Matt3o
- *
- * 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_all( \
- K000, K001, K002, K003, K004, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K114, K115, K116, K117, K118, \
- K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217, \
- K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316, K317, K318,\
- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K414, K415, K416, K417, \
- K500, K501, K502, K504, K506, K508, K510, K511, K512, K514, K515, K516, K517, K518 \
-) { \
- { K000, K001, K002, K003, K004, KC_NO, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO, K114, K115, K116, K117, K118 }, \
- { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217, KC_NO }, \
- { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316, K317, K318 }, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, KC_NO, K414, K415, K416, K417, KC_NO }, \
- { K500, K501, K502, KC_NO, K504, KC_NO, K506, KC_NO, K508, KC_NO, K510, K511, K512, KC_NO, K514, K515, K516, K517, K518 } \
-}
-#define LAYOUT_default( \
- K000, K001, K002, K003, K004, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K114, K115, K116, K117, K118, \
- K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217, \
- K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K314, K315, K316, K317, K318,\
- K400, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K414, K415, K416, K417, \
- K500, K501, K502, K506, K510, K511, K512, K514, K515, K516, K517, K518\
-) { \
- { K000, K001, K002, K003, K004, KC_NO, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO, K114, K115, K116, K117, K118 }, \
- { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217, KC_NO }, \
- { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO, K314, K315, K316, K317, K318 }, \
- { K400, KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, KC_NO, K414, K415, K416, K417, KC_NO }, \
- { K500, K501, K502, KC_NO, KC_NO, KC_NO, K506, KC_NO, KC_NO, KC_NO, K510, K511, K512, KC_NO, K514, K515, K516, K517, K518 } \
-}
-#define LAYOUT_ansi_splitspace( \
- K000, K001, K002, K003, K004, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K114, K115, K116, K117, K118, \
- K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217, \
- K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K314, K315, K316, K317, K318, \
- K400, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K414, K415, K416, K417, \
- K500, K501, K502, K504, K506, K508, K510, K511, K512, K514, K515, K516, K517, K518 \
-) { \
- { K000, K001, K002, K003, K004, KC_NO, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO, K114, K115, K116, K117, K118 }, \
- { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217, KC_NO }, \
- { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO, K314, K315, K316, K317, K318 }, \
- { K400, KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, KC_NO, K414, K415, K416, K417, KC_NO }, \
- { K500, K501, K502, KC_NO, K504, KC_NO, K506, KC_NO, K508, KC_NO, K510, K511, K512, KC_NO, K514, K515, K516, K517, K518 } \
-}
-#define LAYOUT_iso( \
- K000, K001, K002, K003, K004, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K114, K115, K116, K117, K118, \
- K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K215, K216, K217, \
- K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316, K317, K318, \
- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K414, K415, K416, K417, \
- K500, K501, K502, K506, K510, K511, K512, K514, K515, K516, K517, K518 \
-) { \
- { K000, K001, K002, K003, K004, KC_NO, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO, K114, K115, K116, K117, K118 }, \
- { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, KC_NO, K215, K216, K217, KC_NO }, \
- { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316, K317, K318 }, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, KC_NO, K414, K415, K416, K417, KC_NO }, \
- { K500, K501, K502, KC_NO, KC_NO, KC_NO, K506, KC_NO, KC_NO, KC_NO, K510, K511, K512, KC_NO, K514, K515, K516, K517, K518 } \
-}
-#define LAYOUT_iso_splitspace( \
- K000, K001, K002, K003, K004, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K114, K115, K116, K117, K118, \
- K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K215, K216, K217, \
- K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316, K317, K318, \
- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K414, K415, K416, K417, \
- K500, K501, K502, K504, K506, K508, K510, K511, K512, K514, K515, K516, K517, K518 \
-) { \
- { K000, K001, K002, K003, K004, KC_NO, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO, K114, K115, K116, K117, K118 }, \
- { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, KC_NO, K215, K216, K217, KC_NO }, \
- { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316, K317, K318 }, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, KC_NO, K414, K415, K416, K417, KC_NO }, \
- { K500, K501, K502, KC_NO, K504, KC_NO, K506, KC_NO, K508, KC_NO, K510, K511, K512, KC_NO, K514, K515, K516, K517, K518 } \
-}
diff --git a/keyboards/handwired/axon/axon.h b/keyboards/handwired/axon/axon.h
deleted file mode 100644
index 0d3a5c90b7..0000000000
--- a/keyboards/handwired/axon/axon.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-Copyright 2021 Robin Liu
-
-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"
-
-/*
-* Default layout:
-* 2.75u - 2.25u spacebar
-*/
-#define LAYOUT_default( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K310, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, \
- K301, K302, K304, K306, 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, K304, KC_NO, K306, KC_NO, K308, K309, K310 } \
-}
-
-/*
-* Spaceswap layout:
-* Electrically identical to default
-* 2.25u - 2.75u spacebar
-*/
-#define LAYOUT_spaceswap( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K310, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, \
- K301, K302, K304, K306, 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, K304, KC_NO, K306, KC_NO, K308, K309, K310 } \
-}
-
-/*
-* 6.25u spacebar layout:
-* 6.25u spacebar
-*/
-#define LAYOUT_space6p25u( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K310, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, \
- K301, K302, K306, 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, KC_NO, K306, KC_NO, KC_NO, K309, K310 } \
-}
-
-/*
-* 7u spacebar layout:
-* 7u spacebar
-*/
-#define LAYOUT_space7u( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K310, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, \
- K301, K304, 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, K304, KC_NO, KC_NO, KC_NO, KC_NO, K309, K310 } \
-}
diff --git a/keyboards/handwired/axon/info.json b/keyboards/handwired/axon/info.json
index 89300e2398..0d12e92dbe 100644
--- a/keyboards/handwired/axon/info.json
+++ b/keyboards/handwired/axon/info.json
@@ -18,185 +18,185 @@
"layouts": {
"LAYOUT_default": {
"layout": [
- {"x": 0, "y": 0},
- {"x": 1, "y": 0},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0},
- {"x": 4, "y": 0},
- {"x": 5, "y": 0},
- {"x": 6, "y": 0},
- {"x": 7, "y": 0},
- {"x": 8, "y": 0},
- {"x": 9, "y": 0},
- {"x": 10, "y": 0},
- {"x": 11, "y": 0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [3, 10], "x": 11, "y": 0},
- {"x": 0, "y": 1, "w": 1.25},
- {"x": 1.25, "y": 1},
- {"x": 2.25, "y": 1},
- {"x": 3.25, "y": 1},
- {"x": 4.25, "y": 1},
- {"x": 5.25, "y": 1},
- {"x": 6.25, "y": 1},
- {"x": 7.25, "y": 1},
- {"x": 8.25, "y": 1},
- {"x": 9.25, "y": 1},
- {"x": 10.25, "y": 1, "w": 1.75},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75},
- {"x": 0, "y": 2, "w": 1.75},
- {"x": 1.75, "y": 2},
- {"x": 2.75, "y": 2},
- {"x": 3.75, "y": 2},
- {"x": 4.75, "y": 2},
- {"x": 5.75, "y": 2},
- {"x": 6.75, "y": 2},
- {"x": 7.75, "y": 2},
- {"x": 8.75, "y": 2},
- {"x": 9.75, "y": 2},
- {"x": 10.75, "y": 2, "w": 1.25},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
- {"x": 1.25, "y": 3, "w": 1.25},
- {"x": 2.5, "y": 3, "w": 1.25},
- {"x": 3.75, "y": 3, "w": 2.75},
- {"x": 6.5, "y": 3, "w": 2.25},
- {"x": 8.75, "y": 3},
- {"x": 9.75, "y": 3}
+ {"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": 2.75},
+ {"matrix": [3, 6], "x": 6.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3}
]
},
"LAYOUT_spaceswap": {
"layout": [
- {"x": 0, "y": 0},
- {"x": 1, "y": 0},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0},
- {"x": 4, "y": 0},
- {"x": 5, "y": 0},
- {"x": 6, "y": 0},
- {"x": 7, "y": 0},
- {"x": 8, "y": 0},
- {"x": 9, "y": 0},
- {"x": 10, "y": 0},
- {"x": 11, "y": 0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [3, 10], "x": 11, "y": 0},
- {"x": 0, "y": 1, "w": 1.25},
- {"x": 1.25, "y": 1},
- {"x": 2.25, "y": 1},
- {"x": 3.25, "y": 1},
- {"x": 4.25, "y": 1},
- {"x": 5.25, "y": 1},
- {"x": 6.25, "y": 1},
- {"x": 7.25, "y": 1},
- {"x": 8.25, "y": 1},
- {"x": 9.25, "y": 1},
- {"x": 10.25, "y": 1, "w": 1.75},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75},
- {"x": 0, "y": 2, "w": 1.75},
- {"x": 1.75, "y": 2},
- {"x": 2.75, "y": 2},
- {"x": 3.75, "y": 2},
- {"x": 4.75, "y": 2},
- {"x": 5.75, "y": 2},
- {"x": 6.75, "y": 2},
- {"x": 7.75, "y": 2},
- {"x": 8.75, "y": 2},
- {"x": 9.75, "y": 2},
- {"x": 10.75, "y": 2, "w": 1.25},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
- {"x": 1.25, "y": 3, "w": 1.25},
- {"x": 2.5, "y": 3, "w": 1.25},
- {"x": 3.75, "y": 3, "w": 2.25},
- {"x": 6, "y": 3, "w": 2.75},
- {"x": 8.75, "y": 3},
- {"x": 9.75, "y": 3}
+ {"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": 2.25},
+ {"matrix": [3, 6], "x": 6, "y": 3, "w": 2.75},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3}
]
},
"LAYOUT_space6p25u": {
"layout": [
- {"x": 0, "y": 0},
- {"x": 1, "y": 0},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0},
- {"x": 4, "y": 0},
- {"x": 5, "y": 0},
- {"x": 6, "y": 0},
- {"x": 7, "y": 0},
- {"x": 8, "y": 0},
- {"x": 9, "y": 0},
- {"x": 10, "y": 0},
- {"x": 11, "y": 0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [3, 10], "x": 11, "y": 0},
- {"x": 0, "y": 1, "w": 1.25},
- {"x": 1.25, "y": 1},
- {"x": 2.25, "y": 1},
- {"x": 3.25, "y": 1},
- {"x": 4.25, "y": 1},
- {"x": 5.25, "y": 1},
- {"x": 6.25, "y": 1},
- {"x": 7.25, "y": 1},
- {"x": 8.25, "y": 1},
- {"x": 9.25, "y": 1},
- {"x": 10.25, "y": 1, "w": 1.75},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75},
- {"x": 0, "y": 2, "w": 1.75},
- {"x": 1.75, "y": 2},
- {"x": 2.75, "y": 2},
- {"x": 3.75, "y": 2},
- {"x": 4.75, "y": 2},
- {"x": 5.75, "y": 2},
- {"x": 6.75, "y": 2},
- {"x": 7.75, "y": 2},
- {"x": 8.75, "y": 2},
- {"x": 9.75, "y": 2},
- {"x": 10.75, "y": 2, "w": 1.25},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
- {"x": 1.25, "y": 3, "w": 1.25},
- {"x": 2.5, "y": 3},
- {"x": 3.5, "y": 3, "w": 6.25},
- {"x": 9.75, "y": 3}
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 2], "x": 2.5, "y": 3},
+ {"matrix": [3, 6], "x": 3.5, "y": 3, "w": 6.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3}
]
},
"LAYOUT_space7u": {
"layout": [
- {"x": 0, "y": 0},
- {"x": 1, "y": 0},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0},
- {"x": 4, "y": 0},
- {"x": 5, "y": 0},
- {"x": 6, "y": 0},
- {"x": 7, "y": 0},
- {"x": 8, "y": 0},
- {"x": 9, "y": 0},
- {"x": 10, "y": 0},
- {"x": 11, "y": 0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [3, 10], "x": 11, "y": 0},
- {"x": 0, "y": 1, "w": 1.25},
- {"x": 1.25, "y": 1},
- {"x": 2.25, "y": 1},
- {"x": 3.25, "y": 1},
- {"x": 4.25, "y": 1},
- {"x": 5.25, "y": 1},
- {"x": 6.25, "y": 1},
- {"x": 7.25, "y": 1},
- {"x": 8.25, "y": 1},
- {"x": 9.25, "y": 1},
- {"x": 10.25, "y": 1, "w": 1.75},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75},
- {"x": 0, "y": 2, "w": 1.75},
- {"x": 1.75, "y": 2},
- {"x": 2.75, "y": 2},
- {"x": 3.75, "y": 2},
- {"x": 4.75, "y": 2},
- {"x": 5.75, "y": 2},
- {"x": 6.75, "y": 2},
- {"x": 7.75, "y": 2},
- {"x": 8.75, "y": 2},
- {"x": 9.75, "y": 2},
- {"x": 10.75, "y": 2, "w": 1.25},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
- {"x": 1.25, "y": 3, "w": 1.25},
- {"x": 2.5, "y": 3, "w": 7},
- {"x": 9.5, "y": 3, "w": 1.25}
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 4], "x": 2.5, "y": 3, "w": 7},
+ {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.25}
]
}
}
diff --git a/keyboards/keyhive/absinthe/absinthe.h b/keyboards/keyhive/absinthe/absinthe.h
deleted file mode 100644
index 890aff643e..0000000000
--- a/keyboards/keyhive/absinthe/absinthe.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright 2020 cfbender
- *
- * 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 XXX KC_NO
-
-#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_default( \
- K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, K08, K18, \
- K20, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, K37, K28, K38, \
- K40, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, \
- K60, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K67, K68, \
- K80, K81, K82, K83, K76, K86, K87, K77, K88, K78 \
-) \
-{ \
- { 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 },\
- { XXX, K31, K32, K33, K34, K35, K36, K37, K38 },\
- { K40, K41, K42, K43, K44, K45, K46, XXX, XXX },\
- { XXX, K51, K52, K53, K54, K55, K56, XXX, XXX },\
- { K60, K61, K62, K63, K64, K65, K66, K67, K68 },\
- { XXX, K71, K72, K73, K74, K75, K76, K77, K78 },\
- { K80, K81, K82, K83, XXX, XXX, K86, K87, K88 } \
-}
-
-#define LAYOUT_ansi( \
- K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K17, K08, K18, \
- K20, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, K37, K28, K38, \
- K40, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, \
- K60, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K68, \
- K80, K81, K82, K83, K85, K76, K86, K87, K77, K88, K78 \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, XXX, K08 },\
- { K10, K11, K12, K13, K14, K15, K16, K17, K18 },\
- { K20, K21, K22, K23, K24, K25, K26, K27, K28 },\
- { XXX, K31, K32, K33, K34, K35, K36, K37, K38 },\
- { K40, K41, K42, K43, K44, K45, K46, XXX, XXX },\
- { XXX, K51, K52, K53, K54, K55, K56, XXX, XXX },\
- { K60, K61, K62, K63, K64, K65, K66, XXX, K68 },\
- { XXX, K71, K72, K73, K74, K75, K76, K77, K78 },\
- { K80, K81, K82, K83, XXX, K85, K86, K87, K88 } \
-}
-
diff --git a/keyboards/keyhive/absinthe/info.json b/keyboards/keyhive/absinthe/info.json
index a6f70196b4..8001d6db01 100644
--- a/keyboards/keyhive/absinthe/info.json
+++ b/keyboards/keyhive/absinthe/info.json
@@ -26,144 +26,170 @@
"layouts": {
"LAYOUT_default": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"!", "x":1, "y":0},
- {"label":"@", "x":2, "y":0},
- {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0},
- {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0},
- {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0},
- {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0},
- {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0},
- {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0},
- {"label":"Insert", "x":15.25, "y":0},
- {"label":"Home", "x":16.25, "y":0},
- {"label":"PgUp", "x":17.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":"Backspace", "x":13.5, "y":1, "w":1.5},
- {"label":"Delete", "x":15.25, "y":1},
- {"label":"End", "x":16.25, "y":1},
- {"label":"PgDn", "x":17.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":2.25},
- {"label":"Shift", "x":0, "y":3, "w":2.25},
- {"label":"Z", "x":2.25, "y":3},
- {"label":"X", "x":3.25, "y":3},
- {"label":"C", "x":4.25, "y":3},
- {"label":"V", "x":5.25, "y":3},
- {"label":"B", "x":6.25, "y":3},
- {"label":"N", "x":7.25, "y":3},
- {"label":"M", "x":8.25, "y":3},
- {"label":"<", "x":9.25, "y":3},
- {"label":">", "x":10.25, "y":3},
- {"label":"?", "x":11.25, "y":3},
- {"label":"Shift", "x":12.25, "y":3, "w":1.75},
- {"label":"MO(1)", "x":14, "y":3},
- {"label":"\u2191", "x":16.25, "y":3},
- {"label":"Ctrl", "x":0, "y":4, "w":1.5},
- {"label":"Win", "x":1.5, "y":4},
- {"label":"Alt", "x":2.5, "y":4, "w":1.5},
- {"x":4, "y":4, "w":7},
- {"label":"Alt", "x":11, "y":4, "w":1.5},
- {"label":"Win", "x":12.5, "y":4},
- {"label":"Ctrl", "x":13.5, "y":4, "w":1.5},
- {"label":"\u2190", "x":15.25, "y":4},
- {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}]
+ {"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.25, "y": 0},
+ {"matrix": [0, 8], "x": 16.25, "y": 0},
+ {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 1},
+ {"matrix": [3, 1], "x": 2.5, "y": 1},
+ {"matrix": [2, 2], "x": 3.5, "y": 1},
+ {"matrix": [3, 2], "x": 4.5, "y": 1},
+ {"matrix": [2, 3], "x": 5.5, "y": 1},
+ {"matrix": [3, 3], "x": 6.5, "y": 1},
+ {"matrix": [2, 4], "x": 7.5, "y": 1},
+ {"matrix": [3, 4], "x": 8.5, "y": 1},
+ {"matrix": [2, 5], "x": 9.5, "y": 1},
+ {"matrix": [3, 5], "x": 10.5, "y": 1},
+ {"matrix": [2, 6], "x": 11.5, "y": 1},
+ {"matrix": [3, 6], "x": 12.5, "y": 1},
+ {"matrix": [2, 7], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 7], "x": 15.25, "y": 1},
+ {"matrix": [2, 8], "x": 16.25, "y": 1},
+ {"matrix": [3, 8], "x": 17.25, "y": 1},
+
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [4, 1], "x": 1.75, "y": 2},
+ {"matrix": [5, 1], "x": 2.75, "y": 2},
+ {"matrix": [4, 2], "x": 3.75, "y": 2},
+ {"matrix": [5, 2], "x": 4.75, "y": 2},
+ {"matrix": [4, 3], "x": 5.75, "y": 2},
+ {"matrix": [5, 3], "x": 6.75, "y": 2},
+ {"matrix": [4, 4], "x": 7.75, "y": 2},
+ {"matrix": [5, 4], "x": 8.75, "y": 2},
+ {"matrix": [4, 5], "x": 9.75, "y": 2},
+ {"matrix": [5, 5], "x": 10.75, "y": 2},
+ {"matrix": [4, 6], "x": 11.75, "y": 2},
+ {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [6, 1], "x": 2.25, "y": 3},
+ {"matrix": [7, 1], "x": 3.25, "y": 3},
+ {"matrix": [6, 2], "x": 4.25, "y": 3},
+ {"matrix": [7, 2], "x": 5.25, "y": 3},
+ {"matrix": [6, 3], "x": 6.25, "y": 3},
+ {"matrix": [7, 3], "x": 7.25, "y": 3},
+ {"matrix": [6, 4], "x": 8.25, "y": 3},
+ {"matrix": [7, 4], "x": 9.25, "y": 3},
+ {"matrix": [6, 5], "x": 10.25, "y": 3},
+ {"matrix": [7, 5], "x": 11.25, "y": 3},
+ {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [6, 7], "x": 14, "y": 3},
+
+ {"matrix": [6, 8], "x": 16.25, "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": 7},
+ {"matrix": [7, 6], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [8, 6], "x": 12.5, "y": 4},
+ {"matrix": [8, 7], "x": 13.5, "y": 4, "w": 1.5},
+
+ {"matrix": [7, 7], "x": 15.25, "y": 4},
+ {"matrix": [8, 8], "x": 16.25, "y": 4},
+ {"matrix": [7, 8], "x": 17.25, "y": 4}
+ ]
},
"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":"Insert", "x":15.25, "y":0},
- {"label":"Home", "x":16.25, "y":0},
- {"label":"PgUp", "x":17.25, "y":0},
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"Q", "x":1.5, "y":1},
- {"label":"W", "x":2.5, "y":1},
- {"label":"E", "x":3.5, "y":1},
- {"label":"R", "x":4.5, "y":1},
- {"label":"T", "x":5.5, "y":1},
- {"label":"Y", "x":6.5, "y":1},
- {"label":"U", "x":7.5, "y":1},
- {"label":"I", "x":8.5, "y":1},
- {"label":"O", "x":9.5, "y":1},
- {"label":"P", "x":10.5, "y":1},
- {"label":"{", "x":11.5, "y":1},
- {"label":"}", "x":12.5, "y":1},
- {"label":"|", "x":13.5, "y":1, "w":1.5},
- {"label":"Delete", "x":15.25, "y":1},
- {"label":"End", "x":16.25, "y":1},
- {"label":"PgDn", "x":17.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":2.25},
- {"label":"Shift", "x":0, "y":3, "w":2.25},
- {"label":"Z", "x":2.25, "y":3},
- {"label":"X", "x":3.25, "y":3},
- {"label":"C", "x":4.25, "y":3},
- {"label":"V", "x":5.25, "y":3},
- {"label":"B", "x":6.25, "y":3},
- {"label":"N", "x":7.25, "y":3},
- {"label":"M", "x":8.25, "y":3},
- {"label":"<", "x":9.25, "y":3},
- {"label":">", "x":10.25, "y":3},
- {"label":"?", "x":11.25, "y":3},
- {"label":"Shift", "x":12.25, "y":3, "w":2.75},
- {"label":"\u2191", "x":16.25, "y":3},
- {"label":"Ctrl", "x":0, "y":4, "w":1.25},
- {"label":"Win", "x":1.25, "y":4, "w":1.25},
- {"label":"Alt", "x":2.5, "y":4, "w":1.25},
- {"x":3.75, "y":4, "w":6.25},
- {"label":"Alt", "x":10, "y":4, "w":1.25},
- {"label":"Win", "x":11.25, "y":4, "w":1.25},
- {"label":"Menu", "x":12.5, "y":4, "w":1.25},
- {"label":"Ctrl", "x":13.75, "y":4, "w":1.25},
- {"label":"\u2190", "x":15.25, "y":4},
- {"label":"\u2193", "x":16.25, "y":4},
- {"label":"\u2192", "x":17.25, "y":4}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [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, "w": 2},
+
+ {"matrix": [1, 7], "x": 15.25, "y": 0},
+ {"matrix": [0, 8], "x": 16.25, "y": 0},
+ {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 1},
+ {"matrix": [3, 1], "x": 2.5, "y": 1},
+ {"matrix": [2, 2], "x": 3.5, "y": 1},
+ {"matrix": [3, 2], "x": 4.5, "y": 1},
+ {"matrix": [2, 3], "x": 5.5, "y": 1},
+ {"matrix": [3, 3], "x": 6.5, "y": 1},
+ {"matrix": [2, 4], "x": 7.5, "y": 1},
+ {"matrix": [3, 4], "x": 8.5, "y": 1},
+ {"matrix": [2, 5], "x": 9.5, "y": 1},
+ {"matrix": [3, 5], "x": 10.5, "y": 1},
+ {"matrix": [2, 6], "x": 11.5, "y": 1},
+ {"matrix": [3, 6], "x": 12.5, "y": 1},
+ {"matrix": [2, 7], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 7], "x": 15.25, "y": 1},
+ {"matrix": [2, 8], "x": 16.25, "y": 1},
+ {"matrix": [3, 8], "x": 17.25, "y": 1},
+
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [4, 1], "x": 1.75, "y": 2},
+ {"matrix": [5, 1], "x": 2.75, "y": 2},
+ {"matrix": [4, 2], "x": 3.75, "y": 2},
+ {"matrix": [5, 2], "x": 4.75, "y": 2},
+ {"matrix": [4, 3], "x": 5.75, "y": 2},
+ {"matrix": [5, 3], "x": 6.75, "y": 2},
+ {"matrix": [4, 4], "x": 7.75, "y": 2},
+ {"matrix": [5, 4], "x": 8.75, "y": 2},
+ {"matrix": [4, 5], "x": 9.75, "y": 2},
+ {"matrix": [5, 5], "x": 10.75, "y": 2},
+ {"matrix": [4, 6], "x": 11.75, "y": 2},
+ {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [6, 1], "x": 2.25, "y": 3},
+ {"matrix": [7, 1], "x": 3.25, "y": 3},
+ {"matrix": [6, 2], "x": 4.25, "y": 3},
+ {"matrix": [7, 2], "x": 5.25, "y": 3},
+ {"matrix": [6, 3], "x": 6.25, "y": 3},
+ {"matrix": [7, 3], "x": 7.25, "y": 3},
+ {"matrix": [6, 4], "x": 8.25, "y": 3},
+ {"matrix": [7, 4], "x": 9.25, "y": 3},
+ {"matrix": [6, 5], "x": 10.25, "y": 3},
+ {"matrix": [7, 5], "x": 11.25, "y": 3},
+ {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [6, 8], "x": 16.25, "y": 3},
+
+ {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [8, 5], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [7, 6], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 7], "x": 13.75, "y": 4, "w": 1.25},
+
+ {"matrix": [7, 7], "x": 15.25, "y": 4},
+ {"matrix": [8, 8], "x": 16.25, "y": 4},
+ {"matrix": [7, 8], "x": 17.25, "y": 4}
+ ]
}
}
}
diff --git a/keyboards/kv/revt/info.json b/keyboards/kv/revt/info.json
index 7103728056..7697f2acbc 100644
--- a/keyboards/kv/revt/info.json
+++ b/keyboards/kv/revt/info.json
@@ -19,128 +19,128 @@
"layouts": {
"LAYOUT_default": {
"layout": [
- {"x": 4.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.75, "y": 0},
- {"x": 11.75, "y": 0},
- {"x": 12.75, "y": 0},
- {"x": 13.75, "y": 0},
-
- {"x": 15.25, "y": 0},
- {"x": 16.25, "y": 0},
- {"x": 17.25, "y": 0},
- {"x": 18.25, "y": 0},
-
- {"x": 19.5, "y": 0},
- {"x": 20.5, "y": 0},
- {"x": 21.5, "y": 0},
-
- {"x": 0, "y": 1},
- {"x": 1, "y": 1},
- {"x": 2, "y": 1},
- {"x": 3, "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},
- {"x": 13.25, "y": 1},
- {"x": 14.25, "y": 1},
- {"x": 15.25, "y": 1},
- {"x": 16.25, "y": 1},
- {"x": 17.25, "y": 1, "w": 2},
-
- {"x": 19.5, "y": 1},
- {"x": 20.5, "y": 1},
- {"x": 21.5, "y": 1},
-
- {"x": 0, "y": 2},
- {"x": 1, "y": 2},
- {"x": 2, "y": 2},
- {"x": 3, "y": 2, "h": 2},
-
- {"x": 4.25, "y": 2, "w": 1.5},
- {"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},
- {"x": 14.75, "y": 2},
- {"x": 15.75, "y": 2},
- {"x": 16.75, "y": 2},
- {"x": 17.75, "y": 2, "w": 1.5},
-
- {"x": 19.5, "y": 2},
- {"x": 20.5, "y": 2},
- {"x": 21.5, "y": 2},
-
- {"x": 0, "y": 3},
- {"x": 1, "y": 3},
- {"x": 2, "y": 3},
-
- {"x": 4.25, "y": 3, "w": 1.75},
- {"x": 6, "y": 3},
- {"x": 7, "y": 3},
- {"x": 8, "y": 3},
- {"x": 9, "y": 3},
- {"x": 10, "y": 3},
- {"x": 11, "y": 3},
- {"x": 12, "y": 3},
- {"x": 13, "y": 3},
- {"x": 14, "y": 3},
- {"x": 15, "y": 3},
- {"x": 16, "y": 3},
- {"x": 17, "y": 3, "w": 2.25},
-
- {"x": 0, "y": 4},
- {"x": 1, "y": 4},
- {"x": 2, "y": 4},
- {"x": 3, "y": 4, "h": 2},
-
- {"x": 4.25, "y": 4, "w": 2.25},
- {"x": 6.5, "y": 4},
- {"x": 7.5, "y": 4},
- {"x": 8.5, "y": 4},
- {"x": 9.5, "y": 4},
- {"x": 10.5, "y": 4},
- {"x": 11.5, "y": 4},
- {"x": 12.5, "y": 4},
- {"x": 13.5, "y": 4},
- {"x": 14.5, "y": 4},
- {"x": 15.5, "y": 4},
- {"x": 16.5, "y": 4, "w": 2.75},
-
- {"x": 20.5, "y": 4},
-
- {"x": 0, "y": 5, "w": 2},
- {"x": 2, "y": 5},
-
- {"x": 4.25, "y": 5, "w": 1.25},
- {"x": 5.5, "y": 5, "w": 1.25},
- {"x": 6.75, "y": 5, "w": 1.25},
- {"x": 8, "y": 5, "w": 6.25},
- {"x": 14.25, "y": 5, "w": 1.25},
- {"x": 15.5, "y": 5, "w": 1.25},
- {"x": 16.75, "y": 5, "w": 1.25},
- {"x": 18, "y": 5, "w": 1.25},
-
- {"x": 19.5, "y": 5},
- {"x": 20.5, "y": 5},
- {"x": 21.5, "y": 5}
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [0, 8], "x": 8.25, "y": 0},
+ {"matrix": [0, 9], "x": 9.25, "y": 0},
+
+ {"matrix": [0, 10], "x": 10.75, "y": 0},
+ {"matrix": [0, 11], "x": 11.75, "y": 0},
+ {"matrix": [0, 12], "x": 12.75, "y": 0},
+ {"matrix": [0, 13], "x": 13.75, "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.25, "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},
+ {"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.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.25, "y": 1},
+ {"matrix": [1, 11], "x": 11.25, "y": 1},
+ {"matrix": [1, 12], "x": 12.25, "y": 1},
+ {"matrix": [1, 13], "x": 13.25, "y": 1},
+ {"matrix": [1, 14], "x": 14.25, "y": 1},
+ {"matrix": [1, 15], "x": 15.25, "y": 1},
+ {"matrix": [1, 16], "x": 16.25, "y": 1},
+ {"matrix": [1, 17], "x": 17.25, "y": 1, "w": 2},
+
+ {"matrix": [1, 18], "x": 19.5, "y": 1},
+ {"matrix": [1, 19], "x": 20.5, "y": 1},
+ {"matrix": [1, 20], "x": 21.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, "h": 2},
+
+ {"matrix": [2, 4], "x": 4.25, "y": 2, "w": 1.5},
+ {"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},
+ {"matrix": [2, 14], "x": 14.75, "y": 2},
+ {"matrix": [2, 15], "x": 15.75, "y": 2},
+ {"matrix": [2, 16], "x": 16.75, "y": 2},
+ {"matrix": [2, 17], "x": 17.75, "y": 2, "w": 1.5},
+
+ {"matrix": [2, 18], "x": 19.5, "y": 2},
+ {"matrix": [2, 19], "x": 20.5, "y": 2},
+ {"matrix": [2, 20], "x": 21.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, 4], "x": 4.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 5], "x": 6, "y": 3},
+ {"matrix": [3, 6], "x": 7, "y": 3},
+ {"matrix": [3, 7], "x": 8, "y": 3},
+ {"matrix": [3, 8], "x": 9, "y": 3},
+ {"matrix": [3, 9], "x": 10, "y": 3},
+ {"matrix": [3, 10], "x": 11, "y": 3},
+ {"matrix": [3, 11], "x": 12, "y": 3},
+ {"matrix": [3, 12], "x": 13, "y": 3},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+ {"matrix": [3, 15], "x": 16, "y": 3},
+ {"matrix": [3, 17], "x": 17, "y": 3, "w": 2.25},
+
+ {"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": [4, 4], "x": 4.25, "y": 4, "w": 2.25},
+ {"matrix": [4, 5], "x": 6.5, "y": 4},
+ {"matrix": [4, 6], "x": 7.5, "y": 4},
+ {"matrix": [4, 7], "x": 8.5, "y": 4},
+ {"matrix": [4, 8], "x": 9.5, "y": 4},
+ {"matrix": [4, 9], "x": 10.5, "y": 4},
+ {"matrix": [4, 10], "x": 11.5, "y": 4},
+ {"matrix": [4, 11], "x": 12.5, "y": 4},
+ {"matrix": [4, 12], "x": 13.5, "y": 4},
+ {"matrix": [4, 13], "x": 14.5, "y": 4},
+ {"matrix": [4, 14], "x": 15.5, "y": 4},
+ {"matrix": [4, 17], "x": 16.5, "y": 4, "w": 2.75},
+
+ {"matrix": [4, 19], "x": 20.5, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 2},
+ {"matrix": [5, 2], "x": 2, "y": 5},
+
+ {"matrix": [5, 4], "x": 4.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 5], "x": 5.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 6], "x": 6.75, "y": 5, "w": 1.25},
+ {"matrix": [5, 9], "x": 8, "y": 5, "w": 6.25},
+ {"matrix": [5, 14], "x": 14.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 15], "x": 15.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 16], "x": 16.75, "y": 5, "w": 1.25},
+ {"matrix": [5, 17], "x": 18, "y": 5, "w": 1.25},
+
+ {"matrix": [5, 18], "x": 19.5, "y": 5},
+ {"matrix": [5, 19], "x": 20.5, "y": 5},
+ {"matrix": [5, 20], "x": 21.5, "y": 5}
]
}
}
diff --git a/keyboards/kv/revt/revt.c b/keyboards/kv/revt/revt.c
index 443a814015..fba4582c26 100644
--- a/keyboards/kv/revt/revt.c
+++ b/keyboards/kv/revt/revt.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "revt.h"
+#include "quantum.h"
void matrix_init_kb(void) {
// Turn status LED on
diff --git a/keyboards/kv/revt/revt.h b/keyboards/kv/revt/revt.h
deleted file mode 100644
index ed98f4aabe..0000000000
--- a/keyboards/kv/revt/revt.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2020 Hybrid65
- *
- * 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_default( \
- K04, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I, K0J, K0K, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, \
- K30, K31, K32, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3H, \
- K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4H, K4J, \
- K50, K52, K54, K55, K56, K59, K5E, K5F, K5G, K5H, K5I, K5J, K5K \
-) \
-{ \
- { KC_NO, KC_NO, KC_NO, KC_NO, K04, KC_NO, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I, K0J, K0K, }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, }, \
- { K30, K31, K32, KC_NO, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, KC_NO, K3H, KC_NO, KC_NO, KC_NO, }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, KC_NO, KC_NO, K4H, KC_NO, K4J, KC_NO, }, \
- { K50, KC_NO, K52, KC_NO, K54, K55, K56, KC_NO, KC_NO, K59, KC_NO, KC_NO, KC_NO, KC_NO, K5E, K5F, K5G, K5H, K5I, K5J, K5K }, \
-}
diff --git a/keyboards/ll3macorn/bongopad/bongopad.c b/keyboards/ll3macorn/bongopad/bongopad.c
index a53c7e9fbe..f6d03ded6c 100644
--- a/keyboards/ll3macorn/bongopad/bongopad.c
+++ b/keyboards/ll3macorn/bongopad/bongopad.c
@@ -1,6 +1,6 @@
// Copyright 2021 Ll3macorn (@ll3macorn)
// SPDX-License-Identifier: GPL-2.0-or-later
-#include "bongopad.h"
+#include "quantum.h"
#ifdef OLED_ENABLE
bool oled_task_kb(void) {
diff --git a/keyboards/ll3macorn/bongopad/bongopad.h b/keyboards/ll3macorn/bongopad/bongopad.h
deleted file mode 100644
index 31fc0cc5c7..0000000000
--- a/keyboards/ll3macorn/bongopad/bongopad.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2021 Ll3macorn (@ll3macorn)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_default( \
- K00, \
- K10, K11, K12, \
- K20, K21, K22, \
- K30, K31, K32 \
-) { \
- { K00, KC_NO, KC_NO }, \
- { K10, K11, K12 }, \
- { K20, K21, K22 }, \
- { K30, K31, K32 } \
-}
-
diff --git a/keyboards/ll3macorn/bongopad/info.json b/keyboards/ll3macorn/bongopad/info.json
index ff276547ea..f7276d6e82 100644
--- a/keyboards/ll3macorn/bongopad/info.json
+++ b/keyboards/ll3macorn/bongopad/info.json
@@ -27,8 +27,22 @@
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
- "LAYOUT_default": {
- "layout": [{"x":0, "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}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}]
- }
+ "LAYOUT_default": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "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},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3}
+ ]
+ }
}
- } \ No newline at end of file
+}
diff --git a/keyboards/lyso1/lck75/info.json b/keyboards/lyso1/lck75/info.json
index cbf77708cf..9369fc54fe 100644
--- a/keyboards/lyso1/lck75/info.json
+++ b/keyboards/lyso1/lck75/info.json
@@ -22,25 +22,721 @@
"bootloader": "usbasploader",
"layouts": {
"LAYOUT_default": {
- "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":"F13", "x":14, "y":0}, {"label":"Mute", "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":"PgDn", "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":"Del", "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":"Up", "x":14.25, "y":4.5}, {"label":"MO(1)", "x":15.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.5}, {"label":"Ctrl", "x":11.5, "y":5.25, "w":1.5}, {"label":"Left", "x":13.25, "y":5.5}, {"label":"Down", "x":14.25, "y":5.5}, {"label":"Right", "x":15.25, "y":5.5}]
+ "layout": [
+ {"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, 14], "x": 14, "y": 0},
+
+ {"matrix": [0, 15], "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, 14], "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.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 15], "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, 14], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [3, 15], "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, 14], "x": 14.25, "y": 4.5},
+
+ {"matrix": [4, 15], "x": 15.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, 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.5},
+
+ {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+ {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+ {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+ ]
},
"LAYOUT_7u": {
- "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":"F13", "x":14, "y":0}, {"label":"Mute", "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":"PgDn", "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":"Del", "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":"Up", "x":14.25, "y":4.5}, {"label":"MO(1)", "x":15.5, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.5}, {"label":"Alt", "x":1.5, "y":5.25, "w":1.5}, {"x":3, "y":5.25, "w":7}, {"label":"Alt", "x":10, "y":5.25, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":5.25, "w":1.5}, {"label":"Left", "x":13.25, "y":5.5}, {"label":"Down", "x":14.25, "y":5.5}, {"label":"Right", "x":15.25, "y":5.5}]
+ "layout": [
+ {"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, 14], "x": 14, "y": 0},
+
+ {"matrix": [0, 15], "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, 14], "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.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 15], "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, 14], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [3, 15], "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, 14], "x": 14.25, "y": 4.5},
+
+ {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 2], "x": 1.5, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 6], "x": 3, "y": 5.25, "w": 7},
+ {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+
+ {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+ {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+ {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+ ]
},
"LAYOUT_7u_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":"F13", "x":14, "y":0}, {"label":"Mute", "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":"PgDn", "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}, {"x":13.75, "y":2.25, "w":1.25, "h":2}, {"label":"PgUp", "x":15.5, "y":2.25}, {"x":0, "y":3.25, "w":1.25}, {"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":"Del", "x":15.5, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":1.25}, {"label":"Shift", "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":"MO(1)", "x":15.5, "y":4.25}, {"label":"Up", "x":14.25, "y":4.5}, {"label":"Alt", "x":0, "y":5.25, "w":1.5}, {"label":"Alt", "x":1.5, "y":5.25, "w":1.5}, {"x":3, "y":5.25, "w":7}, {"label":"Alt", "x":10, "y":5.25, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":5.25, "w":1.5}, {"label":"Left", "x":13.25, "y":5.5}, {"label":"Down", "x":14.25, "y":5.5}, {"label":"Right", "x":15.25, "y":5.5}]
+ "layout": [
+ {"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, 14], "x": 14, "y": 0},
+
+ {"matrix": [0, 15], "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, 14], "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, 15], "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.25},
+ {"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, 14], "x": 12.75, "y": 3.25},
+
+ {"matrix": [3, 15], "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, 14], "x": 15.5, "y": 4.25},
+
+ {"matrix": [4, 15], "x": 14.25, "y": 4.5},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 2], "x": 1.5, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 6], "x": 3, "y": 5.25, "w": 7},
+ {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+
+ {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+ {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+ {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+ ]
},
"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":"F13", "x":14, "y":0}, {"label":"Mute", "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":"PgDn", "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}, {"x":13.75, "y":2.25, "w":1.25, "h":2}, {"label":"PgUp", "x":15.5, "y":2.25}, {"x":0, "y":3.25, "w":1.25}, {"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":"Del", "x":15.5, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":1.25}, {"label":"Shift", "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":"MO(1)", "x":15.5, "y":4.25}, {"label":"Up", "x":14.25, "y":4.5}, {"label":"Alt", "x":0, "y":5.25, "w":1.25}, {"label":"Alt", "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.5}, {"label":"Ctrl", "x":11.5, "y":5.25, "w":1.5}, {"label":"Left", "x":13.25, "y":5.5}, {"label":"Down", "x":14.25, "y":5.5}, {"label":"Right", "x":15.25, "y":5.5}]
+ "layout": [
+ {"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, 14], "x": 14, "y": 0},
+
+ {"matrix": [0, 15], "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, 14], "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, 15], "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.25},
+ {"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, 14], "x": 12.75, "y": 3.25},
+
+ {"matrix": [3, 15], "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, 14], "x": 15.5, "y": 4.25},
+
+ {"matrix": [4, 15], "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, 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.5},
+
+ {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+ {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+ {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+ ]
},
- "LAYOUT_sbs": {
- "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":"F13", "x":14, "y":0}, {"label":"Mute", "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":"|", "x":13, "y":1.25}, {"label":"Insert", "x":14, "y":1.25}, {"label":"PgDn", "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":"Backspace", "x":13.5, "y":2.25, "w":1.5}, {"label":"PgUp", "x":15.5, "y":2.25}, {"x":0, "y":3.25, "w":1.25}, {"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":"Del", "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":"MO(1)", "x":15.5, "y":4.25}, {"label":"Up", "x":14.25, "y":4.5}, {"label":"Alt", "x":0, "y":5.25, "w":1.25}, {"label":"Alt", "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.5}, {"label":"Ctrl", "x":11.5, "y":5.25, "w":1.5}, {"label":"Left", "x":13.25, "y":5.5}, {"label":"Down", "x":14.25, "y":5.5}, {"label":"Right", "x":15.25, "y":5.5}]
+ "LAYOUT_sbs": {
+ "layout": [
+ {"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, 14], "x": 14, "y": 0},
+
+ {"matrix": [0, 15], "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.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 15], "x": 15.5, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 14], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [3, 15], "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, 14], "x": 15.5, "y": 4.25},
+
+ {"matrix": [4, 15], "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, 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.5},
+
+ {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+ {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+ {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+ ]
},
- "LAYOUT_7u_sbs": {
- "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":"F13", "x":14, "y":0}, {"label":"Mute", "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":"|", "x":13, "y":1.25}, {"label":"Insert", "x":14, "y":1.25}, {"label":"PgDn", "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":"Backspace", "x":13.5, "y":2.25, "w":1.5}, {"label":"PgUp", "x":15.5, "y":2.25}, {"x":0, "y":3.25, "w":1.25}, {"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":"Del", "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":"MO(1)", "x":15.5, "y":4.25}, {"label":"Up", "x":14.25, "y":4.5}, {"label":"Alt", "x":0, "y":5.25, "w":1.5}, {"label":"Alt", "x":1.5, "y":5.25, "w":1.5}, {"x":3, "y":5.25, "w":7}, {"label":"Alt", "x":10, "y":5.25, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":5.25, "w":1.5}, {"label":"Left", "x":13.25, "y":5.5}, {"label":"Down", "x":14.25, "y":5.5}, {"label":"Right", "x":15.25, "y":5.5}]
+ "LAYOUT_7u_sbs": {
+ "layout": [
+ {"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, 14], "x": 14, "y": 0},
+
+ {"matrix": [0, 15], "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.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 15], "x": 15.5, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 14], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [3, 15], "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, 14], "x": 15.5, "y": 4.25},
+
+ {"matrix": [4, 15], "x": 14.25, "y": 4.5},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 2], "x": 1.5, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 6], "x": 3, "y": 5.25, "w": 7},
+ {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+
+ {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+ {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+ {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+ ]
},
- "LAYOUT_iso_sbs": {
- "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":"F13", "x":14, "y":0}, {"label":"Mute", "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":"Ins", "x":13, "y":1.25}, {"label":"Del", "x":14, "y":1.25}, {"label":"PgDn", "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}, {"x":13.75, "y":2.25, "w":1.25, "h":2}, {"label":"PgUp", "x":15.5, "y":2.25}, {"x":0, "y":3.25, "w":1.25}, {"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":"Del", "x":15.5, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":1.25}, {"label":"Shift", "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":"MO(1)", "x":15.5, "y":4.25}, {"label":"Up", "x":14.25, "y":4.5}, {"label":"Alt", "x":0, "y":5.25, "w":1.25}, {"label":"Alt", "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.5}, {"label":"Ctrl", "x":11.5, "y":5.25, "w":1.5}, {"label":"Left", "x":13.25, "y":5.5}, {"label":"Down", "x":14.25, "y":5.5}, {"label":"Right", "x":15.25, "y":5.5}]
+ "LAYOUT_iso_sbs": {
+ "layout": [
+ {"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, 14], "x": 14, "y": 0},
+
+ {"matrix": [0, 15], "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, 15], "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.25},
+ {"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, 14], "x": 12.75, "y": 3.25},
+
+ {"matrix": [3, 15], "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, 14], "x": 15.5, "y": 4.25},
+
+ {"matrix": [4, 15], "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, 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.5},
+
+ {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+ {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+ {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+ ]
}
}
} \ No newline at end of file
diff --git a/keyboards/lyso1/lck75/lck75.c b/keyboards/lyso1/lck75/lck75.c
index edaaf3feb1..af0cdc6467 100644
--- a/keyboards/lyso1/lck75/lck75.c
+++ b/keyboards/lyso1/lck75/lck75.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 "lck75.h"
+#include "quantum.h"
#define IDLE_FRAMES 5
#define IDLE_SPEED 30
diff --git a/keyboards/lyso1/lck75/lck75.h b/keyboards/lyso1/lck75/lck75.h
deleted file mode 100644
index d7648eff2a..0000000000
--- a/keyboards/lyso1/lck75/lck75.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/* Copyright 2020 Lyso1
- *
- * 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/>.
- */
-//#define BONGO ENABLE
-
-#pragma once
-
-
-
-#define _x_ KC_NO
-
-#include "quantum.h"
-
-#define LAYOUT_default(\
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, K2F, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3E, K3F, \
- K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4E, K4F, \
- K50, K51, K52, K56, K5A, K5B, K5C, K5E, K5F \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, _x_, K0E, K0F}, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, _x_, K1E, K1F}, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, _x_, K2E, K2F}, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, _x_, K3E, K3F}, \
- { K40, _x_, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, _x_, K4E, K4F}, \
- { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, _x_, K5A, K5B, K5C, _x_, K5E, K5F} \
-}
-
-#define LAYOUT_7u( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, K2F, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3E, K3F, \
- K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4E, K4F, \
- K50, K52, K56, K5A, K5B, K5C, K5E, K5F \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, _x_, K0E, K0F}, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, _x_, K1E, K1F}, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, _x_, K2E, K2F}, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, _x_, K3E, K3F}, \
- { K40, _x_, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, _x_, K4E, K4F}, \
- { K50, _x_, K52, _x_, _x_, _x_, K56, _x_, _x_, _x_, K5A, K5B, K5C, _x_, K5E, K5F} \
-}
-
-#define LAYOUT_iso_sbs( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, 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, K2F, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, K3F, \
- K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4E, K4F, \
- K50, K51, K52, K56, K5A, K5B, K5C, K5E, K5F \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, _x_, 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, _x_, _x_, K2F}, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, _x_, K3E, K3F}, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, _x_, K4E, K4F}, \
- { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, _x_, K5A, K5B, K5C, _x_, K5E, K5F} \
-}
-
-#define LAYOUT_sbs( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, 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, K2E, K2F, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3E, K3F, \
- K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4E, K4F, \
- K50, K51, K52, K56, K5A, K5B, K5C, K5E, K5F \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, _x_, 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, _x_, K2E, K2F}, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, _x_, K3E, K3F}, \
- { K40, _x_, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, _x_, K4E, K4F}, \
- { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, _x_, K5A, K5B, K5C, _x_, K5E, K5F} \
-}
-
-#define LAYOUT_7u_sbs( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, 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, K2E, K2F, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3E, K3F, \
- K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4E, K4F, \
- K50, K52, K56, K5A, K5B, K5C, K5E, K5F \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, _x_, 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, _x_, K2E, K2F}, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, _x_, K3E, K3F}, \
- { K40, _x_, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, _x_, K4E, K4F}, \
- { K50, _x_, K52, _x_, _x_, _x_, K56, _x_, _x_, _x_, K5A, K5B, K5C, _x_, K5E, K5F} \
-}
-
-#define LAYOUT_iso( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2F, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, K3F, \
- K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4E, K4F, \
- K50, K51, K52, K56, K5A, K5B, K5C, K5E, K5F \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, _x_, K0E, K0F}, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, _x_, K1E, K1F}, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, _x_, _x_, K2F}, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, _x_, K3E, K3F}, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, _x_, K4E, K4F}, \
- { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, _x_, K5A, K5B, K5C, _x_, K5E, K5F} \
-}
-
-#define LAYOUT_7u_iso( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2F, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, K3F, \
- K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4E, K4F, \
- K50, K52, K56, K5A, K5B, K5C, K5E, K5F \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, _x_, K0E, K0F}, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, _x_, K1E, K1F}, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, _x_, _x_, K2F}, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, _x_, K3E, K3F}, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, _x_, K4E, K4F}, \
- { K50, _x_, K52, _x_, _x_, _x_, K56, _x_, _x_, _x_, K5A, K5B, K5C, _x_, K5E, K5F} \
-}
diff --git a/keyboards/lyso1/lefishe/info.json b/keyboards/lyso1/lefishe/info.json
index 017a064c37..580a6e0959 100644
--- a/keyboards/lyso1/lefishe/info.json
+++ b/keyboards/lyso1/lefishe/info.json
@@ -16,17 +16,365 @@
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
- "LAYOUT_default": {
- "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"label":"~", "x":2.25, "y":0}, {"label":"!", "x":3.25, "y":0}, {"label":"@", "x":4.25, "y":0}, {"label":"#", "x":5.25, "y":0}, {"label":"$", "x":6.25, "y":0}, {"label":"%", "x":7.25, "y":0}, {"label":"^", "x":8.25, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Backspace", "x":15.25, "y":0, "w":2}, {"label":"Insert", "x":17.25, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"label":"Tab", "x":2.25, "y":1, "w":1.5}, {"label":"Q", "x":3.75, "y":1}, {"label":"W", "x":4.75, "y":1}, {"label":"E", "x":5.75, "y":1}, {"label":"R", "x":6.75, "y":1}, {"label":"T", "x":7.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"|", "x":15.75, "y":1, "w":1.5}, {"label":"Delete", "x":17.25, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"label":"Caps", "x":2.25, "y":2, "w":1.25}, {"label":"A", "x":4, "y":2}, {"label":"S", "x":5, "y":2}, {"label":"D", "x":6, "y":2}, {"label":"F", "x":7, "y":2}, {"label":"G", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"PgUp", "x":17.25, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"label":"Shift", "x":2.25, "y":3, "w":2.25}, {"label":"Z", "x":4.5, "y":3}, {"label":"X", "x":5.5, "y":3}, {"label":"C", "x":6.5, "y":3}, {"label":"V", "x":7.5, "y":3}, {"label":"B", "x":8.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"PgDn", "x":17.25, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"label":"Ctrl", "x":2.25, "y":4, "w":1.5}, {"label":"LGUI", "x":3.75, "y":4}, {"label":"Alt", "x":4.75, "y":4, "w":1.5}, {"x":6.25, "y":4, "w":7}, {"label":"Alt", "x":13.25, "y":4, "w":1.5}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}]
+ "LAYOUT_default": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [0, 8], "x": 8.25, "y": 0},
+ {"matrix": [0, 9], "x": 9.25, "y": 0},
+ {"matrix": [0, 10], "x": 10.25, "y": 0},
+ {"matrix": [0, 11], "x": 11.25, "y": 0},
+ {"matrix": [0, 12], "x": 12.25, "y": 0},
+ {"matrix": [0, 13], "x": 13.25, "y": 0},
+ {"matrix": [0, 14], "x": 14.25, "y": 0},
+ {"matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
+ {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+
+ {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [1, 8], "x": 8.75, "y": 1},
+ {"matrix": [1, 9], "x": 9.75, "y": 1},
+ {"matrix": [1, 10], "x": 10.75, "y": 1},
+ {"matrix": [1, 11], "x": 11.75, "y": 1},
+ {"matrix": [1, 12], "x": 12.75, "y": 1},
+ {"matrix": [1, 13], "x": 13.75, "y": 1},
+ {"matrix": [1, 14], "x": 14.75, "y": 1},
+ {"matrix": [1, 16], "x": 15.75, "y": 1, "w": 1.5},
+ {"matrix": [1, 17], "x": 17.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+
+ {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.25},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 9], "x": 10, "y": 2},
+ {"matrix": [2, 10], "x": 11, "y": 2},
+ {"matrix": [2, 11], "x": 12, "y": 2},
+ {"matrix": [2, 12], "x": 13, "y": 2},
+ {"matrix": [2, 13], "x": 14, "y": 2},
+ {"matrix": [2, 16], "x": 15, "y": 2, "w": 2.25},
+ {"matrix": [2, 17], "x": 17.25, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+
+ {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.5, "y": 3},
+ {"matrix": [3, 7], "x": 7.5, "y": 3},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [3, 9], "x": 9.5, "y": 3},
+ {"matrix": [3, 10], "x": 10.5, "y": 3},
+ {"matrix": [3, 11], "x": 11.5, "y": 3},
+ {"matrix": [3, 12], "x": 12.5, "y": 3},
+ {"matrix": [3, 13], "x": 13.5, "y": 3},
+ {"matrix": [3, 15], "x": 14.5, "y": 3, "w": 1.75},
+ {"matrix": [3, 16], "x": 16.25, "y": 3},
+ {"matrix": [3, 17], "x": 17.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 3], "x": 3.75, "y": 4},
+ {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+ {"matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+ {"matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 15], "x": 15.25, "y": 4},
+ {"matrix": [4, 16], "x": 16.25, "y": 4},
+ {"matrix": [4, 17], "x": 17.25, "y": 4}
+ ]
},
- "LAYOUT_wk_sbs": {
- "layout": [{"label":"F1", "x":0, "y":0}, {"label":"F2", "x":1, "y":0}, {"label":"~", "x":2.25, "y":0}, {"label":"!", "x":3.25, "y":0}, {"label":"@", "x":4.25, "y":0}, {"label":"#", "x":5.25, "y":0}, {"label":"$", "x":6.25, "y":0}, {"label":"%", "x":7.25, "y":0}, {"label":"^", "x":8.25, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"|", "x":15.25, "y":0}, {"x":16.25, "y":0}, {"label":"Insert", "x":17.25, "y":0}, {"label":"F3", "x":0, "y":1}, {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.25, "y":1, "w":1.5}, {"label":"Q", "x":3.75, "y":1}, {"label":"W", "x":4.75, "y":1}, {"label":"E", "x":5.75, "y":1}, {"label":"R", "x":6.75, "y":1}, {"label":"T", "x":7.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"Backspace", "x":15.75, "y":1, "w":1.5}, {"label":"Delete", "x":17.25, "y":1}, {"label":"F5", "x":0, "y":2}, {"label":"F6", "x":1, "y":2}, {"label":"Caps", "x":2.25, "y":2, "w":1.25}, {"label":"A", "x":4, "y":2}, {"label":"S", "x":5, "y":2}, {"label":"D", "x":6, "y":2}, {"label":"F", "x":7, "y":2}, {"label":"G", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"PgUp", "x":17.25, "y":2}, {"label":"F7", "x":0, "y":3}, {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.25, "y":3, "w":2.25}, {"label":"Z", "x":4.5, "y":3}, {"label":"X", "x":5.5, "y":3}, {"label":"C", "x":6.5, "y":3}, {"label":"V", "x":7.5, "y":3}, {"label":"B", "x":8.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"PgDn", "x":17.25, "y":3}, {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Ctrl", "x":2.25, "y":4, "w":1.5}, {"label":"LGUI", "x":3.75, "y":4}, {"label":"Alt", "x":4.75, "y":4, "w":1.5}, {"x":6.25, "y":4, "w":7}, {"label":"Alt", "x":13.25, "y":4, "w":1.5}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}]
+ "LAYOUT_wk_sbs": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [0, 8], "x": 8.25, "y": 0},
+ {"matrix": [0, 9], "x": 9.25, "y": 0},
+ {"matrix": [0, 10], "x": 10.25, "y": 0},
+ {"matrix": [0, 11], "x": 11.25, "y": 0},
+ {"matrix": [0, 12], "x": 12.25, "y": 0},
+ {"matrix": [0, 13], "x": 13.25, "y": 0},
+ {"matrix": [0, 14], "x": 14.25, "y": 0},
+ {"matrix": [0, 15], "x": 15.25, "y": 0},
+ {"matrix": [0, 16], "x": 16.25, "y": 0},
+ {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+
+ {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [1, 8], "x": 8.75, "y": 1},
+ {"matrix": [1, 9], "x": 9.75, "y": 1},
+ {"matrix": [1, 10], "x": 10.75, "y": 1},
+ {"matrix": [1, 11], "x": 11.75, "y": 1},
+ {"matrix": [1, 12], "x": 12.75, "y": 1},
+ {"matrix": [1, 13], "x": 13.75, "y": 1},
+ {"matrix": [1, 14], "x": 14.75, "y": 1},
+ {"matrix": [1, 16], "x": 15.75, "y": 1, "w": 1.5},
+ {"matrix": [1, 17], "x": 17.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+
+ {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.25},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 9], "x": 10, "y": 2},
+ {"matrix": [2, 10], "x": 11, "y": 2},
+ {"matrix": [2, 11], "x": 12, "y": 2},
+ {"matrix": [2, 12], "x": 13, "y": 2},
+ {"matrix": [2, 13], "x": 14, "y": 2},
+ {"matrix": [2, 16], "x": 15, "y": 2, "w": 2.25},
+ {"matrix": [2, 17], "x": 17.25, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+
+ {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.5, "y": 3},
+ {"matrix": [3, 7], "x": 7.5, "y": 3},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [3, 9], "x": 9.5, "y": 3},
+ {"matrix": [3, 10], "x": 10.5, "y": 3},
+ {"matrix": [3, 11], "x": 11.5, "y": 3},
+ {"matrix": [3, 12], "x": 12.5, "y": 3},
+ {"matrix": [3, 13], "x": 13.5, "y": 3},
+ {"matrix": [3, 15], "x": 14.5, "y": 3, "w": 1.75},
+ {"matrix": [3, 16], "x": 16.25, "y": 3},
+ {"matrix": [3, 17], "x": 17.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 3], "x": 3.75, "y": 4},
+ {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+ {"matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+ {"matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 15], "x": 15.25, "y": 4},
+ {"matrix": [4, 16], "x": 16.25, "y": 4},
+ {"matrix": [4, 17], "x": 17.25, "y": 4}
+ ]
},
- "LAYOUT_wkl_sbs": {
- "layout": [{"label":"F1", "x":0, "y":0}, {"label":"F2", "x":1, "y":0}, {"label":"~", "x":2.25, "y":0}, {"label":"!", "x":3.25, "y":0}, {"label":"@", "x":4.25, "y":0}, {"label":"#", "x":5.25, "y":0}, {"label":"$", "x":6.25, "y":0}, {"label":"%", "x":7.25, "y":0}, {"label":"^", "x":8.25, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"|", "x":15.25, "y":0}, {"x":16.25, "y":0}, {"label":"Insert", "x":17.25, "y":0}, {"label":"F3", "x":0, "y":1}, {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.25, "y":1, "w":1.5}, {"label":"Q", "x":3.75, "y":1}, {"label":"W", "x":4.75, "y":1}, {"label":"E", "x":5.75, "y":1}, {"label":"R", "x":6.75, "y":1}, {"label":"T", "x":7.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"Backspace", "x":15.75, "y":1, "w":1.5}, {"label":"Delete", "x":17.25, "y":1}, {"label":"F5", "x":0, "y":2}, {"label":"F6", "x":1, "y":2}, {"label":"Caps", "x":2.25, "y":2, "w":1.25}, {"label":"A", "x":4, "y":2}, {"label":"S", "x":5, "y":2}, {"label":"D", "x":6, "y":2}, {"label":"F", "x":7, "y":2}, {"label":"G", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"PgUp", "x":17.25, "y":2}, {"label":"F7", "x":0, "y":3}, {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.25, "y":3, "w":2.25}, {"label":"Z", "x":4.5, "y":3}, {"label":"X", "x":5.5, "y":3}, {"label":"C", "x":6.5, "y":3}, {"label":"V", "x":7.5, "y":3}, {"label":"B", "x":8.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"PgDn", "x":17.25, "y":3}, {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Ctrl", "x":2.25, "y":4, "w":1.5}, {"label":"Alt", "x":4.75, "y":4, "w":1.5}, {"x":6.25, "y":4, "w":7}, {"label":"Alt", "x":13.25, "y":4, "w":1.5}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}]
+ "LAYOUT_wkl_sbs": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [0, 8], "x": 8.25, "y": 0},
+ {"matrix": [0, 9], "x": 9.25, "y": 0},
+ {"matrix": [0, 10], "x": 10.25, "y": 0},
+ {"matrix": [0, 11], "x": 11.25, "y": 0},
+ {"matrix": [0, 12], "x": 12.25, "y": 0},
+ {"matrix": [0, 13], "x": 13.25, "y": 0},
+ {"matrix": [0, 14], "x": 14.25, "y": 0},
+ {"matrix": [0, 15], "x": 15.25, "y": 0},
+ {"matrix": [0, 16], "x": 16.25, "y": 0},
+ {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+
+ {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [1, 8], "x": 8.75, "y": 1},
+ {"matrix": [1, 9], "x": 9.75, "y": 1},
+ {"matrix": [1, 10], "x": 10.75, "y": 1},
+ {"matrix": [1, 11], "x": 11.75, "y": 1},
+ {"matrix": [1, 12], "x": 12.75, "y": 1},
+ {"matrix": [1, 13], "x": 13.75, "y": 1},
+ {"matrix": [1, 14], "x": 14.75, "y": 1},
+ {"matrix": [1, 16], "x": 15.75, "y": 1, "w": 1.5},
+ {"matrix": [1, 17], "x": 17.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+
+ {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.25},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 9], "x": 10, "y": 2},
+ {"matrix": [2, 10], "x": 11, "y": 2},
+ {"matrix": [2, 11], "x": 12, "y": 2},
+ {"matrix": [2, 12], "x": 13, "y": 2},
+ {"matrix": [2, 13], "x": 14, "y": 2},
+ {"matrix": [2, 16], "x": 15, "y": 2, "w": 2.25},
+ {"matrix": [2, 17], "x": 17.25, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+
+ {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.5, "y": 3},
+ {"matrix": [3, 7], "x": 7.5, "y": 3},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [3, 9], "x": 9.5, "y": 3},
+ {"matrix": [3, 10], "x": 10.5, "y": 3},
+ {"matrix": [3, 11], "x": 11.5, "y": 3},
+ {"matrix": [3, 12], "x": 12.5, "y": 3},
+ {"matrix": [3, 13], "x": 13.5, "y": 3},
+ {"matrix": [3, 15], "x": 14.5, "y": 3, "w": 1.75},
+ {"matrix": [3, 16], "x": 16.25, "y": 3},
+ {"matrix": [3, 17], "x": 17.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+ {"matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+ {"matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 15], "x": 15.25, "y": 4},
+ {"matrix": [4, 16], "x": 16.25, "y": 4},
+ {"matrix": [4, 17], "x": 17.25, "y": 4}
+ ]
},
- "LAYOUT_wkl": {
- "layout": [{"label":"F1", "x":0, "y":0}, {"label":"F2", "x":1, "y":0}, {"label":"~", "x":2.25, "y":0}, {"label":"!", "x":3.25, "y":0}, {"label":"@", "x":4.25, "y":0}, {"label":"#", "x":5.25, "y":0}, {"label":"$", "x":6.25, "y":0}, {"label":"%", "x":7.25, "y":0}, {"label":"^", "x":8.25, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Backspace", "x":15.25, "y":0, "w":2}, {"label":"Insert", "x":17.25, "y":0}, {"label":"F3", "x":0, "y":1}, {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.25, "y":1, "w":1.5}, {"label":"Q", "x":3.75, "y":1}, {"label":"W", "x":4.75, "y":1}, {"label":"E", "x":5.75, "y":1}, {"label":"R", "x":6.75, "y":1}, {"label":"T", "x":7.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"|", "x":15.75, "y":1, "w":1.5}, {"label":"Delete", "x":17.25, "y":1}, {"label":"F5", "x":0, "y":2}, {"label":"F6", "x":1, "y":2}, {"label":"Caps", "x":2.25, "y":2, "w":1.25}, {"label":"A", "x":4, "y":2}, {"label":"S", "x":5, "y":2}, {"label":"D", "x":6, "y":2}, {"label":"F", "x":7, "y":2}, {"label":"G", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"PgUp", "x":17.25, "y":2}, {"label":"F7", "x":0, "y":3}, {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.25, "y":3, "w":2.25}, {"label":"Z", "x":4.5, "y":3}, {"label":"X", "x":5.5, "y":3}, {"label":"C", "x":6.5, "y":3}, {"label":"V", "x":7.5, "y":3}, {"label":"B", "x":8.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"PgDn", "x":17.25, "y":3}, {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Ctrl", "x":2.25, "y":4, "w":1.5}, {"label":"Alt", "x":4.75, "y":4, "w":1.5}, {"x":6.25, "y":4, "w":7}, {"label":"Alt", "x":13.25, "y":4, "w":1.5}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}]
+ "LAYOUT_wkl": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [0, 8], "x": 8.25, "y": 0},
+ {"matrix": [0, 9], "x": 9.25, "y": 0},
+ {"matrix": [0, 10], "x": 10.25, "y": 0},
+ {"matrix": [0, 11], "x": 11.25, "y": 0},
+ {"matrix": [0, 12], "x": 12.25, "y": 0},
+ {"matrix": [0, 13], "x": 13.25, "y": 0},
+ {"matrix": [0, 14], "x": 14.25, "y": 0},
+ {"matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
+ {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+
+ {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [1, 8], "x": 8.75, "y": 1},
+ {"matrix": [1, 9], "x": 9.75, "y": 1},
+ {"matrix": [1, 10], "x": 10.75, "y": 1},
+ {"matrix": [1, 11], "x": 11.75, "y": 1},
+ {"matrix": [1, 12], "x": 12.75, "y": 1},
+ {"matrix": [1, 13], "x": 13.75, "y": 1},
+ {"matrix": [1, 14], "x": 14.75, "y": 1},
+ {"matrix": [1, 16], "x": 15.75, "y": 1, "w": 1.5},
+ {"matrix": [1, 17], "x": 17.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+
+ {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.25},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 9], "x": 10, "y": 2},
+ {"matrix": [2, 10], "x": 11, "y": 2},
+ {"matrix": [2, 11], "x": 12, "y": 2},
+ {"matrix": [2, 12], "x": 13, "y": 2},
+ {"matrix": [2, 13], "x": 14, "y": 2},
+ {"matrix": [2, 16], "x": 15, "y": 2, "w": 2.25},
+ {"matrix": [2, 17], "x": 17.25, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+
+ {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.5, "y": 3},
+ {"matrix": [3, 7], "x": 7.5, "y": 3},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [3, 9], "x": 9.5, "y": 3},
+ {"matrix": [3, 10], "x": 10.5, "y": 3},
+ {"matrix": [3, 11], "x": 11.5, "y": 3},
+ {"matrix": [3, 12], "x": 12.5, "y": 3},
+ {"matrix": [3, 13], "x": 13.5, "y": 3},
+ {"matrix": [3, 15], "x": 14.5, "y": 3, "w": 1.75},
+ {"matrix": [3, 16], "x": 16.25, "y": 3},
+ {"matrix": [3, 17], "x": 17.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+ {"matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+ {"matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 15], "x": 15.25, "y": 4},
+ {"matrix": [4, 16], "x": 16.25, "y": 4},
+ {"matrix": [4, 17], "x": 17.25, "y": 4}
+ ]
}
}
}
diff --git a/keyboards/lyso1/lefishe/lefishe.h b/keyboards/lyso1/lefishe/lefishe.h
deleted file mode 100644
index 98197b21c4..0000000000
--- a/keyboards/lyso1/lefishe/lefishe.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Copyright 2020 Lyso1
- *
- * 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_default( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K017, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K116, K117, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K216, K217, \
- K300, K301, K302, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K315, K316, K317, \
- K400, K401, K402, K403, K404, K408, K413, K415, K416, K417 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, KC_NO, K017 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, KC_NO, K116, K117 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, KC_NO, KC_NO, K216, K217 }, \
- { K300, K301, K302, KC_NO, 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, KC_NO, K413, KC_NO, K415, K416, K417 } \
-}
-
-#define LAYOUT_wk_sbs( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K116, K117, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K216, K217, \
- K300, K301, K302, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K315, K316, K317, \
- K400, K401, K402, K403, K404, K408, K413, K415, K416, K417 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, KC_NO, K116, K117 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, KC_NO, KC_NO, K216, K217 }, \
- { K300, K301, K302, KC_NO, 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, KC_NO, K413, KC_NO, K415, K416, K417 } \
-}
-
-#define LAYOUT_wkl_sbs( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K116, K117, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K216, K217, \
- K300, K301, K302, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K315, K316, K317, \
- K400, K401, K402, K404, K408, K413, K415, K416, K417 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, KC_NO, K116, K117 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, KC_NO, KC_NO, K216, K217 }, \
- { K300, K301, K302, KC_NO, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, KC_NO, K315, K316, K317 }, \
- { K400, K401, K402, KC_NO, K404, KC_NO, KC_NO, KC_NO, K408, KC_NO, KC_NO, KC_NO, KC_NO, K413, KC_NO, K415, K416, K417 } \
-}
-
-#define LAYOUT_wkl( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K017, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K116, K117, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K216, K217, \
- K300, K301, K302, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K315, K316, K317, \
- K400, K401, K402, K404, K408, K413, K415, K416, K417 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, KC_NO, K017 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, KC_NO, K116, K117 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, KC_NO, KC_NO, K216, K217 }, \
- { K300, K301, K302, KC_NO, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, KC_NO, K315, K316, K317 }, \
- { K400, K401, K402, KC_NO, K404, KC_NO, KC_NO, KC_NO, K408, KC_NO, KC_NO, KC_NO, KC_NO, K413, KC_NO, K415, K416, K417 } \
-}
diff --git a/keyboards/mb44/info.json b/keyboards/mb44/info.json
index e12e2dfc94..95acbc9ba2 100644
--- a/keyboards/mb44/info.json
+++ b/keyboards/mb44/info.json
@@ -23,195 +23,211 @@
"layouts": {
"LAYOUT_default": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6, "y":0},
- {"x":7, "y":0},
- {"x":8, "y":0},
- {"x":9, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0, "w":1.75},
- {"x":0, "y":1, "w":1.25},
- {"x":1.25, "y":1},
- {"x":2.25, "y":1},
- {"x":3.25, "y":1},
- {"x":4.25, "y":1},
- {"x":5.25, "y":1},
- {"x":6.25, "y":1},
- {"x":7.25, "y":1},
- {"x":8.25, "y":1},
- {"x":9.25, "y":1},
- {"x":10.25, "y":1},
- {"x":11.25, "y":1, "w":1.5},
- {"x":0, "y":2, "w":1.75},
- {"x":1.75, "y":2},
- {"x":2.75, "y":2},
- {"x":3.75, "y":2},
- {"x":4.75, "y":2},
- {"x":5.75, "y":2},
- {"x":6.75, "y":2},
- {"x":7.75, "y":2},
- {"x":8.75, "y":2},
- {"x":9.75, "y":2},
- {"x":10.75, "y":2},
- {"x":11.75, "y":2},
- {"x":0, "y":3},
- {"x":1, "y":3},
- {"x":2, "y":3},
- {"x":3, "y":3, "w":6.25},
- {"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, "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, 5], "x": 3, "y": 3, "w": 6.25},
+
+ {"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_2u_space": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6, "y":0},
- {"x":7, "y":0},
- {"x":8, "y":0},
- {"x":9, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0, "w":1.75},
- {"x":0, "y":1, "w":1.25},
- {"x":1.25, "y":1},
- {"x":2.25, "y":1},
- {"x":3.25, "y":1},
- {"x":4.25, "y":1},
- {"x":5.25, "y":1},
- {"x":6.25, "y":1},
- {"x":7.25, "y":1},
- {"x":8.25, "y":1},
- {"x":9.25, "y":1},
- {"x":10.25, "y":1},
- {"x":11.25, "y":1, "w":1.5},
- {"x":0, "y":2, "w":1.75},
- {"x":1.75, "y":2},
- {"x":2.75, "y":2},
- {"x":3.75, "y":2},
- {"x":4.75, "y":2},
- {"x":5.75, "y":2},
- {"x":6.75, "y":2},
- {"x":7.75, "y":2},
- {"x":8.75, "y":2},
- {"x":9.75, "y":2},
- {"x":10.75, "y":2},
- {"x":11.75, "y":2},
- {"x":0, "y":3},
- {"x":1, "y":3, "w":1.25},
- {"x":2.25, "y":3},
- {"x":3.25, "y":3, "w":2.25},
- {"x":5.5, "y":3},
- {"x":6.5, "y":3, "w":2.75},
- {"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, "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, "w": 1.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.5, "y": 3, "w": 2.75},
+
+ {"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_2u1u_space": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6, "y":0},
- {"x":7, "y":0},
- {"x":8, "y":0},
- {"x":9, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0, "w":1.75},
- {"x":0, "y":1, "w":1.25},
- {"x":1.25, "y":1},
- {"x":2.25, "y":1},
- {"x":3.25, "y":1},
- {"x":4.25, "y":1},
- {"x":5.25, "y":1},
- {"x":6.25, "y":1},
- {"x":7.25, "y":1},
- {"x":8.25, "y":1},
- {"x":9.25, "y":1},
- {"x":10.25, "y":1},
- {"x":11.25, "y":1, "w":1.5},
- {"x":0, "y":2, "w":1.75},
- {"x":1.75, "y":2},
- {"x":2.75, "y":2},
- {"x":3.75, "y":2},
- {"x":4.75, "y":2},
- {"x":5.75, "y":2},
- {"x":6.75, "y":2},
- {"x":7.75, "y":2},
- {"x":8.75, "y":2},
- {"x":9.75, "y":2},
- {"x":10.75, "y":2},
- {"x":11.75, "y":2},
- {"x":0, "y":3},
- {"x":1, "y":3, "w":1.25},
- {"x":2.25, "y":3},
- {"x":3.25, "y":3, "w":2.75},
- {"x":6, "y":3, "w":2.25},
- {"x":8.25, "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, "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, "w": 1.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3, "w": 2.75},
+ {"matrix": [3, 5], "x": 6, "y": 3, "w": 2.25},
+ {"matrix": [3, 6], "x": 8.25, "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}
]
},
"LAYOUT_3u_space": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6, "y":0},
- {"x":7, "y":0},
- {"x":8, "y":0},
- {"x":9, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0, "w":1.75},
- {"x":0, "y":1, "w":1.25},
- {"x":1.25, "y":1},
- {"x":2.25, "y":1},
- {"x":3.25, "y":1},
- {"x":4.25, "y":1},
- {"x":5.25, "y":1},
- {"x":6.25, "y":1},
- {"x":7.25, "y":1},
- {"x":8.25, "y":1},
- {"x":9.25, "y":1},
- {"x":10.25, "y":1},
- {"x":11.25, "y":1, "w":1.5},
- {"x":0, "y":2, "w":1.75},
- {"x":1.75, "y":2},
- {"x":2.75, "y":2},
- {"x":3.75, "y":2},
- {"x":4.75, "y":2},
- {"x":5.75, "y":2},
- {"x":6.75, "y":2},
- {"x":7.75, "y":2},
- {"x":8.75, "y":2},
- {"x":9.75, "y":2},
- {"x":10.75, "y":2},
- {"x":11.75, "y":2},
- {"x":0, "y":3},
- {"x":1, "y":3, "w":1.25},
- {"x":2.25, "y":3},
- {"x":3.25, "y":3, "w":3},
- {"x":6.25, "y":3, "w":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, "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, "w": 1.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3, "w": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3, "w": 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}
]
}
}
diff --git a/keyboards/mb44/mb44.h b/keyboards/mb44/mb44.h
deleted file mode 100644
index e3c490e87c..0000000000
--- a/keyboards/mb44/mb44.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Copyright 2021 melonbred
- *
- * 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_default( \
- 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, K35, 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, XXX, XXX, K35, XXX, XXX, XXX, K39, K3A, K3B } \
-}
-
-#define LAYOUT_2u_space( \
- 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, K35, K36, 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, XXX, K35, K36, XXX, XXX, K39, K3A, K3B } \
-}
-
-#define LAYOUT_2u1u_space( \
- 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, K35, K36, 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, XXX, K35, K36, XXX, XXX, K39, K3A, K3B } \
-}
-
-#define LAYOUT_3u_space( \
- 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, K36, 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, XXX, XXX, K36, XXX, XXX, K39, K3A, K3B } \
-}
diff --git a/keyboards/mechkeys/espectro/espectro.h b/keyboards/mechkeys/espectro/espectro.h
deleted file mode 100755
index 98c930f8f5..0000000000
--- a/keyboards/mechkeys/espectro/espectro.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/* Copyright 2018 @TurboMech /u/TurboMech <discord> @A9entOran9e#6134
- *
- * 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"
-
-
-/*
- * Placement of every possible switch defined below.
- * x2 means the diode allows two possible positions for the switch
- *
- * Layout:
- * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
- * │K00 │K01 │K02 │K03 │K04 │K60 │K61 │K62 │K63 │K05 │K06 │K07 │K08 │K72 │K09 │K0A │K0B │K0C │K7C │
- * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
- * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
- * │K10 │K11 │K12 │K13 │K14 │K64 │K65 │K66 │K67 │K15 │K16 │K17 │K18 │K70 │K71 │K19 │K1A │K1B │K1C │
- * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │x2 │ │ │ │ │
- * ├─────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴─────┼─────┼─────┼─────┼─────┤ ┌────────┐
- * │K20 │K21 │K22 │K23 │K24 │K68 │K69 │K6A │K6B │K25 │K26 │K27 │K28 │K73 │K29 │K2A │K2B │K2C │ │K38 │
- * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
- * ├────────┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴────────┼─────┼─────┼─────┼─────┤ ┌───┴─┐ │
- * │K30 │K31 │K32 │K33 │K34 │K6C │K75 │K76 │K77 │K35 │K36 │K37 │K38 │K39 │K3A │K3B │K3C │ │K73 │ │
- * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
- * ├───────┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──────┬─────┼─────┼─────┼─────┼─────┤ └─────┴──────┘
- * │K40x2 │K41 │K42 │K43 │K44 │K78 │K79 │K7A │K7B │K45 │K46 │K47 │K48 │K74 │K49 │K4A │K4B │K4C │
- * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
- * ├───────┼─────┴─┬───┴───┬─┴─────┴─────┴─────┴─────┴─────┴───┬─┴───┬─┴───┬─┴───┬─────┼─────┼─────┼─────┼─────┼─────┤
- * │K50 │K51 │K52 │K59 │K55 │K56 │K57 │K58 │K53 │K54 │K5A │K5B │K5C │
- * │x2 │x2 │ │x3 │x3 │x2 │x2 │x2 │x2 │ │x2 │ │ │
- * └───────┴───────┴───────┴───────────────────────────────────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
- *
- * Variants:
- * - 2u Backspace: Delete K70 Use K71
- * - 2u Num +: Delete K3C Use K2C
- * - 2u Num Enter: Delete K5C Use K4C
- * - ANSI Left Shift: Delete K41 Use K40
- *
- * ANSI Backslash and ISO Hash are the same position
- * ANSI Enter and ISO Enter are the same position
- * For two 1.5u modifiers on the right of the Spacebar, delete K56 and use K55 and K57
- *
- * Matrix:
- * { 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, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C }, \
- * { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C }, \
- * { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C }, \
- * { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C }, \
- * { K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C } \
- */
-
-
-/* LAYOUT_all (Identical to LAYOUT_split_shift_and_bs)
- * Every matrix position
- * ,---------------------------------------------------------------------------.
- * | 00| 01| 02| 03| 04| 60| 61| 62| 63| 05| 06| 07| 08| 72| 09| 0A| 0B| 0C| 7C|
- * |---------------------------------------------------------------------------|
- * | 10| 11| 12| 13| 14| 64| 65| 66| 67| 15| 16| 17| 18| 70| 71| 19| 1A| 1B| 1C|
- * |---------------------------------------------------------------------------|
- * | 20 | 21| 22| 23| 24| 68| 69| 6A| 6B| 25| 26| 27| 28| 73| 29| 2A| 2B| 2C|
- * |---------------------------------------------------------------------------|
- * | 30 | 31| 32| 33| 34| 6C| 75| 76| 77| 35| 36| 37| 38| 39| 3A| 3B| 3C|
- * |---------------------------------------------------------------------------|
- * | 40 | 41| 42| 43| 44| 78| 79| 7A| 7B| 45| 46| 47| 48| 74| 49| 4A| 4B| 4C|
- * |---------------------------------------------------------------------------|
- * | 50 | 51 | 52 | 59 | 55| 56| 57| 58| 53| 54| 5A| 5B| 5C|
- * `---------------------------------------------------------------------------'
-*/
-
-
-//Arrow keys and 1.75u right shift
-#define LAYOUT_default( \
- K00, K01, K02, K03, K04, K60, K61, K62, K63, K05, K06, K07, K08, K72, K09, K0A, K0B, K0C, K7C, \
- K10, K11, K12, K13, K14, K64, K65, K66, K67, K15, K16, K17, K18, K71, K19, K1A, K1B, K1C, \
- K20, K21, K22, K23, K24, K68, K69, K6A, K6B, K25, K26, K27, K28, K73, K29, K2A, K2B, K2C, \
- K30, K31, K32, K33, K34, K6C, K75, K76, K77, K35, K36, K37, K38, K39, K3A, K3B, \
- K40, K42, K43, K44, K78, K79, K7A, K7B, K45, K46, K47, K48, K74, K49, K4A, K4B, K4C, \
- K50, K51, K52, K59, K55, K56, K57, K58, K53, K54, K5A, K5B \
-) { \
- { 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, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO }, \
- { K40, KC_NO, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C }, \
- { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, KC_NO }, \
- { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C }, \
- { KC_NO, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C } \
-}
-
-// Split backspace 1.5u right mods
-#define LAYOUT_split_bs_joined_right( \
- K00, K01, K02, K03, K04, K60, K61, K62, K63, K05, K06, K07, K08, K72, K09, K0A, K0B, K0C, K7C, \
- K10, K11, K12, K13, K14, K64, K65, K66, K67, K15, K16, K17, K18, K70, K71, K19, K1A, K1B, K1C, \
- K20, K21, K22, K23, K24, K68, K69, K6A, K6B, K25, K26, K27, K28, K73, K29, K2A, K2B, K2C, \
- K30, K31, K32, K33, K34, K6C, K75, K76, K77, K35, K36, K37, K38, K39, K3A, K3B, \
- K40, K42, K43, K44, K78, K79, K7A, K7B, K45, K46, K47, K48, K74, K49, K4A, K4B, K4C, \
- K50, K51, K52, K59, K55, K57, K58, K53, K54, K5A, K5B \
-) { \
- { 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, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO }, \
- { K40, KC_NO, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C }, \
- { K50, K51, K52, K53, K54, K55, KC_NO, K57, K58, K59, K5A, K5B, KC_NO }, \
- { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C }, \
- { K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C }, \
-}
-
-// Split numpad (enter, 0), split shifts (right, left), split backspace
-// This layout contains every possible keycode placement
-#define LAYOUT_split_shift_and_bs( \
- K00, K01, K02, K03, K04, K60, K61, K62, K63, K05, K06, K07, K08, K72, K09, K0A, K0B, K0C, K7C, \
- K10, K11, K12, K13, K14, K64, K65, K66, K67, K15, K16, K17, K18, K70, K71, K19, K1A, K1B, K1C, \
- K20, K21, K22, K23, K24, K68, K69, K6A, K6B, K25, K26, K27, K28, K73, K29, K2A, K2B, K2C, \
- K30, K31, K32, K33, K34, K6C, K75, K76, K77, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
- K40, K41, K42, K43, K44, K78, K79, K7A, K7B, K45, K46, K47, K48, K74, K49, K4A, K4B, K4C, \
- K50, K51, K52, K59, K55, K56, K57, K58, K53, K54, K5A, K5B, K5C \
-) { \
- { 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, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C }, \
- { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C }, \
- { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C }, \
- { K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C }, \
-}
-
-// ISO Layout
-#define LAYOUT_iso( \
- K00, K01, K02, K03, K04, K60, K61, K62, K63, K05, K06, K07, K08, K72, K09, K0A, K0B, K0C, K7C, \
- K10, K11, K12, K13, K14, K64, K65, K66, K67, K15, K16, K17, K18, K71, K19, K1A, K1B, K1C, \
- K20, K21, K22, K23, K24, K68, K69, K6A, K6B, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
- K30, K31, K32, K33, K34, K6C, K75, K76, K77, K35, K36, K37, K73, K38, K39, K3A, K3B, \
- K40, K41, K42, K43, K44, K78, K79, K7A, K7B, K45, K46, K47, K48, K74, K49, K4A, K4B, K4C, \
- K50, K51, K52, K59, K55, K56, K57, K58, K53, K54, K5A, K5B \
-) { \
- { 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, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C }, \
- { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, KC_NO }, \
- { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C }, \
- { KC_NO, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C } \
-}
diff --git a/keyboards/mechkeys/espectro/info.json b/keyboards/mechkeys/espectro/info.json
index 8fec453c53..40d6710829 100644
--- a/keyboards/mechkeys/espectro/info.json
+++ b/keyboards/mechkeys/espectro/info.json
@@ -31,446 +31,443 @@
"layouts": {
"LAYOUT_default": {
"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":"HOME", "x":14, "y":0},
- {"label":"END", "x":15, "y":0},
- {"label":"PAGE UP", "x":16, "y":0},
- {"label":"PAGE DOWN", "x":17, "y":0},
- {"label":"DELETE", "x":18, "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": [6, 0], "x": 5, "y": 0},
+ {"matrix": [6, 1], "x": 6, "y": 0},
+ {"matrix": [6, 2], "x": 7, "y": 0},
+ {"matrix": [6, 3], "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": [7, 2], "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": [0, 12], "x": 17, "y": 0},
+ {"matrix": [7, 12], "x": 18, "y": 0},
- {"label":"GRAVE", "x":0, "y":1},
- {"label":"1", "x":1, "y":1},
- {"label":"2", "x":2, "y":1},
- {"label":"3", "x":3, "y":1},
- {"label":"4", "x":4, "y":1},
- {"label":"5", "x":5, "y":1},
- {"label":"6", "x":6, "y":1},
- {"label":"7", "x":7, "y":1},
- {"label":"8", "x":8, "y":1},
- {"label":"9", "x":9, "y":1},
- {"label":"0", "x":10, "y":1},
- {"label":"MINUS", "x":11, "y":1},
- {"label":"EQUAL", "x":12, "y":1},
- {"label":"BACKSPACE", "x":13, "y":1, "w":2},
- {"label":"NUM LOCK", "x":15, "y":1},
- {"label":"KEYPAD /", "x":16, "y":1},
- {"label":"KEYPAD *", "x":17, "y":1},
- {"label":"KEYPAD -", "x":18, "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": [6, 4], "x": 5, "y": 1},
+ {"matrix": [6, 5], "x": 6, "y": 1},
+ {"matrix": [6, 6], "x": 7, "y": 1},
+ {"matrix": [6, 7], "x": 8, "y": 1},
+ {"matrix": [1, 5], "x": 9, "y": 1},
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [7, 1], "x": 13, "y": 1, "w": 2},
+ {"matrix": [1, 9], "x": 15, "y": 1},
+ {"matrix": [1, 10], "x": 16, "y": 1},
+ {"matrix": [1, 11], "x": 17, "y": 1},
+ {"matrix": [1, 12], "x": 18, "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":"LBRACKET", "x":11.5, "y":2},
- {"label":"RBRACKET", "x":12.5, "y":2},
- {"label":"BACKSLASH", "x":13.5, "y":2, "w":1.5},
- {"label":"KEYPAD 7", "x":15, "y":2},
- {"label":"KEYPAD 8", "x":16, "y":2},
- {"label":"KEYPAD 9", "x":17, "y":2},
- {"label":"KEYPAD +", "x":18, "y":2, "h":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": [6, 8], "x": 5.5, "y": 2},
+ {"matrix": [6, 9], "x": 6.5, "y": 2},
+ {"matrix": [6, 10], "x": 7.5, "y": 2},
+ {"matrix": [6, 11], "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": [7, 3], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [2, 9], "x": 15, "y": 2},
+ {"matrix": [2, 10], "x": 16, "y": 2},
+ {"matrix": [2, 11], "x": 17, "y": 2},
+ {"matrix": [2, 12], "x": 18, "y": 2, "h": 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":"SEMICOLON", "x":10.75, "y":3},
- {"label":"QUOTE", "x":11.75, "y":3},
- {"label":"ENTER", "x":12.75, "y":3, "w":2.25},
- {"label":"KEYPAD 4", "x":15, "y":3},
- {"label":"KEYPAD 5", "x":16, "y":3},
- {"label":"KEYPAD 6", "x":17, "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": [6, 12], "x": 5.75, "y": 3},
+ {"matrix": [7, 5], "x": 6.75, "y": 3},
+ {"matrix": [7, 6], "x": 7.75, "y": 3},
+ {"matrix": [7, 7], "x": 8.75, "y": 3},
+ {"matrix": [3, 5], "x": 9.75, "y": 3},
+ {"matrix": [3, 6], "x": 10.75, "y": 3},
+ {"matrix": [3, 7], "x": 11.75, "y": 3},
+ {"matrix": [3, 8], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 9], "x": 15, "y": 3},
+ {"matrix": [3, 10], "x": 16, "y": 3},
+ {"matrix": [3, 11], "x": 17, "y": 3},
- {"label":"LSHIFT", "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":"COMMA", "x":9.25, "y":4},
- {"label":"PERIOD", "x":10.25, "y":4},
- {"label":"SLASH", "x":11.25, "y":4},
- {"label":"RSHIFT", "x":12.25, "y":4, "w":1.75},
- {"label":"UP", "x":14, "y":4},
- {"label":"KEYPAD 1", "x":15, "y":4},
- {"label":"KEYPAD 2", "x":16, "y":4},
- {"label":"KEYPAD 3", "x":17, "y":4},
- {"label":"KEYPAD ENTER", "x":18, "y":4, "h":2},
+ {"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": [7, 8], "x": 5.25, "y": 4},
+ {"matrix": [7, 9], "x": 6.25, "y": 4},
+ {"matrix": [7, 10], "x": 7.25, "y": 4},
+ {"matrix": [7, 11], "x": 8.25, "y": 4},
+ {"matrix": [4, 5], "x": 9.25, "y": 4},
+ {"matrix": [4, 6], "x": 10.25, "y": 4},
+ {"matrix": [4, 7], "x": 11.25, "y": 4},
+ {"matrix": [4, 8], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [7, 4], "x": 14, "y": 4},
+ {"matrix": [4, 9], "x": 15, "y": 4},
+ {"matrix": [4, 10], "x": 16, "y": 4},
+ {"matrix": [4, 11], "x": 17, "y": 4},
+ {"matrix": [4, 12], "x": 18, "y": 4, "h": 2},
- {"label":"LCTRL", "x":0, "y":5, "w":1.25},
- {"label":"LGUI", "x":1.25, "y":5, "w":1.25},
- {"label":"LALT", "x":2.5, "y":5, "w":1.25},
- {"label":"SPACE", "x":3.75, "y":5, "w":6.25},
- {"label":"RALT", "x":10, "y":5},
- {"label":"RCTRL", "x":11, "y":5},
- {"label":"FN", "x":12, "y":5},
- {"label":"LEFT", "x":13, "y":5},
- {"label":"DOWN", "x":14, "y":5},
- {"label":"RIGHT", "x":15, "y":5},
- {"label":"KEYPAD 0", "x":16, "y":5},
- {"label":"KEYPAD .", "x":17, "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, 9], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 5], "x": 10, "y": 5},
+ {"matrix": [5, 6], "x": 11, "y": 5},
+ {"matrix": [5, 7], "x": 12, "y": 5},
+ {"matrix": [5, 8], "x": 13, "y": 5},
+ {"matrix": [5, 3], "x": 14, "y": 5},
+ {"matrix": [5, 4], "x": 15, "y": 5},
+ {"matrix": [5, 10], "x": 16, "y": 5},
+ {"matrix": [5, 11], "x": 17, "y": 5}
]
},
-
"LAYOUT_split_bs_joined_right": {
"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": "K60", "x": 5, "y": 0},
- {"label": "K61", "x": 6, "y": 0},
- {"label": "K62", "x": 7, "y": 0},
- {"label": "K63", "x": 8, "y": 0},
- {"label": "K05", "x": 9, "y": 0},
- {"label": "K06", "x": 10, "y": 0},
- {"label": "K07", "x": 11, "y": 0},
- {"label": "K08", "x": 12, "y": 0},
- {"label": "K72", "x": 13, "y": 0},
- {"label": "K09", "x": 14, "y": 0},
- {"label": "K0A", "x": 15, "y": 0},
- {"label": "K0B", "x": 16, "y": 0},
- {"label": "K0C", "x": 17, "y": 0},
- {"label": "K7C", "x": 18, "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": [6, 0], "x": 5, "y": 0},
+ {"matrix": [6, 1], "x": 6, "y": 0},
+ {"matrix": [6, 2], "x": 7, "y": 0},
+ {"matrix": [6, 3], "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": [7, 2], "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": [0, 12], "x": 17, "y": 0},
+ {"matrix": [7, 12], "x": 18, "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": "K64", "x": 5, "y": 1},
- {"label": "K65", "x": 6, "y": 1},
- {"label": "K66", "x": 7, "y": 1},
- {"label": "K67", "x": 8, "y": 1},
- {"label": "K15", "x": 9, "y": 1},
- {"label": "K16", "x": 10, "y": 1},
- {"label": "K17", "x": 11, "y": 1},
- {"label": "K18", "x": 12, "y": 1},
- {"label": "K70", "x": 13, "y": 1},
- {"label": "K71", "x": 14, "y": 1},
- {"label": "K19", "x": 15, "y": 1},
- {"label": "K1A", "x": 16, "y": 1},
- {"label": "K1B", "x": 17, "y": 1},
- {"label": "K1C", "x": 18, "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": [6, 4], "x": 5, "y": 1},
+ {"matrix": [6, 5], "x": 6, "y": 1},
+ {"matrix": [6, 6], "x": 7, "y": 1},
+ {"matrix": [6, 7], "x": 8, "y": 1},
+ {"matrix": [1, 5], "x": 9, "y": 1},
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [7, 0], "x": 13, "y": 1},
+ {"matrix": [7, 1], "x": 14, "y": 1},
+ {"matrix": [1, 9], "x": 15, "y": 1},
+ {"matrix": [1, 10], "x": 16, "y": 1},
+ {"matrix": [1, 11], "x": 17, "y": 1},
+ {"matrix": [1, 12], "x": 18, "y": 1},
- {"label": "K20", "x": 0, "y": 2, "w": 1.5},
- {"label": "K21", "x": 1.5, "y": 2},
- {"label": "K22", "x": 2.5, "y": 2},
- {"label": "K23", "x": 3.5, "y": 2},
- {"label": "K24", "x": 4.5, "y": 2},
- {"label": "K68", "x": 5.5, "y": 2},
- {"label": "K69", "x": 6.5, "y": 2},
- {"label": "K6A", "x": 7.5, "y": 2},
- {"label": "K6B", "x": 8.5, "y": 2},
- {"label": "K25", "x": 9.5, "y": 2},
- {"label": "K26", "x": 10.5, "y": 2},
- {"label": "K27", "x": 11.5, "y": 2},
- {"label": "K28", "x": 12.5, "y": 2},
- {"label": "K73", "x": 13.5, "y": 2, "w": 1.5},
- {"label": "K29", "x": 15, "y": 2},
- {"label": "K2A", "x": 16, "y": 2},
- {"label": "K2B", "x": 17, "y": 2},
- {"label": "K2C", "x": 18, "y": 2, "h": 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": [6, 8], "x": 5.5, "y": 2},
+ {"matrix": [6, 9], "x": 6.5, "y": 2},
+ {"matrix": [6, 10], "x": 7.5, "y": 2},
+ {"matrix": [6, 11], "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": [7, 3], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [2, 9], "x": 15, "y": 2},
+ {"matrix": [2, 10], "x": 16, "y": 2},
+ {"matrix": [2, 11], "x": 17, "y": 2},
+ {"matrix": [2, 12], "x": 18, "y": 2, "h": 2},
- {"label": "K30", "x": 0, "y": 3, "w": 1.75},
- {"label": "K31", "x": 1.75, "y": 3},
- {"label": "K32", "x": 2.75, "y": 3},
- {"label": "K33", "x": 3.75, "y": 3},
- {"label": "K34", "x": 4.75, "y": 3},
- {"label": "K6C", "x": 5.75, "y": 3},
- {"label": "K75", "x": 6.75, "y": 3},
- {"label": "K76", "x": 7.75, "y": 3},
- {"label": "K77", "x": 8.75, "y": 3},
- {"label": "K35", "x": 9.75, "y": 3},
- {"label": "K36", "x": 10.75, "y": 3},
- {"label": "K37", "x": 11.75, "y": 3},
- {"label": "K38", "x": 12.75, "y": 3, "w": 2.25},
- {"label": "K39", "x": 15, "y": 3},
- {"label": "K3A", "x": 16, "y": 3},
- {"label": "K3B", "x": 17, "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": [6, 12], "x": 5.75, "y": 3},
+ {"matrix": [7, 5], "x": 6.75, "y": 3},
+ {"matrix": [7, 6], "x": 7.75, "y": 3},
+ {"matrix": [7, 7], "x": 8.75, "y": 3},
+ {"matrix": [3, 5], "x": 9.75, "y": 3},
+ {"matrix": [3, 6], "x": 10.75, "y": 3},
+ {"matrix": [3, 7], "x": 11.75, "y": 3},
+ {"matrix": [3, 8], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 9], "x": 15, "y": 3},
+ {"matrix": [3, 10], "x": 16, "y": 3},
+ {"matrix": [3, 11], "x": 17, "y": 3},
- {"label": "K40", "x": 0, "y": 4, "w": 2.25},
- {"label": "K42", "x": 2.25, "y": 4},
- {"label": "K43", "x": 3.25, "y": 4},
- {"label": "K44", "x": 4.25, "y": 4},
- {"label": "K78", "x": 5.25, "y": 4},
- {"label": "K79", "x": 6.25, "y": 4},
- {"label": "K7A", "x": 7.25, "y": 4},
- {"label": "K7B", "x": 8.25, "y": 4},
- {"label": "K45", "x": 9.25, "y": 4},
- {"label": "K46", "x": 10.25, "y": 4},
- {"label": "K47", "x": 11.25, "y": 4},
- {"label": "K48", "x": 12.25, "y": 4, "w": 1.75},
- {"label": "K74", "x": 14, "y": 4},
- {"label": "K49", "x": 15, "y": 4},
- {"label": "K4A", "x": 16, "y": 4},
- {"label": "K4B", "x": 17, "y": 4},
- {"label": "K4C", "x": 18, "y": 4, "h": 2},
+ {"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": [7, 8], "x": 5.25, "y": 4},
+ {"matrix": [7, 9], "x": 6.25, "y": 4},
+ {"matrix": [7, 10], "x": 7.25, "y": 4},
+ {"matrix": [7, 11], "x": 8.25, "y": 4},
+ {"matrix": [4, 5], "x": 9.25, "y": 4},
+ {"matrix": [4, 6], "x": 10.25, "y": 4},
+ {"matrix": [4, 7], "x": 11.25, "y": 4},
+ {"matrix": [4, 8], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [7, 4], "x": 14, "y": 4},
+ {"matrix": [4, 9], "x": 15, "y": 4},
+ {"matrix": [4, 10], "x": 16, "y": 4},
+ {"matrix": [4, 11], "x": 17, "y": 4},
+ {"matrix": [4, 12], "x": 18, "y": 4, "h": 2},
- {"label": "K50", "x": 0, "y": 5, "w": 1.25},
- {"label": "K51", "x": 1.25, "y": 5, "w": 1.25},
- {"label": "K52", "x": 2.5, "y": 5, "w": 1.25},
- {"label": "K59", "x": 3.75, "y": 5, "w": 6.25},
- {"label": "K55", "x": 10, "y": 5, "w": 1.5},
- {"label": "K57", "x": 11.5, "y": 5, "w": 1.5},
- {"label": "K58", "x": 13, "y": 5},
- {"label": "K53", "x": 14, "y": 5},
- {"label": "K54", "x": 15, "y": 5},
- {"label": "K5A", "x": 16, "y": 5},
- {"label": "K5B", "x": 17, "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, 9], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 5], "x": 10, "y": 5, "w": 1.5},
+ {"matrix": [5, 7], "x": 11.5, "y": 5, "w": 1.5},
+ {"matrix": [5, 8], "x": 13, "y": 5},
+ {"matrix": [5, 3], "x": 14, "y": 5},
+ {"matrix": [5, 4], "x": 15, "y": 5},
+ {"matrix": [5, 10], "x": 16, "y": 5},
+ {"matrix": [5, 11], "x": 17, "y": 5}
]
},
-
"LAYOUT_split_shift_and_bs": {
"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":"HOME", "x":14, "y":0},
- {"label":"END", "x":15, "y":0},
- {"label":"PAGE UP", "x":16, "y":0},
- {"label":"PAGE DOWN", "x":17, "y":0},
- {"label":"DELETE", "x":18, "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": [6, 0], "x": 5, "y": 0},
+ {"matrix": [6, 1], "x": 6, "y": 0},
+ {"matrix": [6, 2], "x": 7, "y": 0},
+ {"matrix": [6, 3], "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": [7, 2], "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": [0, 12], "x": 17, "y": 0},
+ {"matrix": [7, 12], "x": 18, "y": 0},
- {"label":"GRAVE", "x":0, "y":1},
- {"label":"1", "x":1, "y":1},
- {"label":"2", "x":2, "y":1},
- {"label":"3", "x":3, "y":1},
- {"label":"4", "x":4, "y":1},
- {"label":"5", "x":5, "y":1},
- {"label":"6", "x":6, "y":1},
- {"label":"7", "x":7, "y":1},
- {"label":"8", "x":8, "y":1},
- {"label":"9", "x":9, "y":1},
- {"label":"0", "x":10, "y":1},
- {"label":"MINUS", "x":11, "y":1},
- {"label":"EQUAL", "x":12, "y":1},
- {"label":"BACKSPACE", "x":13, "y":1},
- {"label":"BACKSPACE", "x":14, "y":1},
- {"label":"NUM LOCK", "x":15, "y":1},
- {"label":"KEYPAD /", "x":16, "y":1},
- {"label":"KEYPAD *", "x":17, "y":1},
- {"label":"KEYPAD -", "x":18, "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": [6, 4], "x": 5, "y": 1},
+ {"matrix": [6, 5], "x": 6, "y": 1},
+ {"matrix": [6, 6], "x": 7, "y": 1},
+ {"matrix": [6, 7], "x": 8, "y": 1},
+ {"matrix": [1, 5], "x": 9, "y": 1},
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [7, 0], "x": 13, "y": 1},
+ {"matrix": [7, 1], "x": 14, "y": 1},
+ {"matrix": [1, 9], "x": 15, "y": 1},
+ {"matrix": [1, 10], "x": 16, "y": 1},
+ {"matrix": [1, 11], "x": 17, "y": 1},
+ {"matrix": [1, 12], "x": 18, "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":"LBRACKET", "x":11.5, "y":2},
- {"label":"RBRACKET", "x":12.5, "y":2},
- {"label":"BACKSLASH", "x":13.5, "y":2, "w":1.5},
- {"label":"KEYPAD 7", "x":15, "y":2},
- {"label":"KEYPAD 8", "x":16, "y":2},
- {"label":"KEYPAD 9", "x":17, "y":2},
- {"label":"KEYPAD +", "x":18, "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": [6, 8], "x": 5.5, "y": 2},
+ {"matrix": [6, 9], "x": 6.5, "y": 2},
+ {"matrix": [6, 10], "x": 7.5, "y": 2},
+ {"matrix": [6, 11], "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": [7, 3], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [2, 9], "x": 15, "y": 2},
+ {"matrix": [2, 10], "x": 16, "y": 2},
+ {"matrix": [2, 11], "x": 17, "y": 2},
+ {"matrix": [2, 12], "x": 18, "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":"SEMICOLON", "x":10.75, "y":3},
- {"label":"QUOTE", "x":11.75, "y":3},
- {"label":"ENTER", "x":12.75, "y":3, "w":2.25},
- {"label":"KEYPAD 4", "x":15, "y":3},
- {"label":"KEYPAD 5", "x":16, "y":3},
- {"label":"KEYPAD 6", "x":17, "y":3},
- {"label":"KEYPAD +", "x":18, "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": [6, 12], "x": 5.75, "y": 3},
+ {"matrix": [7, 5], "x": 6.75, "y": 3},
+ {"matrix": [7, 6], "x": 7.75, "y": 3},
+ {"matrix": [7, 7], "x": 8.75, "y": 3},
+ {"matrix": [3, 5], "x": 9.75, "y": 3},
+ {"matrix": [3, 6], "x": 10.75, "y": 3},
+ {"matrix": [3, 7], "x": 11.75, "y": 3},
+ {"matrix": [3, 8], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 9], "x": 15, "y": 3},
+ {"matrix": [3, 10], "x": 16, "y": 3},
+ {"matrix": [3, 11], "x": 17, "y": 3},
+ {"matrix": [3, 12], "x": 18, "y": 3},
- {"label":"LSHIFT", "x":0, "y":4, "w":1.25},
- {"label":"ISO BACKSLASH", "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":"COMMA", "x":9.25, "y":4},
- {"label":"PERIOD", "x":10.25, "y":4},
- {"label":"SLASH", "x":11.25, "y":4},
- {"label":"RSHIFT", "x":12.25, "y":4, "w":1.75},
- {"label":"UP", "x":14, "y":4},
- {"label":"KEYPAD 1", "x":15, "y":4},
- {"label":"KEYPAD 2", "x":16, "y":4},
- {"label":"KEYPAD 3", "x":17, "y":4},
- {"label":"KEYPAD ENTER", "x":18, "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": [7, 8], "x": 5.25, "y": 4},
+ {"matrix": [7, 9], "x": 6.25, "y": 4},
+ {"matrix": [7, 10], "x": 7.25, "y": 4},
+ {"matrix": [7, 11], "x": 8.25, "y": 4},
+ {"matrix": [4, 5], "x": 9.25, "y": 4},
+ {"matrix": [4, 6], "x": 10.25, "y": 4},
+ {"matrix": [4, 7], "x": 11.25, "y": 4},
+ {"matrix": [4, 8], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [7, 4], "x": 14, "y": 4},
+ {"matrix": [4, 9], "x": 15, "y": 4},
+ {"matrix": [4, 10], "x": 16, "y": 4},
+ {"matrix": [4, 11], "x": 17, "y": 4},
+ {"matrix": [4, 12], "x": 18, "y": 4},
- {"label":"LCTRL", "x":0, "y":5, "w":1.25},
- {"label":"LGUI", "x":1.25, "y":5, "w":1.25},
- {"label":"LALT", "x":2.5, "y":5, "w":1.25},
- {"label":"SPACE", "x":3.75, "y":5, "w":6.25},
- {"label":"RALT", "x":10, "y":5},
- {"label":"MENU", "x":11, "y":5},
- {"label":"RCTRL", "x":12, "y":5},
- {"label":"LEFT", "x":13, "y":5},
- {"label":"DOWN", "x":14, "y":5},
- {"label":"RIGHT", "x":15, "y":5},
- {"label":"KEYPAD 0", "x":16, "y":5},
- {"label":"KEYPAD .", "x":17, "y":5},
- {"label":"KEYPAD ENTER", "x":18, "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, 9], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 5], "x": 10, "y": 5},
+ {"matrix": [5, 6], "x": 11, "y": 5},
+ {"matrix": [5, 7], "x": 12, "y": 5},
+ {"matrix": [5, 8], "x": 13, "y": 5},
+ {"matrix": [5, 3], "x": 14, "y": 5},
+ {"matrix": [5, 4], "x": 15, "y": 5},
+ {"matrix": [5, 10], "x": 16, "y": 5},
+ {"matrix": [5, 11], "x": 17, "y": 5},
+ {"matrix": [5, 12], "x": 18, "y": 5}
]
},
-
"LAYOUT_iso": {
- "layout": [
- {"label":"ESC", "x":0, "y":0},
- {"label":"F1", "x":1, "y":0},
- {"label":"F2", "x":2, "y":0},
- {"label":"F3", "x":3, "y":0},
- {"label":"F4", "x":4, "y":0},
- {"label":"F5", "x":5, "y":0},
- {"label":"F6", "x":6, "y":0},
- {"label":"F7", "x":7, "y":0},
- {"label":"F8", "x":8, "y":0},
- {"label":"F9", "x":9, "y":0},
- {"label":"F10", "x":10, "y":0},
- {"label":"F11", "x":11, "y":0},
- {"label":"F12", "x":12, "y":0},
- {"label":"PRINT SCREEN", "x":13, "y":0},
- {"label":"HOME", "x":14, "y":0},
- {"label":"END", "x":15, "y":0},
- {"label":"PAGE UP", "x":16, "y":0},
- {"label":"PAGE DOWN", "x":17, "y":0},
- {"label":"DELETE", "x":18, "y":0},
+ "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": [6, 0], "x": 5, "y": 0},
+ {"matrix": [6, 1], "x": 6, "y": 0},
+ {"matrix": [6, 2], "x": 7, "y": 0},
+ {"matrix": [6, 3], "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": [7, 2], "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": [0, 12], "x": 17, "y": 0},
+ {"matrix": [7, 12], "x": 18, "y": 0},
- {"label":"GRAVE", "x":0, "y":1},
- {"label":"1", "x":1, "y":1},
- {"label":"2", "x":2, "y":1},
- {"label":"3", "x":3, "y":1},
- {"label":"4", "x":4, "y":1},
- {"label":"5", "x":5, "y":1},
- {"label":"6", "x":6, "y":1},
- {"label":"7", "x":7, "y":1},
- {"label":"8", "x":8, "y":1},
- {"label":"9", "x":9, "y":1},
- {"label":"0", "x":10, "y":1},
- {"label":"MINUS", "x":11, "y":1},
- {"label":"EQUAL", "x":12, "y":1},
- {"label":"BACKSPACE", "x":13, "y":1, "w":2},
- {"label":"NUM LOCK", "x":15, "y":1},
- {"label":"KEYPAD /", "x":16, "y":1},
- {"label":"KEYPAD *", "x":17, "y":1},
- {"label":"KEYPAD -", "x":18, "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": [6, 4], "x": 5, "y": 1},
+ {"matrix": [6, 5], "x": 6, "y": 1},
+ {"matrix": [6, 6], "x": 7, "y": 1},
+ {"matrix": [6, 7], "x": 8, "y": 1},
+ {"matrix": [1, 5], "x": 9, "y": 1},
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [7, 1], "x": 13, "y": 1, "w": 2},
+ {"matrix": [1, 9], "x": 15, "y": 1},
+ {"matrix": [1, 10], "x": 16, "y": 1},
+ {"matrix": [1, 11], "x": 17, "y": 1},
+ {"matrix": [1, 12], "x": 18, "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":"LBRACKET", "x":11.5, "y":2},
- {"label":"RBRACKET", "x":12.5, "y":2},
- {"label":"KEYPAD 7", "x":15, "y":2},
- {"label":"KEYPAD 8", "x":16, "y":2},
- {"label":"KEYPAD 9", "x":17, "y":2},
- {"label":"KEYPAD +", "x":18, "y":2, "h":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": [6, 8], "x": 5.5, "y": 2},
+ {"matrix": [6, 9], "x": 6.5, "y": 2},
+ {"matrix": [6, 10], "x": 7.5, "y": 2},
+ {"matrix": [6, 11], "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": 15, "y": 2},
+ {"matrix": [2, 10], "x": 16, "y": 2},
+ {"matrix": [2, 11], "x": 17, "y": 2},
+ {"matrix": [2, 12], "x": 18, "y": 2, "h": 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":"SEMICOLON", "x":10.75, "y":3},
- {"label":"QUOTE", "x":11.75, "y":3},
- {"label":"ISO HASH", "x":12.75, "y":3},
- {"label":"ENTER", "x":13.75, "y":2, "w":1.25, "h":2},
- {"label":"KEYPAD 4", "x":15, "y":3},
- {"label":"KEYPAD 5", "x":16, "y":3},
- {"label":"KEYPAD 6", "x":17, "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": [6, 12], "x": 5.75, "y": 3},
+ {"matrix": [7, 5], "x": 6.75, "y": 3},
+ {"matrix": [7, 6], "x": 7.75, "y": 3},
+ {"matrix": [7, 7], "x": 8.75, "y": 3},
+ {"matrix": [3, 5], "x": 9.75, "y": 3},
+ {"matrix": [3, 6], "x": 10.75, "y": 3},
+ {"matrix": [3, 7], "x": 11.75, "y": 3},
+ {"matrix": [7, 3], "x": 12.75, "y": 3},
+ {"matrix": [3, 8], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+ {"matrix": [3, 9], "x": 15, "y": 3},
+ {"matrix": [3, 10], "x": 16, "y": 3},
+ {"matrix": [3, 11], "x": 17, "y": 3},
- {"label":"LSHIFT", "x":0, "y":4, "w":1.25},
- {"label":"ISO BACKSLASH", "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":"COMMA", "x":9.25, "y":4},
- {"label":"PERIOD", "x":10.25, "y":4},
- {"label":"SLASH", "x":11.25, "y":4},
- {"label":"RSHIFT", "x":12.25, "y":4, "w":1.75},
- {"label":"UP", "x":14, "y":4},
- {"label":"KEYPAD 1", "x":15, "y":4},
- {"label":"KEYPAD 2", "x":16, "y":4},
- {"label":"KEYPAD 3", "x":17, "y":4},
- {"label":"KEYPAD ENTER", "x":18, "y":4, "h":2},
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [7, 8], "x": 5.25, "y": 4},
+ {"matrix": [7, 9], "x": 6.25, "y": 4},
+ {"matrix": [7, 10], "x": 7.25, "y": 4},
+ {"matrix": [7, 11], "x": 8.25, "y": 4},
+ {"matrix": [4, 5], "x": 9.25, "y": 4},
+ {"matrix": [4, 6], "x": 10.25, "y": 4},
+ {"matrix": [4, 7], "x": 11.25, "y": 4},
+ {"matrix": [4, 8], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [7, 4], "x": 14, "y": 4},
+ {"matrix": [4, 9], "x": 15, "y": 4},
+ {"matrix": [4, 10], "x": 16, "y": 4},
+ {"matrix": [4, 11], "x": 17, "y": 4},
+ {"matrix": [4, 12], "x": 18, "y": 4, "h": 2},
- {"label":"LCTRL", "x":0, "y":5, "w":1.25},
- {"label":"LGUI", "x":1.25, "y":5, "w":1.25},
- {"label":"LALT", "x":2.5, "y":5, "w":1.25},
- {"label":"SPACE", "x":3.75, "y":5, "w":6.25},
- {"label":"RALT", "x":10, "y":5},
- {"label":"MENU", "x":11, "y":5},
- {"label":"RCTRL", "x":12, "y":5},
- {"label":"LEFT", "x":13, "y":5},
- {"label":"DOWN", "x":14, "y":5},
- {"label":"RIGHT", "x":15, "y":5},
- {"label":"KEYPAD 0", "x":16, "y":5},
- {"label":"KEYPAD .", "x":17, "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, 9], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 5], "x": 10, "y": 5},
+ {"matrix": [5, 6], "x": 11, "y": 5},
+ {"matrix": [5, 7], "x": 12, "y": 5},
+ {"matrix": [5, 8], "x": 13, "y": 5},
+ {"matrix": [5, 3], "x": 14, "y": 5},
+ {"matrix": [5, 4], "x": 15, "y": 5},
+ {"matrix": [5, 10], "x": 16, "y": 5},
+ {"matrix": [5, 11], "x": 17, "y": 5}
]
}
}
diff --git a/keyboards/mino/hotswap/hotswap.h b/keyboards/mino/hotswap/hotswap.h
deleted file mode 100644
index fc55cc8c2b..0000000000
--- a/keyboards/mino/hotswap/hotswap.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2022 ShandonCodes
- *
- * 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_default( \
- 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, k35, 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, KC_NO, k35, KC_NO, k37, k38, k39, k3a, k3b}, \
-}
-
diff --git a/keyboards/mino/hotswap/info.json b/keyboards/mino/hotswap/info.json
index be4f161ed6..9ba7617920 100644
--- a/keyboards/mino/hotswap/info.json
+++ b/keyboards/mino/hotswap/info.json
@@ -18,55 +18,55 @@
"layouts": {
"LAYOUT_default": {
"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},
+ {"matrix": [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},
- {"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},
+ {"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},
- {"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},
+ {"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},
- {"x": 0, "y": 3, "w": 1.25},
- {"x": 1.25, "y": 3},
- {"x": 2.25, "y": 3, "w": 1.25},
- {"x": 3.5, "y": 3, "w": 2.25},
- {"x": 5.75, "y": 3},
- {"x": 6.75, "y": 3, "w": 2.75},
- {"x": 9.5, "y": 3, "w": 1.25},
- {"x": 10.75, "y": 3},
- {"x": 11.75, "y": 3, "w": 1.25}
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 7], "x": 6.75, "y": 3, "w": 2.75},
+ {"matrix": [3, 8], "x": 9.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 9], "x": 10.75, "y": 3},
+ {"matrix": [3, 10], "x": 11.75, "y": 3, "w": 1.25}
]
}
}
diff --git a/keyboards/nightmare/info.json b/keyboards/nightmare/info.json
index 0a7fd2adf7..87f0187e59 100644
--- a/keyboards/nightmare/info.json
+++ b/keyboards/nightmare/info.json
@@ -21,527 +21,125 @@
"layouts": {
"LAYOUT_default": {
"layout": [
- {
- "label": "Home",
- "x": 0,
- "y": 0
- },
- {
- "label": "`",
- "x": 1.25,
- "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.25,
- "y": 0
- },
- {
- "label": "U",
- "x": 8.25,
- "y": 0
- },
- {
- "label": "I",
- "x": 9.25,
- "y": 0
- },
- {
- "label": "O",
- "x": 10.25,
- "y": 0
- },
- {
- "label": "P",
- "x": 11.25,
- "y": 0
- },
- {
- "label": "{",
- "x": 12.25,
- "y": 0
- },
- {
- "label": "}",
- "x": 13.25,
- "y": 0
- },
- {
- "label": "Bspc",
- "x": 14.25,
- "y": 0
- },
- {
- "label": "End",
- "x": 0,
- "y": 1
- },
- {
- "label": "Tab",
- "x": 1.25,
- "y": 1,
- "w": 1.25
- },
- {
- "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": "\"",
- "x": 12.5,
- "y": 1
- },
- {
- "label": "Enter",
- "x": 13.5,
- "y": 1,
- "w": 1.75
- },
- {
- "label": "PgUp",
- "x": 0,
- "y": 2
- },
- {
- "label": "Shift",
- "x": 1.25,
- "y": 2,
- "w": 1.75
- },
- {
- "label": "Z",
- "x": 3,
- "y": 2
- },
- {
- "label": "X",
- "x": 4,
- "y": 2
- },
- {
- "label": "C",
- "x": 5,
- "y": 2
- },
- {
- "label": "V",
- "x": 6,
- "y": 2
- },
- {
- "label": "B",
- "x": 7,
- "y": 2
- },
- {
- "label": "N",
- "x": 8,
- "y": 2
- },
- {
- "label": "M",
- "x": 9,
- "y": 2
- },
- {
- "label": "<",
- "x": 10,
- "y": 2
- },
- {
- "label": "<",
- "x": 11,
- "y": 2
- },
- {
- "label": "?",
- "x": 12,
- "y": 2
- },
- {
- "label": "Shift",
- "x": 13,
- "y": 2,
- "w": 1.25
- },
- {
- "label": "MO(1)",
- "x": 14.25,
- "y": 2
- },
- {
- "label": "PgDn",
- "x": 0,
- "y": 3
- },
- {
- "label": "GUI",
- "x": 2.5,
- "y": 3
- },
- {
- "label": "Ctrl",
- "x": 3.5,
- "y": 3,
- "w": 1.25
- },
- {
- "x": 4.75,
- "y": 3,
- "w": 7
- },
- {
- "label": "Ctrl",
- "x": 11.75,
- "y": 3,
- "w": 1.25
- },
- {
- "label": "MO(2)",
- "x": 13,
- "y": 3
- }
+ {"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.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [0, 8], "x": 8.25, "y": 0},
+ {"matrix": [0, 9], "x": 9.25, "y": 0},
+ {"matrix": [0, 10], "x": 10.25, "y": 0},
+ {"matrix": [0, 11], "x": 11.25, "y": 0},
+ {"matrix": [0, 12], "x": 12.25, "y": 0},
+ {"matrix": [1, 13], "x": 13.25, "y": 0},
+ {"matrix": [0, 13], "x": 14.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.25},
+ {"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.5, "y": 1, "w": 1.75},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 9], "x": 10, "y": 2},
+ {"matrix": [2, 10], "x": 11, "y": 2},
+ {"matrix": [2, 11], "x": 12, "y": 2},
+ {"matrix": [2, 12], "x": 13, "y": 2, "w": 1.25},
+ {"matrix": [3, 13], "x": 14.25, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2.5, "y": 3},
+ {"matrix": [3, 2], "x": 3.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 7], "x": 4.75, "y": 3, "w": 7},
+ {"matrix": [3, 11], "x": 11.75, "y": 3, "w": 1.25},
+ {"matrix": [3, 12], "x": 13, "y": 3}
]
},
"LAYOUT_split": {
"layout": [
- {
- "label": "Home",
- "x": 0,
- "y": 0
- },
- {
- "label": "`",
- "x": 1.25,
- "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.25,
- "y": 0
- },
- {
- "label": "U",
- "x": 8.25,
- "y": 0
- },
- {
- "label": "I",
- "x": 9.25,
- "y": 0
- },
- {
- "label": "O",
- "x": 10.25,
- "y": 0
- },
- {
- "label": "P",
- "x": 11.25,
- "y": 0
- },
- {
- "label": "{",
- "x": 12.25,
- "y": 0
- },
- {
- "label": "}",
- "x": 13.25,
- "y": 0
- },
- {
- "label": "Bspc",
- "x": 14.25,
- "y": 0
- },
- {
- "label": "End",
- "x": 0,
- "y": 1
- },
- {
- "label": "Tab",
- "x": 1.25,
- "y": 1,
- "w": 1.25
- },
- {
- "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": "\"",
- "x": 12.5,
- "y": 1
- },
- {
- "label": "Enter",
- "x": 13.5,
- "y": 1,
- "w": 1.75
- },
- {
- "label": "PgUp",
- "x": 0,
- "y": 2
- },
- {
- "label": "Shift",
- "x": 1.25,
- "y": 2,
- "w": 1.75
- },
- {
- "label": "Z",
- "x": 3,
- "y": 2
- },
- {
- "label": "X",
- "x": 4,
- "y": 2
- },
- {
- "label": "C",
- "x": 5,
- "y": 2
- },
- {
- "label": "V",
- "x": 6,
- "y": 2
- },
- {
- "label": "B",
- "x": 7,
- "y": 2
- },
- {
- "label": "N",
- "x": 8,
- "y": 2
- },
- {
- "label": "M",
- "x": 9,
- "y": 2
- },
- {
- "label": "<",
- "x": 10,
- "y": 2
- },
- {
- "label": "<",
- "x": 11,
- "y": 2
- },
- {
- "label": "?",
- "x": 12,
- "y": 2
- },
- {
- "label": "Shift",
- "x": 13,
- "y": 2,
- "w": 1.25
- },
- {
- "label": "MO(1)",
- "x": 14.25,
- "y": 2
- },
- {
- "label": "PgDn",
- "x": 0,
- "y": 3
- },
- {
- "label": "GUI",
- "x": 2.5,
- "y": 3
- },
- {
- "label": "Ctrl",
- "x": 3.5,
- "y": 3,
- "w": 1.25
- },
- {
- "label": "Alt",
- "x": 4.75,
- "y": 3
- },
- {
- "x": 5.75,
- "y": 3,
- "w": 2.25
- },
- {
- "x": 8,
- "y": 3,
- "w": 2.75
- },
- {
- "label": "RGUI",
- "x": 10.75,
- "y": 3
- },
- {
- "label": "Ctrl",
- "x": 11.75,
- "y": 3,
- "w": 1.25
- },
- {
- "label": "MO(2)",
- "x": 13,
- "y": 3
- }
+ {"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.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [0, 8], "x": 8.25, "y": 0},
+ {"matrix": [0, 9], "x": 9.25, "y": 0},
+ {"matrix": [0, 10], "x": 10.25, "y": 0},
+ {"matrix": [0, 11], "x": 11.25, "y": 0},
+ {"matrix": [0, 12], "x": 12.25, "y": 0},
+ {"matrix": [1, 13], "x": 13.25, "y": 0},
+ {"matrix": [0, 13], "x": 14.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.25},
+ {"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.5, "y": 1, "w": 1.75},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 9], "x": 10, "y": 2},
+ {"matrix": [2, 10], "x": 11, "y": 2},
+ {"matrix": [2, 11], "x": 12, "y": 2},
+ {"matrix": [2, 12], "x": 13, "y": 2, "w": 1.25},
+ {"matrix": [3, 13], "x": 14.25, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2.5, "y": 3},
+ {"matrix": [3, 2], "x": 3.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 7], "x": 8, "y": 3, "w": 2.75},
+ {"matrix": [3, 9], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3, "w": 1.25},
+ {"matrix": [3, 12], "x": 13, "y": 3}
]
}
}
diff --git a/keyboards/nightmare/nightmare.h b/keyboards/nightmare/nightmare.h
deleted file mode 100644
index 017e3494e0..0000000000
--- a/keyboards/nightmare/nightmare.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2019 cfbender
- *
- * 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_default( \
- k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k113, k013, \
- k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k213, \
- k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k313, \
- k300, k301, k302, k307, k311, k312 \
-) { \
- { 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 }, \
- { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213 }, \
- { k300, k301, k302, KC_NO, KC_NO, KC_NO, KC_NO, k307, KC_NO, KC_NO, KC_NO, k311, k312, k313 } \
-}
-
-
-#define LAYOUT_split( \
- k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k113, k013, \
- k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k213, \
- k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k313, \
- k300, k301, k302, k304, k305, k307, k309, k311, k312 \
-) { \
- { 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 }, \
- { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213 }, \
- { k300, k301, k302, KC_NO, k304, k305, KC_NO, k307, KC_NO, k309, KC_NO, k311, k312, k313 } \
-}
diff --git a/keyboards/pegasus/info.json b/keyboards/pegasus/info.json
index 0aaa062f4b..29b99c8e25 100644
--- a/keyboards/pegasus/info.json
+++ b/keyboards/pegasus/info.json
@@ -24,95 +24,101 @@
"layouts": {
"LAYOUT_default": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"Q", "x":1, "y":0},
- {"label":"W", "x":2, "y":0},
- {"label":"E", "x":3, "y":0},
- {"label":"R", "x":4, "y":0},
- {"label":"T", "x":5, "y":0},
- {"label":"Y", "x":6, "y":0},
- {"label":"U", "x":7, "y":0},
- {"label":"I", "x":8, "y":0},
- {"label":"O", "x":9, "y":0},
- {"label":"P", "x":10, "y":0},
- {"label":"Backspace", "x":11, "y":0, "w":1.75},
- {"label":"Control", "x":0, "y":1, "w":1.25},
- {"label":"A", "x":1.25, "y":1},
- {"label":"S", "x":2.25, "y":1},
- {"label":"D", "x":3.25, "y":1},
- {"label":"F", "x":4.25, "y":1},
- {"label":"G", "x":5.25, "y":1},
- {"label":"H", "x":6.25, "y":1},
- {"label":"J", "x":7.25, "y":1},
- {"label":"K", "x":8.25, "y":1},
- {"label":"L", "x":9.25, "y":1},
- {"label":":", "x":10.25, "y":1},
- {"label":"Enter", "x":11.25, "y":1, "w":1.5},
- {"label":"Shift", "x":0, "y":2, "w":1.75},
- {"label":"Z", "x":1.75, "y":2},
- {"label":"X", "x":2.75, "y":2},
- {"label":"C", "x":3.75, "y":2},
- {"label":"V", "x":4.75, "y":2},
- {"label":"B", "x":5.75, "y":2},
- {"label":"N", "x":6.75, "y":2},
- {"label":"M", "x":7.75, "y":2},
- {"label":"<", "x":8.75, "y":2},
- {"label":">", "x":9.75, "y":2},
- {"label":"?", "x":10.75, "y":2},
- {"label":"Shift", "x":11.75, "y":2},
- {"label":"Fn", "x":0, "y":3, "w":1.25},
- {"label":"Alt", "x":2, "y":3, "w":1.25},
- {"x":3.25, "y":3, "w":6.25},
- {"label":"Alt", "x":9.5, "y":3, "w":1.25},
- {"label":"Ctrl", "x":11.5, "y":3, "w":1.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 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": 2, "y": 3, "w": 1.25},
+ {"matrix": [3, 6], "x": 3.25, "y": 3, "w": 6.25},
+ {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 11], "x": 11.5, "y": 3, "w": 1.25}
]
},
"LAYOUT_split": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"Q", "x":1, "y":0},
- {"label":"W", "x":2, "y":0},
- {"label":"E", "x":3, "y":0},
- {"label":"R", "x":4, "y":0},
- {"label":"T", "x":5, "y":0},
- {"label":"Y", "x":6, "y":0},
- {"label":"U", "x":7, "y":0},
- {"label":"I", "x":8, "y":0},
- {"label":"O", "x":9, "y":0},
- {"label":"P", "x":10, "y":0},
- {"label":"Backspace", "x":11, "y":0, "w":1.75},
- {"label":"Control", "x":0, "y":1, "w":1.25},
- {"label":"A", "x":1.25, "y":1},
- {"label":"S", "x":2.25, "y":1},
- {"label":"D", "x":3.25, "y":1},
- {"label":"F", "x":4.25, "y":1},
- {"label":"G", "x":5.25, "y":1},
- {"label":"H", "x":6.25, "y":1},
- {"label":"J", "x":7.25, "y":1},
- {"label":"K", "x":8.25, "y":1},
- {"label":"L", "x":9.25, "y":1},
- {"label":":", "x":10.25, "y":1},
- {"label":"Enter", "x":11.25, "y":1, "w":1.5},
- {"label":"Shift", "x":0, "y":2, "w":1.75},
- {"label":"Z", "x":1.75, "y":2},
- {"label":"X", "x":2.75, "y":2},
- {"label":"C", "x":3.75, "y":2},
- {"label":"V", "x":4.75, "y":2},
- {"label":"B", "x":5.75, "y":2},
- {"label":"N", "x":6.75, "y":2},
- {"label":"M", "x":7.75, "y":2},
- {"label":"<", "x":8.75, "y":2},
- {"label":">", "x":9.75, "y":2},
- {"label":"?", "x":10.75, "y":2},
- {"label":"Shift", "x":11.75, "y":2},
- {"label":"Fn", "x":0, "y":3, "w":1.25},
- {"label":"Alt", "x":2, "y":3, "w":1.25},
- {"x":3.25, "y":3},
- {"x":4.25, "y":3, "w":2},
- {"x":6.25, "y":3, "w":2.25},
- {"x":8.5, "y":3},
- {"label":"Alt", "x":9.5, "y":3, "w":1.25},
- {"label":"Ctrl", "x":11.5, "y":3, "w":1.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 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": 2, "y": 3, "w": 1.25},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3, "w": 2},
+ {"matrix": [3, 6], "x": 6.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 11], "x": 11.5, "y": 3, "w": 1.25}
]
}
}
diff --git a/keyboards/pegasus/pegasus.c b/keyboards/pegasus/pegasus.c
index 0800a36f9e..1ffcd50fae 100644
--- a/keyboards/pegasus/pegasus.c
+++ b/keyboards/pegasus/pegasus.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "pegasus.h"
+#include "quantum.h"
#ifdef ENCODER_ENABLE
bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/pegasus/pegasus.h b/keyboards/pegasus/pegasus.h
deleted file mode 100644
index 4582b2ccab..0000000000
--- a/keyboards/pegasus/pegasus.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright 2020 melonbred
- *
- * 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_default( \
- 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, K36, 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, XXX, XXX, XXX, K36, XXX, XXX, K39, XXX, K3B } \
-}
-
-#define LAYOUT_split( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
- K30, K31, K32, K34, K36, 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, XXX, K34, XXX, K36, XXX, K38, K39, XXX, K3B } \
-}
diff --git a/keyboards/program_yoink/staggered/info.json b/keyboards/program_yoink/staggered/info.json
index b17fd072a8..1b028593e3 100644
--- a/keyboards/program_yoink/staggered/info.json
+++ b/keyboards/program_yoink/staggered/info.json
@@ -26,107 +26,117 @@
"layouts": {
"LAYOUT_default": {
"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.5, "y":0},
-
- {"x":0, "y":1, "w":1.25},
- {"x":1.25, "y":1},
- {"x":2.25, "y":1},
- {"x":3.25, "y":1},
- {"x":4.25, "y":1},
- {"x":5.25, "y":1},
- {"x":6.25, "y":1},
- {"x":7.25, "y":1},
- {"x":8.25, "y":1},
- {"x":9.25, "y":1},
- {"x":10.25, "y":1, "w":1.75},
- {"x":12.5, "y":1},
-
- {"x":0, "y":2, "w":1.75},
- {"x":1.75, "y":2},
- {"x":2.75, "y":2},
- {"x":3.75, "y":2},
- {"x":4.75, "y":2},
- {"x":5.75, "y":2},
- {"x":6.75, "y":2},
- {"x":7.75, "y":2},
- {"x":8.75, "y":2},
- {"x":9.75, "y":2, "w":1.25},
- {"x":11.25, "y":2.25},
- {"x":12.5, "y":2},
-
- {"x":0, "y":3, "w":1.25},
- {"x":1.25, "y":3, "w":1.25},
- {"x":2.5, "y":3, "w":6.25},
- {"x":8.75, "y":3, "w":1.25},
- {"x":10.25, "y":3.25},
- {"x":11.25, "y":3.25},
- {"x":12.25, "y":3.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.5, "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, "w": 1.75},
+
+ {"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, "w": 1.25},
+
+ {"matrix": [2, 10], "x": 11.25, "y": 2.25},
+
+ {"matrix": [2, 12], "x": 12.5, "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, 4], "x": 2.5, "y": 3, "w": 6.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3, "w": 1.25},
+
+ {"matrix": [3, 9], "x": 10.25, "y": 3.25},
+ {"matrix": [3, 10], "x": 11.25, "y": 3.25},
+ {"matrix": [3, 12], "x": 12.25, "y": 3.25}
]
},
"LAYOUT_split_bar": {
"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.5, "y":0},
-
- {"x":0, "y":1, "w":1.25},
- {"x":1.25, "y":1},
- {"x":2.25, "y":1},
- {"x":3.25, "y":1},
- {"x":4.25, "y":1},
- {"x":5.25, "y":1},
- {"x":6.25, "y":1},
- {"x":7.25, "y":1},
- {"x":8.25, "y":1},
- {"x":9.25, "y":1},
- {"x":10.25, "y":1, "w":1.75},
- {"x":12.5, "y":1},
-
- {"x":0, "y":2, "w":1.75},
- {"x":1.75, "y":2},
- {"x":2.75, "y":2},
- {"x":3.75, "y":2},
- {"x":4.75, "y":2},
- {"x":5.75, "y":2},
- {"x":6.75, "y":2},
- {"x":7.75, "y":2},
- {"x":8.75, "y":2},
- {"x":9.75, "y":2, "w":1.25},
- {"x":11.25, "y":2.25},
- {"x":12.5, "y":2},
-
- {"x":0, "y":3},
- {"x":1, "y":3},
- {"x":2, "y":3},
- {"x":3, "y":3, "w":2.75},
- {"x":5.75, "y":3, "w":2.25},
- {"x":8, "y":3},
- {"x":9, "y":3},
- {"x":10.25, "y":3.25},
- {"x":11.25, "y":3.25},
- {"x":12.25, "y":3.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.5, "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, "w": 1.75},
+
+ {"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, "w": 1.25},
+
+ {"matrix": [2, 10], "x": 11.25, "y": 2.25},
+
+ {"matrix": [2, 12], "x": 12.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, "w": 2.75},
+ {"matrix": [3, 5], "x": 5.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 7], "x": 8, "y": 3},
+ {"matrix": [3, 8], "x": 9, "y": 3},
+
+ {"matrix": [3, 9], "x": 10.25, "y": 3.25},
+ {"matrix": [3, 10], "x": 11.25, "y": 3.25},
+ {"matrix": [3, 12], "x": 12.25, "y": 3.25}
]
}
}
diff --git a/keyboards/program_yoink/staggered/staggered.h b/keyboards/program_yoink/staggered/staggered.h
deleted file mode 100644
index 15def50979..0000000000
--- a/keyboards/program_yoink/staggered/staggered.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright 2020 melonbred
- *
- * 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_default( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1C, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2C, \
- K30, K31, K34, K38, K39, K3A, K3C \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, XXX, K1C }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, XXX, K2C }, \
- { K30, K31, XXX, XXX, K34, XXX, XXX, XXX, K38, K39, K3A, XXX, K3C } \
-}
-
-#define LAYOUT_split_bar( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1C, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2C, \
- K30, K31, K32, K33, K35, K37, K38, K39, K3A, K3C \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, XXX, K1C }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, XXX, K2C }, \
- { K30, K31, K32, K33, XXX, K35, XXX, K37, K38, K39, K3A, XXX, K3C } \
-}
diff --git a/keyboards/qpockets/eggman/eggman.h b/keyboards/qpockets/eggman/eggman.h
deleted file mode 100644
index 4d4c4a1241..0000000000
--- a/keyboards/qpockets/eggman/eggman.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2021 Alan Lehners
- *
- * 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_default( \
- K02, K04, \
- K10, K00, K11, K01, K12, K13, K14, K05, K15, K06, K16, \
- K30, K20, K31, K21, K32, K33, K34, K25, K35, K26, K36, \
- K50, K40, K51, K41, K52, K53, K54, K45, K55, K46, K56, \
- K61, K62, K64, K65 \
-) \
-{ \
-{ K00, K01, K02, XXX, K04, K05, K06 }, \
-{ K10, K11, K12, K13, K14, K15, K16 }, \
-{ K20, K21, XXX, XXX, XXX, K25, K26 }, \
-{ K30, K31, K32, K33, K34, K35, K36 }, \
-{ K40, K41, XXX, XXX, XXX, K45, K46 }, \
-{ K50, K51, K52, K53, K54, K55, K56 }, \
-{ XXX, K61, K62, XXX, K64, K65, XXX }, \
-}
-
diff --git a/keyboards/qpockets/eggman/info.json b/keyboards/qpockets/eggman/info.json
index 58d2975169..1dbf27825c 100644
--- a/keyboards/qpockets/eggman/info.json
+++ b/keyboards/qpockets/eggman/info.json
@@ -24,45 +24,51 @@
"layouts": {
"LAYOUT_default": {
"layout": [
- {"label":"RE", "x":4.25, "y":0},
- {"label":"RE", "x":6.25, "y":0},
- {"label":"Q", "x":0, "y":0.75},
- {"label":"W", "x":1, "y":0.5},
- {"label":"E", "x":2, "y":0.25},
- {"label":"R", "x":3, "y":0.75},
- {"label":"T", "x":4, "y":1},
- {"label":"Delete", "x":5, "y":1, "w":1.5},
- {"label":"Y", "x":6.5, "y":1},
- {"label":"U", "x":7.5, "y":0.75},
- {"label":"I", "x":8.5, "y":0.25},
- {"label":"O", "x":9.5, "y":0.5},
- {"label":"P", "x":10.5, "y":0.75},
- {"label":"A", "x":0, "y":1.75},
- {"label":"S", "x":1, "y":1.5},
- {"label":"D", "x":2, "y":1.25},
- {"label":"F", "x":3, "y":1.75},
- {"label":"G", "x":4, "y":2},
- {"label":"Tab", "x":5, "y":2, "w":1.5},
- {"label":"H", "x":6.5, "y":2},
- {"label":"J", "x":7.5, "y":1.75},
- {"label":"K", "x":8.5, "y":1.25},
- {"label":"L", "x":9.5, "y":1.5},
- {"label":"\"", "x":10.5, "y":1.75},
- {"label":"Z", "x":0, "y":2.75},
- {"label":"X", "x":1, "y":2.5},
- {"label":"C", "x":2, "y":2.25},
- {"label":"V", "x":3, "y":2.75},
- {"label":"B", "x":4, "y":3},
- {"label":"Shift", "x":5, "y":3, "w":1.5},
- {"label":"N", "x":6.5, "y":3},
- {"label":"M", "x":7.5, "y":2.75},
- {"label":"<", "x":8.5, "y":2.25},
- {"label":">", "x":9.5, "y":2.5},
- {"label":"?", "x":10.5, "y":2.75},
- {"label":"Ctrl", "x":2.5, "y":4, "w":1.25},
- {"label":"Backspace", "x":3.75, "y":4, "w":2},
- {"label":"Space", "x":5.75, "y":4, "w":2},
- {"label":"Alt", "x":7.75, "y":4, "w":1.25}]
+ {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+ {"matrix": [0, 4], "x": 6.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 0.75},
+ {"matrix": [0, 0], "x": 1, "y": 0.5},
+ {"matrix": [1, 1], "x": 2, "y": 0.25},
+ {"matrix": [0, 1], "x": 3, "y": 0.75},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1, "w": 1.5},
+ {"matrix": [1, 4], "x": 6.5, "y": 1},
+ {"matrix": [0, 5], "x": 7.5, "y": 0.75},
+ {"matrix": [1, 5], "x": 8.5, "y": 0.25},
+ {"matrix": [0, 6], "x": 9.5, "y": 0.5},
+ {"matrix": [1, 6], "x": 10.5, "y": 0.75},
+
+ {"matrix": [3, 0], "x": 0, "y": 1.75},
+ {"matrix": [2, 0], "x": 1, "y": 1.5},
+ {"matrix": [3, 1], "x": 2, "y": 1.25},
+ {"matrix": [2, 1], "x": 3, "y": 1.75},
+ {"matrix": [3, 2], "x": 4, "y": 2},
+ {"matrix": [3, 3], "x": 5, "y": 2, "w": 1.5},
+ {"matrix": [3, 4], "x": 6.5, "y": 2},
+ {"matrix": [2, 5], "x": 7.5, "y": 1.75},
+ {"matrix": [3, 5], "x": 8.5, "y": 1.25},
+ {"matrix": [2, 6], "x": 9.5, "y": 1.5},
+ {"matrix": [3, 6], "x": 10.5, "y": 1.75},
+
+ {"matrix": [5, 0], "x": 0, "y": 2.75},
+ {"matrix": [4, 0], "x": 1, "y": 2.5},
+ {"matrix": [5, 1], "x": 2, "y": 2.25},
+ {"matrix": [4, 1], "x": 3, "y": 2.75},
+ {"matrix": [5, 2], "x": 4, "y": 3},
+ {"matrix": [5, 3], "x": 5, "y": 3, "w": 1.5},
+ {"matrix": [5, 4], "x": 6.5, "y": 3},
+ {"matrix": [4, 5], "x": 7.5, "y": 2.75},
+ {"matrix": [5, 5], "x": 8.5, "y": 2.25},
+ {"matrix": [4, 6], "x": 9.5, "y": 2.5},
+ {"matrix": [5, 6], "x": 10.5, "y": 2.75},
+
+ {"matrix": [6, 1], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [6, 2], "x": 3.75, "y": 4, "w": 2},
+ {"matrix": [6, 4], "x": 5.75, "y": 4, "w": 2},
+ {"matrix": [6, 5], "x": 7.75, "y": 4, "w": 1.25}
+ ]
}
}
}
diff --git a/keyboards/qpockets/space_space/rev1/info.json b/keyboards/qpockets/space_space/rev1/info.json
index 5b4806e832..32d744c0a9 100644
--- a/keyboards/qpockets/space_space/rev1/info.json
+++ b/keyboards/qpockets/space_space/rev1/info.json
@@ -24,86 +24,92 @@
"debounce": 7,
"layouts": {
"LAYOUT_default": {
- "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":"Delete", "x":5, "y":0, "w":1.5},
- {"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":"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":"Tab", "x":5, "y":1, "w":1.5},
- {"label":"H", "x":6.5, "y":1},
- {"label":"J", "x":7.5, "y":1},
- {"label":"K", "x":8.5, "y":1},
- {"label":"L", "x":9.5, "y":1},
- {"label":"\"", "x":10.5, "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":"Shift", "x":5, "y":2, "w":1.5},
- {"label":"N", "x":6.5, "y":2},
- {"label":"M", "x":7.5, "y":2},
- {"label":"<", "x":8.5, "y":2},
- {"label":">", "x":9.5, "y":2},
- {"label":"?", "x":10.5, "y":2},
- {"label":"Ctrl", "x":1.25, "y":3.35, "w":1.25},
- {"label":"Fn", "x":2.5, "y":3.35},
- {"label":"Backspace", "x":3.5, "y":3.35, "w":2},
- {"label":"Space", "x":5.5, "y":3.35, "w":2.25},
- {"label":"Gui", "x":7.75, "y":3.35},
- {"label":"Alt", "x":8.75, "y":3.35, "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, "w": 1.5},
+ {"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": [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, "w": 1.5},
+ {"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": [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, "w": 1.5},
+ {"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": [3, 2], "x": 1.25, "y": 3.35, "w": 1.25},
+ {"matrix": [3, 3], "x": 2.5, "y": 3.35},
+ {"matrix": [3, 4], "x": 3.5, "y": 3.35, "w": 2},
+ {"matrix": [3, 6], "x": 5.5, "y": 3.35, "w": 2.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.35},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.35, "w": 1.25}
]
},
- "LAYOUT_big_space": {
+ "LAYOUT_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":"Delete", "x":5, "y":0, "w":1.5},
- {"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":"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":"Tab", "x":5, "y":1, "w":1.5},
- {"label":"H", "x":6.5, "y":1},
- {"label":"J", "x":7.5, "y":1},
- {"label":"K", "x":8.5, "y":1},
- {"label":"L", "x":9.5, "y":1},
- {"label":"\"", "x":10.5, "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":"Shift", "x":5, "y":2, "w":1.5},
- {"label":"N", "x":6.5, "y":2},
- {"label":"M", "x":7.5, "y":2},
- {"label":"<", "x":8.5, "y":2},
- {"label":">", "x":9.5, "y":2},
- {"label":"?", "x":10.5, "y":2},
- {"label":"Ctrl", "x":1.25, "y":3.35, "w":1.25},
- {"label":"Space", "x":2.5, "y":3.35, "w":6.25},
- {"label":"Alt", "x":8.75, "y":3.35, "w":1.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0, "w": 1.5},
+ {"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": [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, "w": 1.5},
+ {"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": [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, "w": 1.5},
+ {"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": [3, 2], "x": 1.25, "y": 3.35, "w": 1.25},
+ {"matrix": [3, 5], "x": 2.5, "y": 3.35, "w": 6.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.35, "w": 1.25}
]
}
}
diff --git a/keyboards/qpockets/space_space/rev1/rev1.h b/keyboards/qpockets/space_space/rev1/rev1.h
deleted file mode 100644
index e56068ec42..0000000000
--- a/keyboards/qpockets/space_space/rev1/rev1.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2020 qpockets
- *
- * 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_default( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, \
- K32, K33, K34, K36, K37, K38 \
-) { \
- {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50}, \
- {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51}, \
- {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52}, \
- {XXX, XXX, K32, K33, K34, XXX, K36, K37, K38, XXX, XXX} \
-}
-
-#define LAYOUT_big_space( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, \
- K32, K35, K38 \
-) { \
- {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50}, \
- {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51}, \
- {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52}, \
- {XXX, XXX, K32, XXX, XXX, K35, XXX, XXX, K38, XXX, XXX} \
-}
diff --git a/keyboards/qpockets/space_space/rev2/info.json b/keyboards/qpockets/space_space/rev2/info.json
index 6c70d42f42..949b80bd3b 100644
--- a/keyboards/qpockets/space_space/rev2/info.json
+++ b/keyboards/qpockets/space_space/rev2/info.json
@@ -26,86 +26,92 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_default": {
- "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":"Delete", "x":5, "y":0, "w":1.5},
- {"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":"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":"Tab", "x":5, "y":1, "w":1.5},
- {"label":"H", "x":6.5, "y":1},
- {"label":"J", "x":7.5, "y":1},
- {"label":"K", "x":8.5, "y":1},
- {"label":"L", "x":9.5, "y":1},
- {"label":"\"", "x":10.5, "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":"Shift", "x":5, "y":2, "w":1.5},
- {"label":"N", "x":6.5, "y":2},
- {"label":"M", "x":7.5, "y":2},
- {"label":"<", "x":8.5, "y":2},
- {"label":">", "x":9.5, "y":2},
- {"label":"?", "x":10.5, "y":2},
- {"label":"Ctrl", "x":1.25, "y":3.35, "w":1.25},
- {"label":"Fn", "x":2.5, "y":3.35},
- {"label":"Backspace", "x":3.5, "y":3.35, "w":2},
- {"label":"Space", "x":5.5, "y":3.35, "w":2.25},
- {"label":"Gui", "x":7.75, "y":3.35},
- {"label":"Alt", "x":8.75, "y":3.35, "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, "w": 1.5},
+ {"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": [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, "w": 1.5},
+ {"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": [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, "w": 1.5},
+ {"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": [3, 2], "x": 1.25, "y": 3.35, "w": 1.25},
+ {"matrix": [3, 3], "x": 2.5, "y": 3.35},
+ {"matrix": [3, 4], "x": 3.5, "y": 3.35, "w": 2},
+ {"matrix": [3, 6], "x": 5.5, "y": 3.35, "w": 2.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.35},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.35, "w": 1.25}
]
},
- "LAYOUT_big_space": {
+ "LAYOUT_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":"Delete", "x":5, "y":0, "w":1.5},
- {"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":"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":"Tab", "x":5, "y":1, "w":1.5},
- {"label":"H", "x":6.5, "y":1},
- {"label":"J", "x":7.5, "y":1},
- {"label":"K", "x":8.5, "y":1},
- {"label":"L", "x":9.5, "y":1},
- {"label":"\"", "x":10.5, "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":"Shift", "x":5, "y":2, "w":1.5},
- {"label":"N", "x":6.5, "y":2},
- {"label":"M", "x":7.5, "y":2},
- {"label":"<", "x":8.5, "y":2},
- {"label":">", "x":9.5, "y":2},
- {"label":"?", "x":10.5, "y":2},
- {"label":"Ctrl", "x":1.25, "y":3.35, "w":1.25},
- {"label":"Space", "x":2.5, "y":3.35, "w":6.25},
- {"label":"Alt", "x":8.75, "y":3.35, "w":1.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0, "w": 1.5},
+ {"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": [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, "w": 1.5},
+ {"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": [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, "w": 1.5},
+ {"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": [3, 2], "x": 1.25, "y": 3.35, "w": 1.25},
+ {"matrix": [3, 5], "x": 2.5, "y": 3.35, "w": 6.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.35, "w": 1.25}
]
}
}
diff --git a/keyboards/qpockets/space_space/rev2/rev2.c b/keyboards/qpockets/space_space/rev2/rev2.c
index 07b93b36aa..e6053afb75 100644
--- a/keyboards/qpockets/space_space/rev2/rev2.c
+++ b/keyboards/qpockets/space_space/rev2/rev2.c
@@ -14,7 +14,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 "rev2.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/qpockets/space_space/rev2/rev2.h b/keyboards/qpockets/space_space/rev2/rev2.h
deleted file mode 100644
index 99362b900f..0000000000
--- a/keyboards/qpockets/space_space/rev2/rev2.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2021 qpockets
- *
- * 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_default( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, \
- K32, K33, K34, K36, K37, K38 \
-) \
-{ \
- {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50}, \
- {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51}, \
- {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52}, \
- {XXX, XXX, K32, K33, K34, XXX, K36, K37, K38, XXX, XXX} \
-} \
-
-#define LAYOUT_big_space( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, \
- K32, K35, K38 \
-) \
-{ \
- {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50}, \
- {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51}, \
- {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52}, \
- {XXX, XXX, K32, XXX, XXX, K35, XXX, XXX, K38, XXX, XXX} \
-}
-
-
diff --git a/keyboards/qpockets/wanten/info.json b/keyboards/qpockets/wanten/info.json
index f9c2841a58..4cb26a4365 100644
--- a/keyboards/qpockets/wanten/info.json
+++ b/keyboards/qpockets/wanten/info.json
@@ -25,148 +25,155 @@
"layouts": {
"LAYOUT_default": {
"layout": [
- {"label":"Play", "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":"Del", "x":6, "y":0, "w":1.75},
- {"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":"Next", "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":"Tab", "x":6, "y":1, "w":1.75},
- {"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":"Prev", "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":"Shift", "x":6, "y":2, "w":1.75},
- {"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":"LCtrl", "x":0, "y":3, "w":1.25},
- {"label":"LGui", "x":1.25, "y":3, "w":1.25},
- {"label":"LAlt", "x":2.5, "y":3, "w":1.25},
- {"label":"Back", "x":3.75, "y":3, "w":3},
- {"label":"Space", "x":6.75, "y":3, "w":3},
- {"label":"RCtrl", "x":9.75, "y":3},
- {"label":"RGui", "x":10.75, "y":3},
- {"label":"RAlt", "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, "w": 1.75},
+ {"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": 10.75, "y": 0},
+ {"matrix": [0, 11], "x": 11.75, "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, "w": 1.75},
+ {"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": [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, "w": 1.75},
+ {"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.25},
+ {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 5], "x": 3.75, "y": 3, "w": 3},
+ {"matrix": [3, 7], "x": 6.75, "y": 3, "w": 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}
+ ]
},
-
- "LAYOUT_2u_bars": {
+ "LAYOUT_2u_bars": {
"layout": [
- {"label":"Play", "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":"Del", "x":6, "y":0, "w":1.75},
- {"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":"Next", "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":"Tab", "x":6, "y":1, "w":1.75},
- {"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":"Prev", "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":"Shift", "x":6, "y":2, "w":1.75},
- {"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":"PSCR", "x":0, "y":3, "w":1.25},
- {"label":"LAlt", "x":1.25, "y":3, "w":1.25},
- {"label":"LGui", "x":2.5, "y":3, "w":1.25},
- {"label":"LCtl", "x":3.75, "y":3},
- {"label":"Back", "x":4.75, "y":3, "w":2},
- {"label":"Space", "x":6.75, "y":3, "w":2.25},
- {"label":"RCtrl", "x":9, "y":3},
- {"label":"RGui", "x":10, "y":3, "w":1.25},
- {"label":"RAlt", "x":11.25, "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, "w": 1.75},
+ {"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": 10.75, "y": 0},
+ {"matrix": [0, 11], "x": 11.75, "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, "w": 1.75},
+ {"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": [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, "w": 1.75},
+ {"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.25},
+ {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 4], "x": 3.75, "y": 3},
+ {"matrix": [3, 5], "x": 4.75, "y": 3, "w": 2},
+ {"matrix": [3, 7], "x": 6.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 8], "x": 9, "y": 3},
+ {"matrix": [3, 9], "x": 10, "y": 3, "w": 1.25},
+ {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.5}
+ ]
},
-
"LAYOUT_625_bar": {
"layout": [
- {"label":"Play", "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":"Del", "x":6, "y":0, "w":1.75},
- {"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":"Next", "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":"Tab", "x":6, "y":1, "w":1.75},
- {"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":"Prev", "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":"Shift", "x":6, "y":2, "w":1.75},
- {"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":"LAlt", "x":0, "y":3, "w":1.25},
- {"label":"LGui", "x":1.25, "y":3, "w":1.25},
- {"label":"LCtrl", "x":2.5, "y":3, "w":1.25},
- {"label":"Space", "x":3.75, "y":3, "w":6.25},
- {"label":"RAlt", "x":10, "y":3, "w":1.25},
- {"label":"RCtrl", "x":11.25, "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, "w": 1.75},
+ {"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": 10.75, "y": 0},
+ {"matrix": [0, 11], "x": 11.75, "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, "w": 1.75},
+ {"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": [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, "w": 1.75},
+ {"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.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, 9], "x": 10, "y": 3, "w": 1.25},
+ {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.5}
+ ]
}
}
} \ No newline at end of file
diff --git a/keyboards/qpockets/wanten/wanten.h b/keyboards/qpockets/wanten/wanten.h
deleted file mode 100644
index e6db44fea6..0000000000
--- a/keyboards/qpockets/wanten/wanten.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright 2021 qpockets
- *
- * 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_default( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k50, k51, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k60, k61, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k70, k71, \
- k30, k31, k32, k35, k37, k39, k80, k81 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k50, k51, }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k60, k61, }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k70, k71, }, \
- { k30, k31, k32, XXX, XXX, k35, XXX, k37, XXX, k39, k80, k81, } \
-}
-
-#define LAYOUT_625_bar( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k50, k51, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k60, k61, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k70, k71, \
- k30, k31, k32, k36, k39, k81 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k50, k51, }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k60, k61, }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k70, k71, }, \
- { k30, k31, k32, XXX, XXX, XXX, k36, XXX, XXX, k39, XXX, k81, } \
-}
-
-#define LAYOUT_2u_bars( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k50, k51, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k60, k61, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k70, k71, \
- k30, k31, k32, k34, k35, k37, k38, k39, k81 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k50, k51, }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k60, k61, }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k70, k71, }, \
- { k30, k31, k32, XXX, k34, k35, XXX, k37, k38, k39, XXX, k81, } \
-}
diff --git a/keyboards/sowbug/68keys/68keys.c b/keyboards/sowbug/68keys/68keys.c
index d26a6bab56..8c7394d75b 100644
--- a/keyboards/sowbug/68keys/68keys.c
+++ b/keyboards/sowbug/68keys/68keys.c
@@ -14,9 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-// 68keys.c
-
-#include "68keys.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
diff --git a/keyboards/sowbug/68keys/68keys.h b/keyboards/sowbug/68keys/68keys.h
deleted file mode 100644
index 6f455154f1..0000000000
--- a/keyboards/sowbug/68keys/68keys.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2021 Mike Tsao
- *
- * 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/>.
- */
-
-// 68keys.h
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_default( A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, B0, B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, B11, B12, B13, B14, B15, C0, C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, D0, D1, D2, D3, D4, D5, D6, D7, D8, D9, D10, D11, D12, E0, E1, E2, E3, E4, E5, E6, E7, E8, E9) \
-{ \
- { A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15 }, \
- { B0, B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, B11, B12, B13, B14, B15 }, \
- { C0, C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, KC_NO, KC_NO, KC_NO }, \
- { D0, D1, D2, D3, D4, D5, D6, D7, D8, D9, D10, D11, D12, KC_NO, KC_NO, KC_NO }, \
- { E0, E1, E2, E3, E4, E5, E6, E7, E8, E9, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
-}
-
-#define LAYOUT LAYOUT_default
diff --git a/keyboards/sowbug/68keys/info.json b/keyboards/sowbug/68keys/info.json
index acead2062a..801140e04a 100644
--- a/keyboards/sowbug/68keys/info.json
+++ b/keyboards/sowbug/68keys/info.json
@@ -21,77 +21,88 @@
"diode_direction": "COL2ROW",
"processor": "STM32F103",
"bootloader": "stm32duino",
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_default"
+ },
"layouts": {
"LAYOUT_default": {
"layout": [
- {"label":"K00", "x":0, "y":0},
- {"label":"K01", "x":1, "y":0},
- {"label":"K02", "x":2, "y":0},
- {"label":"K03", "x":3, "y":0},
- {"label":"K04", "x":4, "y":0},
- {"label":"K05", "x":5, "y":0},
- {"label":"K06", "x":6, "y":0},
- {"label":"K07", "x":7, "y":0},
- {"label":"K08", "x":8, "y":0},
- {"label":"K09", "x":9, "y":0},
- {"label":"K0A", "x":10, "y":0},
- {"label":"K0B", "x":11, "y":0},
- {"label":"K0C", "x":12, "y":0},
- {"label":"K0E", "x":13, "y":0, "w":2},
- {"label":"K0F", "x":15.25, "y":0},
- {"label":"K0G", "x":16.25, "y":0},
- {"label":"K10", "x":0, "y":1, "w":1.5},
- {"label":"K12", "x":1.5, "y":1},
- {"label":"K13", "x":2.5, "y":1},
- {"label":"K14", "x":3.5, "y":1},
- {"label":"K15", "x":4.5, "y":1},
- {"label":"K16", "x":5.5, "y":1},
- {"label":"K17", "x":6.5, "y":1},
- {"label":"K18", "x":7.5, "y":1},
- {"label":"K19", "x":8.5, "y":1},
- {"label":"K1A", "x":9.5, "y":1},
- {"label":"K1B", "x":10.5, "y":1},
- {"label":"K1C", "x":11.5, "y":1},
- {"label":"K1D", "x":12.5, "y":1},
- {"label":"K1E", "x":13.5, "y":1, "w":1.5},
- {"label":"K1F", "x":15.25, "y":1},
- {"label":"K1G", "x":16.25, "y":1},
- {"label":"K20", "x":0, "y":2, "w":1.75},
- {"label":"K22", "x":1.75, "y":2},
- {"label":"K23", "x":2.75, "y":2},
- {"label":"K24", "x":3.75, "y":2},
- {"label":"K25", "x":4.75, "y":2},
- {"label":"K26", "x":5.75, "y":2},
- {"label":"K27", "x":6.75, "y":2},
- {"label":"K28", "x":7.75, "y":2},
- {"label":"K29", "x":8.75, "y":2},
- {"label":"K2A", "x":9.75, "y":2},
- {"label":"K2B", "x":10.75, "y":2},
- {"label":"K2C", "x":11.75, "y":2},
- {"label":"K2D", "x":12.75, "y":2, "w":2.25},
- {"label":"K31", "x":0, "y":3, "w":2.25},
- {"label":"K32", "x":2.25, "y":3},
- {"label":"K33", "x":3.25, "y":3},
- {"label":"K34", "x":4.25, "y":3},
- {"label":"K35", "x":5.25, "y":3},
- {"label":"K36", "x":6.25, "y":3},
- {"label":"K37", "x":7.25, "y":3},
- {"label":"K38", "x":8.25, "y":3},
- {"label":"K39", "x":9.25, "y":3},
- {"label":"K3A", "x":10.25, "y":3},
- {"label":"K3B", "x":11.25, "y":3},
- {"label":"K3D", "x":12.25, "y":3, "w":2.75},
- {"label":"K3F", "x":15.25, "y":3},
- {"label":"K40", "x":0, "y":4, "w":1.25},
- {"label":"K41", "x":1.25, "y":4, "w":1.25},
- {"label":"K43", "x":2.5, "y":4, "w":1.25},
- {"label":"K46", "x":3.75, "y":4, "w":6.25},
- {"label":"K4A", "x":10, "y":4, "w":1.25},
- {"label":"K4B", "x":11.25, "y":4, "w":1.25},
- {"label":"K4D", "x":12.5, "y":4, "w":1.25},
- {"label":"K4E", "x":14.25, "y":4},
- {"label":"K4F", "x":15.25, "y":4},
- {"label":"K4G", "x":16.25, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1},
+ {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [3, 12], "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": 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},
+ {"matrix": [4, 8], "x": 15.25, "y": 4},
+ {"matrix": [4, 9], "x": 16.25, "y": 4}
]
}
}
diff --git a/keyboards/sowbug/ansi_tkl/ansi_tkl.c b/keyboards/sowbug/ansi_tkl/ansi_tkl.c
index dc24631a8c..284cd612dd 100644
--- a/keyboards/sowbug/ansi_tkl/ansi_tkl.c
+++ b/keyboards/sowbug/ansi_tkl/ansi_tkl.c
@@ -14,9 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-// ansi_tkl.c
-
-#include "ansi_tkl.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = {{
diff --git a/keyboards/sowbug/ansi_tkl/ansi_tkl.h b/keyboards/sowbug/ansi_tkl/ansi_tkl.h
deleted file mode 100644
index bf32fc18ce..0000000000
--- a/keyboards/sowbug/ansi_tkl/ansi_tkl.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 Mike Tsao
- *
- * 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/>.
- */
-
-// ansi_tkl.h
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_default( A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, B0, B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, B11, B12, B13, B14, B15, B16, C0, C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, C13, C14, C15, C16, D0, D1, D2, D3, D4, D5, D6, D7, D8, D9, D10, D11, D12, E0, E1, E2, E3, E4, E5, E6, E7, E8, E9, E10, E11, E12, F0, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10) \
-{ \
- { A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, KC_NO }, \
- { B0, B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, B11, B12, B13, B14, B15, B16 }, \
- { C0, C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, C13, C14, C15, C16 }, \
- { D0, D1, D2, D3, D4, D5, D6, D7, D8, D9, D10, D11, D12, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { E0, E1, E2, E3, E4, E5, E6, E7, E8, E9, E10, E11, E12, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { F0, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
-}
-
-#define LAYOUT LAYOUT_default
diff --git a/keyboards/sowbug/ansi_tkl/info.json b/keyboards/sowbug/ansi_tkl/info.json
index a0689ac0dd..221c591738 100644
--- a/keyboards/sowbug/ansi_tkl/info.json
+++ b/keyboards/sowbug/ansi_tkl/info.json
@@ -21,96 +21,112 @@
"diode_direction": "COL2ROW",
"processor": "STM32F103",
"bootloader": "stm32duino",
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_default"
+ },
"layouts": {
"LAYOUT_default": {
"layout": [
- {"label":"K00", "x":0, "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":"K07", "x":6.5, "y":0},
- {"label":"K08", "x":7.5, "y":0},
- {"label":"K09", "x":8.5, "y":0},
- {"label":"K0A", "x":9.5, "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":"K0F", "x":15.25, "y":0},
- {"label":"K0G", "x":16.25, "y":0},
- {"label":"K0H", "x":17.25, "y":0},
- {"label":"K20", "x":0, "y":1.5},
- {"label":"K21", "x":1, "y":1.5},
- {"label":"K22", "x":2, "y":1.5},
- {"label":"K23", "x":3, "y":1.5},
- {"label":"K24", "x":4, "y":1.5},
- {"label":"K25", "x":5, "y":1.5},
- {"label":"K26", "x":6, "y":1.5},
- {"label":"K27", "x":7, "y":1.5},
- {"label":"K28", "x":8, "y":1.5},
- {"label":"K29", "x":9, "y":1.5},
- {"label":"K2A", "x":10, "y":1.5},
- {"label":"K2B", "x":11, "y":1.5},
- {"label":"K2C", "x":12, "y":1.5},
- {"label":"K2E", "x":13, "y":1.5, "w":2},
- {"label":"K2F", "x":15.25, "y":1.5},
- {"label":"K2G", "x":16.25, "y":1.5},
- {"label":"K2H", "x":17.25, "y":1.5},
- {"label":"K30", "x":0, "y":2.5, "w":1.5},
- {"label":"K32", "x":1.5, "y":2.5},
- {"label":"K33", "x":2.5, "y":2.5},
- {"label":"K34", "x":3.5, "y":2.5},
- {"label":"K35", "x":4.5, "y":2.5},
- {"label":"K36", "x":5.5, "y":2.5},
- {"label":"K37", "x":6.5, "y":2.5},
- {"label":"K38", "x":7.5, "y":2.5},
- {"label":"K39", "x":8.5, "y":2.5},
- {"label":"K3A", "x":9.5, "y":2.5},
- {"label":"K3B", "x":10.5, "y":2.5},
- {"label":"K3C", "x":11.5, "y":2.5},
- {"label":"K3D", "x":12.5, "y":2.5},
- {"label":"K3E", "x":13.5, "y":2.5, "w":1.5},
- {"label":"K3F", "x":15.25, "y":2.5},
- {"label":"K3G", "x":16.25, "y":2.5},
- {"label":"K3H", "x":17.25, "y":2.5},
- {"label":"K40", "x":0, "y":3.5, "w":1.75},
- {"label":"K42", "x":1.75, "y":3.5},
- {"label":"K43", "x":2.75, "y":3.5},
- {"label":"K44", "x":3.75, "y":3.5},
- {"label":"K45", "x":4.75, "y":3.5},
- {"label":"K46", "x":5.75, "y":3.5},
- {"label":"K47", "x":6.75, "y":3.5},
- {"label":"K48", "x":7.75, "y":3.5},
- {"label":"K49", "x":8.75, "y":3.5},
- {"label":"K4A", "x":9.75, "y":3.5},
- {"label":"K4B", "x":10.75, "y":3.5},
- {"label":"K4C", "x":11.75, "y":3.5},
- {"label":"K4D", "x":12.75, "y":3.5, "w":2.25},
- {"label":"K51", "x":0, "y":4.5, "w":2.25},
- {"label":"K52", "x":2.25, "y":4.5},
- {"label":"K53", "x":3.25, "y":4.5},
- {"label":"K54", "x":4.25, "y":4.5},
- {"label":"K55", "x":5.25, "y":4.5},
- {"label":"K56", "x":6.25, "y":4.5},
- {"label":"K57", "x":7.25, "y":4.5},
- {"label":"K58", "x":8.25, "y":4.5},
- {"label":"K59", "x":9.25, "y":4.5},
- {"label":"K5A", "x":10.25, "y":4.5},
- {"label":"K5B", "x":11.25, "y":4.5},
- {"label":"K5D", "x":12.25, "y":4.5, "w":2.75},
- {"label":"K5G", "x":16.25, "y":4.5},
- {"label":"K60", "x":0, "y":5.5, "w":1.25},
- {"label":"K61", "x":1.25, "y":5.5, "w":1.25},
- {"label":"K63", "x":2.5, "y":5.5, "w":1.25},
- {"label":"K66", "x":3.75, "y":5.5, "w":6.25},
- {"label":"K6A", "x":10, "y":5.5, "w":1.25},
- {"label":"K6B", "x":11.25, "y":5.5, "w":1.25},
- {"label":"K6D", "x":12.5, "y":5.5, "w":1.25},
- {"label":"K6E", "x":13.75, "y":5.5, "w":1.25},
- {"label":"K6F", "x":15.25, "y":5.5},
- {"label":"K6G", "x":16.25, "y":5.5},
- {"label":"K6H", "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": 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": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+ {"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, "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": 2.75},
+
+ {"matrix": [4, 12], "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, 3], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 4], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 6], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 7], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [5, 8], "x": 15.25, "y": 5.5},
+ {"matrix": [5, 9], "x": 16.25, "y": 5.5},
+ {"matrix": [5, 10], "x": 17.25, "y": 5.5}
]
}
}
diff --git a/keyboards/synapse/info.json b/keyboards/synapse/info.json
index 8f207c975b..06ace305e6 100644
--- a/keyboards/synapse/info.json
+++ b/keyboards/synapse/info.json
@@ -22,94 +22,100 @@
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
+ "LAYOUT_7u_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": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "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, "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": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3, "w": 1.5},
+ {"matrix": [3, 3], "x": 2.5, "y": 3, "w": 7},
+ {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.5},
+ {"matrix": [3, 10], "x": 11, "y": 3}
+ ]
+ },
"LAYOUT_default": {
- "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, "w":1.25},
- {"x":1.25, "y":1},
- {"x":2.25, "y":1},
- {"x":3.25, "y":1},
- {"x":4.25, "y":1},
- {"x":5.25, "y":1},
- {"x":6.25, "y":1},
- {"x":7.25, "y":1},
- {"x":8.25, "y":1},
- {"x":9.25, "y":1},
- {"x":10.25, "y":1, "w":1.75},
- {"x":0, "y":2, "w":1.75},
- {"x":1.75, "y":2},
- {"x":2.75, "y":2},
- {"x":3.75, "y":2},
- {"x":4.75, "y":2},
- {"x":5.75, "y":2},
- {"x":6.75, "y":2},
- {"x":7.75, "y":2},
- {"x":8.75, "y":2},
- {"x":9.75, "y":2},
- {"x":10.75, "y":2, "w":1.25},
- {"x":0, "y":3},
- {"x":1, "y":3},
- {"x":2, "y":3},
- {"x":3, "y":3, "w":3},
- {"x":6, "y":3, "w":3},
- {"x":9, "y":3},
- {"x":10, "y":3},
- {"x":11, "y":3}
- ]
- },
- "LAYOUT_7u_space": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6, "y":0},
- {"x":7, "y":0},
- {"x":8, "y":0},
- {"x":9, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0},
- {"x":0, "y":1, "w":1.25},
- {"x":1.25, "y":1},
- {"x":2.25, "y":1},
- {"x":3.25, "y":1},
- {"x":4.25, "y":1},
- {"x":5.25, "y":1},
- {"x":6.25, "y":1},
- {"x":7.25, "y":1},
- {"x":8.25, "y":1},
- {"x":9.25, "y":1},
- {"x":10.25, "y":1, "w":1.75},
- {"x":0, "y":2, "w":1.75},
- {"x":1.75, "y":2},
- {"x":2.75, "y":2},
- {"x":3.75, "y":2},
- {"x":4.75, "y":2},
- {"x":5.75, "y":2},
- {"x":6.75, "y":2},
- {"x":7.75, "y":2},
- {"x":8.75, "y":2},
- {"x":9.75, "y":2},
- {"x":10.75, "y":2, "w":1.25},
- {"x":0, "y":3},
- {"x":1, "y":3, "w":1.5},
- {"x":2.5, "y":3, "w":7},
- {"x":9.5, "y":3, "w":1.5},
- {"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, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75},
+
+ {"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": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3, "w": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3, "w": 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/synapse/synapse.c b/keyboards/synapse/synapse.c
index ac9c50ceb1..0b532eaab6 100644
--- a/keyboards/synapse/synapse.c
+++ b/keyboards/synapse/synapse.c
@@ -13,7 +13,8 @@
* 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 "synapse.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/synapse/synapse.h b/keyboards/synapse/synapse.h
deleted file mode 100644
index a126e450ec..0000000000
--- a/keyboards/synapse/synapse.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2021 qpockets
- *
- * 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_default( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, K60, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, \
- K30, K31, K32, K33, K36, K38, K39, K53 \
-) \
-{ \
- {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, K60}, \
- {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, XXX}, \
- {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, XXX}, \
- {K30, K31, K32, K33, XXX, XXX, K36, XXX, K38, K39, K53, XXX} \
-} \
-
-#define LAYOUT_7u_space( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, K60, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, \
- K30, K31, K33, K39, K53 \
-) \
-{ \
- {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, K60}, \
- {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, XXX}, \
- {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, XXX}, \
- {K30, K31, XXX, K33, XXX, XXX, XXX, XXX, XXX, K39, K53, XXX} \
-}
-
diff --git a/keyboards/viktus/styrka/info.json b/keyboards/viktus/styrka/info.json
index 7e0c7c4c03..52cf5823a0 100644
--- a/keyboards/viktus/styrka/info.json
+++ b/keyboards/viktus/styrka/info.json
@@ -15,15 +15,283 @@
"diode_direction": "COL2ROW",
"processor": "STM32F072",
"bootloader": "stm32-dfu",
- "layouts": {
- "LAYOUT_default": {
- "layout": [{"label":"F1", "x":0, "y":0}, {"label":"MO(1)", "x":1, "y":0}, {"label":"~", "x":2.25, "y":0}, {"label":"!", "x":3.25, "y":0}, {"label":"@", "x":4.25, "y":0}, {"label":"#", "x":5.25, "y":0}, {"label":"$", "x":6.25, "y":0}, {"label":"%", "x":7.25, "y":0}, {"label":"^", "x":8.25, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Backspace", "x":15.25, "y":0, "w":2}, {"label":"Insert", "x":17.25, "y":0}, {"label":"F3", "x":0, "y":1}, {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.25, "y":1, "w":1.5}, {"label":"Q", "x":3.75, "y":1}, {"label":"W", "x":4.75, "y":1}, {"label":"E", "x":5.75, "y":1}, {"label":"R", "x":6.75, "y":1}, {"label":"T", "x":7.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"|", "x":15.75, "y":1, "w":1.5}, {"label":"Delete", "x":17.25, "y":1}, {"label":"F5", "x":0, "y":2}, {"label":"F6", "x":1, "y":2}, {"label":"Caps Lock", "x":2.25, "y":2, "w":1.75}, {"label":"A", "x":4, "y":2}, {"label":"S", "x":5, "y":2}, {"label":"D", "x":6, "y":2}, {"label":"F", "x":7, "y":2}, {"label":"G", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"PgUp", "x":17.25, "y":2}, {"label":"F7", "x":0, "y":3}, {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.25, "y":3, "w":2.25}, {"label":"Z", "x":4.5, "y":3}, {"label":"X", "x":5.5, "y":3}, {"label":"C", "x":6.5, "y":3}, {"label":"V", "x":7.5, "y":3}, {"label":"B", "x":8.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"PgDn", "x":17.25, "y":3}, {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Ctrl", "x":2.25, "y":4, "w":1.25}, {"label":"Win", "x":3.5, "y":4, "w":1.25}, {"label":"Alt", "x":4.75, "y":4, "w":1.25}, {"x":6, "y":4, "w":6.25}, {"label":"Alt", "x":12.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.25}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}]
- },
- "LAYOUT_split_bs": {
- "layout": [{"label":"F1", "x":0, "y":0}, {"label":"MO(1)", "x":1, "y":0}, {"label":"~", "x":2.25, "y":0}, {"label":"!", "x":3.25, "y":0}, {"label":"@", "x":4.25, "y":0}, {"label":"#", "x":5.25, "y":0}, {"label":"$", "x":6.25, "y":0}, {"label":"%", "x":7.25, "y":0}, {"label":"^", "x":8.25, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"|", "x":15.25, "y":0}, {"label":"Delete", "x":16.25, "y":0}, {"label":"Insert", "x":17.25, "y":0}, {"label":"F3", "x":0, "y":1}, {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.25, "y":1, "w":1.5}, {"label":"Q", "x":3.75, "y":1}, {"label":"W", "x":4.75, "y":1}, {"label":"E", "x":5.75, "y":1}, {"label":"R", "x":6.75, "y":1}, {"label":"T", "x":7.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"Backspace", "x":15.75, "y":1, "w":1.5}, {"label":"PgUp", "x":17.25, "y":1}, {"label":"F5", "x":0, "y":2}, {"label":"F6", "x":1, "y":2}, {"label":"Caps Lock", "x":2.25, "y":2, "w":1.75}, {"label":"A", "x":4, "y":2}, {"label":"S", "x":5, "y":2}, {"label":"D", "x":6, "y":2}, {"label":"F", "x":7, "y":2}, {"label":"G", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"PgDn", "x":17.25, "y":2}, {"label":"F7", "x":0, "y":3}, {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.25, "y":3, "w":2.25}, {"label":"Z", "x":4.5, "y":3}, {"label":"X", "x":5.5, "y":3}, {"label":"C", "x":6.5, "y":3}, {"label":"V", "x":7.5, "y":3}, {"label":"B", "x":8.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"End", "x":17.25, "y":3}, {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Ctrl", "x":2.25, "y":4, "w":1.25}, {"label":"Win", "x":3.5, "y":4, "w":1.25}, {"label":"Alt", "x":4.75, "y":4, "w":1.25}, {"x":6, "y":4, "w":6.25}, {"label":"Alt", "x":12.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.25}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}]
- },
- "LAYOUT_all": {
- "layout": [{"label":"F1", "x":0, "y":0}, {"label":"MO(1)", "x":1, "y":0}, {"label":"~", "x":2.25, "y":0}, {"label":"!", "x":3.25, "y":0}, {"label":"@", "x":4.25, "y":0}, {"label":"#", "x":5.25, "y":0}, {"label":"$", "x":6.25, "y":0}, {"label":"%", "x":7.25, "y":0}, {"label":"^", "x":8.25, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"x":15.25, "y":0}, {"label":"Back", "x":16.25, "y":0}, {"label":"Insert", "x":17.25, "y":0}, {"label":"F3", "x":0, "y":1}, {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.25, "y":1, "w":1.5}, {"label":"Q", "x":3.75, "y":1}, {"label":"W", "x":4.75, "y":1}, {"label":"E", "x":5.75, "y":1}, {"label":"R", "x":6.75, "y":1}, {"label":"T", "x":7.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"|", "x":15.75, "y":1, "w":1.5}, {"label":"Delete", "x":17.25, "y":1}, {"label":"F5", "x":0, "y":2}, {"label":"F6", "x":1, "y":2}, {"label":"Caps Lock", "x":2.25, "y":2, "w":1.75}, {"label":"A", "x":4, "y":2}, {"label":"S", "x":5, "y":2}, {"label":"D", "x":6, "y":2}, {"label":"F", "x":7, "y":2}, {"label":"G", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":1.25}, {"label":"PgUp", "x":17.25, "y":2}, {"label":"F7", "x":0, "y":3}, {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.25, "y":3, "w":1.25}, {"x":3.5, "y":3}, {"label":"Z", "x":4.5, "y":3}, {"label":"X", "x":5.5, "y":3}, {"label":"C", "x":6.5, "y":3}, {"label":"V", "x":7.5, "y":3}, {"label":"B", "x":8.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"PgDn", "x":17.25, "y":3}, {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Ctrl", "x":2.25, "y":4, "w":1.25}, {"label":"Win", "x":3.5, "y":4, "w":1.25}, {"label":"Alt", "x":4.75, "y":4, "w":1.25}, {"x":6, "y":4, "w":6.25}, {"label":"Alt", "x":12.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.25}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}]
+ "layouts": {
+ "LAYOUT_default": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+
+ {"matrix": [0, 1], "x": 2.25, "y": 0},
+ {"matrix": [1, 1], "x": 3.25, "y": 0},
+ {"matrix": [0, 2], "x": 4.25, "y": 0},
+ {"matrix": [1, 2], "x": 5.25, "y": 0},
+ {"matrix": [0, 3], "x": 6.25, "y": 0},
+ {"matrix": [1, 3], "x": 7.25, "y": 0},
+ {"matrix": [0, 4], "x": 8.25, "y": 0},
+ {"matrix": [1, 4], "x": 9.25, "y": 0},
+ {"matrix": [0, 5], "x": 10.25, "y": 0},
+ {"matrix": [1, 5], "x": 11.25, "y": 0},
+ {"matrix": [0, 6], "x": 12.25, "y": 0},
+ {"matrix": [1, 6], "x": 13.25, "y": 0},
+ {"matrix": [0, 7], "x": 14.25, "y": 0},
+ {"matrix": [0, 8], "x": 15.25, "y": 0, "w": 2},
+ {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1},
+ {"matrix": [3, 0], "x": 1, "y": 1},
+
+ {"matrix": [2, 1], "x": 2.25, "y": 1, "w": 1.5},
+ {"matrix": [3, 1], "x": 3.75, "y": 1},
+ {"matrix": [2, 2], "x": 4.75, "y": 1},
+ {"matrix": [3, 2], "x": 5.75, "y": 1},
+ {"matrix": [2, 3], "x": 6.75, "y": 1},
+ {"matrix": [3, 3], "x": 7.75, "y": 1},
+ {"matrix": [2, 4], "x": 8.75, "y": 1},
+ {"matrix": [3, 4], "x": 9.75, "y": 1},
+ {"matrix": [2, 5], "x": 10.75, "y": 1},
+ {"matrix": [3, 5], "x": 11.75, "y": 1},
+ {"matrix": [2, 6], "x": 12.75, "y": 1},
+ {"matrix": [3, 6], "x": 13.75, "y": 1},
+ {"matrix": [2, 7], "x": 14.75, "y": 1},
+ {"matrix": [2, 8], "x": 15.75, "y": 1, "w": 1.5},
+ {"matrix": [3, 8], "x": 17.25, "y": 1},
+
+ {"matrix": [4, 0], "x": 0, "y": 2},
+ {"matrix": [5, 0], "x": 1, "y": 2},
+
+ {"matrix": [4, 1], "x": 2.25, "y": 2, "w": 1.75},
+ {"matrix": [5, 1], "x": 4, "y": 2},
+ {"matrix": [4, 2], "x": 5, "y": 2},
+ {"matrix": [5, 2], "x": 6, "y": 2},
+ {"matrix": [4, 3], "x": 7, "y": 2},
+ {"matrix": [5, 3], "x": 8, "y": 2},
+ {"matrix": [4, 4], "x": 9, "y": 2},
+ {"matrix": [5, 4], "x": 10, "y": 2},
+ {"matrix": [4, 5], "x": 11, "y": 2},
+ {"matrix": [5, 5], "x": 12, "y": 2},
+ {"matrix": [4, 6], "x": 13, "y": 2},
+ {"matrix": [5, 6], "x": 14, "y": 2},
+ {"matrix": [4, 8], "x": 15, "y": 2, "w": 2.25},
+ {"matrix": [5, 8], "x": 17.25, "y": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3},
+ {"matrix": [7, 0], "x": 1, "y": 3},
+
+ {"matrix": [6, 1], "x": 2.25, "y": 3, "w": 2.25},
+ {"matrix": [6, 2], "x": 4.5, "y": 3},
+ {"matrix": [7, 2], "x": 5.5, "y": 3},
+ {"matrix": [6, 3], "x": 6.5, "y": 3},
+ {"matrix": [7, 3], "x": 7.5, "y": 3},
+ {"matrix": [6, 4], "x": 8.5, "y": 3},
+ {"matrix": [7, 4], "x": 9.5, "y": 3},
+ {"matrix": [6, 5], "x": 10.5, "y": 3},
+ {"matrix": [7, 5], "x": 11.5, "y": 3},
+ {"matrix": [6, 6], "x": 12.5, "y": 3},
+ {"matrix": [7, 6], "x": 13.5, "y": 3},
+ {"matrix": [6, 7], "x": 14.5, "y": 3, "w": 1.75},
+ {"matrix": [6, 8], "x": 16.25, "y": 3},
+ {"matrix": [7, 8], "x": 17.25, "y": 3},
+
+ {"matrix": [8, 0], "x": 0, "y": 4},
+ {"matrix": [9, 0], "x": 1, "y": 4},
+
+ {"matrix": [8, 1], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 1], "x": 3.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 2], "x": 4.75, "y": 4, "w": 1.25},
+ {"matrix": [8, 4], "x": 6, "y": 4, "w": 6.25},
+ {"matrix": [8, 6], "x": 12.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 6], "x": 13.5, "y": 4, "w": 1.25},
+
+ {"matrix": [8, 7], "x": 15.25, "y": 4},
+ {"matrix": [8, 8], "x": 16.25, "y": 4},
+ {"matrix": [9, 8], "x": 17.25, "y": 4}
+ ]
+ },
+ "LAYOUT_split_bs": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+
+ {"matrix": [0, 1], "x": 2.25, "y": 0},
+ {"matrix": [1, 1], "x": 3.25, "y": 0},
+ {"matrix": [0, 2], "x": 4.25, "y": 0},
+ {"matrix": [1, 2], "x": 5.25, "y": 0},
+ {"matrix": [0, 3], "x": 6.25, "y": 0},
+ {"matrix": [1, 3], "x": 7.25, "y": 0},
+ {"matrix": [0, 4], "x": 8.25, "y": 0},
+ {"matrix": [1, 4], "x": 9.25, "y": 0},
+ {"matrix": [0, 5], "x": 10.25, "y": 0},
+ {"matrix": [1, 5], "x": 11.25, "y": 0},
+ {"matrix": [0, 6], "x": 12.25, "y": 0},
+ {"matrix": [1, 6], "x": 13.25, "y": 0},
+ {"matrix": [0, 7], "x": 14.25, "y": 0},
+ {"matrix": [1, 7], "x": 15.25, "y": 0},
+ {"matrix": [0, 8], "x": 16.25, "y": 0},
+ {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1},
+ {"matrix": [3, 0], "x": 1, "y": 1},
+
+ {"matrix": [2, 1], "x": 2.25, "y": 1, "w": 1.5},
+ {"matrix": [3, 1], "x": 3.75, "y": 1},
+ {"matrix": [2, 2], "x": 4.75, "y": 1},
+ {"matrix": [3, 2], "x": 5.75, "y": 1},
+ {"matrix": [2, 3], "x": 6.75, "y": 1},
+ {"matrix": [3, 3], "x": 7.75, "y": 1},
+ {"matrix": [2, 4], "x": 8.75, "y": 1},
+ {"matrix": [3, 4], "x": 9.75, "y": 1},
+ {"matrix": [2, 5], "x": 10.75, "y": 1},
+ {"matrix": [3, 5], "x": 11.75, "y": 1},
+ {"matrix": [2, 6], "x": 12.75, "y": 1},
+ {"matrix": [3, 6], "x": 13.75, "y": 1},
+ {"matrix": [2, 7], "x": 14.75, "y": 1},
+ {"matrix": [2, 8], "x": 15.75, "y": 1, "w": 1.5},
+ {"matrix": [3, 8], "x": 17.25, "y": 1},
+
+ {"matrix": [4, 0], "x": 0, "y": 2},
+ {"matrix": [5, 0], "x": 1, "y": 2},
+
+ {"matrix": [4, 1], "x": 2.25, "y": 2, "w": 1.75},
+ {"matrix": [5, 1], "x": 4, "y": 2},
+ {"matrix": [4, 2], "x": 5, "y": 2},
+ {"matrix": [5, 2], "x": 6, "y": 2},
+ {"matrix": [4, 3], "x": 7, "y": 2},
+ {"matrix": [5, 3], "x": 8, "y": 2},
+ {"matrix": [4, 4], "x": 9, "y": 2},
+ {"matrix": [5, 4], "x": 10, "y": 2},
+ {"matrix": [4, 5], "x": 11, "y": 2},
+ {"matrix": [5, 5], "x": 12, "y": 2},
+ {"matrix": [4, 6], "x": 13, "y": 2},
+ {"matrix": [5, 6], "x": 14, "y": 2},
+ {"matrix": [4, 8], "x": 15, "y": 2, "w": 2.25},
+ {"matrix": [5, 8], "x": 17.25, "y": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3},
+ {"matrix": [7, 0], "x": 1, "y": 3},
+
+ {"matrix": [6, 1], "x": 2.25, "y": 3, "w": 2.25},
+ {"matrix": [6, 2], "x": 4.5, "y": 3},
+ {"matrix": [7, 2], "x": 5.5, "y": 3},
+ {"matrix": [6, 3], "x": 6.5, "y": 3},
+ {"matrix": [7, 3], "x": 7.5, "y": 3},
+ {"matrix": [6, 4], "x": 8.5, "y": 3},
+ {"matrix": [7, 4], "x": 9.5, "y": 3},
+ {"matrix": [6, 5], "x": 10.5, "y": 3},
+ {"matrix": [7, 5], "x": 11.5, "y": 3},
+ {"matrix": [6, 6], "x": 12.5, "y": 3},
+ {"matrix": [7, 6], "x": 13.5, "y": 3},
+ {"matrix": [6, 7], "x": 14.5, "y": 3, "w": 1.75},
+ {"matrix": [6, 8], "x": 16.25, "y": 3},
+ {"matrix": [7, 8], "x": 17.25, "y": 3},
+
+ {"matrix": [8, 0], "x": 0, "y": 4},
+ {"matrix": [9, 0], "x": 1, "y": 4},
+
+ {"matrix": [8, 1], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 1], "x": 3.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 2], "x": 4.75, "y": 4, "w": 1.25},
+ {"matrix": [8, 4], "x": 6, "y": 4, "w": 6.25},
+ {"matrix": [8, 6], "x": 12.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 6], "x": 13.5, "y": 4, "w": 1.25},
+
+ {"matrix": [8, 7], "x": 15.25, "y": 4},
+ {"matrix": [8, 8], "x": 16.25, "y": 4},
+ {"matrix": [9, 8], "x": 17.25, "y": 4}
+ ]
+ },
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+
+ {"matrix": [0, 1], "x": 2.25, "y": 0},
+ {"matrix": [1, 1], "x": 3.25, "y": 0},
+ {"matrix": [0, 2], "x": 4.25, "y": 0},
+ {"matrix": [1, 2], "x": 5.25, "y": 0},
+ {"matrix": [0, 3], "x": 6.25, "y": 0},
+ {"matrix": [1, 3], "x": 7.25, "y": 0},
+ {"matrix": [0, 4], "x": 8.25, "y": 0},
+ {"matrix": [1, 4], "x": 9.25, "y": 0},
+ {"matrix": [0, 5], "x": 10.25, "y": 0},
+ {"matrix": [1, 5], "x": 11.25, "y": 0},
+ {"matrix": [0, 6], "x": 12.25, "y": 0},
+ {"matrix": [1, 6], "x": 13.25, "y": 0},
+ {"matrix": [0, 7], "x": 14.25, "y": 0},
+ {"matrix": [1, 7], "x": 15.25, "y": 0},
+ {"matrix": [0, 8], "x": 16.25, "y": 0},
+ {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1},
+ {"matrix": [3, 0], "x": 1, "y": 1},
+
+ {"matrix": [2, 1], "x": 2.25, "y": 1, "w": 1.5},
+ {"matrix": [3, 1], "x": 3.75, "y": 1},
+ {"matrix": [2, 2], "x": 4.75, "y": 1},
+ {"matrix": [3, 2], "x": 5.75, "y": 1},
+ {"matrix": [2, 3], "x": 6.75, "y": 1},
+ {"matrix": [3, 3], "x": 7.75, "y": 1},
+ {"matrix": [2, 4], "x": 8.75, "y": 1},
+ {"matrix": [3, 4], "x": 9.75, "y": 1},
+ {"matrix": [2, 5], "x": 10.75, "y": 1},
+ {"matrix": [3, 5], "x": 11.75, "y": 1},
+ {"matrix": [2, 6], "x": 12.75, "y": 1},
+ {"matrix": [3, 6], "x": 13.75, "y": 1},
+ {"matrix": [2, 7], "x": 14.75, "y": 1},
+ {"matrix": [2, 8], "x": 15.75, "y": 1, "w": 1.5},
+ {"matrix": [3, 8], "x": 17.25, "y": 1},
+
+ {"matrix": [4, 0], "x": 0, "y": 2},
+ {"matrix": [5, 0], "x": 1, "y": 2},
+
+ {"matrix": [4, 1], "x": 2.25, "y": 2, "w": 1.75},
+ {"matrix": [5, 1], "x": 4, "y": 2},
+ {"matrix": [4, 2], "x": 5, "y": 2},
+ {"matrix": [5, 2], "x": 6, "y": 2},
+ {"matrix": [4, 3], "x": 7, "y": 2},
+ {"matrix": [5, 3], "x": 8, "y": 2},
+ {"matrix": [4, 4], "x": 9, "y": 2},
+ {"matrix": [5, 4], "x": 10, "y": 2},
+ {"matrix": [4, 5], "x": 11, "y": 2},
+ {"matrix": [5, 5], "x": 12, "y": 2},
+ {"matrix": [4, 6], "x": 13, "y": 2},
+ {"matrix": [5, 6], "x": 14, "y": 2},
+ {"matrix": [4, 7], "x": 15, "y": 2},
+ {"matrix": [4, 8], "x": 16, "y": 2, "w": 1.25},
+ {"matrix": [5, 8], "x": 17.25, "y": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3},
+ {"matrix": [7, 0], "x": 1, "y": 3},
+
+ {"matrix": [6, 1], "x": 2.25, "y": 3, "w": 1.25},
+ {"matrix": [7, 1], "x": 3.5, "y": 3},
+ {"matrix": [6, 2], "x": 4.5, "y": 3},
+ {"matrix": [7, 2], "x": 5.5, "y": 3},
+ {"matrix": [6, 3], "x": 6.5, "y": 3},
+ {"matrix": [7, 3], "x": 7.5, "y": 3},
+ {"matrix": [6, 4], "x": 8.5, "y": 3},
+ {"matrix": [7, 4], "x": 9.5, "y": 3},
+ {"matrix": [6, 5], "x": 10.5, "y": 3},
+ {"matrix": [7, 5], "x": 11.5, "y": 3},
+ {"matrix": [6, 6], "x": 12.5, "y": 3},
+ {"matrix": [7, 6], "x": 13.5, "y": 3},
+ {"matrix": [6, 7], "x": 14.5, "y": 3, "w": 1.75},
+ {"matrix": [6, 8], "x": 16.25, "y": 3},
+ {"matrix": [7, 8], "x": 17.25, "y": 3},
+
+ {"matrix": [8, 0], "x": 0, "y": 4},
+ {"matrix": [9, 0], "x": 1, "y": 4},
+
+ {"matrix": [8, 1], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 1], "x": 3.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 2], "x": 4.75, "y": 4, "w": 1.25},
+ {"matrix": [8, 4], "x": 6, "y": 4, "w": 6.25},
+ {"matrix": [8, 6], "x": 12.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 6], "x": 13.5, "y": 4, "w": 1.25},
+
+ {"matrix": [8, 7], "x": 15.25, "y": 4},
+ {"matrix": [8, 8], "x": 16.25, "y": 4},
+ {"matrix": [9, 8], "x": 17.25, "y": 4}
+ ]
+ }
}
}
-}
diff --git a/keyboards/viktus/styrka/styrka.h b/keyboards/viktus/styrka/styrka.h
deleted file mode 100644
index 81d1a76f70..0000000000
--- a/keyboards/viktus/styrka/styrka.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* Copyright 2020 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"
-#define ___ KC_NO
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- *
- *
- * Use LAYOUT_all for ISO and Tsangan builds
- *
- */
-
-#define LAYOUT_default( \
- K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K08, K18, \
- K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, K28, K38, \
- K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K48, K58, \
- K60, K70, K61, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, K67, K68, K78, \
- K80, K90, K81, K91, K82, K84, K86, K96, K87, K88, K98 \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
- { K10, K11, K12, K13, K14, K15, K16, ___, K18 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
- { K30, K31, K32, K33, K34, K35, K36, ___, K38 }, \
- { K40, K41, K42, K43, K44, K45, K46, ___, K48 }, \
- { K50, K51, K52, K53, K54, K55, K56, ___, K58 }, \
- { K60, K61, K62, K63, K64, K65, K66, K67, K68 }, \
- { K70, ___, K72, K73, K74, K75, K76, ___, K78 }, \
- { K80, K81, K82, ___, K84, ___, K86, K87, K88 }, \
- { K90, K91, ___, ___, ___, ___, K96, ___, K98 } \
-}
-#define LAYOUT_split_bs( \
- K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, K08, K18, \
- K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, K28, K38, \
- K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K48, K58, \
- K60, K70, K61, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, K67, K68, K78, \
- K80, K90, K81, K91, K82, K84, K86, K96, K87, K88, K98 \
-) \
-{ \
- { 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, ___, K38 }, \
- { K40, K41, K42, K43, K44, K45, K46, ___, K48 }, \
- { K50, K51, K52, K53, K54, K55, K56, ___, K58 }, \
- { K60, K61, K62, K63, K64, K65, K66, K67, K68 }, \
- { K70, ___, K72, K73, K74, K75, K76, ___, K78 }, \
- { K80, K81, K82, ___, K84, ___, K86, K87, K88 }, \
- { K90, K91, ___, ___, ___, ___, K96, ___, K98 } \
-}
-#define LAYOUT_all( \
- K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, K08, K18, \
- K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, K28, K38, \
- K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K47, K48, K58, \
- K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, K67, K68, K78, \
- K80, K90, K81, K91, K82, K84, K86, K96, K87, K88, K98 \
-) \
-{ \
- { 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, ___, K38 }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
- { K50, K51, K52, K53, K54, K55, K56, ___, K58 }, \
- { K60, K61, K62, K63, K64, K65, K66, K67, K68 }, \
- { K70, K71, K72, K73, K74, K75, K76, ___, K78 }, \
- { K80, K81, K82, ___, K84, ___, K86, K87, K88 }, \
- { K90, K91, ___, ___, ___, ___, K96, ___, K98 } \
-}
diff --git a/keyboards/ymdk/ymd96/info.json b/keyboards/ymdk/ymd96/info.json
index d090c54c49..d24d4fa4cd 100644
--- a/keyboards/ymdk/ymd96/info.json
+++ b/keyboards/ymdk/ymd96/info.json
@@ -30,13 +30,332 @@
"bootloader": "bootloadhid",
"layouts": {
"LAYOUT_default": {
- "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":"Home", "x":14, "y":0}, {"label":"End", "x":15, "y":0}, {"label":"Insert", "x":16, "y":0}, {"label":"Delete", "x":17, "y":0}, {"label":"Page Up", "x":18, "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":"Num Lock", "x":15, "y":1}, {"label":"/", "x":16, "y":1}, {"label":"*", "x":17, "y":1}, {"label":"PgDn", "x":18, "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":"7", "x":15, "y":2}, {"label":"8", "x":16, "y":2}, {"label":"9", "x":17, "y":2}, {"label":"+", "x":18, "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":"4", "x":15, "y":3}, {"label":"5", "x":16, "y":3}, {"label":"6", "x":17, "y":3}, {"label":"+", "x":18, "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":2.75}, {"label":"1", "x":15, "y":4}, {"label":"2", "x":16, "y":4}, {"label":"3", "x":17, "y":4}, {"label":"Enter", "x":18, "y":4, "h":2}, {"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":"Fn", "x":10, "y":5}, {"label":"Win", "x":11, "y":5}, {"label":"\u2190", "x":12, "y":5}, {"label":"\u2193", "x":13, "y":5}, {"label":"\u2191", "x":14, "y":5}, {"label":"\u2192", "x":15, "y":5}, {"label":"0", "x":16, "y":5}, {"label":".", "x":17, "y":5}]
+ "layout": [
+ {"matrix": [5, 0], "x": 0, "y": 0},
+ {"matrix": [5, 2], "x": 1, "y": 0},
+ {"matrix": [5, 3], "x": 2, "y": 0},
+ {"matrix": [5, 4], "x": 3, "y": 0},
+ {"matrix": [5, 5], "x": 4, "y": 0},
+ {"matrix": [6, 0], "x": 5, "y": 0},
+ {"matrix": [6, 10], "x": 6, "y": 0},
+ {"matrix": [7, 10], "x": 7, "y": 0},
+ {"matrix": [7, 0], "x": 8, "y": 0},
+ {"matrix": [5, 11], "x": 9, "y": 0},
+ {"matrix": [5, 12], "x": 10, "y": 0},
+ {"matrix": [5, 13], "x": 11, "y": 0},
+ {"matrix": [5, 14], "x": 12, "y": 0},
+ {"matrix": [1, 13], "x": 13, "y": 0},
+ {"matrix": [2, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0},
+ {"matrix": [7, 6], "x": 16, "y": 0},
+ {"matrix": [7, 9], "x": 17, "y": 0},
+ {"matrix": [7, 8], "x": 18, "y": 0},
+
+ {"matrix": [4, 0], "x": 0, "y": 1},
+ {"matrix": [4, 1], "x": 1, "y": 1},
+ {"matrix": [4, 2], "x": 2, "y": 1},
+ {"matrix": [4, 3], "x": 3, "y": 1},
+ {"matrix": [4, 4], "x": 4, "y": 1},
+ {"matrix": [4, 5], "x": 5, "y": 1},
+ {"matrix": [6, 1], "x": 6, "y": 1},
+ {"matrix": [6, 11], "x": 7, "y": 1},
+ {"matrix": [7, 11], "x": 8, "y": 1},
+ {"matrix": [7, 1], "x": 9, "y": 1},
+ {"matrix": [4, 10], "x": 10, "y": 1},
+ {"matrix": [4, 11], "x": 11, "y": 1},
+ {"matrix": [4, 12], "x": 12, "y": 1},
+ {"matrix": [4, 14], "x": 13, "y": 1, "w": 2},
+ {"matrix": [4, 6], "x": 15, "y": 1},
+ {"matrix": [4, 7], "x": 16, "y": 1},
+ {"matrix": [4, 8], "x": 17, "y": 1},
+ {"matrix": [4, 9], "x": 18, "y": 1},
+
+ {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [3, 1], "x": 1.5, "y": 2},
+ {"matrix": [3, 2], "x": 2.5, "y": 2},
+ {"matrix": [3, 3], "x": 3.5, "y": 2},
+ {"matrix": [3, 4], "x": 4.5, "y": 2},
+ {"matrix": [3, 5], "x": 5.5, "y": 2},
+ {"matrix": [6, 2], "x": 6.5, "y": 2},
+ {"matrix": [6, 12], "x": 7.5, "y": 2},
+ {"matrix": [7, 12], "x": 8.5, "y": 2},
+ {"matrix": [7, 2], "x": 9.5, "y": 2},
+ {"matrix": [3, 10], "x": 10.5, "y": 2},
+ {"matrix": [3, 11], "x": 11.5, "y": 2},
+ {"matrix": [3, 12], "x": 12.5, "y": 2},
+ {"matrix": [3, 13], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [3, 6], "x": 15, "y": 2},
+ {"matrix": [3, 7], "x": 16, "y": 2},
+ {"matrix": [3, 8], "x": 17, "y": 2},
+ {"matrix": [3, 9], "x": 18, "y": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 3},
+ {"matrix": [2, 2], "x": 2.75, "y": 3},
+ {"matrix": [2, 3], "x": 3.75, "y": 3},
+ {"matrix": [2, 4], "x": 4.75, "y": 3},
+ {"matrix": [2, 5], "x": 5.75, "y": 3},
+ {"matrix": [6, 3], "x": 6.75, "y": 3},
+ {"matrix": [6, 13], "x": 7.75, "y": 3},
+ {"matrix": [7, 13], "x": 8.75, "y": 3},
+ {"matrix": [7, 3], "x": 9.75, "y": 3},
+ {"matrix": [2, 10], "x": 10.75, "y": 3},
+ {"matrix": [2, 11], "x": 11.75, "y": 3},
+ {"matrix": [2, 13], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [2, 6], "x": 15, "y": 3},
+ {"matrix": [2, 7], "x": 16, "y": 3},
+ {"matrix": [2, 8], "x": 17, "y": 3},
+ {"matrix": [2, 9], "x": 18, "y": 3},
+
+ {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
+ {"matrix": [1, 1], "x": 2.25, "y": 4},
+ {"matrix": [1, 2], "x": 3.25, "y": 4},
+ {"matrix": [1, 3], "x": 4.25, "y": 4},
+ {"matrix": [1, 4], "x": 5.25, "y": 4},
+ {"matrix": [1, 5], "x": 6.25, "y": 4},
+ {"matrix": [6, 4], "x": 7.25, "y": 4},
+ {"matrix": [6, 14], "x": 8.25, "y": 4},
+ {"matrix": [7, 14], "x": 9.25, "y": 4},
+ {"matrix": [7, 4], "x": 10.25, "y": 4},
+ {"matrix": [1, 10], "x": 11.25, "y": 4},
+ {"matrix": [1, 11], "x": 12.25, "y": 4, "w": 2.75},
+ {"matrix": [1, 6], "x": 15, "y": 4},
+ {"matrix": [1, 7], "x": 16, "y": 4},
+ {"matrix": [1, 8], "x": 17, "y": 4},
+ {"matrix": [0, 9], "x": 18, "y": 4, "h": 2},
+
+ {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [6, 5], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [7, 5], "x": 10, "y": 5},
+ {"matrix": [0, 10], "x": 11, "y": 5},
+ {"matrix": [0, 11], "x": 12, "y": 5},
+ {"matrix": [6, 6], "x": 13, "y": 5},
+ {"matrix": [6, 7], "x": 14, "y": 5},
+ {"matrix": [6, 9], "x": 15, "y": 5},
+ {"matrix": [0, 6], "x": 16, "y": 5},
+ {"matrix": [0, 8], "x": 17, "y": 5}
+ ]
},
"LAYOUT_custom": {
- "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":"Home", "x":14, "y":0}, {"label":"End", "x":15, "y":0}, {"label":"Insert", "x":16, "y":0}, {"label":"Delete", "x":17, "y":0}, {"label":"Page Up", "x":18, "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":"Num Lock", "x":15, "y":1}, {"label":"/", "x":16, "y":1}, {"label":"*", "x":17, "y":1}, {"label":"PgDn", "x":18, "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":"7", "x":15, "y":2}, {"label":"8", "x":16, "y":2}, {"label":"9", "x":17, "y":2}, {"label":"-", "x":18, "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":"4", "x":15, "y":3}, {"label":"5", "x":16, "y":3}, {"label":"6", "x":17, "y":3}, {"label":"+", "x":18, "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":"Fn", "x":14, "y":4}, {"label":"1", "x":15, "y":4}, {"label":"2", "x":16, "y":4}, {"label":"3", "x":17, "y":4}, {"label":"Enter", "x":18, "y":4, "h":2}, {"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":"Menu", "x":11, "y":5}, {"label":"Prnt Scr", "x":12, "y":5}, {"label":"Ctrl", "x":13, "y":5}, {"label":"Scroll Lock", "x":14, "y":5}, {"label":"0", "x":15, "y":5, "w":2}, {"label":".", "x":17, "y":5}]
+ "layout": [
+ {"matrix": [5, 0], "x": 0, "y": 0},
+ {"matrix": [5, 2], "x": 1, "y": 0},
+ {"matrix": [5, 3], "x": 2, "y": 0},
+ {"matrix": [5, 4], "x": 3, "y": 0},
+ {"matrix": [5, 5], "x": 4, "y": 0},
+ {"matrix": [6, 0], "x": 5, "y": 0},
+ {"matrix": [6, 10], "x": 6, "y": 0},
+ {"matrix": [7, 10], "x": 7, "y": 0},
+ {"matrix": [7, 0], "x": 8, "y": 0},
+ {"matrix": [5, 11], "x": 9, "y": 0},
+ {"matrix": [5, 12], "x": 10, "y": 0},
+ {"matrix": [5, 13], "x": 11, "y": 0},
+ {"matrix": [5, 14], "x": 12, "y": 0},
+ {"matrix": [1, 13], "x": 13, "y": 0},
+ {"matrix": [2, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0},
+ {"matrix": [7, 6], "x": 16, "y": 0},
+ {"matrix": [7, 9], "x": 17, "y": 0},
+ {"matrix": [7, 8], "x": 18, "y": 0},
+
+ {"matrix": [4, 0], "x": 0, "y": 1},
+ {"matrix": [4, 1], "x": 1, "y": 1},
+ {"matrix": [4, 2], "x": 2, "y": 1},
+ {"matrix": [4, 3], "x": 3, "y": 1},
+ {"matrix": [4, 4], "x": 4, "y": 1},
+ {"matrix": [4, 5], "x": 5, "y": 1},
+ {"matrix": [6, 1], "x": 6, "y": 1},
+ {"matrix": [6, 11], "x": 7, "y": 1},
+ {"matrix": [7, 11], "x": 8, "y": 1},
+ {"matrix": [7, 1], "x": 9, "y": 1},
+ {"matrix": [4, 10], "x": 10, "y": 1},
+ {"matrix": [4, 11], "x": 11, "y": 1},
+ {"matrix": [4, 12], "x": 12, "y": 1},
+ {"matrix": [4, 14], "x": 13, "y": 1, "w": 2},
+ {"matrix": [4, 6], "x": 15, "y": 1},
+ {"matrix": [4, 7], "x": 16, "y": 1},
+ {"matrix": [4, 8], "x": 17, "y": 1},
+ {"matrix": [4, 9], "x": 18, "y": 1},
+
+ {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [3, 1], "x": 1.5, "y": 2},
+ {"matrix": [3, 2], "x": 2.5, "y": 2},
+ {"matrix": [3, 3], "x": 3.5, "y": 2},
+ {"matrix": [3, 4], "x": 4.5, "y": 2},
+ {"matrix": [3, 5], "x": 5.5, "y": 2},
+ {"matrix": [6, 2], "x": 6.5, "y": 2},
+ {"matrix": [6, 12], "x": 7.5, "y": 2},
+ {"matrix": [7, 12], "x": 8.5, "y": 2},
+ {"matrix": [7, 2], "x": 9.5, "y": 2},
+ {"matrix": [3, 10], "x": 10.5, "y": 2},
+ {"matrix": [3, 11], "x": 11.5, "y": 2},
+ {"matrix": [3, 12], "x": 12.5, "y": 2},
+ {"matrix": [3, 13], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [3, 6], "x": 15, "y": 2},
+ {"matrix": [3, 7], "x": 16, "y": 2},
+ {"matrix": [3, 8], "x": 17, "y": 2},
+ {"matrix": [3, 9], "x": 18, "y": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 3},
+ {"matrix": [2, 2], "x": 2.75, "y": 3},
+ {"matrix": [2, 3], "x": 3.75, "y": 3},
+ {"matrix": [2, 4], "x": 4.75, "y": 3},
+ {"matrix": [2, 5], "x": 5.75, "y": 3},
+ {"matrix": [6, 3], "x": 6.75, "y": 3},
+ {"matrix": [6, 13], "x": 7.75, "y": 3},
+ {"matrix": [7, 13], "x": 8.75, "y": 3},
+ {"matrix": [7, 3], "x": 9.75, "y": 3},
+ {"matrix": [2, 10], "x": 10.75, "y": 3},
+ {"matrix": [2, 11], "x": 11.75, "y": 3},
+ {"matrix": [2, 13], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [2, 6], "x": 15, "y": 3},
+ {"matrix": [2, 7], "x": 16, "y": 3},
+ {"matrix": [2, 8], "x": 17, "y": 3},
+ {"matrix": [2, 9], "x": 18, "y": 3},
+
+ {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
+ {"matrix": [1, 1], "x": 2.25, "y": 4},
+ {"matrix": [1, 2], "x": 3.25, "y": 4},
+ {"matrix": [1, 3], "x": 4.25, "y": 4},
+ {"matrix": [1, 4], "x": 5.25, "y": 4},
+ {"matrix": [1, 5], "x": 6.25, "y": 4},
+ {"matrix": [6, 4], "x": 7.25, "y": 4},
+ {"matrix": [6, 14], "x": 8.25, "y": 4},
+ {"matrix": [7, 14], "x": 9.25, "y": 4},
+ {"matrix": [7, 4], "x": 10.25, "y": 4},
+ {"matrix": [1, 10], "x": 11.25, "y": 4},
+ {"matrix": [1, 11], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [6, 8], "x": 14, "y": 4},
+ {"matrix": [1, 6], "x": 15, "y": 4},
+ {"matrix": [1, 7], "x": 16, "y": 4},
+ {"matrix": [1, 8], "x": 17, "y": 4},
+ {"matrix": [0, 9], "x": 18, "y": 4, "h": 2},
+
+ {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [6, 5], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [7, 5], "x": 10, "y": 5},
+ {"matrix": [0, 10], "x": 11, "y": 5},
+ {"matrix": [0, 11], "x": 12, "y": 5},
+ {"matrix": [6, 6], "x": 13, "y": 5},
+ {"matrix": [6, 7], "x": 14, "y": 5},
+ {"matrix": [0, 6], "x": 15, "y": 5, "w": 2},
+ {"matrix": [0, 8], "x": 17, "y": 5}
+ ]
},
"LAYOUT_iso": {
- "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"PrtSc", "x":13, "y":0}, {"label":"Home", "x":14, "y":0}, {"label":"End", "x":15, "y":0}, {"label":"Insert", "x":16, "y":0}, {"label":"Delete", "x":17, "y":0}, {"label":"PgUp", "x":18, "y":0}, {"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":"Num Lock", "x":15, "y":1}, {"label":"/", "x":16, "y":1}, {"label":"*", "x":17, "y":1}, {"label":"PgDn", "x":18, "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":"7", "x":15, "y":2}, {"label":"8", "x":16, "y":2}, {"label":"9", "x":17, "y":2}, {"label":"-", "x":18, "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":"4", "x":15, "y":3}, {"label":"5", "x":16, "y":3}, {"label":"6", "x":17, "y":3}, {"label":"+", "x":18, "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":"1", "x":15, "y":4}, {"label":"2", "x":16, "y":4}, {"label":"3", "x":17, "y":4}, {"label":"Enter", "x":18, "y":4, "h":2}, {"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":"AltGr", "x":10, "y":5, "w":1.5}, {"label":"Win", "x":11.5, "y":5, "w":1.5}, {"label":"Left", "x":13, "y":5}, {"label":"Down", "x":14, "y":5}, {"label":"Right", "x":15, "y":5}, {"label":"0", "x":16, "y":5}, {"label":".", "x":17, "y":5}]
+ "layout": [
+ {"matrix": [5, 0], "x": 0, "y": 0},
+ {"matrix": [5, 2], "x": 1, "y": 0},
+ {"matrix": [5, 3], "x": 2, "y": 0},
+ {"matrix": [5, 4], "x": 3, "y": 0},
+ {"matrix": [5, 5], "x": 4, "y": 0},
+ {"matrix": [6, 0], "x": 5, "y": 0},
+ {"matrix": [6, 10], "x": 6, "y": 0},
+ {"matrix": [7, 10], "x": 7, "y": 0},
+ {"matrix": [7, 0], "x": 8, "y": 0},
+ {"matrix": [5, 11], "x": 9, "y": 0},
+ {"matrix": [5, 12], "x": 10, "y": 0},
+ {"matrix": [5, 13], "x": 11, "y": 0},
+ {"matrix": [5, 14], "x": 12, "y": 0},
+ {"matrix": [1, 13], "x": 13, "y": 0},
+ {"matrix": [2, 14], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0},
+ {"matrix": [7, 6], "x": 16, "y": 0},
+ {"matrix": [7, 9], "x": 17, "y": 0},
+ {"matrix": [7, 8], "x": 18, "y": 0},
+
+ {"matrix": [4, 0], "x": 0, "y": 1},
+ {"matrix": [4, 1], "x": 1, "y": 1},
+ {"matrix": [4, 2], "x": 2, "y": 1},
+ {"matrix": [4, 3], "x": 3, "y": 1},
+ {"matrix": [4, 4], "x": 4, "y": 1},
+ {"matrix": [4, 5], "x": 5, "y": 1},
+ {"matrix": [6, 1], "x": 6, "y": 1},
+ {"matrix": [6, 11], "x": 7, "y": 1},
+ {"matrix": [7, 11], "x": 8, "y": 1},
+ {"matrix": [7, 1], "x": 9, "y": 1},
+ {"matrix": [4, 10], "x": 10, "y": 1},
+ {"matrix": [4, 11], "x": 11, "y": 1},
+ {"matrix": [4, 12], "x": 12, "y": 1},
+ {"matrix": [4, 14], "x": 13, "y": 1, "w": 2},
+ {"matrix": [4, 6], "x": 15, "y": 1},
+ {"matrix": [4, 7], "x": 16, "y": 1},
+ {"matrix": [4, 8], "x": 17, "y": 1},
+ {"matrix": [4, 9], "x": 18, "y": 1},
+
+ {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [3, 1], "x": 1.5, "y": 2},
+ {"matrix": [3, 2], "x": 2.5, "y": 2},
+ {"matrix": [3, 3], "x": 3.5, "y": 2},
+ {"matrix": [3, 4], "x": 4.5, "y": 2},
+ {"matrix": [3, 5], "x": 5.5, "y": 2},
+ {"matrix": [6, 2], "x": 6.5, "y": 2},
+ {"matrix": [6, 12], "x": 7.5, "y": 2},
+ {"matrix": [7, 12], "x": 8.5, "y": 2},
+ {"matrix": [7, 2], "x": 9.5, "y": 2},
+ {"matrix": [3, 10], "x": 10.5, "y": 2},
+ {"matrix": [3, 11], "x": 11.5, "y": 2},
+ {"matrix": [3, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+ {"matrix": [3, 6], "x": 15, "y": 2},
+ {"matrix": [3, 7], "x": 16, "y": 2},
+ {"matrix": [3, 8], "x": 17, "y": 2},
+ {"matrix": [3, 9], "x": 18, "y": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 3},
+ {"matrix": [2, 2], "x": 2.75, "y": 3},
+ {"matrix": [2, 3], "x": 3.75, "y": 3},
+ {"matrix": [2, 4], "x": 4.75, "y": 3},
+ {"matrix": [2, 5], "x": 5.75, "y": 3},
+ {"matrix": [6, 3], "x": 6.75, "y": 3},
+ {"matrix": [6, 13], "x": 7.75, "y": 3},
+ {"matrix": [7, 13], "x": 8.75, "y": 3},
+ {"matrix": [7, 3], "x": 9.75, "y": 3},
+ {"matrix": [2, 10], "x": 10.75, "y": 3},
+ {"matrix": [2, 11], "x": 11.75, "y": 3},
+ {"matrix": [2, 12], "x": 12.75, "y": 3},
+ {"matrix": [2, 6], "x": 15, "y": 3},
+ {"matrix": [2, 7], "x": 16, "y": 3},
+ {"matrix": [2, 8], "x": 17, "y": 3},
+ {"matrix": [2, 9], "x": 18, "y": 3},
+
+ {"matrix": [1, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [0, 3], "x": 1.25, "y": 4},
+ {"matrix": [1, 1], "x": 2.25, "y": 4},
+ {"matrix": [1, 2], "x": 3.25, "y": 4},
+ {"matrix": [1, 3], "x": 4.25, "y": 4},
+ {"matrix": [1, 4], "x": 5.25, "y": 4},
+ {"matrix": [1, 5], "x": 6.25, "y": 4},
+ {"matrix": [6, 4], "x": 7.25, "y": 4},
+ {"matrix": [6, 14], "x": 8.25, "y": 4},
+ {"matrix": [7, 14], "x": 9.25, "y": 4},
+ {"matrix": [7, 4], "x": 10.25, "y": 4},
+ {"matrix": [1, 10], "x": 11.25, "y": 4},
+ {"matrix": [1, 11], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [6, 8], "x": 14, "y": 4},
+ {"matrix": [1, 6], "x": 15, "y": 4},
+ {"matrix": [1, 7], "x": 16, "y": 4},
+ {"matrix": [1, 8], "x": 17, "y": 4},
+ {"matrix": [0, 9], "x": 18, "y": 4, "h": 2},
+
+ {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [6, 5], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [7, 5], "x": 10, "y": 5, "w": 1.5},
+ {"matrix": [0, 11], "x": 11.5, "y": 5, "w": 1.5},
+ {"matrix": [6, 6], "x": 13, "y": 5},
+ {"matrix": [6, 7], "x": 14, "y": 5},
+ {"matrix": [6, 9], "x": 15, "y": 5},
+ {"matrix": [0, 6], "x": 16, "y": 5},
+ {"matrix": [0, 8], "x": 17, "y": 5}
+ ]
}
}
}
diff --git a/keyboards/ymdk/ymd96/ymd96.h b/keyboards/ymdk/ymd96/ymd96.h
deleted file mode 100644
index c89be71686..0000000000
--- a/keyboards/ymdk/ymd96/ymd96.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-Base Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-Modified 2017 Andrew Novak <ndrw.nvk@gmail.com>
-Modified 2018 harshit goel
-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_default( \
- K50, K52, K53, K54, K55, K60, K6A, K7A, K70, K5B, K5C, K5D, K5E, K1D, K2E, K0D, K76, K79, K78, \
- K40, K41, K42, K43, K44, K45, K61, K6B, K7B, K71, K4A, K4B, K4C, K4E, K46, K47, K48, K49, \
- K30, K31, K32, K33, K34, K35, K62, K6C, K7C, K72, K3A, K3B, K3C, K3D, K36, K37, K38, K39, \
- K20, K21, K22, K23, K24, K25, K63, K6D, K7D, K73, K2A, K2B, K2D, K26, K27, K28, K29, \
- K10, K11, K12, K13, K14, K15, K64, K6E, K7E, K74, K1A, K1B, K16, K17, K18, K09, \
- K00, K01, K02, K65, K75, K0A, K0B, K66, K67, K69, K06, K08 \
-) { \
- { K00, K01, K02, KC_NO, KC_NO, KC_NO, K06, KC_NO, K08, K09, K0A, K0B, KC_NO, K0D, KC_NO }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, KC_NO, K1A, K1B, KC_NO, K1D, KC_NO }, \
- { 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, KC_NO }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, KC_NO, K4E }, \
- { K50, KC_NO, K52, K53, K54, K55, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K5B, K5C, K5D, K5E }, \
- { K60, K61, K62, K63, K64, K65, K66, K67, KC_NO, K69, K6A, K6B, K6C, K6D, K6E }, \
- { K70, K71, K72, K73, K74, K75, K76, KC_NO, K78, K79, K7A, K7B, K7C, K7D, K7E } \
-}
-
-#define LAYOUT_custom( \
- K50, K52, K53, K54, K55, K60, K6A, K7A, K70, K5B, K5C, K5D, K5E, K1D, K2E, K0D, K76, K79, K78, \
- K40, K41, K42, K43, K44, K45, K61, K6B, K7B, K71, K4A, K4B, K4C, K4E, K46, K47, K48, K49, \
- K30, K31, K32, K33, K34, K35, K62, K6C, K7C, K72, K3A, K3B, K3C, K3D, K36, K37, K38, K39, \
- K20, K21, K22, K23, K24, K25, K63, K6D, K7D, K73, K2A, K2B, K2D, K26, K27, K28, K29, \
- K10, K11, K12, K13, K14, K15, K64, K6E, K7E, K74, K1A, K1B, K68, K16, K17, K18, K09, \
- K00, K01, K02, K65, K75, K0A, K0B, K66, K67, K06, K08 \
-) { \
- { K00, K01, K02, KC_NO, KC_NO, KC_NO, K06, KC_NO, K08, K09, K0A, K0B, KC_NO, K0D, KC_NO }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, KC_NO, K1A, K1B, KC_NO, K1D, KC_NO }, \
- { 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, KC_NO }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, KC_NO, K4E }, \
- { K50, KC_NO, K52, K53, K54, K55, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K5B, K5C, K5D, K5E }, \
- { K60, K61, K62, K63, K64, K65, K66, K67, K68, KC_NO, K6A, K6B, K6C, K6D, K6E }, \
- { K70, K71, K72, K73, K74, K75, K76, KC_NO, K78, K79, K7A, K7B, K7C, K7D, K7E } \
-}
-
-#define LAYOUT_iso( \
- K50, K52, K53, K54, K55, K60, K6A, K7A, K70, K5B, K5C, K5D, K5E, K1D, K2E, K0D, K76, K79, K78, \
- K40, K41, K42, K43, K44, K45, K61, K6B, K7B, K71, K4A, K4B, K4C, K4E, K46, K47, K48, K49, \
- K30, K31, K32, K33, K34, K35, K62, K6C, K7C, K72, K3A, K3B, K3C, K2D, K36, K37, K38, K39, \
- K20, K21, K22, K23, K24, K25, K63, K6D, K7D, K73, K2A, K2B, K2C, K26, K27, K28, K29, \
- K10, K03, K11, K12, K13, K14, K15, K64, K6E, K7E, K74, K1A, K1B, K68, K16, K17, K18, K09, \
- K00, K01, K02, K65, K75, K0B, K66, K67, K69, K06, K08 \
-) { \
- { K00, K01, K02, K03, KC_NO, KC_NO, K06, KC_NO, K08, K09, KC_NO, K0B, KC_NO, K0D, KC_NO }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, KC_NO, K1A, K1B, KC_NO, K1D, KC_NO }, \
- { 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, KC_NO, KC_NO }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, KC_NO, K4E }, \
- { K50, KC_NO, K52, K53, K54, K55, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K5B, K5C, K5D, K5E }, \
- { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E }, \
- { K70, K71, K72, K73, K74, K75, K76, KC_NO, K78, K79, K7A, K7B, K7C, K7D, K7E } \
-}