summaryrefslogtreecommitdiff
path: root/keyboards/mechlovin
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/mechlovin')
-rw-r--r--keyboards/mechlovin/adelais/adelais.c2
-rw-r--r--keyboards/mechlovin/adelais/adelais.h35
-rw-r--r--keyboards/mechlovin/adelais/info.json299
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/config.h21
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev1/config.h4
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev1/info.json333
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c2
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev1/rev1.h77
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev2/config.h4
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev2/info.json333
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c2
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev2/rev2.h77
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev3/config.h4
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev3/info.json318
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c2
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev3/rev3.h78
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk1
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/config.h7
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/info.json8
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json327
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev2/rev2.h77
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json327
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev3/rev3.h77
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json325
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev4/rev4.h77
-rw-r--r--keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h1
-rw-r--r--keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json328
-rw-r--r--keyboards/mechlovin/adelais/standard_led/avr/rev1/rev1.h77
-rw-r--r--keyboards/mechlovin/delphine/config.h34
-rw-r--r--keyboards/mechlovin/delphine/delphine.c17
-rw-r--r--keyboards/mechlovin/delphine/delphine.h73
-rw-r--r--keyboards/mechlovin/delphine/info.json100
-rw-r--r--keyboards/mechlovin/delphine/mono_led/config.h1
-rw-r--r--keyboards/mechlovin/delphine/mono_led/info.json3
-rw-r--r--keyboards/mechlovin/delphine/rgb_led/config.h1
-rw-r--r--keyboards/mechlovin/delphine/rgb_led/info.json3
-rw-r--r--keyboards/mechlovin/delphine/rgb_led/rgb_led.c2
-rw-r--r--keyboards/mechlovin/delphine/rgb_led/rgb_led.h19
-rw-r--r--keyboards/mechlovin/foundation/config.h21
-rw-r--r--keyboards/mechlovin/foundation/foundation.c17
-rw-r--r--keyboards/mechlovin/foundation/foundation.h2
-rw-r--r--keyboards/mechlovin/foundation/info.json8
-rw-r--r--keyboards/mechlovin/hannah60rgb/config.h34
-rw-r--r--keyboards/mechlovin/hannah60rgb/hannah60rgb.h24
-rw-r--r--keyboards/mechlovin/hannah60rgb/rev1/config.h1
-rw-r--r--keyboards/mechlovin/hannah60rgb/rev1/info.json8
-rw-r--r--keyboards/mechlovin/hannah60rgb/rev1/rev1.c2
-rw-r--r--keyboards/mechlovin/hannah60rgb/rev2/config.h1
-rw-r--r--keyboards/mechlovin/hannah60rgb/rev2/info.json8
-rw-r--r--keyboards/mechlovin/hannah65/config.h16
-rw-r--r--keyboards/mechlovin/hannah65/hannah65.c17
-rw-r--r--keyboards/mechlovin/hannah65/hannah65.h23
-rw-r--r--keyboards/mechlovin/hannah65/info.json5
-rw-r--r--keyboards/mechlovin/hannah65/rev1/haus/info.json420
-rw-r--r--keyboards/mechlovin/hannah65/rev1/rev1.h61
-rw-r--r--keyboards/mechlovin/hannah910/config.h18
-rw-r--r--keyboards/mechlovin/hannah910/hannah910.c2
-rw-r--r--keyboards/mechlovin/hannah910/hannah910.h26
-rw-r--r--keyboards/mechlovin/hannah910/rev1/info.json8
-rw-r--r--keyboards/mechlovin/hannah910/rev2/info.json440
-rw-r--r--keyboards/mechlovin/hannah910/rev2/rev2.h48
-rw-r--r--keyboards/mechlovin/hannah910/rev3/info.json300
-rw-r--r--keyboards/mechlovin/hannah910/rev3/rev3.h34
-rw-r--r--keyboards/mechlovin/hex4b/config.h33
-rw-r--r--keyboards/mechlovin/hex4b/hex4b.c17
-rw-r--r--keyboards/mechlovin/hex4b/rev1/config.h33
-rw-r--r--keyboards/mechlovin/hex4b/rev1/info.json5
-rw-r--r--keyboards/mechlovin/hex4b/rev2/config.h15
-rw-r--r--keyboards/mechlovin/hex4b/rev2/info.json5
-rw-r--r--keyboards/mechlovin/hex6c/config.h17
-rw-r--r--keyboards/mechlovin/hex6c/hex6c.c17
-rw-r--r--keyboards/mechlovin/hex6c/info.json5
-rw-r--r--keyboards/mechlovin/infinity87/infinity87.c17
-rw-r--r--keyboards/mechlovin/infinity87/infinity87.h18
-rw-r--r--keyboards/mechlovin/infinity87/rev1/config.h5
-rw-r--r--keyboards/mechlovin/infinity87/rev1/info.json5
-rw-r--r--keyboards/mechlovin/infinity87/rev1/rev1.c17
-rw-r--r--keyboards/mechlovin/infinity87/rev1/rev1.h19
-rw-r--r--keyboards/mechlovin/infinity87/rev1/standard/config.h1
-rw-r--r--keyboards/mechlovin/infinity87/rev1/standard/info.json3
-rw-r--r--keyboards/mechlovin/infinity87/rev2/config.h1
-rw-r--r--keyboards/mechlovin/infinity87/rev2/info.json3
-rw-r--r--keyboards/mechlovin/infinity87/rev2/rev2.c17
-rw-r--r--keyboards/mechlovin/infinity87/rev2/rev2.h19
-rw-r--r--keyboards/mechlovin/infinity87/rgb_rev1/config.h6
-rw-r--r--keyboards/mechlovin/infinity87/rgb_rev1/info.json5
-rw-r--r--keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c2
-rw-r--r--keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.h19
-rw-r--r--keyboards/mechlovin/infinity875/config.h1
-rw-r--r--keyboards/mechlovin/infinity875/infinity875.c3
-rw-r--r--keyboards/mechlovin/infinity875/infinity875.h99
-rw-r--r--keyboards/mechlovin/infinity875/info.json537
-rw-r--r--keyboards/mechlovin/infinity88/config.h17
-rw-r--r--keyboards/mechlovin/infinity88/infinity88.c17
-rw-r--r--keyboards/mechlovin/infinity88/infinity88.h89
-rw-r--r--keyboards/mechlovin/infinity88/info.json598
-rw-r--r--keyboards/mechlovin/infinityce/config.h8
-rw-r--r--keyboards/mechlovin/infinityce/info.json8
-rw-r--r--keyboards/mechlovin/jay60/config.h17
-rw-r--r--keyboards/mechlovin/jay60/info.json5
-rw-r--r--keyboards/mechlovin/jay60/jay60.c17
-rw-r--r--keyboards/mechlovin/kanu/config.h18
-rw-r--r--keyboards/mechlovin/kanu/info.json518
-rw-r--r--keyboards/mechlovin/kanu/kanu.c2
-rw-r--r--keyboards/mechlovin/kanu/kanu.h80
-rw-r--r--keyboards/mechlovin/kay60/config.h20
-rw-r--r--keyboards/mechlovin/kay60/info.json8
-rw-r--r--keyboards/mechlovin/kay60/kay60.c17
-rw-r--r--keyboards/mechlovin/kay65/config.h20
-rw-r--r--keyboards/mechlovin/kay65/info.json430
-rw-r--r--keyboards/mechlovin/kay65/kay65.c2
-rw-r--r--keyboards/mechlovin/kay65/kay65.h62
-rw-r--r--keyboards/mechlovin/mechlovin9/config.h21
-rw-r--r--keyboards/mechlovin/mechlovin9/mechlovin9.c17
-rw-r--r--keyboards/mechlovin/mechlovin9/rev1/config.h13
-rw-r--r--keyboards/mechlovin/mechlovin9/rev1/info.json5
-rw-r--r--keyboards/mechlovin/mechlovin9/rev2/config.h31
-rw-r--r--keyboards/mechlovin/mechlovin9/rev2/info.json5
-rw-r--r--keyboards/mechlovin/mechlovin9/rev3/info.json1
-rw-r--r--keyboards/mechlovin/olly/bb/config.h1
-rw-r--r--keyboards/mechlovin/olly/bb/info.json3
-rw-r--r--keyboards/mechlovin/olly/jf/config.h1
-rw-r--r--keyboards/mechlovin/olly/jf/info.json3
-rw-r--r--keyboards/mechlovin/olly/octagon/config.h9
-rw-r--r--keyboards/mechlovin/olly/octagon/info.json8
-rw-r--r--keyboards/mechlovin/olly/orion/config.h18
-rw-r--r--keyboards/mechlovin/olly/orion/info.json325
-rw-r--r--keyboards/mechlovin/olly/orion/orion.c2
-rw-r--r--keyboards/mechlovin/olly/orion/orion.h67
-rw-r--r--keyboards/mechlovin/pisces/config.h19
-rw-r--r--keyboards/mechlovin/pisces/info.json8
-rw-r--r--keyboards/mechlovin/pisces/pisces.c17
-rw-r--r--keyboards/mechlovin/serratus/config.h1
-rw-r--r--keyboards/mechlovin/serratus/info.json3
-rw-r--r--keyboards/mechlovin/serratus/serratus.c17
-rw-r--r--keyboards/mechlovin/th1800/config.h35
-rw-r--r--keyboards/mechlovin/th1800/info.json5
-rw-r--r--keyboards/mechlovin/th1800/th1800.c17
-rw-r--r--keyboards/mechlovin/tmkl/config.h16
-rw-r--r--keyboards/mechlovin/tmkl/info.json5
-rw-r--r--keyboards/mechlovin/tmkl/tmkl.c17
-rw-r--r--keyboards/mechlovin/tmkl/tmkl.h2
-rw-r--r--keyboards/mechlovin/zed60/config.h20
-rw-r--r--keyboards/mechlovin/zed60/info.json9
-rw-r--r--keyboards/mechlovin/zed60/rules.mk1
-rw-r--r--keyboards/mechlovin/zed60/zed60.c17
-rw-r--r--keyboards/mechlovin/zed65/config.h48
-rw-r--r--keyboards/mechlovin/zed65/mono_led/config.h8
-rw-r--r--keyboards/mechlovin/zed65/mono_led/info.json234
-rw-r--r--keyboards/mechlovin/zed65/mono_led/mono_led.c2
-rw-r--r--keyboards/mechlovin/zed65/mono_led/mono_led.h62
-rw-r--r--keyboards/mechlovin/zed65/no_backlight/cor65/config.h22
-rw-r--r--keyboards/mechlovin/zed65/no_backlight/cor65/cor65.c19
-rw-r--r--keyboards/mechlovin/zed65/no_backlight/cor65/cor65.h62
-rw-r--r--keyboards/mechlovin/zed65/no_backlight/cor65/info.json247
-rw-r--r--keyboards/mechlovin/zed65/no_backlight/retro66/config.h4
-rw-r--r--keyboards/mechlovin/zed65/no_backlight/retro66/info.json5
-rw-r--r--keyboards/mechlovin/zed65/no_backlight/retro66/retro66.c19
-rw-r--r--keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h10
-rw-r--r--keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json9
-rw-r--r--keyboards/mechlovin/zed65/no_backlight/wearhaus66/rules.mk1
-rw-r--r--keyboards/mechlovin/zed65/zed65.c18
-rw-r--r--keyboards/mechlovin/zed65/zed65.h30
163 files changed, 5320 insertions, 4136 deletions
diff --git a/keyboards/mechlovin/adelais/adelais.c b/keyboards/mechlovin/adelais/adelais.c
index da954bce04..5758bb7322 100644
--- a/keyboards/mechlovin/adelais/adelais.c
+++ b/keyboards/mechlovin/adelais/adelais.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "adelais.h"
+#include "quantum.h"
#ifdef RGBLIGHT_ENABLE
void keyboard_post_init_kb(void) {
diff --git a/keyboards/mechlovin/adelais/adelais.h b/keyboards/mechlovin/adelais/adelais.h
deleted file mode 100644
index 6c3980a090..0000000000
--- a/keyboards/mechlovin/adelais/adelais.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_mechlovin_adelais_rgb_led_rev1
- #include "rev1.h"
-#elif KEYBOARD_mechlovin_adelais_rgb_led_rev2
- #include "rev2.h"
-#elif KEYBOARD_mechlovin_adelais_rgb_led_rev3
- #include "rev3.h"
-#elif KEYBOARD_mechlovin_adelais_standard_led_arm_rev2
- #include "rev2.h"
-#elif KEYBOARD_mechlovin_adelais_standard_led_arm_rev3
- #include "rev3.h"
-#elif KEYBOARD_mechlovin_adelais_standard_led_arm_rev4
- #include "rev4.h"
-#elif KEYBOARD_mechlovin_adelais_standard_led_avr_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/mechlovin/adelais/info.json b/keyboards/mechlovin/adelais/info.json
index f9680e47d5..42b16d6398 100644
--- a/keyboards/mechlovin/adelais/info.json
+++ b/keyboards/mechlovin/adelais/info.json
@@ -6,302 +6,5 @@
"vid": "0x4D4C",
"device_version": "0.0.1"
},
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_alice_split_bs"
- },
- "community_layouts": ["alice", "alice_split_bs"],
- "layouts": {
- "LAYOUT_alice_split_bs": {
- "layout": [
- {"label":"K1E", "x":0, "y":0},
- {"label":"K00", "x":1.5, "y":0},
- {"label":"K01", "x":2.5, "y":0},
- {"label":"K02", "x":3.5, "y":0},
- {"label":"K03", "x":4.5, "y":0},
- {"label":"K04", "x":5.5, "y":0},
- {"label":"K05", "x":6.5, "y":0},
- {"label":"K06", "x":7.5, "y":0},
- {"label":"K07", "x":10.5, "y":0},
- {"label":"K08", "x":11.5, "y":0},
- {"label":"K09", "x":12.5, "y":0},
- {"label":"K0A", "x":13.5, "y":0},
- {"label":"K0B", "x":14.5, "y":0},
- {"label":"K0C", "x":15.5, "y":0},
- {"label":"K0D", "x":16.5, "y":0},
- {"label":"K0E", "x":17.5, "y":0},
-
- {"label":"K2E", "x":0, "y":1},
- {"label":"K10", "x":1.5, "y":1, "w":1.5},
- {"label":"K11", "x":3, "y":1},
- {"label":"K12", "x":4, "y":1},
- {"label":"K13", "x":5, "y":1},
- {"label":"K14", "x":6, "y":1},
- {"label":"K15", "x":7, "y":1},
- {"label":"K16", "x":10, "y":1},
- {"label":"K17", "x":11, "y":1},
- {"label":"K18", "x":12, "y":1},
- {"label":"K19", "x":13, "y":1},
- {"label":"K1A", "x":14, "y":1},
- {"label":"K1B", "x":15, "y":1},
- {"label":"K1C", "x":16, "y":1},
- {"label":"K1D", "x":17, "y":1, "w":1.5},
-
- {"label":"K3E", "x":0, "y":2},
- {"label":"K20", "x":1.5, "y":2, "w":1.75},
- {"label":"K21", "x":3.25, "y":2},
- {"label":"K22", "x":4.25, "y":2},
- {"label":"K23", "x":5.25, "y":2},
- {"label":"K24", "x":6.25, "y":2},
- {"label":"K25", "x":7.25, "y":2},
- {"label":"K26", "x":10.25, "y":2},
- {"label":"K27", "x":11.25, "y":2},
- {"label":"K28", "x":12.25, "y":2},
- {"label":"K29", "x":13.25, "y":2},
- {"label":"K2A", "x":14.25, "y":2},
- {"label":"K2B", "x":15.25, "y":2},
- {"label":"K2D", "x":16.25, "y":2, "w":2.25},
-
- {"label":"K30", "x":1.5, "y":3, "w":2.25},
- {"label":"K32", "x":3.75, "y":3},
- {"label":"K33", "x":4.75, "y":3},
- {"label":"K34", "x":5.75, "y":3},
- {"label":"K35", "x":6.75, "y":3},
- {"label":"K36", "x":7.75, "y":3},
- {"label":"K37", "x":9.75, "y":3},
- {"label":"K38", "x":10.75, "y":3},
- {"label":"K39", "x":11.75, "y":3},
- {"label":"K3A", "x":12.75, "y":3},
- {"label":"K3B", "x":13.75, "y":3},
- {"label":"K3D", "x":14.75, "y":3},
- {"label":"K3C", "x":15.75, "y":3, "w":1.75},
- {"label":"K4D", "x":17.5, "y":3},
-
- {"label":"K40", "x":1.5, "y":4, "w":1.5},
- {"label":"K42", "x":4.5, "y":4, "w":1.25},
- {"label":"K44", "x":5.75, "y":4, "w":2.25},
- {"label":"K46", "x":8, "y":4, "w":1.25},
- {"label":"K48", "x":9.75, "y":4, "w":2.75},
- {"label":"K4A", "x":12.5, "y":4, "w":1.25},
- {"label":"K4E", "x":17, "y":4, "w":1.5}
- ]
- },
- "LAYOUT_alice": {
- "layout": [
- {"label":"K1E", "x":0, "y":0},
- {"label":"K00", "x":1.5, "y":0},
- {"label":"K01", "x":2.5, "y":0},
- {"label":"K02", "x":3.5, "y":0},
- {"label":"K03", "x":4.5, "y":0},
- {"label":"K04", "x":5.5, "y":0},
- {"label":"K05", "x":6.5, "y":0},
- {"label":"K06", "x":7.5, "y":0},
- {"label":"K07", "x":10.5, "y":0},
- {"label":"K08", "x":11.5, "y":0},
- {"label":"K09", "x":12.5, "y":0},
- {"label":"K0A", "x":13.5, "y":0},
- {"label":"K0B", "x":14.5, "y":0},
- {"label":"K0C", "x":15.5, "y":0},
- {"label":"K0D", "x":16.5, "y":0, "w":2},
-
- {"label":"K2E", "x":0, "y":1},
- {"label":"K10", "x":1.5, "y":1, "w":1.5},
- {"label":"K11", "x":3, "y":1},
- {"label":"K12", "x":4, "y":1},
- {"label":"K13", "x":5, "y":1},
- {"label":"K14", "x":6, "y":1},
- {"label":"K15", "x":7, "y":1},
- {"label":"K16", "x":10, "y":1},
- {"label":"K17", "x":11, "y":1},
- {"label":"K18", "x":12, "y":1},
- {"label":"K19", "x":13, "y":1},
- {"label":"K1A", "x":14, "y":1},
- {"label":"K1B", "x":15, "y":1},
- {"label":"K1C", "x":16, "y":1},
- {"label":"K1D", "x":17, "y":1, "w":1.5},
-
- {"label":"K3E", "x":0, "y":2},
- {"label":"K20", "x":1.5, "y":2, "w":1.75},
- {"label":"K21", "x":3.25, "y":2},
- {"label":"K22", "x":4.25, "y":2},
- {"label":"K23", "x":5.25, "y":2},
- {"label":"K24", "x":6.25, "y":2},
- {"label":"K25", "x":7.25, "y":2},
- {"label":"K26", "x":10.25, "y":2},
- {"label":"K27", "x":11.25, "y":2},
- {"label":"K28", "x":12.25, "y":2},
- {"label":"K29", "x":13.25, "y":2},
- {"label":"K2A", "x":14.25, "y":2},
- {"label":"K2B", "x":15.25, "y":2},
- {"label":"K2D", "x":16.25, "y":2, "w":2.25},
-
- {"label":"K30", "x":1.5, "y":3, "w":2.25},
- {"label":"K32", "x":3.75, "y":3},
- {"label":"K33", "x":4.75, "y":3},
- {"label":"K34", "x":5.75, "y":3},
- {"label":"K35", "x":6.75, "y":3},
- {"label":"K36", "x":7.75, "y":3},
- {"label":"K37", "x":9.75, "y":3},
- {"label":"K38", "x":10.75, "y":3},
- {"label":"K39", "x":11.75, "y":3},
- {"label":"K3A", "x":12.75, "y":3},
- {"label":"K3B", "x":13.75, "y":3},
- {"label":"K3D", "x":14.75, "y":3},
- {"label":"K3C", "x":15.75, "y":3, "w":1.75},
- {"label":"K4D", "x":17.5, "y":3},
-
- {"label":"K40", "x":1.5, "y":4, "w":1.5},
- {"label":"K42", "x":4.5, "y":4, "w":1.25},
- {"label":"K44", "x":5.75, "y":4, "w":2.25},
- {"label":"K46", "x":8, "y":4, "w":1.25},
- {"label":"K48", "x":9.75, "y":4, "w":2.75},
- {"label":"K4A", "x":12.5, "y":4, "w":1.25},
- {"label":"K4E", "x":17, "y":4, "w":1.5}
- ]
- },
- "LAYOUT_alice_split_bs_full_rshift": {
- "layout": [
- {"label":"K1E", "x":0, "y":0},
- {"label":"K00", "x":1.5, "y":0},
- {"label":"K01", "x":2.5, "y":0},
- {"label":"K02", "x":3.5, "y":0},
- {"label":"K03", "x":4.5, "y":0},
- {"label":"K04", "x":5.5, "y":0},
- {"label":"K05", "x":6.5, "y":0},
- {"label":"K06", "x":7.5, "y":0},
- {"label":"K07", "x":10.5, "y":0},
- {"label":"K08", "x":11.5, "y":0},
- {"label":"K09", "x":12.5, "y":0},
- {"label":"K0A", "x":13.5, "y":0},
- {"label":"K0B", "x":14.5, "y":0},
- {"label":"K0C", "x":15.5, "y":0},
- {"label":"K0D", "x":16.5, "y":0},
- {"label":"K0E", "x":17.5, "y":0},
-
- {"label":"K2E", "x":0, "y":1},
- {"label":"K10", "x":1.5, "y":1, "w":1.5},
- {"label":"K11", "x":3, "y":1},
- {"label":"K12", "x":4, "y":1},
- {"label":"K13", "x":5, "y":1},
- {"label":"K14", "x":6, "y":1},
- {"label":"K15", "x":7, "y":1},
- {"label":"K16", "x":10, "y":1},
- {"label":"K17", "x":11, "y":1},
- {"label":"K18", "x":12, "y":1},
- {"label":"K19", "x":13, "y":1},
- {"label":"K1A", "x":14, "y":1},
- {"label":"K1B", "x":15, "y":1},
- {"label":"K1C", "x":16, "y":1},
- {"label":"K1D", "x":17, "y":1, "w":1.5},
-
- {"label":"K3E", "x":0, "y":2},
- {"label":"K20", "x":1.5, "y":2, "w":1.75},
- {"label":"K21", "x":3.25, "y":2},
- {"label":"K22", "x":4.25, "y":2},
- {"label":"K23", "x":5.25, "y":2},
- {"label":"K24", "x":6.25, "y":2},
- {"label":"K25", "x":7.25, "y":2},
- {"label":"K26", "x":10.25, "y":2},
- {"label":"K27", "x":11.25, "y":2},
- {"label":"K28", "x":12.25, "y":2},
- {"label":"K29", "x":13.25, "y":2},
- {"label":"K2A", "x":14.25, "y":2},
- {"label":"K2B", "x":15.25, "y":2},
- {"label":"K2D", "x":16.25, "y":2, "w":2.25},
-
- {"label":"K30", "x":1.5, "y":3, "w":2.25},
- {"label":"K32", "x":3.75, "y":3},
- {"label":"K33", "x":4.75, "y":3},
- {"label":"K34", "x":5.75, "y":3},
- {"label":"K35", "x":6.75, "y":3},
- {"label":"K36", "x":7.75, "y":3},
- {"label":"K37", "x":9.75, "y":3},
- {"label":"K38", "x":10.75, "y":3},
- {"label":"K39", "x":11.75, "y":3},
- {"label":"K3A", "x":12.75, "y":3},
- {"label":"K3B", "x":13.75, "y":3},
- {"label":"K3D", "x":14.75, "y":3},
- {"label":"K3C", "x":15.75, "y":3, "w":2.75},
-
- {"label":"K40", "x":1.5, "y":4, "w":1.5},
- {"label":"K42", "x":4.5, "y":4, "w":1.25},
- {"label":"K44", "x":5.75, "y":4, "w":2.25},
- {"label":"K46", "x":8, "y":4, "w":1.25},
- {"label":"K48", "x":9.75, "y":4, "w":2.75},
- {"label":"K4A", "x":12.5, "y":4, "w":1.25},
- {"label":"K4E", "x":17, "y":4, "w":1.5}
- ]
- },
- "LAYOUT_alice_full_rshift": {
- "layout": [
- {"label":"K1E", "x":0, "y":0},
- {"label":"K00", "x":1.5, "y":0},
- {"label":"K01", "x":2.5, "y":0},
- {"label":"K02", "x":3.5, "y":0},
- {"label":"K03", "x":4.5, "y":0},
- {"label":"K04", "x":5.5, "y":0},
- {"label":"K05", "x":6.5, "y":0},
- {"label":"K06", "x":7.5, "y":0},
- {"label":"K07", "x":10.5, "y":0},
- {"label":"K08", "x":11.5, "y":0},
- {"label":"K09", "x":12.5, "y":0},
- {"label":"K0A", "x":13.5, "y":0},
- {"label":"K0B", "x":14.5, "y":0},
- {"label":"K0C", "x":15.5, "y":0},
- {"label":"K0D", "x":16.5, "y":0, "w":2},
-
- {"label":"K2E", "x":0, "y":1},
- {"label":"K10", "x":1.5, "y":1, "w":1.5},
- {"label":"K11", "x":3, "y":1},
- {"label":"K12", "x":4, "y":1},
- {"label":"K13", "x":5, "y":1},
- {"label":"K14", "x":6, "y":1},
- {"label":"K15", "x":7, "y":1},
- {"label":"K16", "x":10, "y":1},
- {"label":"K17", "x":11, "y":1},
- {"label":"K18", "x":12, "y":1},
- {"label":"K19", "x":13, "y":1},
- {"label":"K1A", "x":14, "y":1},
- {"label":"K1B", "x":15, "y":1},
- {"label":"K1C", "x":16, "y":1},
- {"label":"K1D", "x":17, "y":1, "w":1.5},
-
- {"label":"K3E", "x":0, "y":2},
- {"label":"K20", "x":1.5, "y":2, "w":1.75},
- {"label":"K21", "x":3.25, "y":2},
- {"label":"K22", "x":4.25, "y":2},
- {"label":"K23", "x":5.25, "y":2},
- {"label":"K24", "x":6.25, "y":2},
- {"label":"K25", "x":7.25, "y":2},
- {"label":"K26", "x":10.25, "y":2},
- {"label":"K27", "x":11.25, "y":2},
- {"label":"K28", "x":12.25, "y":2},
- {"label":"K29", "x":13.25, "y":2},
- {"label":"K2A", "x":14.25, "y":2},
- {"label":"K2B", "x":15.25, "y":2},
- {"label":"K2D", "x":16.25, "y":2, "w":2.25},
-
- {"label":"K30", "x":1.5, "y":3, "w":2.25},
- {"label":"K32", "x":3.75, "y":3},
- {"label":"K33", "x":4.75, "y":3},
- {"label":"K34", "x":5.75, "y":3},
- {"label":"K35", "x":6.75, "y":3},
- {"label":"K36", "x":7.75, "y":3},
- {"label":"K37", "x":9.75, "y":3},
- {"label":"K38", "x":10.75, "y":3},
- {"label":"K39", "x":11.75, "y":3},
- {"label":"K3A", "x":12.75, "y":3},
- {"label":"K3B", "x":13.75, "y":3},
- {"label":"K3D", "x":14.75, "y":3},
- {"label":"K3C", "x":15.75, "y":3, "w":2.75},
-
- {"label":"K40", "x":1.5, "y":4, "w":1.5},
- {"label":"K42", "x":4.5, "y":4, "w":1.25},
- {"label":"K44", "x":5.75, "y":4, "w":2.25},
- {"label":"K46", "x":8, "y":4, "w":1.25},
- {"label":"K48", "x":9.75, "y":4, "w":2.75},
- {"label":"K4A", "x":12.5, "y":4, "w":1.25},
- {"label":"K4E", "x":17, "y":4, "w":1.5}
- ]
- }
- }
+ "community_layouts": ["alice", "alice_split_bs"]
}
diff --git a/keyboards/mechlovin/adelais/rgb_led/config.h b/keyboards/mechlovin/adelais/rgb_led/config.h
deleted file mode 100644
index 2ec0afd47b..0000000000
--- a/keyboards/mechlovin/adelais/rgb_led/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2020 Team Mechlovin'
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
index f668bd88ed..909bc7f83a 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
@@ -1,9 +1,5 @@
#pragma once
-#define MATRIX_ROW_PINS { B1, A0, C13, A1, A2}
-#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A15 }
-
-#define RGB_DI_PIN A7
#define RGB_MATRIX_LED_COUNT 91
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
index f098bdbf95..249d85c084 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
@@ -3,6 +3,11 @@
"usb": {
"pid": "0xAEC1"
},
+ "matrix_pins": {
+ "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B8", "B4", "B5", "B3", "C14", "A15"],
+ "rows": ["B1", "A0", "C13", "A1", "A2"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F303",
"board": "QMK_PROTON_C",
"bootloader": "stm32-dfu",
@@ -10,5 +15,333 @@
"caps_lock": "B2",
"num_lock": "C15",
"scroll_lock": "B9"
+ },
+ "ws2812": {
+ "pin": "A7"
+ },
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_alice_split_bs"
+ },
+ "layouts": {
+ "LAYOUT_alice": {
+ "layout": [
+ {"matrix": [1, 14], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+ {"matrix": [2, 14], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "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, 13], "x": 14.75, "y": 3},
+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+ {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_full_rshift": {
+ "layout": [
+ {"matrix": [1, 14], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+ {"matrix": [2, 14], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "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, 13], "x": 14.75, "y": 3},
+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_split_bs": {
+ "layout": [
+ {"matrix": [1, 14], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0},
+ {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+ {"matrix": [2, 14], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "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, 13], "x": 14.75, "y": 3},
+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+ {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_split_bs_full_rshift": {
+ "layout": [
+ {"matrix": [1, 14], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0},
+ {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+ {"matrix": [2, 14], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "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, 13], "x": 14.75, "y": 3},
+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ }
}
}
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c b/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c
index 490599c43a..5f01f322df 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "adelais.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.h b/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.h
deleted file mode 100644
index 45d48fac46..0000000000
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_alice_split_bs( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07,K08,K09, K0A, K0B, K0C, K0D, K0E,\
- K2E, K10, K11, K12, K13, K14, K15, K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
- K3E, K20, K21, K22, K23, K24, K25, K26,K27,K28, K29, K2A, K2B, K2D,\
- K30, K32, K33, K34, K35, K36, K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, K4D, K4E }, \
-}
-
-#define LAYOUT_alice( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07,K08,K09, K0A, K0B, K0C, K0D, \
- K2E, K10, K11, K12, K13, K14, K15, K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
- K3E, K20, K21, K22, K23, K24, K25, K26,K27,K28, K29, K2A, K2B, K2D,\
- K30, K32, K33, K34, K35, K36, K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, K4D, K4E }, \
-}
-
-#define LAYOUT_alice_split_bs_full_rshift( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K2E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K3E, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, KC_NO, K4E }, \
-}
-
-#define LAYOUT_alice_full_rshift( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
- K2E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K3E, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, KC_NO, K4E }, \
-}
-
-#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
index d9d75a4b9e..1e549f9a89 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
@@ -1,9 +1,5 @@
#pragma once
-#define MATRIX_ROW_PINS { B1, A0, C13, A1, A2}
-#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A7 }
-
-#define RGB_DI_PIN A15
#define RGBLED_NUM 23
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
index 7dcd0f1765..2d71c2b5f9 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
@@ -3,11 +3,19 @@
"usb": {
"pid": "0xAEC2"
},
+ "matrix_pins": {
+ "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B8", "B4", "B5", "B3", "C14", "A7"],
+ "rows": ["B1", "A0", "C13", "A1", "A2"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "A4", "pin_b": "A3"}
]
},
+ "ws2812": {
+ "pin": "A15"
+ },
"processor": "STM32F303",
"board": "QMK_PROTON_C",
"bootloader": "stm32-dfu",
@@ -15,5 +23,330 @@
"caps_lock": "B2",
"num_lock": "C15",
"scroll_lock": "B9"
+ },
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_alice_split_bs"
+ },
+ "layouts": {
+ "LAYOUT_alice": {
+ "layout": [
+ {"matrix": [1, 14], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+ {"matrix": [2, 14], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "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, 13], "x": 14.75, "y": 3},
+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+ {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_full_rshift": {
+ "layout": [
+ {"matrix": [1, 14], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+ {"matrix": [2, 14], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "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, 13], "x": 14.75, "y": 3},
+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_split_bs": {
+ "layout": [
+ {"matrix": [1, 14], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0},
+ {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+ {"matrix": [2, 14], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "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, 13], "x": 14.75, "y": 3},
+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+ {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_split_bs_full_rshift": {
+ "layout": [
+ {"matrix": [1, 14], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0},
+ {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+ {"matrix": [2, 14], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "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, 13], "x": 14.75, "y": 3},
+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ }
}
}
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c b/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c
index 20b4b69114..e51e92ed6f 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "adelais.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.h b/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.h
deleted file mode 100644
index 45d48fac46..0000000000
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_alice_split_bs( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07,K08,K09, K0A, K0B, K0C, K0D, K0E,\
- K2E, K10, K11, K12, K13, K14, K15, K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
- K3E, K20, K21, K22, K23, K24, K25, K26,K27,K28, K29, K2A, K2B, K2D,\
- K30, K32, K33, K34, K35, K36, K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, K4D, K4E }, \
-}
-
-#define LAYOUT_alice( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07,K08,K09, K0A, K0B, K0C, K0D, \
- K2E, K10, K11, K12, K13, K14, K15, K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
- K3E, K20, K21, K22, K23, K24, K25, K26,K27,K28, K29, K2A, K2B, K2D,\
- K30, K32, K33, K34, K35, K36, K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, K4D, K4E }, \
-}
-
-#define LAYOUT_alice_split_bs_full_rshift( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K2E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K3E, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, KC_NO, K4E }, \
-}
-
-#define LAYOUT_alice_full_rshift( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
- K2E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K3E, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, KC_NO, K4E }, \
-}
-
-#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
index 7457fd50a7..c4f801b40d 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
@@ -17,11 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_ROW_PINS { A4, A3, C13, A1, A2}
-#define MATRIX_COL_PINS { B10, B11, B2, B1, B0, A6, A5, A10, A9, A15, B3, B4, B5, B8, B9 }
-
#ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN A7
#define WS2812_SPI SPID1 // default: SPID1
#define WS2812_SPI_MOSI_PAL_MODE 5 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 5
#define RGBLED_NUM 23
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
index 3f83750e3a..9639ad3c1c 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
@@ -3,6 +3,11 @@
"usb": {
"pid": "0xAEC3"
},
+ "matrix_pins": {
+ "cols": ["B10", "B11", "B2", "B1", "B0", "A6", "A5", "A10", "A9", "A15", "B3", "B4", "B5", "B8", "B9"],
+ "rows": ["A4", "A3", "C13", "A1", "A2"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B12", "pin_b": "B13"}
@@ -14,5 +19,318 @@
"caps_lock": "C14",
"num_lock": "A0",
"scroll_lock": "C15"
+ },
+ "ws2812": {
+ "pin": "A7",
+ "driver": "spi"
+ },
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_alice_split_bs"
+ },
+ "layouts": {
+ "LAYOUT_alice": {
+ "layout": [
+ {"matrix": [3, 1], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+ {"matrix": [4, 1], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [4, 3], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "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": [3, 14], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_full_rshift": {
+ "layout": [
+ {"matrix": [3, 1], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+ {"matrix": [4, 1], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [4, 3], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "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": 2.75},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_split_bs": {
+ "layout": [
+ {"matrix": [3, 1], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0},
+ {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+ {"matrix": [4, 1], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [4, 3], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "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": [3, 14], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_split_bs_full_rshift": {
+ "layout": [
+ {"matrix": [3, 1], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0},
+ {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+ {"matrix": [4, 1], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [4, 3], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "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": 2.75},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ }
}
}
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c b/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c
index ad9c7c4db0..b7e03d0f1e 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "rev3.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.h b/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.h
deleted file mode 100644
index 28c373ad85..0000000000
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Copyright 2021 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_alice_split_bs( \
- K31, K00, K01, K02, K03, K04, K05, K06, K07,K08,K09, K0A, K0B, K0C, K0D, K0E,\
- K41, K10, K11, K12, K13, K14, K15, K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
- K43, K20, K21, K22, K23, K24, K25, K26,K27,K28, K29, K2A, K2B, K2D,\
- K30, K32, K33, K34, K35, K36, K37,K38,K39, K3A, K3B, K3C, K3D, K3E,\
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, K42, K43, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, KC_NO, K4E }, \
-}
-
-#define LAYOUT_alice( \
- K31, K00, K01, K02, K03, K04, K05, K06, K07,K08,K09, K0A, K0B, K0C, K0D,\
- K41, K10, K11, K12, K13, K14, K15, K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
- K43, K20, K21, K22, K23, K24, K25, K26,K27,K28, K29, K2A, K2B, K2D,\
- K30, K32, K33, K34, K35, K36, K37,K38,K39, K3A, K3B, K3C, K3D, K3E,\
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, K42, K43, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, KC_NO, K4E }, \
-}
-
-#define LAYOUT_alice_split_bs_full_rshift( \
- K31, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K41, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K43, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO }, \
- { K40, K41, K42, K43, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, KC_NO, K4E }, \
-}
-
-#define LAYOUT_alice_full_rshift( \
- K31, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
- K41, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K43, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO }, \
- { K40, K41, K42, K43, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, KC_NO, K4E }, \
-}
-
-#define LAYOUT_all LAYOUT_alice_split_bs
-
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk
index 7127485d00..188d06aee1 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk
@@ -5,7 +5,6 @@ RGB_MATRIX_ENABLE = yes
RGB_MATRIX_DRIVER = IS31FL3741
RGBLIGHT_ENABLE = yes
ENCODER_ENABLE = yes
-WS2812_DRIVER = spi
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/config.h b/keyboards/mechlovin/adelais/standard_led/arm/config.h
index e1081a9560..1ba9c573b1 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/config.h
+++ b/keyboards/mechlovin/adelais/standard_led/arm/config.h
@@ -17,16 +17,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_ROW_PINS { B1, A0, C13, A1, A2}
-#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A15 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 3
-#define RGB_DI_PIN A7
#define RGBLED_NUM 23
#define RGBLIGHT_LIMIT_VAL 255
#define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/info.json b/keyboards/mechlovin/adelais/standard_led/arm/info.json
index a5f20190d1..9c6bd46a70 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/info.json
@@ -1,9 +1,17 @@
{
"keyboard_name": "Adelais",
+ "matrix_pins": {
+ "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B8", "B4", "B5", "B3", "C14", "A15"],
+ "rows": ["B1", "A0", "C13", "A1", "A2"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B0",
"breathing": true
},
+ "ws2812": {
+ "pin": "A7"
+ },
"indicators": {
"caps_lock": "B2",
"num_lock": "C15",
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json
index a6efa3810a..9a2a280c10 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json
@@ -4,5 +4,330 @@
},
"processor": "STM32F303",
"board": "QMK_PROTON_C",
- "bootloader": "stm32-dfu"
+ "bootloader": "stm32-dfu",
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_alice_split_bs"
+ },
+ "layouts": {
+ "LAYOUT_alice": {
+ "layout": [
+ {"matrix": [1, 14], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+ {"matrix": [2, 14], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "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, 13], "x": 14.75, "y": 3},
+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+ {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_full_rshift": {
+ "layout": [
+ {"matrix": [1, 14], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+ {"matrix": [2, 14], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "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, 13], "x": 14.75, "y": 3},
+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_split_bs": {
+ "layout": [
+ {"matrix": [1, 14], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0},
+ {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+ {"matrix": [2, 14], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "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, 13], "x": 14.75, "y": 3},
+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+ {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_split_bs_full_rshift": {
+ "layout": [
+ {"matrix": [1, 14], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0},
+ {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+ {"matrix": [2, 14], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "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, 13], "x": 14.75, "y": 3},
+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ }
+ }
}
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev2/rev2.h b/keyboards/mechlovin/adelais/standard_led/arm/rev2/rev2.h
deleted file mode 100644
index 45d48fac46..0000000000
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev2/rev2.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_alice_split_bs( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07,K08,K09, K0A, K0B, K0C, K0D, K0E,\
- K2E, K10, K11, K12, K13, K14, K15, K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
- K3E, K20, K21, K22, K23, K24, K25, K26,K27,K28, K29, K2A, K2B, K2D,\
- K30, K32, K33, K34, K35, K36, K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, K4D, K4E }, \
-}
-
-#define LAYOUT_alice( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07,K08,K09, K0A, K0B, K0C, K0D, \
- K2E, K10, K11, K12, K13, K14, K15, K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
- K3E, K20, K21, K22, K23, K24, K25, K26,K27,K28, K29, K2A, K2B, K2D,\
- K30, K32, K33, K34, K35, K36, K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, K4D, K4E }, \
-}
-
-#define LAYOUT_alice_split_bs_full_rshift( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K2E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K3E, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, KC_NO, K4E }, \
-}
-
-#define LAYOUT_alice_full_rshift( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
- K2E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K3E, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, KC_NO, K4E }, \
-}
-
-#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json
index 60d20c4a29..a5ebef5b87 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json
@@ -11,5 +11,330 @@
},
"processor": "STM32F303",
"board": "QMK_PROTON_C",
- "bootloader": "stm32-dfu"
+ "bootloader": "stm32-dfu",
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_alice_split_bs"
+ },
+ "layouts": {
+ "LAYOUT_alice": {
+ "layout": [
+ {"matrix": [1, 14], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+ {"matrix": [2, 14], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "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, 13], "x": 14.75, "y": 3},
+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+ {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_full_rshift": {
+ "layout": [
+ {"matrix": [1, 14], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+ {"matrix": [2, 14], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "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, 13], "x": 14.75, "y": 3},
+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_split_bs": {
+ "layout": [
+ {"matrix": [1, 14], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0},
+ {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+ {"matrix": [2, 14], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "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, 13], "x": 14.75, "y": 3},
+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+ {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_split_bs_full_rshift": {
+ "layout": [
+ {"matrix": [1, 14], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0},
+ {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+ {"matrix": [2, 14], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "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, 13], "x": 14.75, "y": 3},
+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ }
+ }
}
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev3/rev3.h b/keyboards/mechlovin/adelais/standard_led/arm/rev3/rev3.h
deleted file mode 100644
index 45d48fac46..0000000000
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev3/rev3.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_alice_split_bs( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07,K08,K09, K0A, K0B, K0C, K0D, K0E,\
- K2E, K10, K11, K12, K13, K14, K15, K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
- K3E, K20, K21, K22, K23, K24, K25, K26,K27,K28, K29, K2A, K2B, K2D,\
- K30, K32, K33, K34, K35, K36, K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, K4D, K4E }, \
-}
-
-#define LAYOUT_alice( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07,K08,K09, K0A, K0B, K0C, K0D, \
- K2E, K10, K11, K12, K13, K14, K15, K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
- K3E, K20, K21, K22, K23, K24, K25, K26,K27,K28, K29, K2A, K2B, K2D,\
- K30, K32, K33, K34, K35, K36, K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, K4D, K4E }, \
-}
-
-#define LAYOUT_alice_split_bs_full_rshift( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K2E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K3E, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, KC_NO, K4E }, \
-}
-
-#define LAYOUT_alice_full_rshift( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
- K2E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K3E, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, KC_NO, K4E }, \
-}
-
-#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json
index 925b7cd213..b6ee0c5b67 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json
@@ -8,5 +8,330 @@
{"pin_a": "A4", "pin_b": "A3"},
{"pin_a": "B7", "pin_b": "B6"}
]
+ },
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_alice_split_bs"
+ },
+ "layouts": {
+ "LAYOUT_alice": {
+ "layout": [
+ {"matrix": [1, 14], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+ {"matrix": [2, 14], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "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, 13], "x": 14.75, "y": 3},
+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+ {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_full_rshift": {
+ "layout": [
+ {"matrix": [1, 14], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+ {"matrix": [2, 14], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "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, 13], "x": 14.75, "y": 3},
+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_split_bs": {
+ "layout": [
+ {"matrix": [1, 14], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0},
+ {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+ {"matrix": [2, 14], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "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, 13], "x": 14.75, "y": 3},
+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+ {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_split_bs_full_rshift": {
+ "layout": [
+ {"matrix": [1, 14], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0},
+ {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+ {"matrix": [2, 14], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "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, 13], "x": 14.75, "y": 3},
+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ }
}
}
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/rev4.h b/keyboards/mechlovin/adelais/standard_led/arm/rev4/rev4.h
deleted file mode 100644
index 45d48fac46..0000000000
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/rev4.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_alice_split_bs( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07,K08,K09, K0A, K0B, K0C, K0D, K0E,\
- K2E, K10, K11, K12, K13, K14, K15, K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
- K3E, K20, K21, K22, K23, K24, K25, K26,K27,K28, K29, K2A, K2B, K2D,\
- K30, K32, K33, K34, K35, K36, K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, K4D, K4E }, \
-}
-
-#define LAYOUT_alice( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07,K08,K09, K0A, K0B, K0C, K0D, \
- K2E, K10, K11, K12, K13, K14, K15, K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
- K3E, K20, K21, K22, K23, K24, K25, K26,K27,K28, K29, K2A, K2B, K2D,\
- K30, K32, K33, K34, K35, K36, K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, K4D, K4E }, \
-}
-
-#define LAYOUT_alice_split_bs_full_rshift( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K2E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K3E, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, KC_NO, K4E }, \
-}
-
-#define LAYOUT_alice_full_rshift( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
- K2E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K3E, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, KC_NO, K4E }, \
-}
-
-#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h b/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h
index 831642126b..da42bf05d2 100644
--- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h
+++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h
@@ -31,7 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION ROW2COL
-#define RGB_DI_PIN E2
#define RGBLED_NUM 23
#define RGBLIGHT_LIMIT_VAL 255
#define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json
index e385d5ef1a..31de7de957 100644
--- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json
@@ -14,11 +14,339 @@
"pin": "B5",
"breathing": true
},
+ "ws2812": {
+ "pin": "E2"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"indicators": {
"caps_lock": "E6",
"num_lock": "D7",
"scroll_lock": "F7"
+ },
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_alice_split_bs"
+ },
+ "layouts": {
+ "LAYOUT_alice": {
+ "layout": [
+ {"matrix": [1, 14], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+ {"matrix": [2, 14], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "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": [4, 12], "x": 14.75, "y": 3},
+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 17, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_full_rshift": {
+ "layout": [
+ {"matrix": [1, 14], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+ {"matrix": [2, 14], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "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": [4, 12], "x": 14.75, "y": 3},
+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 17, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_split_bs": {
+ "layout": [
+ {"matrix": [1, 14], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0},
+ {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+ {"matrix": [2, 14], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "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": [4, 12], "x": 14.75, "y": 3},
+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 17, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_split_bs_full_rshift": {
+ "layout": [
+ {"matrix": [1, 14], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0},
+ {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+ {"matrix": [2, 14], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "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": [4, 12], "x": 14.75, "y": 3},
+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 17, "y": 4, "w": 1.5}
+ ]
+ }
}
}
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/rev1.h b/keyboards/mechlovin/adelais/standard_led/avr/rev1/rev1.h
deleted file mode 100644
index 71bb49409d..0000000000
--- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/rev1.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_alice_split_bs( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07,K08,K09, K0A, K0B, K0C, K0D, K0E,\
- K2E, K10, K11, K12, K13, K14, K15, K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
- K3E, K20, K21, K22, K23, K24, K25, K26,K27,K28, K29, K2A, K2B, K2D,\
- K30, K32, K33, K34, K35, K36, K37,K38,K39, K3A, K3B, K4C, K3C, K3D,\
- K40, K42, K44, K46, K48, K4A, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, K4C, K4D, KC_NO }, \
-}
-
-#define LAYOUT_alice( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07,K08,K09, K0A, K0B, K0C, K0D,\
- K2E, K10, K11, K12, K13, K14, K15, K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
- K3E, K20, K21, K22, K23, K24, K25, K26,K27,K28, K29, K2A, K2B, K2D,\
- K30, K32, K33, K34, K35, K36, K37,K38,K39, K3A, K3B, K4C, K3C, K3D,\
- K40, K42, K44, K46, K48, K4A, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, K4C, K4D, KC_NO }, \
-}
-
-#define LAYOUT_alice_split_bs_full_rshift( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K2E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K3E, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K4C, K3C, \
- K40, K42, K44, K46, K48, K4A, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, K4C, K4D, KC_NO }, \
-}
-
-#define LAYOUT_alice_full_rshift( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
- K2E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K3E, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K4C, K3C, \
- K40, K42, K44, K46, K48, K4A, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, K4C, K4D, KC_NO }, \
-}
-
-#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/keyboards/mechlovin/delphine/config.h b/keyboards/mechlovin/delphine/config.h
deleted file mode 100644
index 768ea4744f..0000000000
--- a/keyboards/mechlovin/delphine/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2020 Team Mechlovin'
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, D3 }
-#define MATRIX_COL_PINS { F7, D7, D6, D2 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechlovin/delphine/delphine.c b/keyboards/mechlovin/delphine/delphine.c
deleted file mode 100644
index 8e33b6603c..0000000000
--- a/keyboards/mechlovin/delphine/delphine.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "delphine.h"
diff --git a/keyboards/mechlovin/delphine/delphine.h b/keyboards/mechlovin/delphine/delphine.h
deleted file mode 100644
index da0254eeb4..0000000000
--- a/keyboards/mechlovin/delphine/delphine.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*
- * ┌───┬───┬───┬───┐
- * │00 │01 │02 │03 │
- * └───┴───┴───┴───┘
- * ┌───┬───┬───┬───┐
- * │10 │11 │12 │13 │
- * ├───┼───┼───┼───┤ ┌───┐
- * │20 │21 │22 │23 │ │ │
- * ├───┼───┼───┼───┤ │23 │ 2u Plus
- * │30 │31 │32 │33 │ │ │
- * ├───┼───┼───┼───┤ ├───┤
- * │40 │41 │42 │43 │ │ │
- * ├───┼───┼───┼───┤ │43 │ 2u Enter
- * │50 │51 │52 │53 │ │ │
- * └───┴───┴───┴───┘ └───┘
- * ┌───────┐
- * │51 │ 2u 0/Ins
- * └───────┘
- */
-
-#define LAYOUT_ortho_6x4( \
- K00, K01, K02, K03, \
- K10, K11, K12, K13, \
- K20, K21, K22, K23, \
- K30, K31, K32, K33, \
- K40, K41, K42, K43, \
- K50, K51, K52, K53 \
-) { \
- { K00, K01, K02, K03 }, \
- { K10, K11, K12, K13 }, \
- { K20, K21, K22, K23 }, \
- { K30, K31, K32, K33 }, \
- { K40, K41, K42, K43 }, \
- { K50, K51, K52, K53 }, \
-}
-
-#define LAYOUT_numpad_6x4( \
- K00, K01, K02, K03, \
- K10, K11, K12, K13, \
- K20, K21, K22, \
- K30, K31, K32, K23, \
- K40, K41, K42, \
- K51, K52, K43 \
-) { \
- { K00, K01, K02, K03 }, \
- { K10, K11, K12, K13 }, \
- { K20, K21, K22, K23 }, \
- { K30, K31, K32, XXX }, \
- { K40, K41, K42, K43 }, \
- { XXX, K51, K52, XXX }, \
-}
diff --git a/keyboards/mechlovin/delphine/info.json b/keyboards/mechlovin/delphine/info.json
index 4495943544..baeeab6f18 100644
--- a/keyboards/mechlovin/delphine/info.json
+++ b/keyboards/mechlovin/delphine/info.json
@@ -6,6 +6,11 @@
"usb": {
"vid": "0x4D4C"
},
+ "matrix_pins": {
+ "cols": ["F7", "D7", "D6", "D2"],
+ "rows": ["F0", "F1", "F4", "F5", "F6", "D3"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"num_lock": "B5"
},
@@ -15,60 +20,65 @@
"layouts": {
"LAYOUT_ortho_6x4": {
"layout": [
- {"label":"K00 (F0,F7)", "x":0, "y":0},
- {"label":"K01 (F0,D7)", "x":1, "y":0},
- {"label":"K02 (F0,D6)", "x":2, "y":0},
- {"label":"K03 (F0,D2)", "x":3, "y":0},
- {"label":"K10 (F1,F7)", "x":0, "y":1.25},
- {"label":"K11 (F1,D7)", "x":1, "y":1.25},
- {"label":"K12 (F1,D6)", "x":2, "y":1.25},
- {"label":"K13 (F1,D2)", "x":3, "y":1.25},
- {"label":"K20 (F4,F7)", "x":0, "y":2.25},
- {"label":"K21 (F4,D7)", "x":1, "y":2.25},
- {"label":"K22 (F4,D6)", "x":2, "y":2.25},
- {"label":"K23 (F4,D2)", "x":3, "y":2.25},
- {"label":"K30 (F5,F7)", "x":0, "y":3.25},
- {"label":"K31 (F5,D7)", "x":1, "y":3.25},
- {"label":"K32 (F5,D6)", "x":2, "y":3.25},
- {"label":"K33 (F5,D2)", "x":3, "y":3.25},
- {"label":"K40 (F6,F7)", "x":0, "y":4.25},
- {"label":"K41 (F6,D7)", "x":1, "y":4.25},
- {"label":"K42 (F6,D6)", "x":2, "y":4.25},
- {"label":"K43 (F6,D2)", "x":3, "y":4.25},
- {"label":"K50 (D3,F7)", "x":0, "y":5.25},
- {"label":"K51 (D3,D7)", "x":1, "y":5.25},
- {"label":"K52 (D3,D6)", "x":2, "y":5.25},
- {"label":"K53 (D3,D2)", "x":3, "y":5.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": [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": [2, 0], "x": 0, "y": 2.25},
+ {"matrix": [2, 1], "x": 1, "y": 2.25},
+ {"matrix": [2, 2], "x": 2, "y": 2.25},
+ {"matrix": [2, 3], "x": 3, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25},
+ {"matrix": [3, 1], "x": 1, "y": 3.25},
+ {"matrix": [3, 2], "x": 2, "y": 3.25},
+ {"matrix": [3, 3], "x": 3, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25},
+ {"matrix": [4, 1], "x": 1, "y": 4.25},
+ {"matrix": [4, 2], "x": 2, "y": 4.25},
+ {"matrix": [4, 3], "x": 3, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25},
+ {"matrix": [5, 1], "x": 1, "y": 5.25},
+ {"matrix": [5, 2], "x": 2, "y": 5.25},
+ {"matrix": [5, 3], "x": 3, "y": 5.25}
]
},
"LAYOUT_numpad_6x4": {
"layout": [
- {"label":"K00 (F0,F7)", "x":0, "y":0},
- {"label":"K01 (F0,D7)", "x":1, "y":0},
- {"label":"K02 (F0,D6)", "x":2, "y":0},
- {"label":"K03 (F0,D2)", "x":3, "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},
- {"label":"K10 (F1,F7)", "x":0, "y":1.25},
- {"label":"K11 (F1,D7)", "x":1, "y":1.25},
- {"label":"K12 (F1,D6)", "x":2, "y":1.25},
- {"label":"K13 (F1,D2)", "x":3, "y":1.25},
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
- {"label":"K20 (F4,F7)", "x":0, "y":2.25},
- {"label":"K21 (F4,D7)", "x":1, "y":2.25},
- {"label":"K22 (F4,D6)", "x":2, "y":2.25},
+ {"matrix": [2, 0], "x": 0, "y": 2.25},
+ {"matrix": [2, 1], "x": 1, "y": 2.25},
+ {"matrix": [2, 2], "x": 2, "y": 2.25},
- {"label":"K30 (F5,F7)", "x":0, "y":3.25},
- {"label":"K31 (F5,D7)", "x":1, "y":3.25},
- {"label":"K32 (F5,D6)", "x":2, "y":3.25},
- {"label":"K23 (F4,D2)", "x":3, "y":2.25, "h":2},
+ {"matrix": [3, 0], "x": 0, "y": 3.25},
+ {"matrix": [3, 1], "x": 1, "y": 3.25},
+ {"matrix": [3, 2], "x": 2, "y": 3.25},
+ {"matrix": [2, 3], "x": 3, "y": 2.25, "h": 2},
- {"label":"K40 (F6,F7)", "x":0, "y":4.25},
- {"label":"K41 (F6,D7)", "x":1, "y":4.25},
- {"label":"K42 (F6,D6)", "x":2, "y":4.25},
+ {"matrix": [4, 0], "x": 0, "y": 4.25},
+ {"matrix": [4, 1], "x": 1, "y": 4.25},
+ {"matrix": [4, 2], "x": 2, "y": 4.25},
- {"label":"K51 (D3,D7)", "x":0, "y":5.25, "w":2},
- {"label":"K52 (D3,D6)", "x":2, "y":5.25},
- {"label":"K43 (F6,D2)", "x":3, "y":4.25, "h":2}
+ {"matrix": [5, 1], "x": 0, "y": 5.25, "w": 2},
+ {"matrix": [5, 2], "x": 2, "y": 5.25},
+ {"matrix": [4, 3], "x": 3, "y": 4.25, "h": 2}
]
}
}
diff --git a/keyboards/mechlovin/delphine/mono_led/config.h b/keyboards/mechlovin/delphine/mono_led/config.h
index b1ef0e072a..5b9d874128 100644
--- a/keyboards/mechlovin/delphine/mono_led/config.h
+++ b/keyboards/mechlovin/delphine/mono_led/config.h
@@ -2,7 +2,6 @@
#pragma once
#ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN E2
#define RGBLED_NUM 13
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/mechlovin/delphine/mono_led/info.json b/keyboards/mechlovin/delphine/mono_led/info.json
index ce88a638a9..7f775f8c36 100644
--- a/keyboards/mechlovin/delphine/mono_led/info.json
+++ b/keyboards/mechlovin/delphine/mono_led/info.json
@@ -3,6 +3,9 @@
"pid": "0xDEF1",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "E2"
+ },
"backlight": {
"pin": "B6"
}
diff --git a/keyboards/mechlovin/delphine/rgb_led/config.h b/keyboards/mechlovin/delphine/rgb_led/config.h
index 0f91dd6efa..c813d4fa12 100644
--- a/keyboards/mechlovin/delphine/rgb_led/config.h
+++ b/keyboards/mechlovin/delphine/rgb_led/config.h
@@ -1,7 +1,6 @@
#pragma once
#ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN E2
#define RGBLED_NUM 13
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/mechlovin/delphine/rgb_led/info.json b/keyboards/mechlovin/delphine/rgb_led/info.json
index 0a8f1ab220..0255aae44a 100644
--- a/keyboards/mechlovin/delphine/rgb_led/info.json
+++ b/keyboards/mechlovin/delphine/rgb_led/info.json
@@ -2,5 +2,8 @@
"usb": {
"pid": "0xDEF2",
"device_version": "0.0.1"
+ },
+ "ws2812": {
+ "pin": "E2"
}
}
diff --git a/keyboards/mechlovin/delphine/rgb_led/rgb_led.c b/keyboards/mechlovin/delphine/rgb_led/rgb_led.c
index 3e02735cdf..02a011ba4b 100644
--- a/keyboards/mechlovin/delphine/rgb_led/rgb_led.c
+++ b/keyboards/mechlovin/delphine/rgb_led/rgb_led.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "rgb_led.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/mechlovin/delphine/rgb_led/rgb_led.h b/keyboards/mechlovin/delphine/rgb_led/rgb_led.h
deleted file mode 100644
index 60d5817344..0000000000
--- a/keyboards/mechlovin/delphine/rgb_led/rgb_led.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/mechlovin/foundation/config.h b/keyboards/mechlovin/foundation/config.h
index 951eab595b..d366188f76 100644
--- a/keyboards/mechlovin/foundation/config.h
+++ b/keyboards/mechlovin/foundation/config.h
@@ -17,26 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-#define MATRIX_ROW_PINS { B12, B13, B14, A8, A2 }
-#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A15, B9, B8, B7, B6, B5, B4, B3}
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B15
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 22
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -53,6 +33,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
#define TAP_CODE_DELAY 10 \ No newline at end of file
diff --git a/keyboards/mechlovin/foundation/foundation.c b/keyboards/mechlovin/foundation/foundation.c
deleted file mode 100644
index 12d3e848d7..0000000000
--- a/keyboards/mechlovin/foundation/foundation.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Mechlovin' Studio
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "foundation.h"
diff --git a/keyboards/mechlovin/foundation/foundation.h b/keyboards/mechlovin/foundation/foundation.h
index 0444817bbf..717e9f3b16 100644
--- a/keyboards/mechlovin/foundation/foundation.h
+++ b/keyboards/mechlovin/foundation/foundation.h
@@ -27,7 +27,7 @@
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, KC_NO, KC_NO }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO, KC_NO, K3G, KC_NO }, \
+ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, KC_NO, K3G, KC_NO }, \
{ K40, K41, K42, K43, KC_NO, KC_NO, KC_NO, K47, KC_NO, KC_NO, KC_NO, K4B, K4C, K4D, K4E, K4F, K4G, K4H }, \
}
diff --git a/keyboards/mechlovin/foundation/info.json b/keyboards/mechlovin/foundation/info.json
index bb7491ff19..c1c871a199 100644
--- a/keyboards/mechlovin/foundation/info.json
+++ b/keyboards/mechlovin/foundation/info.json
@@ -8,6 +8,11 @@
"pid": "0x0180",
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A15", "B9", "B8", "B7", "B6", "B5", "B4", "B3"],
+ "rows": ["B12", "B13", "B14", "A8", "A2"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "C13", "pin_b": "C14"}
@@ -17,6 +22,9 @@
"caps_lock": "A1",
"on_state": 0
},
+ "ws2812": {
+ "pin": "B15"
+ },
"processor": "STM32F103",
"bootloader": "stm32duino",
"layout_aliases": {
diff --git a/keyboards/mechlovin/hannah60rgb/config.h b/keyboards/mechlovin/hannah60rgb/config.h
deleted file mode 100644
index b10cdfb013..0000000000
--- a/keyboards/mechlovin/hannah60rgb/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2020 Mechlovin'
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { A4, A5, A3, A2, A1 }
-#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A0, C15, B4, B5, B3, C13, C14 }
-
-#define DIODE_DIRECTION COL2ROW \ No newline at end of file
diff --git a/keyboards/mechlovin/hannah60rgb/hannah60rgb.h b/keyboards/mechlovin/hannah60rgb/hannah60rgb.h
deleted file mode 100644
index 9944b12284..0000000000
--- a/keyboards/mechlovin/hannah60rgb/hannah60rgb.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_mechlovin_hannah60rgb_rev1)
- #include "rev1.h"
-#elif defined(KEYBOARD_mechlovin_hannah60rgb_rev2)
- #include "rev2.h"
-#endif
diff --git a/keyboards/mechlovin/hannah60rgb/rev1/config.h b/keyboards/mechlovin/hannah60rgb/rev1/config.h
index 9033ee59b2..08006aa996 100644
--- a/keyboards/mechlovin/hannah60rgb/rev1/config.h
+++ b/keyboards/mechlovin/hannah60rgb/rev1/config.h
@@ -1,6 +1,5 @@
#pragma once
-#define RGB_DI_PIN A15
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_LED_COUNT 72
# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
diff --git a/keyboards/mechlovin/hannah60rgb/rev1/info.json b/keyboards/mechlovin/hannah60rgb/rev1/info.json
index 2ed43a3fc2..6d5223a32a 100644
--- a/keyboards/mechlovin/hannah60rgb/rev1/info.json
+++ b/keyboards/mechlovin/hannah60rgb/rev1/info.json
@@ -8,6 +8,14 @@
"pid": "0x6001",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "A15"
+ },
+ "matrix_pins": {
+ "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14"],
+ "rows": ["A4", "A5", "A3", "A2", "A1"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F303",
"bootloader": "stm32-dfu",
"board": "QMK_PROTON_C",
diff --git a/keyboards/mechlovin/hannah60rgb/rev1/rev1.c b/keyboards/mechlovin/hannah60rgb/rev1/rev1.c
index b61ac10b14..d8bad04c4f 100644
--- a/keyboards/mechlovin/hannah60rgb/rev1/rev1.c
+++ b/keyboards/mechlovin/hannah60rgb/rev1/rev1.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "hannah60rgb.h"
+#include "rev1.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
diff --git a/keyboards/mechlovin/hannah60rgb/rev2/config.h b/keyboards/mechlovin/hannah60rgb/rev2/config.h
index aff3a43340..81335f31be 100644
--- a/keyboards/mechlovin/hannah60rgb/rev2/config.h
+++ b/keyboards/mechlovin/hannah60rgb/rev2/config.h
@@ -1,7 +1,6 @@
#pragma once
#ifdef RGBLIGHT_ENABLE
-# define RGB_DI_PIN A15
# define RGBLED_NUM 18
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/mechlovin/hannah60rgb/rev2/info.json b/keyboards/mechlovin/hannah60rgb/rev2/info.json
index 798e67ee78..2074fceb8b 100644
--- a/keyboards/mechlovin/hannah60rgb/rev2/info.json
+++ b/keyboards/mechlovin/hannah60rgb/rev2/info.json
@@ -8,6 +8,14 @@
"pid": "0x6002",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "A15"
+ },
+ "matrix_pins": {
+ "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14"],
+ "rows": ["A4", "A5", "A3", "A2", "A1"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F303",
"bootloader": "stm32-dfu",
"board": "QMK_PROTON_C",
diff --git a/keyboards/mechlovin/hannah65/config.h b/keyboards/mechlovin/hannah65/config.h
index e96bc8bc85..1686c861fb 100644
--- a/keyboards/mechlovin/hannah65/config.h
+++ b/keyboards/mechlovin/hannah65/config.h
@@ -17,21 +17,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { A4, A5, A3, A2, A1 }
-#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A0, C15, B4, B5, B3, C13, C14, A13 }
-
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD4
#define BACKLIGHT_PWM_CHANNEL 3
diff --git a/keyboards/mechlovin/hannah65/hannah65.c b/keyboards/mechlovin/hannah65/hannah65.c
deleted file mode 100644
index 92e0917ebe..0000000000
--- a/keyboards/mechlovin/hannah65/hannah65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "hannah65.h"
diff --git a/keyboards/mechlovin/hannah65/hannah65.h b/keyboards/mechlovin/hannah65/hannah65.h
deleted file mode 100644
index 99da5a2a1a..0000000000
--- a/keyboards/mechlovin/hannah65/hannah65.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_mechlovin_hannah65_rev1)
-# include "rev1.h"
-#endif \ No newline at end of file
diff --git a/keyboards/mechlovin/hannah65/info.json b/keyboards/mechlovin/hannah65/info.json
index 74ae965fb7..88a3f39719 100644
--- a/keyboards/mechlovin/hannah65/info.json
+++ b/keyboards/mechlovin/hannah65/info.json
@@ -3,6 +3,11 @@
"pin": "B8",
"breathing": true
},
+ "matrix_pins": {
+ "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14", "A13"],
+ "rows": ["A4", "A5", "A3", "A2", "A1"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "B9",
"on_state": 0
diff --git a/keyboards/mechlovin/hannah65/rev1/haus/info.json b/keyboards/mechlovin/hannah65/rev1/haus/info.json
index 55ddde0a58..ac97de5f18 100644
--- a/keyboards/mechlovin/hannah65/rev1/haus/info.json
+++ b/keyboards/mechlovin/hannah65/rev1/haus/info.json
@@ -11,218 +11,230 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- {"label":"K00 (B0,B5)", "x":0, "y":0},
- {"label":"K01 (B0,B6)", "x":1, "y":0},
- {"label":"K02 (B0,B7)", "x":2, "y":0},
- {"label":"K03 (B0,C0)", "x":3, "y":0},
- {"label":"K04 (B0,C1)", "x":4, "y":0},
- {"label":"K05 (B0,C2)", "x":5, "y":0},
- {"label":"K06 (B0,C3)", "x":6, "y":0},
- {"label":"K07 (B0,C4)", "x":7, "y":0},
- {"label":"K08 (B0,C5)", "x":8, "y":0},
- {"label":"K09 (B0,C6)", "x":9, "y":0},
- {"label":"K0A (B0,C7)", "x":10, "y":0},
- {"label":"K0B (B0,D0)", "x":11, "y":0},
- {"label":"K0C (B0,D1)", "x":12, "y":0},
- {"label":"K0D (B0,D2)", "x":13, "y":0},
- {"label":"K1D (B1,D2)", "x":14, "y":0},
- {"label":"K0E (B0,D3)", "x":15, "y":0},
- {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
- {"label":"K11 (B1,B6)", "x":1.5, "y":1},
- {"label":"K12 (B1,B7)", "x":2.5, "y":1},
- {"label":"K13 (B1,C0)", "x":3.5, "y":1},
- {"label":"K14 (B1,C1)", "x":4.5, "y":1},
- {"label":"K15 (B1,C2)", "x":5.5, "y":1},
- {"label":"K16 (B1,C3)", "x":6.5, "y":1},
- {"label":"K17 (B1,C4)", "x":7.5, "y":1},
- {"label":"K18 (B1,C5)", "x":8.5, "y":1},
- {"label":"K19 (B1,C6)", "x":9.5, "y":1},
- {"label":"K1A (B1,C7)", "x":10.5, "y":1},
- {"label":"K1B (B1,D0)", "x":11.5, "y":1},
- {"label":"K1C (B1,D1)", "x":12.5, "y":1},
- {"label":"K2C (B2,D1)", "x":13.5, "y":1, "w":1.5},
- {"label":"K1E (B1,D3)", "x":15, "y":1},
- {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75},
- {"label":"K21 (B2,B6)", "x":1.75, "y":2},
- {"label":"K22 (B2,B7)", "x":2.75, "y":2},
- {"label":"K23 (B2,C0)", "x":3.75, "y":2},
- {"label":"K24 (B2,C1)", "x":4.75, "y":2},
- {"label":"K25 (B2,C2)", "x":5.75, "y":2},
- {"label":"K26 (B2,C3)", "x":6.75, "y":2},
- {"label":"K27 (B2,C4)", "x":7.75, "y":2},
- {"label":"K28 (B2,C5)", "x":8.75, "y":2},
- {"label":"K29 (B2,C6)", "x":9.75, "y":2},
- {"label":"K2A (B2,C7)", "x":10.75, "y":2},
- {"label":"K2B (B2,D0)", "x":11.75, "y":2},
- {"label":"K2D (B2,D2)", "x":12.75, "y":2, "w":2.25},
- {"label":"K2E (B2,D3)", "x":15, "y":2},
- {"label":"K30 (B3,B5)", "x":0, "y":3, "w":1.25},
- {"label":"K31 (B3,B6)", "x":1.25, "y":3},
- {"label":"K32 (B3,B7)", "x":2.25, "y":3},
- {"label":"K33 (B3,C0)", "x":3.25, "y":3},
- {"label":"K34 (B3,C1)", "x":4.25, "y":3},
- {"label":"K35 (B3,C2)", "x":5.25, "y":3},
- {"label":"K36 (B3,C3)", "x":6.25, "y":3},
- {"label":"K37 (B3,C4)", "x":7.25, "y":3},
- {"label":"K38 (B3,C5)", "x":8.25, "y":3},
- {"label":"K39 (B3,C6)", "x":9.25, "y":3},
- {"label":"K3A (B3,C7)", "x":10.25, "y":3},
- {"label":"K3B (B3,D0)", "x":11.25, "y":3},
- {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75},
- {"label":"K3D (B3,D2)", "x":14, "y":3},
- {"label":"K3E (B3,D3)", "x":15, "y":3},
- {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
- {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
- {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25},
- {"label":"K4A (B4,C7)", "x":10, "y":4, "w":1.25},
- {"label":"K4B (B4,D0)", "x":11.25, "y":4, "w":1.25},
- {"label":"K4C (B4,D1)", "x":13, "y":4},
- {"label":"K4D (B4,D2)", "x":14, "y":4},
- {"label":"K4E (B4,D3)", "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": [1, 13], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [2, 12], "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": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
},
"LAYOUT_65_ansi_blocker": {
"layout": [
- {"label":"K00 (B0,B5)", "x":0, "y":0},
- {"label":"K01 (B0,B6)", "x":1, "y":0},
- {"label":"K02 (B0,B7)", "x":2, "y":0},
- {"label":"K03 (B0,C0)", "x":3, "y":0},
- {"label":"K04 (B0,C1)", "x":4, "y":0},
- {"label":"K05 (B0,C2)", "x":5, "y":0},
- {"label":"K06 (B0,C3)", "x":6, "y":0},
- {"label":"K07 (B0,C4)", "x":7, "y":0},
- {"label":"K08 (B0,C5)", "x":8, "y":0},
- {"label":"K09 (B0,C6)", "x":9, "y":0},
- {"label":"K0A (B0,C7)", "x":10, "y":0},
- {"label":"K0B (B0,D0)", "x":11, "y":0},
- {"label":"K0C (B0,D1)", "x":12, "y":0},
- {"label":"K0D (B0,D2)", "x":13, "y":0, "w":2},
- {"label":"K0E (B0,D3)", "x":15, "y":0},
- {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
- {"label":"K11 (B1,B6)", "x":1.5, "y":1},
- {"label":"K12 (B1,B7)", "x":2.5, "y":1},
- {"label":"K13 (B1,C0)", "x":3.5, "y":1},
- {"label":"K14 (B1,C1)", "x":4.5, "y":1},
- {"label":"K15 (B1,C2)", "x":5.5, "y":1},
- {"label":"K16 (B1,C3)", "x":6.5, "y":1},
- {"label":"K17 (B1,C4)", "x":7.5, "y":1},
- {"label":"K18 (B1,C5)", "x":8.5, "y":1},
- {"label":"K19 (B1,C6)", "x":9.5, "y":1},
- {"label":"K1A (B1,C7)", "x":10.5, "y":1},
- {"label":"K1B (B1,D0)", "x":11.5, "y":1},
- {"label":"K1C (B1,D1)", "x":12.5, "y":1},
- {"label":"K2C (B2,D1)", "x":13.5, "y":1, "w":1.5},
- {"label":"K1E (B1,D3)", "x":15, "y":1},
- {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75},
- {"label":"K21 (B2,B6)", "x":1.75, "y":2},
- {"label":"K22 (B2,B7)", "x":2.75, "y":2},
- {"label":"K23 (B2,C0)", "x":3.75, "y":2},
- {"label":"K24 (B2,C1)", "x":4.75, "y":2},
- {"label":"K25 (B2,C2)", "x":5.75, "y":2},
- {"label":"K26 (B2,C3)", "x":6.75, "y":2},
- {"label":"K27 (B2,C4)", "x":7.75, "y":2},
- {"label":"K28 (B2,C5)", "x":8.75, "y":2},
- {"label":"K29 (B2,C6)", "x":9.75, "y":2},
- {"label":"K2A (B2,C7)", "x":10.75, "y":2},
- {"label":"K2B (B2,D0)", "x":11.75, "y":2},
- {"label":"K2D (B2,D2)", "x":12.75, "y":2, "w":2.25},
- {"label":"K2E (B2,D3)", "x":15, "y":2},
- {"label":"K30 (B3,B5)", "x":0, "y":3, "w":2.25},
- {"label":"K32 (B3,B7)", "x":2.25, "y":3},
- {"label":"K33 (B3,C0)", "x":3.25, "y":3},
- {"label":"K34 (B3,C1)", "x":4.25, "y":3},
- {"label":"K35 (B3,C2)", "x":5.25, "y":3},
- {"label":"K36 (B3,C3)", "x":6.25, "y":3},
- {"label":"K37 (B3,C4)", "x":7.25, "y":3},
- {"label":"K38 (B3,C5)", "x":8.25, "y":3},
- {"label":"K39 (B3,C6)", "x":9.25, "y":3},
- {"label":"K3A (B3,C7)", "x":10.25, "y":3},
- {"label":"K3B (B3,D0)", "x":11.25, "y":3},
- {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75},
- {"label":"K3D (B3,D2)", "x":14, "y":3},
- {"label":"K3E (B3,D3)", "x":15, "y":3},
- {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
- {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
- {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25},
- {"label":"K4A (B4,C7)", "x":10, "y":4, "w":1.25},
- {"label":"K4B (B4,D0)", "x":11.25, "y":4, "w":1.25},
- {"label":"K4C (B4,D1)", "x":13, "y":4},
- {"label":"K4D (B4,D2)", "x":14, "y":4},
- {"label":"K4E (B4,D3)", "x":15, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
},
"LAYOUT_65_iso_blocker": {
"layout": [
- {"label":"K00 (B0,B5)", "x":0, "y":0},
- {"label":"K01 (B0,B6)", "x":1, "y":0},
- {"label":"K02 (B0,B7)", "x":2, "y":0},
- {"label":"K03 (B0,C0)", "x":3, "y":0},
- {"label":"K04 (B0,C1)", "x":4, "y":0},
- {"label":"K05 (B0,C2)", "x":5, "y":0},
- {"label":"K06 (B0,C3)", "x":6, "y":0},
- {"label":"K07 (B0,C4)", "x":7, "y":0},
- {"label":"K08 (B0,C5)", "x":8, "y":0},
- {"label":"K09 (B0,C6)", "x":9, "y":0},
- {"label":"K0A (B0,C7)", "x":10, "y":0},
- {"label":"K0B (B0,D0)", "x":11, "y":0},
- {"label":"K0C (B0,D1)", "x":12, "y":0},
- {"label":"K0D (B0,D2)", "x":13, "y":0, "w":2},
- {"label":"K0E (B0,D3)", "x":15, "y":0},
- {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
- {"label":"K11 (B1,B6)", "x":1.5, "y":1},
- {"label":"K12 (B1,B7)", "x":2.5, "y":1},
- {"label":"K13 (B1,C0)", "x":3.5, "y":1},
- {"label":"K14 (B1,C1)", "x":4.5, "y":1},
- {"label":"K15 (B1,C2)", "x":5.5, "y":1},
- {"label":"K16 (B1,C3)", "x":6.5, "y":1},
- {"label":"K17 (B1,C4)", "x":7.5, "y":1},
- {"label":"K18 (B1,C5)", "x":8.5, "y":1},
- {"label":"K19 (B1,C6)", "x":9.5, "y":1},
- {"label":"K1A (B1,C7)", "x":10.5, "y":1},
- {"label":"K1B (B1,D0)", "x":11.5, "y":1},
- {"label":"K1C (B1,D1)", "x":12.5, "y":1},
- {"label":"K2D (B2,D2)", "x":13.75, "y":1, "w":1.25, "h":2},
- {"label":"K1E (B1,D3)", "x":15, "y":1},
- {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75},
- {"label":"K21 (B2,B6)", "x":1.75, "y":2},
- {"label":"K22 (B2,B7)", "x":2.75, "y":2},
- {"label":"K23 (B2,C0)", "x":3.75, "y":2},
- {"label":"K24 (B2,C1)", "x":4.75, "y":2},
- {"label":"K25 (B2,C2)", "x":5.75, "y":2},
- {"label":"K26 (B2,C3)", "x":6.75, "y":2},
- {"label":"K27 (B2,C4)", "x":7.75, "y":2},
- {"label":"K28 (B2,C5)", "x":8.75, "y":2},
- {"label":"K29 (B2,C6)", "x":9.75, "y":2},
- {"label":"K2A (B2,C7)", "x":10.75, "y":2},
- {"label":"K2B (B2,D0)", "x":11.75, "y":2},
- {"label":"K2C (B2,D1)", "x":12.75, "y":2},
- {"label":"K2E (B2,D3)", "x":15, "y":2},
- {"label":"K30 (B3,B5)", "x":0, "y":3, "w":1.25},
- {"label":"K31 (B3,B6)", "x":1.25, "y":3},
- {"label":"K32 (B3,B7)", "x":2.25, "y":3},
- {"label":"K33 (B3,C0)", "x":3.25, "y":3},
- {"label":"K34 (B3,C1)", "x":4.25, "y":3},
- {"label":"K35 (B3,C2)", "x":5.25, "y":3},
- {"label":"K36 (B3,C3)", "x":6.25, "y":3},
- {"label":"K37 (B3,C4)", "x":7.25, "y":3},
- {"label":"K38 (B3,C5)", "x":8.25, "y":3},
- {"label":"K39 (B3,C6)", "x":9.25, "y":3},
- {"label":"K3A (B3,C7)", "x":10.25, "y":3},
- {"label":"K3B (B3,D0)", "x":11.25, "y":3},
- {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75},
- {"label":"K3D (B3,D2)", "x":14, "y":3},
- {"label":"K3E (B3,D3)", "x":15, "y":3},
- {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
- {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
- {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25},
- {"label":"K4A (B4,C7)", "x":10, "y":4, "w":1.25},
- {"label":"K4B (B4,D0)", "x":11.25, "y":4, "w":1.25},
- {"label":"K4C (B4,D1)", "x":13, "y":4},
- {"label":"K4D (B4,D2)", "x":14, "y":4},
- {"label":"K4E (B4,D3)", "x":15, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
}
}
diff --git a/keyboards/mechlovin/hannah65/rev1/rev1.h b/keyboards/mechlovin/hannah65/rev1/rev1.h
deleted file mode 100644
index 0b6b863d56..0000000000
--- a/keyboards/mechlovin/hannah65/rev1/rev1.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, K1E, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
- K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E }, \
-}
-
-#define LAYOUT_65_ansi_blocker( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, K1E, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
- K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E }, \
-}
-
-#define LAYOUT_65_iso_blocker( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2D, K1E, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
- K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E }, \
-}
diff --git a/keyboards/mechlovin/hannah910/config.h b/keyboards/mechlovin/hannah910/config.h
index be1d769e67..362a7fc459 100644
--- a/keyboards/mechlovin/hannah910/config.h
+++ b/keyboards/mechlovin/hannah910/config.h
@@ -17,24 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B5, B6, D3, C6, C7 }
-#define MATRIX_COL_PINS { E6, B1, B3, F0, F1, F4, F5, F6, F7, D5, D4, B4, D6, D7, B0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
#define RGBLIGHT_LIMIT_VAL 255
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/mechlovin/hannah910/hannah910.c b/keyboards/mechlovin/hannah910/hannah910.c
index fa5b04ea76..0208e16348 100644
--- a/keyboards/mechlovin/hannah910/hannah910.c
+++ b/keyboards/mechlovin/hannah910/hannah910.c
@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "hannah910.h"
+#include "quantum.h"
void led_init_ports(void) {
setPinOutput(B2);
diff --git a/keyboards/mechlovin/hannah910/hannah910.h b/keyboards/mechlovin/hannah910/hannah910.h
deleted file mode 100644
index 2cc38d0690..0000000000
--- a/keyboards/mechlovin/hannah910/hannah910.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2019 Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_mechlovin_hannah910_rev1
- #include "rev1.h"
-#elif KEYBOARD_mechlovin_hannah910_rev2
- #include "rev2.h"
-#elif KEYBOARD_mechlovin_hannah910_rev3
- #include "rev3.h"
-#endif
diff --git a/keyboards/mechlovin/hannah910/rev1/info.json b/keyboards/mechlovin/hannah910/rev1/info.json
index ae5f966622..9a554f3b52 100644
--- a/keyboards/mechlovin/hannah910/rev1/info.json
+++ b/keyboards/mechlovin/hannah910/rev1/info.json
@@ -8,10 +8,18 @@
"pid": "0x9101",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"],
+ "rows": ["B5", "B6", "D3", "C6", "C7"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B7",
"breathing": true
},
+ "ws2812": {
+ "pin": "E2"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/mechlovin/hannah910/rev2/info.json b/keyboards/mechlovin/hannah910/rev2/info.json
index cfb43e786c..43f6ab51a1 100644
--- a/keyboards/mechlovin/hannah910/rev2/info.json
+++ b/keyboards/mechlovin/hannah910/rev2/info.json
@@ -8,232 +8,256 @@
"pid": "0x9102",
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"],
+ "rows": ["B5", "B6", "D3", "C6", "C7"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B7",
"breathing": true
},
+ "ws2812": {
+ "pin": "E2"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["65_ansi_blocker", "65_iso_blocker_split_bs"],
+ "layout_aliases": {
+ "LAYOUT_ansi": "LAYOUT_65_ansi_blocker",
+ "LAYOUT_iso": "LAYOUT_65_iso_blocker_split_bs"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
- {"label":"K00 (B0,B5)", "x":0, "y":0},
- {"label":"K01 (B0,B6)", "x":1, "y":0},
- {"label":"K02 (B0,B7)", "x":2, "y":0},
- {"label":"K03 (B0,C0)", "x":3, "y":0},
- {"label":"K04 (B0,C1)", "x":4, "y":0},
- {"label":"K05 (B0,C2)", "x":5, "y":0},
- {"label":"K06 (B0,C3)", "x":6, "y":0},
- {"label":"K07 (B0,C4)", "x":7, "y":0},
- {"label":"K08 (B0,C5)", "x":8, "y":0},
- {"label":"K09 (B0,C6)", "x":9, "y":0},
- {"label":"K0A (B0,C7)", "x":10, "y":0},
- {"label":"K0B (B0,D0)", "x":11, "y":0},
- {"label":"K0C (B0,D1)", "x":12, "y":0},
- {"label":"K0D (B0,D2)", "x":13, "y":0},
- {"label":"K0E (B0,D3)", "x":14, "y":0},
- {"label":"K49 (B4,C6)", "x":15, "y":0},
- {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
- {"label":"K11 (B1,B6)", "x":1.5, "y":1},
- {"label":"K12 (B1,B7)", "x":2.5, "y":1},
- {"label":"K13 (B1,C0)", "x":3.5, "y":1},
- {"label":"K14 (B1,C1)", "x":4.5, "y":1},
- {"label":"K15 (B1,C2)", "x":5.5, "y":1},
- {"label":"K16 (B1,C3)", "x":6.5, "y":1},
- {"label":"K17 (B1,C4)", "x":7.5, "y":1},
- {"label":"K18 (B1,C5)", "x":8.5, "y":1},
- {"label":"K19 (B1,C6)", "x":9.5, "y":1},
- {"label":"K1A (B1,C7)", "x":10.5, "y":1},
- {"label":"K1B (B1,D0)", "x":11.5, "y":1},
- {"label":"K1C (B1,D1)", "x":12.5, "y":1},
- {"label":"K1D (B1,D2)", "x":13.5, "y":1, "w":1.5},
- {"label":"K1E (B1,D3)", "x":15, "y":1},
- {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75},
- {"label":"K21 (B2,B6)", "x":1.75, "y":2},
- {"label":"K22 (B2,B7)", "x":2.75, "y":2},
- {"label":"K23 (B2,C0)", "x":3.75, "y":2},
- {"label":"K24 (B2,C1)", "x":4.75, "y":2},
- {"label":"K25 (B2,C2)", "x":5.75, "y":2},
- {"label":"K26 (B2,C3)", "x":6.75, "y":2},
- {"label":"K27 (B2,C4)", "x":7.75, "y":2},
- {"label":"K28 (B2,C5)", "x":8.75, "y":2},
- {"label":"K29 (B2,C6)", "x":9.75, "y":2},
- {"label":"K2A (B2,C7)", "x":10.75, "y":2},
- {"label":"K2B (B2,D0)", "x":11.75, "y":2},
- {"label":"K2C (B2,D1)", "x":12.75, "y":2},
- {"label":"K2D (B2,D2)", "x":13.75, "y":2, "w":1.25},
- {"label":"K2E (B2,D3)", "x":15, "y":2},
- {"label":"K30 (B3,B5)", "x":0, "y":3, "w":1.25},
- {"label":"K31 (B3,B6)", "x":1.25, "y":3},
- {"label":"K32 (B3,B7)", "x":2.25, "y":3},
- {"label":"K33 (B3,C0)", "x":3.25, "y":3},
- {"label":"K34 (B3,C1)", "x":4.25, "y":3},
- {"label":"K35 (B3,C2)", "x":5.25, "y":3},
- {"label":"K36 (B3,C3)", "x":6.25, "y":3},
- {"label":"K37 (B3,C4)", "x":7.25, "y":3},
- {"label":"K38 (B3,C5)", "x":8.25, "y":3},
- {"label":"K39 (B3,C6)", "x":9.25, "y":3},
- {"label":"K3A (B3,C7)", "x":10.25, "y":3},
- {"label":"K3B (B3,D0)", "x":11.25, "y":3},
- {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75},
- {"label":"K3D (B3,D2)", "x":14, "y":3},
- {"label":"K3E (B3,D3)", "x":15, "y":3},
- {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
- {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
- {"label":"K44 (B4,C1)", "x":3.75, "y":4, "w":2.75},
- {"label":"K46 (B4,C3)", "x":6.5, "y":4, "w":1.25},
- {"label":"K48 (B4,C5)", "x":7.75, "y":4, "w":2.25},
- {"label":"K4A (B4,C7)", "x":10, "y":4, "w":1.25},
- {"label":"K4B (B4,D0)", "x":11.25, "y":4, "w":1.25},
- {"label":"K4C (B4,D1)", "x":13, "y":4},
- {"label":"K4D (B4,D2)", "x":14, "y":4},
- {"label":"K4E (B4,D3)", "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": [4, 9], "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, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 7.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
},
"LAYOUT_65_iso_blocker_split_bs": {
"layout": [
- {"label":"K00", "x":0, "y":0},
- {"label":"K01", "x":1, "y":0},
- {"label":"K02", "x":2, "y":0},
- {"label":"K03", "x":3, "y":0},
- {"label":"K04", "x":4, "y":0},
- {"label":"K05", "x":5, "y":0},
- {"label":"K06", "x":6, "y":0},
- {"label":"K07", "x":7, "y":0},
- {"label":"K08", "x":8, "y":0},
- {"label":"K09", "x":9, "y":0},
- {"label":"K0A", "x":10, "y":0},
- {"label":"K0B", "x":11, "y":0},
- {"label":"K0C", "x":12, "y":0},
- {"label":"K0D", "x":13, "y":0},
- {"label":"K0E", "x":14, "y":0},
- {"label":"K49", "x":15, "y":0},
- {"label":"K10", "x":0, "y":1, "w":1.5},
- {"label":"K11", "x":1.5, "y":1},
- {"label":"K12", "x":2.5, "y":1},
- {"label":"K13", "x":3.5, "y":1},
- {"label":"K14", "x":4.5, "y":1},
- {"label":"K15", "x":5.5, "y":1},
- {"label":"K16", "x":6.5, "y":1},
- {"label":"K17", "x":7.5, "y":1},
- {"label":"K18", "x":8.5, "y":1},
- {"label":"K19", "x":9.5, "y":1},
- {"label":"K1A", "x":10.5, "y":1},
- {"label":"K1B", "x":11.5, "y":1},
- {"label":"K1C", "x":12.5, "y":1},
- {"label":"K1E", "x":15, "y":1},
- {"label":"K20", "x":0, "y":2, "w":1.75},
- {"label":"K21", "x":1.75, "y":2},
- {"label":"K22", "x":2.75, "y":2},
- {"label":"K23", "x":3.75, "y":2},
- {"label":"K24", "x":4.75, "y":2},
- {"label":"K25", "x":5.75, "y":2},
- {"label":"K26", "x":6.75, "y":2},
- {"label":"K27", "x":7.75, "y":2},
- {"label":"K28", "x":8.75, "y":2},
- {"label":"K29", "x":9.75, "y":2},
- {"label":"K2A", "x":10.75, "y":2},
- {"label":"K2B", "x":11.75, "y":2},
- {"label":"K2C", "x":12.75, "y":2},
- {"label":"K2D", "x":13.75, "y":1, "w":1.25, "h":2},
- {"label":"K2E", "x":15, "y":2},
- {"label":"K30", "x":0, "y":3, "w":1.25},
- {"label":"K31", "x":1.25, "y":3},
- {"label":"K32", "x":2.25, "y":3},
- {"label":"K33", "x":3.25, "y":3},
- {"label":"K34", "x":4.25, "y":3},
- {"label":"K35", "x":5.25, "y":3},
- {"label":"K36", "x":6.25, "y":3},
- {"label":"K37", "x":7.25, "y":3},
- {"label":"K38", "x":8.25, "y":3},
- {"label":"K39", "x":9.25, "y":3},
- {"label":"K3A", "x":10.25, "y":3},
- {"label":"K3B", "x":11.25, "y":3},
- {"label":"K3C", "x":12.25, "y":3, "w":1.75},
- {"label":"K3D", "x":14, "y":3},
- {"label":"K3E", "x":15, "y":3},
- {"label":"K40", "x":0, "y":4, "w":1.25},
- {"label":"K41", "x":1.25, "y":4, "w":1.25},
- {"label":"K42", "x":2.5, "y":4, "w":1.25},
- {"label":"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":"K4C", "x":13, "y":4},
- {"label":"K4D", "x":14, "y":4},
- {"label":"K4E", "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": [4, 9], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
},
"LAYOUT_65_ansi_blocker": {
"layout": [
- {"label":"K00", "x":0, "y":0},
- {"label":"K01", "x":1, "y":0},
- {"label":"K02", "x":2, "y":0},
- {"label":"K03", "x":3, "y":0},
- {"label":"K04", "x":4, "y":0},
- {"label":"K05", "x":5, "y":0},
- {"label":"K06", "x":6, "y":0},
- {"label":"K07", "x":7, "y":0},
- {"label":"K08", "x":8, "y":0},
- {"label":"K09", "x":9, "y":0},
- {"label":"K0A", "x":10, "y":0},
- {"label":"K0B", "x":11, "y":0},
- {"label":"K0C", "x":12, "y":0},
- {"label":"K0D", "x":13, "y":0, "w":2},
- {"label":"K49", "x":15, "y":0},
- {"label":"K10", "x":0, "y":1, "w":1.5},
- {"label":"K11", "x":1.5, "y":1},
- {"label":"K12", "x":2.5, "y":1},
- {"label":"K13", "x":3.5, "y":1},
- {"label":"K14", "x":4.5, "y":1},
- {"label":"K15", "x":5.5, "y":1},
- {"label":"K16", "x":6.5, "y":1},
- {"label":"K17", "x":7.5, "y":1},
- {"label":"K18", "x":8.5, "y":1},
- {"label":"K19", "x":9.5, "y":1},
- {"label":"K1A", "x":10.5, "y":1},
- {"label":"K1B", "x":11.5, "y":1},
- {"label":"K1C", "x":12.5, "y":1},
- {"label":"K1D", "x":13.5, "y":1, "w":1.5},
- {"label":"K1E", "x":15, "y":1},
- {"label":"K20", "x":0, "y":2, "w":1.75},
- {"label":"K21", "x":1.75, "y":2},
- {"label":"K22", "x":2.75, "y":2},
- {"label":"K23", "x":3.75, "y":2},
- {"label":"K24", "x":4.75, "y":2},
- {"label":"K25", "x":5.75, "y":2},
- {"label":"K26", "x":6.75, "y":2},
- {"label":"K27", "x":7.75, "y":2},
- {"label":"K28", "x":8.75, "y":2},
- {"label":"K29", "x":9.75, "y":2},
- {"label":"K2A", "x":10.75, "y":2},
- {"label":"K2B", "x":11.75, "y":2},
- {"label":"K2D", "x":12.75, "y":2, "w":2.25},
- {"label":"K2E", "x":15, "y":2},
- {"label":"K30", "x":0, "y":3, "w":2.25},
- {"label":"K32", "x":2.25, "y":3},
- {"label":"K33", "x":3.25, "y":3},
- {"label":"K34", "x":4.25, "y":3},
- {"label":"K35", "x":5.25, "y":3},
- {"label":"K36", "x":6.25, "y":3},
- {"label":"K37", "x":7.25, "y":3},
- {"label":"K38", "x":8.25, "y":3},
- {"label":"K39", "x":9.25, "y":3},
- {"label":"K3A", "x":10.25, "y":3},
- {"label":"K3B", "x":11.25, "y":3},
- {"label":"K3C", "x":12.25, "y":3, "w":1.75},
- {"label":"K3D", "x":14, "y":3},
- {"label":"K3E", "x":15, "y":3},
- {"label":"K40", "x":0, "y":4, "w":1.25},
- {"label":"K41", "x":1.25, "y":4, "w":1.25},
- {"label":"K42", "x":2.5, "y":4, "w":1.25},
- {"label":"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":"K4C", "x":13, "y":4},
- {"label":"K4D", "x":14, "y":4},
- {"label":"K4E", "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": [4, 9], "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/mechlovin/hannah910/rev2/rev2.h b/keyboards/mechlovin/hannah910/rev2/rev2.h
deleted file mode 100644
index 6d87fea7e8..0000000000
--- a/keyboards/mechlovin/hannah910/rev2/rev2.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K49, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
- K40, K41, K42, K44, K46, K48, K4A, K4B, K4C, K4D, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, K49, K4A, K4B, K4C, K4D, K4E } \
-}
-
-#define LAYOUT_65_iso_blocker_split_bs( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K49, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
- K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, K49, K4A, K4B, K4C, K4D, K4E } \
-}
-
-#define LAYOUT_65_ansi_blocker( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K49, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
- K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, K49, K4A, K4B, K4C, K4D, K4E } \
-}
-
-#define LAYOUT_iso LAYOUT_65_iso_blocker_split_bs
-#define LAYOUT_ansi LAYOUT_65_ansi_blocker
diff --git a/keyboards/mechlovin/hannah910/rev3/info.json b/keyboards/mechlovin/hannah910/rev3/info.json
index 14219cb9b6..d6b606913d 100644
--- a/keyboards/mechlovin/hannah910/rev3/info.json
+++ b/keyboards/mechlovin/hannah910/rev3/info.json
@@ -8,163 +8,179 @@
"pid": "0x9103",
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"],
+ "rows": ["B5", "B6", "D3", "C6", "C7"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B7",
"breathing": true
},
+ "ws2812": {
+ "pin": "E2"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["65_ansi"],
"layouts": {
"LAYOUT_all": {
"layout": [
- {"label":"K00 (B0,B5)", "x":0, "y":0},
- {"label":"K01 (B0,B6)", "x":1, "y":0},
- {"label":"K02 (B0,B7)", "x":2, "y":0},
- {"label":"K03 (B0,C0)", "x":3, "y":0},
- {"label":"K04 (B0,C1)", "x":4, "y":0},
- {"label":"K05 (B0,C2)", "x":5, "y":0},
- {"label":"K06 (B0,C3)", "x":6, "y":0},
- {"label":"K07 (B0,C4)", "x":7, "y":0},
- {"label":"K08 (B0,C5)", "x":8, "y":0},
- {"label":"K09 (B0,C6)", "x":9, "y":0},
- {"label":"K0A (B0,C7)", "x":10, "y":0},
- {"label":"K0B (B0,D0)", "x":11, "y":0},
- {"label":"K0C (B0,D1)", "x":12, "y":0},
- {"label":"K0D (B0,D2)", "x":13, "y":0},
- {"label":"K0E (B0,D3)", "x":14, "y":0},
- {"label":"K48 (B4,C5)", "x":15, "y":0},
- {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
- {"label":"K11 (B1,B6)", "x":1.5, "y":1},
- {"label":"K12 (B1,B7)", "x":2.5, "y":1},
- {"label":"K13 (B1,C0)", "x":3.5, "y":1},
- {"label":"K14 (B1,C1)", "x":4.5, "y":1},
- {"label":"K15 (B1,C2)", "x":5.5, "y":1},
- {"label":"K16 (B1,C3)", "x":6.5, "y":1},
- {"label":"K17 (B1,C4)", "x":7.5, "y":1},
- {"label":"K18 (B1,C5)", "x":8.5, "y":1},
- {"label":"K19 (B1,C6)", "x":9.5, "y":1},
- {"label":"K1A (B1,C7)", "x":10.5, "y":1},
- {"label":"K1B (B1,D0)", "x":11.5, "y":1},
- {"label":"K1C (B1,D1)", "x":12.5, "y":1},
- {"label":"K1D (B1,D2)", "x":13.5, "y":1, "w":1.5},
- {"label":"K1E (B1,D3)", "x":15, "y":1},
- {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75},
- {"label":"K21 (B2,B6)", "x":1.75, "y":2},
- {"label":"K22 (B2,B7)", "x":2.75, "y":2},
- {"label":"K23 (B2,C0)", "x":3.75, "y":2},
- {"label":"K24 (B2,C1)", "x":4.75, "y":2},
- {"label":"K25 (B2,C2)", "x":5.75, "y":2},
- {"label":"K26 (B2,C3)", "x":6.75, "y":2},
- {"label":"K27 (B2,C4)", "x":7.75, "y":2},
- {"label":"K28 (B2,C5)", "x":8.75, "y":2},
- {"label":"K29 (B2,C6)", "x":9.75, "y":2},
- {"label":"K2A (B2,C7)", "x":10.75, "y":2},
- {"label":"K2B (B2,D0)", "x":11.75, "y":2},
- {"label":"K2C (B2,D1)", "x":12.75, "y":2},
- {"label":"K2D (B2,D2)", "x":13.75, "y":2, "w":1.25},
- {"label":"K2E (B2,D3)", "x":15, "y":2},
- {"label":"K30 (B3,B5)", "x":0, "y":3, "w":1.25},
- {"label":"K31 (B3,B6)", "x":1.25, "y":3},
- {"label":"K32 (B3,B7)", "x":2.25, "y":3},
- {"label":"K33 (B3,C0)", "x":3.25, "y":3},
- {"label":"K34 (B3,C1)", "x":4.25, "y":3},
- {"label":"K35 (B3,C2)", "x":5.25, "y":3},
- {"label":"K36 (B3,C3)", "x":6.25, "y":3},
- {"label":"K37 (B3,C4)", "x":7.25, "y":3},
- {"label":"K38 (B3,C5)", "x":8.25, "y":3},
- {"label":"K39 (B3,C6)", "x":9.25, "y":3},
- {"label":"K3A (B3,C7)", "x":10.25, "y":3},
- {"label":"K3B (B3,D0)", "x":11.25, "y":3},
- {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75},
- {"label":"K3D (B3,D2)", "x":14, "y":3},
- {"label":"K3E (B3,D3)", "x":15, "y":3},
- {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
- {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
- {"label":"K43 (B4,C0)", "x":3.75, "y":4, "w":2.75},
- {"label":"K46 (B4,C3)", "x":6.5, "y":4, "w":1.25},
- {"label":"K47 (B4,C4)", "x":7.75, "y":4, "w":2.25},
- {"label":"K49 (B4,C6)", "x":10, "y":4},
- {"label":"K4A (B4,C7)", "x":11, "y":4},
- {"label":"K4B (B4,D0)", "x":12, "y":4},
- {"label":"K4C (B4,D1)", "x":13, "y":4},
- {"label":"K4D (B4,D2)", "x":14, "y":4},
- {"label":"K4E (B4,D3)", "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": [4, 8], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 9], "x": 10, "y": 4},
+ {"matrix": [4, 10], "x": 11, "y": 4},
+ {"matrix": [4, 11], "x": 12, "y": 4},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
},
"LAYOUT_65_ansi": {
"layout": [
- {"label":"K00 (B0,B5)", "x":0, "y":0},
- {"label":"K01 (B0,B6)", "x":1, "y":0},
- {"label":"K02 (B0,B7)", "x":2, "y":0},
- {"label":"K03 (B0,C0)", "x":3, "y":0},
- {"label":"K04 (B0,C1)", "x":4, "y":0},
- {"label":"K05 (B0,C2)", "x":5, "y":0},
- {"label":"K06 (B0,C3)", "x":6, "y":0},
- {"label":"K07 (B0,C4)", "x":7, "y":0},
- {"label":"K08 (B0,C5)", "x":8, "y":0},
- {"label":"K09 (B0,C6)", "x":9, "y":0},
- {"label":"K0A (B0,C7)", "x":10, "y":0},
- {"label":"K0B (B0,D0)", "x":11, "y":0},
- {"label":"K0C (B0,D1)", "x":12, "y":0},
- {"label":"K0D (B0,D2)", "x":13, "y":0, "w":2},
- {"label":"K48 (B4,C5)", "x":15, "y":0},
- {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
- {"label":"K11 (B1,B6)", "x":1.5, "y":1},
- {"label":"K12 (B1,B7)", "x":2.5, "y":1},
- {"label":"K13 (B1,C0)", "x":3.5, "y":1},
- {"label":"K14 (B1,C1)", "x":4.5, "y":1},
- {"label":"K15 (B1,C2)", "x":5.5, "y":1},
- {"label":"K16 (B1,C3)", "x":6.5, "y":1},
- {"label":"K17 (B1,C4)", "x":7.5, "y":1},
- {"label":"K18 (B1,C5)", "x":8.5, "y":1},
- {"label":"K19 (B1,C6)", "x":9.5, "y":1},
- {"label":"K1A (B1,C7)", "x":10.5, "y":1},
- {"label":"K1B (B1,D0)", "x":11.5, "y":1},
- {"label":"K1C (B1,D1)", "x":12.5, "y":1},
- {"label":"K1D (B1,D2)", "x":13.5, "y":1, "w":1.5},
- {"label":"K1E (B1,D3)", "x":15, "y":1},
- {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75},
- {"label":"K21 (B2,B6)", "x":1.75, "y":2},
- {"label":"K22 (B2,B7)", "x":2.75, "y":2},
- {"label":"K23 (B2,C0)", "x":3.75, "y":2},
- {"label":"K24 (B2,C1)", "x":4.75, "y":2},
- {"label":"K25 (B2,C2)", "x":5.75, "y":2},
- {"label":"K26 (B2,C3)", "x":6.75, "y":2},
- {"label":"K27 (B2,C4)", "x":7.75, "y":2},
- {"label":"K28 (B2,C5)", "x":8.75, "y":2},
- {"label":"K29 (B2,C6)", "x":9.75, "y":2},
- {"label":"K2A (B2,C7)", "x":10.75, "y":2},
- {"label":"K2B (B2,D0)", "x":11.75, "y":2},
- {"label":"K2D (B2,D2)", "x":12.75, "y":2, "w":2.25},
- {"label":"K2E (B2,D3)", "x":15, "y":2},
- {"label":"K30 (B3,B5)", "x":0, "y":3, "w":2.25},
- {"label":"K32 (B3,B7)", "x":2.25, "y":3},
- {"label":"K33 (B3,C0)", "x":3.25, "y":3},
- {"label":"K34 (B3,C1)", "x":4.25, "y":3},
- {"label":"K35 (B3,C2)", "x":5.25, "y":3},
- {"label":"K36 (B3,C3)", "x":6.25, "y":3},
- {"label":"K37 (B3,C4)", "x":7.25, "y":3},
- {"label":"K38 (B3,C5)", "x":8.25, "y":3},
- {"label":"K39 (B3,C6)", "x":9.25, "y":3},
- {"label":"K3A (B3,C7)", "x":10.25, "y":3},
- {"label":"K3B (B3,D0)", "x":11.25, "y":3},
- {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75},
- {"label":"K3D (B3,D2)", "x":14, "y":3},
- {"label":"K3E (B3,D3)", "x":15, "y":3},
- {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
- {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
- {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25},
- {"label":"K49 (B4,C6)", "x":10, "y":4},
- {"label":"K4A (B4,C7)", "x":11, "y":4},
- {"label":"K4B (B4,D0)", "x":12, "y":4},
- {"label":"K4C (B4,D1)", "x":13, "y":4},
- {"label":"K4D (B4,D2)", "x":14, "y":4},
- {"label":"K4E (B4,D3)", "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": [4, 8], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4},
+ {"matrix": [4, 10], "x": 11, "y": 4},
+ {"matrix": [4, 11], "x": 12, "y": 4},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
- }
+ }
}
,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
}
diff --git a/keyboards/mechlovin/hannah910/rev3/rev3.h b/keyboards/mechlovin/hannah910/rev3/rev3.h
deleted file mode 100644
index 2a987538d7..0000000000
--- a/keyboards/mechlovin/hannah910/rev3/rev3.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#pragma once
-
-
-#include "quantum.h"
-
-
-
-#define LAYOUT_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K48, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
- K40, K41, K42, K43, K46, K47, K49, K4A, K4B, K4C, K4D, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, K42, K43, KC_NO, KC_NO, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
-}
-
-#define LAYOUT_65_ansi( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K48, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
- K40, K41, K42, K46, K49, K4A, K4B, K4C, K4D, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
-}
diff --git a/keyboards/mechlovin/hex4b/config.h b/keyboards/mechlovin/hex4b/config.h
deleted file mode 100644
index 028be1fb52..0000000000
--- a/keyboards/mechlovin/hex4b/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-Copyright 2020 Team Mechlovin
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechlovin/hex4b/hex4b.c b/keyboards/mechlovin/hex4b/hex4b.c
deleted file mode 100644
index fb8c4aef16..0000000000
--- a/keyboards/mechlovin/hex4b/hex4b.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "hex4b.h"
diff --git a/keyboards/mechlovin/hex4b/rev1/config.h b/keyboards/mechlovin/hex4b/rev1/config.h
deleted file mode 100644
index 1baf1aa2ea..0000000000
--- a/keyboards/mechlovin/hex4b/rev1/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-Copyright 2020 Team Mechlovin
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { B7, A2, A1, A3, A4, A5 }
-#define MATRIX_COL_PINS { B6, B5, B3, B2, B1, B0, A0, A6, A7, C7, C6, C5, C4, D1, D0 }
diff --git a/keyboards/mechlovin/hex4b/rev1/info.json b/keyboards/mechlovin/hex4b/rev1/info.json
index cec380a91f..1e9a7d5776 100644
--- a/keyboards/mechlovin/hex4b/rev1/info.json
+++ b/keyboards/mechlovin/hex4b/rev1/info.json
@@ -3,6 +3,11 @@
"usb": {
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B6", "B5", "B3", "B2", "B1", "B0", "A0", "A6", "A7", "C7", "C6", "C5", "C4", "D1", "D0"],
+ "rows": ["B7", "A2", "A1", "A3", "A4", "A5"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "D4",
"levels": 5,
diff --git a/keyboards/mechlovin/hex4b/rev2/config.h b/keyboards/mechlovin/hex4b/rev2/config.h
index c0486dd0b7..14dfffbed3 100644
--- a/keyboards/mechlovin/hex4b/rev2/config.h
+++ b/keyboards/mechlovin/hex4b/rev2/config.h
@@ -17,19 +17,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { A4, B12, B13, B14, B15, A1 }
-#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A3, C13, B7, B6, B5, B4, B3 }
-
#define BACKLIGHT_PWM_DRIVER PWMD4
diff --git a/keyboards/mechlovin/hex4b/rev2/info.json b/keyboards/mechlovin/hex4b/rev2/info.json
index 7d9a2cb40a..8609be01c3 100644
--- a/keyboards/mechlovin/hex4b/rev2/info.json
+++ b/keyboards/mechlovin/hex4b/rev2/info.json
@@ -3,6 +3,11 @@
"usb": {
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A3", "C13", "B7", "B6", "B5", "B4", "B3"],
+ "rows": ["A4", "B12", "B13", "B14", "B15", "A1"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B8",
"levels": 5,
diff --git a/keyboards/mechlovin/hex6c/config.h b/keyboards/mechlovin/hex6c/config.h
index b0791490a2..a22137acf7 100644
--- a/keyboards/mechlovin/hex6c/config.h
+++ b/keyboards/mechlovin/hex6c/config.h
@@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { A10, B13, B12, B11, C14, C15 }
-#define MATRIX_COL_PINS { A13, A14, A1, A0, C13, B9, B4, B7, B8, B5, B6, A9, A5, A6, A7, B1, B2, B10, B3, B14, B15 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 3
diff --git a/keyboards/mechlovin/hex6c/hex6c.c b/keyboards/mechlovin/hex6c/hex6c.c
deleted file mode 100644
index 255121dc19..0000000000
--- a/keyboards/mechlovin/hex6c/hex6c.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Mechlovin' Studio
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "hex6c.h"
diff --git a/keyboards/mechlovin/hex6c/info.json b/keyboards/mechlovin/hex6c/info.json
index 387043bde6..2e82a83785 100644
--- a/keyboards/mechlovin/hex6c/info.json
+++ b/keyboards/mechlovin/hex6c/info.json
@@ -8,6 +8,11 @@
"pid": "0x6C01",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["A13", "A14", "A1", "A0", "C13", "B9", "B4", "B7", "B8", "B5", "B6", "A9", "A5", "A6", "A7", "B1", "B2", "B10", "B3", "B14", "B15"],
+ "rows": ["A10", "B13", "B12", "B11", "C14", "C15"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "A15", "pin_b": "A2"}
diff --git a/keyboards/mechlovin/infinity87/infinity87.c b/keyboards/mechlovin/infinity87/infinity87.c
deleted file mode 100644
index 434e796091..0000000000
--- a/keyboards/mechlovin/infinity87/infinity87.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "infinity87.h"
diff --git a/keyboards/mechlovin/infinity87/infinity87.h b/keyboards/mechlovin/infinity87/infinity87.h
deleted file mode 100644
index b7b00bef40..0000000000
--- a/keyboards/mechlovin/infinity87/infinity87.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/mechlovin/infinity87/rev1/config.h b/keyboards/mechlovin/infinity87/rev1/config.h
index e03ee6dded..2265fff2d1 100644
--- a/keyboards/mechlovin/infinity87/rev1/config.h
+++ b/keyboards/mechlovin/infinity87/rev1/config.h
@@ -16,10 +16,5 @@
#pragma once
-#define MATRIX_ROW_PINS { A10, B13, B12, B11, C14, C15 }
-#define MATRIX_COL_PINS { C13, B9, B4, B7, B8, B5, B6, A9, A5, A6, A7, B1, B2, B10, B3, B14, B15 }
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 3
-
-#define DIODE_DIRECTION COL2ROW \ No newline at end of file
diff --git a/keyboards/mechlovin/infinity87/rev1/info.json b/keyboards/mechlovin/infinity87/rev1/info.json
index be094e09ae..dbe7cb83f9 100644
--- a/keyboards/mechlovin/infinity87/rev1/info.json
+++ b/keyboards/mechlovin/infinity87/rev1/info.json
@@ -1,4 +1,9 @@
{
+ "matrix_pins": {
+ "cols": ["C13", "B9", "B4", "B7", "B8", "B5", "B6", "A9", "A5", "A6", "A7", "B1", "B2", "B10", "B3", "B14", "B15"],
+ "rows": ["A10", "B13", "B12", "B11", "C14", "C15"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B0",
"breathing": true
diff --git a/keyboards/mechlovin/infinity87/rev1/rev1.c b/keyboards/mechlovin/infinity87/rev1/rev1.c
deleted file mode 100644
index c65ff19838..0000000000
--- a/keyboards/mechlovin/infinity87/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev1.h"
diff --git a/keyboards/mechlovin/infinity87/rev1/rev1.h b/keyboards/mechlovin/infinity87/rev1/rev1.h
deleted file mode 100644
index 167ed6940a..0000000000
--- a/keyboards/mechlovin/infinity87/rev1/rev1.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 Mechlovin' Studio
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/mechlovin/infinity87/rev1/standard/config.h b/keyboards/mechlovin/infinity87/rev1/standard/config.h
index f154c344b3..7b3e497cdf 100644
--- a/keyboards/mechlovin/infinity87/rev1/standard/config.h
+++ b/keyboards/mechlovin/infinity87/rev1/standard/config.h
@@ -16,7 +16,6 @@
#pragma once
-#define RGB_DI_PIN A15
#define RGBLED_NUM 26
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
#define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/mechlovin/infinity87/rev1/standard/info.json b/keyboards/mechlovin/infinity87/rev1/standard/info.json
index 29597cce3f..cd4cf76b35 100644
--- a/keyboards/mechlovin/infinity87/rev1/standard/info.json
+++ b/keyboards/mechlovin/infinity87/rev1/standard/info.json
@@ -8,6 +8,9 @@
"pid": "0x8701",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "A15"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/mechlovin/infinity87/rev2/config.h b/keyboards/mechlovin/infinity87/rev2/config.h
index 178374c1e7..2d6fb7bc2b 100644
--- a/keyboards/mechlovin/infinity87/rev2/config.h
+++ b/keyboards/mechlovin/infinity87/rev2/config.h
@@ -35,7 +35,6 @@
#define DIODE_DIRECTION ROW2COL
#ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN E2
#define RGBLED_NUM 24
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/mechlovin/infinity87/rev2/info.json b/keyboards/mechlovin/infinity87/rev2/info.json
index d75dd051bc..b85416b9b2 100644
--- a/keyboards/mechlovin/infinity87/rev2/info.json
+++ b/keyboards/mechlovin/infinity87/rev2/info.json
@@ -17,6 +17,9 @@
"num_lock": "D7",
"scroll_lock": "B4"
},
+ "ws2812": {
+ "pin": "E2"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/mechlovin/infinity87/rev2/rev2.c b/keyboards/mechlovin/infinity87/rev2/rev2.c
deleted file mode 100644
index ab9ecbf6fc..0000000000
--- a/keyboards/mechlovin/infinity87/rev2/rev2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev2.h" \ No newline at end of file
diff --git a/keyboards/mechlovin/infinity87/rev2/rev2.h b/keyboards/mechlovin/infinity87/rev2/rev2.h
deleted file mode 100644
index 16cdf9ed85..0000000000
--- a/keyboards/mechlovin/infinity87/rev2/rev2.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/config.h b/keyboards/mechlovin/infinity87/rgb_rev1/config.h
index a609587210..10fc42f830 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/config.h
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/config.h
@@ -16,12 +16,6 @@
#pragma once
-#define MATRIX_ROW_PINS { A10, A13, A14, C13, A4, A3 }
-#define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A9, B11, B10, B2, B1, B0, A7, A6, A5, A2, A1, A0 }
-
-
-#define DIODE_DIRECTION COL2ROW
-
//rgb matrix setting
// This is a 7-bit address, that gets left-shifted and bit 0
// set to 0 for write, 1 for read (as per I2C protocol)
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/info.json b/keyboards/mechlovin/infinity87/rgb_rev1/info.json
index 604fa512ed..332606561c 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/info.json
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/info.json
@@ -8,6 +8,11 @@
"pid": "0x8710",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B12", "B13", "B14", "B15", "A8", "A9", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A2", "A1", "A0"],
+ "rows": ["A10", "A13", "A14", "C13", "A4", "A3"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F303",
"bootloader": "stm32-dfu",
"board": "QMK_PROTON_C",
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c b/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c
index 210fb843b3..c10d47d191 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "rgb_rev1.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.h b/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.h
deleted file mode 100644
index 16cdf9ed85..0000000000
--- a/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/mechlovin/infinity875/config.h b/keyboards/mechlovin/infinity875/config.h
index 697ef34ccb..eee31e69ef 100644
--- a/keyboards/mechlovin/infinity875/config.h
+++ b/keyboards/mechlovin/infinity875/config.h
@@ -39,7 +39,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DIODE_DIRECTION ROW2COL
#ifdef RGB_MATRIX_ENABLE
-#define RGB_DI_PIN E2
#define RGB_MATRIX_LED_COUNT 42
#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
#define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
diff --git a/keyboards/mechlovin/infinity875/infinity875.c b/keyboards/mechlovin/infinity875/infinity875.c
index 43606b6c92..09749bbc2b 100644
--- a/keyboards/mechlovin/infinity875/infinity875.c
+++ b/keyboards/mechlovin/infinity875/infinity875.c
@@ -14,7 +14,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "infinity875.h"
+#include "quantum.h"
+
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
//Key Matrix to LED Index
diff --git a/keyboards/mechlovin/infinity875/infinity875.h b/keyboards/mechlovin/infinity875/infinity875.h
deleted file mode 100644
index 2febe0824c..0000000000
--- a/keyboards/mechlovin/infinity875/infinity875.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* Copyright 2021 Mechlovin' Studio
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D, K1E, K1F, K1G, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K3C, K2E, K2F, K2G, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
- K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4F, \
- K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E, K5F, K5G \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO, KC_NO, KC_NO }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, KC_NO, K4F, KC_NO }, \
- { K50, K51, K52, KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO, KC_NO, K5A, K5B, K5C, K5D, K5E, K5F, K5G }, \
-}
-
-#define LAYOUT_tkl_f13_ansi_split_bs_rshift( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D, K1E, K1F, K1G, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K3C, K2E, K2F, K2G, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
- K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4F, \
- K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E, K5F, K5G \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO, KC_NO, KC_NO }, \
- { K40, KC_NO, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, KC_NO, K4F, KC_NO }, \
- { K50, K51, K52, KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO, KC_NO, K5A, K5B, K5C, K5D, K5E, K5F, K5G }, \
-}
-
-#define LAYOUT_tkl_f13_iso_split_bs_rshift( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D, K1E, K1F, K1G, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, K2F, K2G, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
- K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4F, \
- K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E, K5F, K5G \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO, KC_NO, KC_NO }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, KC_NO, K4F, KC_NO }, \
- { K50, K51, K52, KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO, KC_NO, K5A, K5B, K5C, K5D, K5E, K5F, K5G }, \
-}
-
-#define LAYOUT_tkl_ansi_split_bs_rshift( \
- K00, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D, K1E, K1F, K1G, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K3C, K2E, K2F, K2G, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
- K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4F, \
- K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E, K5F, K5G \
-) { \
- { K00, KC_NO, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO, KC_NO, KC_NO }, \
- { K40, KC_NO, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, KC_NO, K4F, KC_NO }, \
- { K50, K51, K52, KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO, KC_NO, K5A, K5B, K5C, K5D, K5E, K5F, K5G }, \
-}
-
-#define LAYOUT_tkl_iso_split_bs_rshift( \
- K00, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D, K1E, K1F, K1G, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, K2F, K2G, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
- K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4F, \
- K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E, K5F, K5G \
-) { \
- { K00, KC_NO, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO, KC_NO, KC_NO }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, KC_NO, K4F, KC_NO }, \
- { K50, K51, K52, KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO, KC_NO, K5A, K5B, K5C, K5D, K5E, K5F, K5G }, \
-}
diff --git a/keyboards/mechlovin/infinity875/info.json b/keyboards/mechlovin/infinity875/info.json
index f27235b8c5..d85cccbe36 100644
--- a/keyboards/mechlovin/infinity875/info.json
+++ b/keyboards/mechlovin/infinity875/info.json
@@ -12,23 +12,550 @@
"caps_lock": "D6",
"scroll_lock": "B4"
},
+ "ws2812": {
+ "pin": "E2"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_tkl_ansi_split_bs_rshift": {
- "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":2, "y":0}, {"label":"0,2", "x":3, "y":0}, {"label":"0,3", "x":4, "y":0}, {"label":"0,4", "x":5, "y":0}, {"label":"0,5", "x":6.5, "y":0}, {"label":"0,6", "x":7.5, "y":0}, {"label":"0,7", "x":8.5, "y":0}, {"label":"0,8", "x":9.5, "y":0}, {"label":"0,9", "x":11, "y":0}, {"label":"0,10", "x":12, "y":0}, {"label":"0,11", "x":13, "y":0}, {"label":"0,12", "x":14, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.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":"2,13", "x":14, "y":1.25}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.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":"3,12", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.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,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25}, {"label":"4,13", "x":13.25, "y":4.25, "w":1.75}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,6", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,10", "x":10, "y":5.25, "w":1.25}, {"label":"5,11", "x":11.25, "y":5.25, "w":1.25}, {"label":"5,12", "x":12.5, "y":5.25, "w":1.25}, {"label":"5,13", "x":13.75, "y":5.25, "w":1.25}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 10], "x": 11, "y": 0},
+ {"matrix": [0, 11], "x": 12, "y": 0},
+ {"matrix": [0, 12], "x": 13, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [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": [2, 13], "x": 14, "y": 1.25},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"matrix": [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": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+ {"matrix": [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, 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},
+ {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+
+ {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+ ]
},
"LAYOUT_tkl_iso_split_bs_rshift": {
- "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":2, "y":0}, {"label":"0,2", "x":3, "y":0}, {"label":"0,3", "x":4, "y":0}, {"label":"0,4", "x":5, "y":0}, {"label":"0,5", "x":6.5, "y":0}, {"label":"0,6", "x":7.5, "y":0}, {"label":"0,7", "x":8.5, "y":0}, {"label":"0,8", "x":9.5, "y":0}, {"label":"0,9", "x":11, "y":0}, {"label":"0,10", "x":12, "y":0}, {"label":"0,11", "x":13, "y":0}, {"label":"0,12", "x":14, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.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":"2,13", "x":14, "y":1.25}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.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":"3,13", "x":13.75, "y":2.25, "w":1.25, "h":2}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.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,12", "x":12.75, "y":3.25}, {"label":"4,0", "x":0, "y":4.25, "w":1.25}, {"label":"4,1", "x":1.25, "y":4.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25}, {"label":"4,13", "x":13.25, "y":4.25, "w":1.75}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,6", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,10", "x":10, "y":5.25, "w":1.25}, {"label":"5,11", "x":11.25, "y":5.25, "w":1.25}, {"label":"5,12", "x":12.5, "y":5.25, "w":1.25}, {"label":"5,13", "x":13.75, "y":5.25, "w":1.25}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 10], "x": 11, "y": 0},
+ {"matrix": [0, 11], "x": 12, "y": 0},
+ {"matrix": [0, 12], "x": 13, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [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": [2, 13], "x": 14, "y": 1.25},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"matrix": [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": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+ {"matrix": [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": [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},
+ {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+
+ {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+ ]
},
"LAYOUT_tkl_f13_ansi_split_bs_rshift": {
- "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":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.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":"2,13", "x":14, "y":1.25}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.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":"3,12", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.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,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25}, {"label":"4,13", "x":13.25, "y":4.25, "w":1.75}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,6", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,10", "x":10, "y":5.25, "w":1.25}, {"label":"5,11", "x":11.25, "y":5.25, "w":1.25}, {"label":"5,12", "x":12.5, "y":5.25, "w":1.25}, {"label":"5,13", "x":13.75, "y":5.25, "w":1.25}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}]
+ "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, 13], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [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": [2, 13], "x": 14, "y": 1.25},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"matrix": [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": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+ {"matrix": [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, 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},
+ {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+
+ {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+ ]
},
"LAYOUT_tkl_f13_iso_split_bs_rshift": {
- "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":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.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":"2,13", "x":14, "y":1.25}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.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":"3,13", "x":13.75, "y":2.25, "w":1.25, "h":2}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.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,12", "x":12.75, "y":3.25}, {"label":"4,0", "x":0, "y":4.25, "w":1.25}, {"label":"4,1", "x":1.25, "y":4.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25}, {"label":"4,13", "x":13.25, "y":4.25, "w":1.75}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,6", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,10", "x":10, "y":5.25, "w":1.25}, {"label":"5,11", "x":11.25, "y":5.25, "w":1.25}, {"label":"5,12", "x":12.5, "y":5.25, "w":1.25}, {"label":"5,13", "x":13.75, "y":5.25, "w":1.25}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}]
+ "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, 13], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [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": [2, 13], "x": 14, "y": 1.25},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"matrix": [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": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+ {"matrix": [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": [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},
+ {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+
+ {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+ ]
},
"LAYOUT_all": {
- "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":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.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":"2,13", "x":14, "y":1.25}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.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":"3,12", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.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":1.25}, {"label":"4,1", "x":1.25, "y":4.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25}, {"label":"4,13", "x":13.25, "y":4.25, "w":1.75}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,6", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,10", "x":10, "y":5.25, "w":1.25}, {"label":"5,11", "x":11.25, "y":5.25, "w":1.25}, {"label":"5,12", "x":12.5, "y":5.25, "w":1.25}, {"label":"5,13", "x":13.75, "y":5.25, "w":1.25}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}]
+ "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, 13], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [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": [2, 13], "x": 14, "y": 1.25},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"matrix": [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": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+ {"matrix": [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": 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},
+ {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+
+ {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+ ]
}
}
,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
diff --git a/keyboards/mechlovin/infinity88/config.h b/keyboards/mechlovin/infinity88/config.h
index 11ae35100b..dd0f9e4f30 100644
--- a/keyboards/mechlovin/infinity88/config.h
+++ b/keyboards/mechlovin/infinity88/config.h
@@ -17,26 +17,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { A10, B13, B12, B11, C14, C15 }
-#define MATRIX_COL_PINS { C13, B9, B4, B7, B8, B5, B6, A9, A5, A6, A7,B1, B2, B10, B3, B14, B15 }
-
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 3
-#define RGB_DI_PIN A15
#define RGBLED_NUM 26
#define RGBLIGHT_LIMIT_VAL 255
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
diff --git a/keyboards/mechlovin/infinity88/infinity88.c b/keyboards/mechlovin/infinity88/infinity88.c
deleted file mode 100644
index 4d352358a7..0000000000
--- a/keyboards/mechlovin/infinity88/infinity88.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "infinity88.h"
diff --git a/keyboards/mechlovin/infinity88/infinity88.h b/keyboards/mechlovin/infinity88/infinity88.h
deleted file mode 100644
index c7decced45..0000000000
--- a/keyboards/mechlovin/infinity88/infinity88.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*
- * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││3E │ │0E │0F │0G │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐ ┌───────┐
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │0D │ │1E │1F │1G │ │1D │ 2u Backspace
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤ └─┬─────┤ ┌─────┐
- * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │ │2E │2F │2G │ │ │ │2D │
- * 2.25u ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┤ └───┴───┴───┘ ┌──┴┐3D │ ISO Enter ┌──┴─────┤ ANSI Enter
- * LShift │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │ │3C │ │ │3D │
- * ┌────────┐ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤ ┌───┐ ┌─┴───┴────┤ ┌─┴─┬──────┤
- * │40 │ │40 │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C │4D │ │4F │ │4D │ 2.75u RShift │4C │4D │ 1u/1.75u
- * └────────┘ ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───┐ └──────────┘ └───┴──────┘
- * │50 │51 │52 │56 │5A │5B │5C │5D │ │5E │5F │5G │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
- * ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
- * │50 │51 │52 │56 │5B │5C │5D │ Tsangan/WKL
- * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
- */
-
-#define LAYOUT_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K3E, K0E, K0F, K0G, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K0D, K1E, K1F, K1G, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
- K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4F, \
- K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E, K5F, K5G \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, XXX, XXX }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, XXX, K4F, XXX }, \
- { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }, \
-}
-
-#define LAYOUT_tkl_f13_ansi( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K3E, K0E, K0F, K0G, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
- K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4F, \
- K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E, K5F, K5G \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F, K0G }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, XXX, XXX }, \
- { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX, K4F, XXX }, \
- { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }, \
-}
-
-#define LAYOUT_tkl_f13_iso( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K3E, K0E, K0F, K0G, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, K2F, K2G, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
- K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4F, \
- K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E, K5F, K5G \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F, K0G }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F, K2G }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, XXX, XXX }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX, K4F, XXX }, \
- { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }, \
-}
diff --git a/keyboards/mechlovin/infinity88/info.json b/keyboards/mechlovin/infinity88/info.json
index 37ccd27537..fdbb45a7d6 100644
--- a/keyboards/mechlovin/infinity88/info.json
+++ b/keyboards/mechlovin/infinity88/info.json
@@ -8,6 +8,11 @@
"pid": "0x8802",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["C13", "B9", "B4", "B7", "B8", "B5", "B6", "A9", "A5", "A6", "A7", "B1", "B2", "B10", "B3", "B14", "B15"],
+ "rows": ["A10", "B13", "B12", "B11", "C14", "C15"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B0",
"breathing": true
@@ -16,6 +21,9 @@
"caps_lock": "A4",
"num_lock": "A3"
},
+ "ws2812": {
+ "pin": "A15"
+ },
"processor": "STM32F303",
"bootloader": "stm32-dfu",
"board": "QMK_PROTON_C",
@@ -23,293 +31,325 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- {"label":"K00 (B0,B6)", "x":0, "y":0},
- {"label":"K01 (B0,F4)", "x":1.25, "y":0},
- {"label":"K02 (B0,C0)", "x":2.25, "y":0},
- {"label":"K03 (B0,C1)", "x":3.25, "y":0},
- {"label":"K04 (B0,C2)", "x":4.25, "y":0},
- {"label":"K05 (B0,C3)", "x":5.5, "y":0},
- {"label":"K06 (B0,C4)", "x":6.5, "y":0},
- {"label":"K07 (B0,C5)", "x":7.5, "y":0},
- {"label":"K08 (B0,C6)", "x":8.5, "y":0},
- {"label":"K09 (B0,C7)", "x":9.75, "y":0},
- {"label":"K0A (B0,D0)", "x":10.75, "y":0},
- {"label":"K0B (B0,D1)", "x":11.75, "y":0},
- {"label":"K0C (B0,D2)", "x":12.75, "y":0},
- {"label":"K3E (B3,D4)", "x":14, "y":0},
- {"label":"K0E (B0,D4)", "x":15.25, "y":0},
- {"label":"K0F (B0,D5)", "x":16.25, "y":0},
- {"label":"K0G (B0,D6)", "x":17.25, "y":0},
- {"label":"K10 (B1,B6)", "x":0, "y":1.25},
- {"label":"K11 (B1,F4)", "x":1, "y":1.25},
- {"label":"K12 (B1,C0)", "x":2, "y":1.25},
- {"label":"K13 (B1,C1)", "x":3, "y":1.25},
- {"label":"K14 (B1,C2)", "x":4, "y":1.25},
- {"label":"K15 (B1,C3)", "x":5, "y":1.25},
- {"label":"K16 (B1,C4)", "x":6, "y":1.25},
- {"label":"K17 (B1,C5)", "x":7, "y":1.25},
- {"label":"K18 (B1,C6)", "x":8, "y":1.25},
- {"label":"K19 (B1,C7)", "x":9, "y":1.25},
- {"label":"K1A (B1,D0)", "x":10, "y":1.25},
- {"label":"K1B (B1,D1)", "x":11, "y":1.25},
- {"label":"K1C (B1,D2)", "x":12, "y":1.25},
- {"label":"K1D (B1,D3)", "x":13, "y":1.25},
- {"label":"K0D (B0,D3)", "x":14, "y":1.25},
- {"label":"K1E (B1,D4)", "x":15.25, "y":1.25},
- {"label":"K1F (B1,D5)", "x":16.25, "y":1.25},
- {"label":"K1G (B1,D6)", "x":17.25, "y":1.25},
- {"label":"K20 (B2,B6)", "x":0, "y":2.25, "w":1.5},
- {"label":"K21 (B2,F4)", "x":1.5, "y":2.25},
- {"label":"K22 (B2,C0)", "x":2.5, "y":2.25},
- {"label":"K23 (B2,C1)", "x":3.5, "y":2.25},
- {"label":"K24 (B2,C2)", "x":4.5, "y":2.25},
- {"label":"K25 (B2,C3)", "x":5.5, "y":2.25},
- {"label":"K26 (B2,C4)", "x":6.5, "y":2.25},
- {"label":"K27 (B2,C5)", "x":7.5, "y":2.25},
- {"label":"K28 (B2,C6)", "x":8.5, "y":2.25},
- {"label":"K29 (B2,C7)", "x":9.5, "y":2.25},
- {"label":"K2A (B2,D0)", "x":10.5, "y":2.25},
- {"label":"K2B (B2,D1)", "x":11.5, "y":2.25},
- {"label":"K2C (B2,D2)", "x":12.5, "y":2.25},
- {"label":"K2D (B2,D3)", "x":13.5, "y":2.25, "w":1.5},
- {"label":"K2E (B2,D4)", "x":15.25, "y":2.25},
- {"label":"K2F (B2,D5)", "x":16.25, "y":2.25},
- {"label":"K2G (B2,D6)", "x":17.25, "y":2.25},
- {"label":"K30 (B3,B6)", "x":0, "y":3.25, "w":1.75},
- {"label":"K31 (B3,F4)", "x":1.75, "y":3.25},
- {"label":"K32 (B3,C0)", "x":2.75, "y":3.25},
- {"label":"K33 (B3,C1)", "x":3.75, "y":3.25},
- {"label":"K34 (B3,C2)", "x":4.75, "y":3.25},
- {"label":"K35 (B3,C3)", "x":5.75, "y":3.25},
- {"label":"K36 (B3,C4)", "x":6.75, "y":3.25},
- {"label":"K37 (B3,C5)", "x":7.75, "y":3.25},
- {"label":"K38 (B3,C6)", "x":8.75, "y":3.25},
- {"label":"K39 (B3,C7)", "x":9.75, "y":3.25},
- {"label":"K3A (B3,D0)", "x":10.75, "y":3.25},
- {"label":"K3B (B3,D1)", "x":11.75, "y":3.25},
- {"label":"K3C (B3,D2)", "x":12.75, "y":3.25},
- {"label":"K3D (B3,D3)", "x":13.75, "y":3.25, "w":1.25},
- {"label":"K40 (B4,B6)", "x":0, "y":4.25, "w":1.25},
- {"label":"K41 (B4,F4)", "x":1.25, "y":4.25},
- {"label":"K42 (B4,C0)", "x":2.25, "y":4.25},
- {"label":"K43 (B4,C1)", "x":3.25, "y":4.25},
- {"label":"K44 (B4,C2)", "x":4.25, "y":4.25},
- {"label":"K45 (B4,C3)", "x":5.25, "y":4.25},
- {"label":"K46 (B4,C4)", "x":6.25, "y":4.25},
- {"label":"K47 (B4,C5)", "x":7.25, "y":4.25},
- {"label":"K48 (B4,C6)", "x":8.25, "y":4.25},
- {"label":"K49 (B4,C7)", "x":9.25, "y":4.25},
- {"label":"K4A (B4,D0)", "x":10.25, "y":4.25},
- {"label":"K4B (B4,D1)", "x":11.25, "y":4.25},
- {"label":"K4C (B4,D2)", "x":12.25, "y":4.25, "w":1.75},
- {"label":"K4D (B4,D3)", "x":14, "y":4.25},
- {"label":"K4F (B4,D5)", "x":16.25, "y":4.25},
- {"label":"K50 (B5,B6)", "x":0, "y":5.25, "w":1.25},
- {"label":"K51 (B5,F4)", "x":1.25, "y":5.25, "w":1.25},
- {"label":"K52 (B5,C0)", "x":2.5, "y":5.25, "w":1.25},
- {"label":"K56 (B5,C4)", "x":3.75, "y":5.25, "w":6.25},
- {"label":"K5A (B5,D0)", "x":10, "y":5.25, "w":1.25},
- {"label":"K5B (B5,D1)", "x":11.25, "y":5.25, "w":1.25},
- {"label":"K5C (B5,D2)", "x":12.5, "y":5.25, "w":1.25},
- {"label":"K5D (B5,D3)", "x":13.75, "y":5.25, "w":1.25},
- {"label":"K5E (B5,D4)", "x":15.25, "y":5.25},
- {"label":"K5F (B5,D5)", "x":16.25, "y":5.25},
- {"label":"K5G (B5,D6)", "x":17.25, "y":5.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+ {"matrix": [0, 9], "x": 9.75, "y": 0},
+ {"matrix": [0, 10], "x": 10.75, "y": 0},
+ {"matrix": [0, 11], "x": 11.75, "y": 0},
+ {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+ {"matrix": [3, 14], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [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": [0, 13], "x": 14, "y": 1.25},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+ {"matrix": [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": [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, "y": 4.25},
+
+ {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"matrix": [5, 16], "x": 17.25, "y": 5.25}
]
},
"LAYOUT_tkl_f13_ansi": {
"layout": [
- {"label":"K00 (B0,B6)", "x":0, "y":0},
- {"label":"K01 (B0,F4)", "x":1.25, "y":0},
- {"label":"K02 (B0,C0)", "x":2.25, "y":0},
- {"label":"K03 (B0,C1)", "x":3.25, "y":0},
- {"label":"K04 (B0,C2)", "x":4.25, "y":0},
- {"label":"K05 (B0,C3)", "x":5.5, "y":0},
- {"label":"K06 (B0,C4)", "x":6.5, "y":0},
- {"label":"K07 (B0,C5)", "x":7.5, "y":0},
- {"label":"K08 (B0,C6)", "x":8.5, "y":0},
- {"label":"K09 (B0,C7)", "x":9.75, "y":0},
- {"label":"K0A (B0,D0)", "x":10.75, "y":0},
- {"label":"K0B (B0,D1)", "x":11.75, "y":0},
- {"label":"K0C (B0,D2)", "x":12.75, "y":0},
- {"label":"K3E (B3,D4)", "x":14, "y":0},
- {"label":"K0E (B0,D4)", "x":15.25, "y":0},
- {"label":"K0F (B0,D5)", "x":16.25, "y":0},
- {"label":"K0G (B0,D6)", "x":17.25, "y":0},
-
- {"label":"K10 (B1,B6)", "x":0, "y":1.25},
- {"label":"K11 (B1,F4)", "x":1, "y":1.25},
- {"label":"K12 (B1,C0)", "x":2, "y":1.25},
- {"label":"K13 (B1,C1)", "x":3, "y":1.25},
- {"label":"K14 (B1,C2)", "x":4, "y":1.25},
- {"label":"K15 (B1,C3)", "x":5, "y":1.25},
- {"label":"K16 (B1,C4)", "x":6, "y":1.25},
- {"label":"K17 (B1,C5)", "x":7, "y":1.25},
- {"label":"K18 (B1,C6)", "x":8, "y":1.25},
- {"label":"K19 (B1,C7)", "x":9, "y":1.25},
- {"label":"K1A (B1,D0)", "x":10, "y":1.25},
- {"label":"K1B (B1,D1)", "x":11, "y":1.25},
- {"label":"K1C (B1,D2)", "x":12, "y":1.25},
- {"label":"K1D (B1,D3)", "x":13, "y":1.25, "w":2},
- {"label":"K1E (B1,D4)", "x":15.25, "y":1.25},
- {"label":"K1F (B1,D5)", "x":16.25, "y":1.25},
- {"label":"K1G (B1,D6)", "x":17.25, "y":1.25},
-
- {"label":"K20 (B2,B6)", "x":0, "y":2.25, "w":1.5},
- {"label":"K21 (B2,F4)", "x":1.5, "y":2.25},
- {"label":"K22 (B2,C0)", "x":2.5, "y":2.25},
- {"label":"K23 (B2,C1)", "x":3.5, "y":2.25},
- {"label":"K24 (B2,C2)", "x":4.5, "y":2.25},
- {"label":"K25 (B2,C3)", "x":5.5, "y":2.25},
- {"label":"K26 (B2,C4)", "x":6.5, "y":2.25},
- {"label":"K27 (B2,C5)", "x":7.5, "y":2.25},
- {"label":"K28 (B2,C6)", "x":8.5, "y":2.25},
- {"label":"K29 (B2,C7)", "x":9.5, "y":2.25},
- {"label":"K2A (B2,D0)", "x":10.5, "y":2.25},
- {"label":"K2B (B2,D1)", "x":11.5, "y":2.25},
- {"label":"K2C (B2,D2)", "x":12.5, "y":2.25},
- {"label":"K2D (B2,D3)", "x":13.5, "y":2.25, "w":1.5},
- {"label":"K2E (B2,D4)", "x":15.25, "y":2.25},
- {"label":"K2F (B2,D5)", "x":16.25, "y":2.25},
- {"label":"K2G (B2,D6)", "x":17.25, "y":2.25},
-
- {"label":"K30 (B3,B6)", "x":0, "y":3.25, "w":1.75},
- {"label":"K31 (B3,F4)", "x":1.75, "y":3.25},
- {"label":"K32 (B3,C0)", "x":2.75, "y":3.25},
- {"label":"K33 (B3,C1)", "x":3.75, "y":3.25},
- {"label":"K34 (B3,C2)", "x":4.75, "y":3.25},
- {"label":"K35 (B3,C3)", "x":5.75, "y":3.25},
- {"label":"K36 (B3,C4)", "x":6.75, "y":3.25},
- {"label":"K37 (B3,C5)", "x":7.75, "y":3.25},
- {"label":"K38 (B3,C6)", "x":8.75, "y":3.25},
- {"label":"K39 (B3,C7)", "x":9.75, "y":3.25},
- {"label":"K3A (B3,D0)", "x":10.75, "y":3.25},
- {"label":"K3B (B3,D1)", "x":11.75, "y":3.25},
- {"label":"K3D (B3,D3)", "x":12.75, "y":3.25, "w":2.25},
-
- {"label":"K40 (B4,B6)", "x":0, "y":4.25, "w":2.25},
- {"label":"K42 (B4,C0)", "x":2.25, "y":4.25},
- {"label":"K43 (B4,C1)", "x":3.25, "y":4.25},
- {"label":"K44 (B4,C2)", "x":4.25, "y":4.25},
- {"label":"K45 (B4,C3)", "x":5.25, "y":4.25},
- {"label":"K46 (B4,C4)", "x":6.25, "y":4.25},
- {"label":"K47 (B4,C5)", "x":7.25, "y":4.25},
- {"label":"K48 (B4,C6)", "x":8.25, "y":4.25},
- {"label":"K49 (B4,C7)", "x":9.25, "y":4.25},
- {"label":"K4A (B4,D0)", "x":10.25, "y":4.25},
- {"label":"K4B (B4,D1)", "x":11.25, "y":4.25},
- {"label":"K4D (B4,D3)", "x":12.25, "y":4.25, "w":2.75},
- {"label":"K4F (B4,D5)", "x":16.25, "y":4.25},
-
- {"label":"K50 (B5,B6)", "x":0, "y":5.25, "w":1.25},
- {"label":"K51 (B5,F4)", "x":1.25, "y":5.25, "w":1.25},
- {"label":"K52 (B5,C0)", "x":2.5, "y":5.25, "w":1.25},
- {"label":"K56 (B5,C4)", "x":3.75, "y":5.25, "w":6.25},
- {"label":"K5A (B5,D0)", "x":10, "y":5.25, "w":1.25},
- {"label":"K5B (B5,D1)", "x":11.25, "y":5.25, "w":1.25},
- {"label":"K5C (B5,D2)", "x":12.5, "y":5.25, "w":1.25},
- {"label":"K5D (B5,D3)", "x":13.75, "y":5.25, "w":1.25},
- {"label":"K5E (B5,D4)", "x":15.25, "y":5.25},
- {"label":"K5F (B5,D5)", "x":16.25, "y":5.25},
- {"label":"K5G (B5,D6)", "x":17.25, "y":5.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+ {"matrix": [0, 9], "x": 9.75, "y": 0},
+ {"matrix": [0, 10], "x": 10.75, "y": 0},
+ {"matrix": [0, 11], "x": 11.75, "y": 0},
+ {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+ {"matrix": [3, 14], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+ {"matrix": [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, 2], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+ {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"matrix": [5, 16], "x": 17.25, "y": 5.25}
]
},
"LAYOUT_tkl_f13_iso": {
"layout": [
- {"label":"K00 (B0,B6)", "x":0, "y":0},
- {"label":"K01 (B0,F4)", "x":1.25, "y":0},
- {"label":"K02 (B0,C0)", "x":2.25, "y":0},
- {"label":"K03 (B0,C1)", "x":3.25, "y":0},
- {"label":"K04 (B0,C2)", "x":4.25, "y":0},
- {"label":"K05 (B0,C3)", "x":5.5, "y":0},
- {"label":"K06 (B0,C4)", "x":6.5, "y":0},
- {"label":"K07 (B0,C5)", "x":7.5, "y":0},
- {"label":"K08 (B0,C6)", "x":8.5, "y":0},
- {"label":"K09 (B0,C7)", "x":9.75, "y":0},
- {"label":"K0A (B0,D0)", "x":10.75, "y":0},
- {"label":"K0B (B0,D1)", "x":11.75, "y":0},
- {"label":"K0C (B0,D2)", "x":12.75, "y":0},
- {"label":"K3E (B3,D4)", "x":14, "y":0},
- {"label":"K0E (B0,D4)", "x":15.25, "y":0},
- {"label":"K0F (B0,D5)", "x":16.25, "y":0},
- {"label":"K0G (B0,D6)", "x":17.25, "y":0},
-
- {"label":"K10 (B1,B6)", "x":0, "y":1.25},
- {"label":"K11 (B1,F4)", "x":1, "y":1.25},
- {"label":"K12 (B1,C0)", "x":2, "y":1.25},
- {"label":"K13 (B1,C1)", "x":3, "y":1.25},
- {"label":"K14 (B1,C2)", "x":4, "y":1.25},
- {"label":"K15 (B1,C3)", "x":5, "y":1.25},
- {"label":"K16 (B1,C4)", "x":6, "y":1.25},
- {"label":"K17 (B1,C5)", "x":7, "y":1.25},
- {"label":"K18 (B1,C6)", "x":8, "y":1.25},
- {"label":"K19 (B1,C7)", "x":9, "y":1.25},
- {"label":"K1A (B1,D0)", "x":10, "y":1.25},
- {"label":"K1B (B1,D1)", "x":11, "y":1.25},
- {"label":"K1C (B1,D2)", "x":12, "y":1.25},
- {"label":"K1D (B1,D3)", "x":13, "y":1.25, "w":2},
- {"label":"K1E (B1,D4)", "x":15.25, "y":1.25},
- {"label":"K1F (B1,D5)", "x":16.25, "y":1.25},
- {"label":"K1G (B1,D6)", "x":17.25, "y":1.25},
-
- {"label":"K20 (B2,B6)", "x":0, "y":2.25, "w":1.5},
- {"label":"K21 (B2,F4)", "x":1.5, "y":2.25},
- {"label":"K22 (B2,C0)", "x":2.5, "y":2.25},
- {"label":"K23 (B2,C1)", "x":3.5, "y":2.25},
- {"label":"K24 (B2,C2)", "x":4.5, "y":2.25},
- {"label":"K25 (B2,C3)", "x":5.5, "y":2.25},
- {"label":"K26 (B2,C4)", "x":6.5, "y":2.25},
- {"label":"K27 (B2,C5)", "x":7.5, "y":2.25},
- {"label":"K28 (B2,C6)", "x":8.5, "y":2.25},
- {"label":"K29 (B2,C7)", "x":9.5, "y":2.25},
- {"label":"K2A (B2,D0)", "x":10.5, "y":2.25},
- {"label":"K2B (B2,D1)", "x":11.5, "y":2.25},
- {"label":"K2C (B2,D2)", "x":12.5, "y":2.25},
- {"label":"K2E (B2,D4)", "x":15.25, "y":2.25},
- {"label":"K2F (B2,D5)", "x":16.25, "y":2.25},
- {"label":"K2G (B2,D6)", "x":17.25, "y":2.25},
-
- {"label":"K30 (B3,B6)", "x":0, "y":3.25, "w":1.75},
- {"label":"K31 (B3,F4)", "x":1.75, "y":3.25},
- {"label":"K32 (B3,C0)", "x":2.75, "y":3.25},
- {"label":"K33 (B3,C1)", "x":3.75, "y":3.25},
- {"label":"K34 (B3,C2)", "x":4.75, "y":3.25},
- {"label":"K35 (B3,C3)", "x":5.75, "y":3.25},
- {"label":"K36 (B3,C4)", "x":6.75, "y":3.25},
- {"label":"K37 (B3,C5)", "x":7.75, "y":3.25},
- {"label":"K38 (B3,C6)", "x":8.75, "y":3.25},
- {"label":"K39 (B3,C7)", "x":9.75, "y":3.25},
- {"label":"K3A (B3,D0)", "x":10.75, "y":3.25},
- {"label":"K3B (B3,D1)", "x":11.75, "y":3.25},
- {"label":"K3C (B3,D2)", "x":12.75, "y":3.25},
- {"label":"K3D (B3,D3)", "x":13.75, "y":2.25, "w":1.25, "h":2},
-
- {"label":"K40 (B4,B6)", "x":0, "y":4.25, "w":1.25},
- {"label":"K41 (B4,F4)", "x":1.25, "y":4.25},
- {"label":"K42 (B4,C0)", "x":2.25, "y":4.25},
- {"label":"K43 (B4,C1)", "x":3.25, "y":4.25},
- {"label":"K44 (B4,C2)", "x":4.25, "y":4.25},
- {"label":"K45 (B4,C3)", "x":5.25, "y":4.25},
- {"label":"K46 (B4,C4)", "x":6.25, "y":4.25},
- {"label":"K47 (B4,C5)", "x":7.25, "y":4.25},
- {"label":"K48 (B4,C6)", "x":8.25, "y":4.25},
- {"label":"K49 (B4,C7)", "x":9.25, "y":4.25},
- {"label":"K4A (B4,D0)", "x":10.25, "y":4.25},
- {"label":"K4B (B4,D1)", "x":11.25, "y":4.25},
- {"label":"K4D (B4,D3)", "x":12.25, "y":4.25, "w":2.75},
- {"label":"K4F (B4,D5)", "x":16.25, "y":4.25},
-
- {"label":"K50 (B5,B6)", "x":0, "y":5.25, "w":1.25},
- {"label":"K51 (B5,F4)", "x":1.25, "y":5.25, "w":1.25},
- {"label":"K52 (B5,C0)", "x":2.5, "y":5.25, "w":1.25},
- {"label":"K56 (B5,C4)", "x":3.75, "y":5.25, "w":6.25},
- {"label":"K5A (B5,D0)", "x":10, "y":5.25, "w":1.25},
- {"label":"K5B (B5,D1)", "x":11.25, "y":5.25, "w":1.25},
- {"label":"K5C (B5,D2)", "x":12.5, "y":5.25, "w":1.25},
- {"label":"K5D (B5,D3)", "x":13.75, "y":5.25, "w":1.25},
- {"label":"K5E (B5,D4)", "x":15.25, "y":5.25},
- {"label":"K5F (B5,D5)", "x":16.25, "y":5.25},
- {"label":"K5G (B5,D6)", "x":17.25, "y":5.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+ {"matrix": [0, 9], "x": 9.75, "y": 0},
+ {"matrix": [0, 10], "x": 10.75, "y": 0},
+ {"matrix": [0, 11], "x": 11.75, "y": 0},
+ {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+ {"matrix": [3, 14], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+ {"matrix": [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": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+ {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"matrix": [5, 16], "x": 17.25, "y": 5.25}
]
}
}
diff --git a/keyboards/mechlovin/infinityce/config.h b/keyboards/mechlovin/infinityce/config.h
index e0900333cd..db2ba4b78e 100644
--- a/keyboards/mechlovin/infinityce/config.h
+++ b/keyboards/mechlovin/infinityce/config.h
@@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-#define MATRIX_ROW_PINS { D7, D6, B6, B1, C6, C7 }
-#define MATRIX_COL_PINS { B5, B4, B0, D5, D4, D1, D0, E6, F7, F6, F5, F4, F1, F0, B2, D3, D2}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
#define RGBLED_NUM 31
#define RGBLIGHT_LIMIT_VAL 255
#define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/mechlovin/infinityce/info.json b/keyboards/mechlovin/infinityce/info.json
index 1ab5cad305..b5e1da8d58 100644
--- a/keyboards/mechlovin/infinityce/info.json
+++ b/keyboards/mechlovin/infinityce/info.json
@@ -8,10 +8,18 @@
"pid": "0x8801",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B5", "B4", "B0", "D5", "D4", "D1", "D0", "E6", "F7", "F6", "F5", "F4", "F1", "F0", "B2", "D3", "D2"],
+ "rows": ["D7", "D6", "B6", "B1", "C6", "C7"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B7",
"breathing": true
},
+ "ws2812": {
+ "pin": "E2"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/mechlovin/jay60/config.h b/keyboards/mechlovin/jay60/config.h
index afc0a4af7d..d685b92631 100644
--- a/keyboards/mechlovin/jay60/config.h
+++ b/keyboards/mechlovin/jay60/config.h
@@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { C2, C1, C0, D7, A1 }
-#define MATRIX_COL_PINS { B6, B5, B3, B2, B1, B0, A0, A6, A7, C7, C6, C5, C4, C3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/mechlovin/jay60/info.json b/keyboards/mechlovin/jay60/info.json
index f64b25c9e7..f06f4b2fea 100644
--- a/keyboards/mechlovin/jay60/info.json
+++ b/keyboards/mechlovin/jay60/info.json
@@ -8,6 +8,11 @@
"pid": "0x0600",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B6", "B5", "B3", "B2", "B1", "B0", "A0", "A6", "A7", "C7", "C6", "C5", "C4", "C3"],
+ "rows": ["C2", "C1", "C0", "D7", "A1"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "D4"
},
diff --git a/keyboards/mechlovin/jay60/jay60.c b/keyboards/mechlovin/jay60/jay60.c
deleted file mode 100644
index 9571c1375a..0000000000
--- a/keyboards/mechlovin/jay60/jay60.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "jay60.h"
diff --git a/keyboards/mechlovin/kanu/config.h b/keyboards/mechlovin/kanu/config.h
index 6a6dc97744..bfa2908890 100644
--- a/keyboards/mechlovin/kanu/config.h
+++ b/keyboards/mechlovin/kanu/config.h
@@ -17,24 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B5, B6, D3, C6, C7 }
-#define MATRIX_COL_PINS { E6, B1, B3, F0, F1, F4, F5, F6, F7, D5, D4, B4, D6, D7, B0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
#define RGBLED_NUM 6
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/mechlovin/kanu/info.json b/keyboards/mechlovin/kanu/info.json
index 628a78e1a5..fabaf33380 100644
--- a/keyboards/mechlovin/kanu/info.json
+++ b/keyboards/mechlovin/kanu/info.json
@@ -8,232 +8,328 @@
"pid": "0x4B4E",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"],
+ "rows": ["B5", "B6", "D3", "C6", "C7"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B7",
"breathing": true
},
+ "ws2812": {
+ "pin": "E2"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["65_ansi_blocker", "65_iso_blocker_split_bs", "65_iso_blocker"],
"layouts": {
- "LAYOUT_all": {
+ "LAYOUT_65_ansi_blocker": {
+ "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": [4, 9], "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}
+ ]
+ },
+ "LAYOUT_65_iso_blocker": {
"layout": [
- {"label":"K00 (B0,B5)", "x":0, "y":0},
- {"label":"K01 (B0,B6)", "x":1, "y":0},
- {"label":"K02 (B0,B7)", "x":2, "y":0},
- {"label":"K03 (B0,C0)", "x":3, "y":0},
- {"label":"K04 (B0,C1)", "x":4, "y":0},
- {"label":"K05 (B0,C2)", "x":5, "y":0},
- {"label":"K06 (B0,C3)", "x":6, "y":0},
- {"label":"K07 (B0,C4)", "x":7, "y":0},
- {"label":"K08 (B0,C5)", "x":8, "y":0},
- {"label":"K09 (B0,C6)", "x":9, "y":0},
- {"label":"K0A (B0,C7)", "x":10, "y":0},
- {"label":"K0B (B0,D0)", "x":11, "y":0},
- {"label":"K0C (B0,D1)", "x":12, "y":0},
- {"label":"K0D (B0,D2)", "x":13, "y":0},
- {"label":"K0E (B0,D3)", "x":14, "y":0},
- {"label":"K49 (B4,C6)", "x":15, "y":0},
- {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
- {"label":"K11 (B1,B6)", "x":1.5, "y":1},
- {"label":"K12 (B1,B7)", "x":2.5, "y":1},
- {"label":"K13 (B1,C0)", "x":3.5, "y":1},
- {"label":"K14 (B1,C1)", "x":4.5, "y":1},
- {"label":"K15 (B1,C2)", "x":5.5, "y":1},
- {"label":"K16 (B1,C3)", "x":6.5, "y":1},
- {"label":"K17 (B1,C4)", "x":7.5, "y":1},
- {"label":"K18 (B1,C5)", "x":8.5, "y":1},
- {"label":"K19 (B1,C6)", "x":9.5, "y":1},
- {"label":"K1A (B1,C7)", "x":10.5, "y":1},
- {"label":"K1B (B1,D0)", "x":11.5, "y":1},
- {"label":"K1C (B1,D1)", "x":12.5, "y":1},
- {"label":"K1D (B1,D2)", "x":13.5, "y":1, "w":1.5},
- {"label":"K1E (B1,D3)", "x":15, "y":1},
- {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75},
- {"label":"K21 (B2,B6)", "x":1.75, "y":2},
- {"label":"K22 (B2,B7)", "x":2.75, "y":2},
- {"label":"K23 (B2,C0)", "x":3.75, "y":2},
- {"label":"K24 (B2,C1)", "x":4.75, "y":2},
- {"label":"K25 (B2,C2)", "x":5.75, "y":2},
- {"label":"K26 (B2,C3)", "x":6.75, "y":2},
- {"label":"K27 (B2,C4)", "x":7.75, "y":2},
- {"label":"K28 (B2,C5)", "x":8.75, "y":2},
- {"label":"K29 (B2,C6)", "x":9.75, "y":2},
- {"label":"K2A (B2,C7)", "x":10.75, "y":2},
- {"label":"K2B (B2,D0)", "x":11.75, "y":2},
- {"label":"K2C (B2,D1)", "x":12.75, "y":2},
- {"label":"K2D (B2,D2)", "x":13.75, "y":2, "w":1.25},
- {"label":"K2E (B2,D3)", "x":15, "y":2},
- {"label":"K30 (B3,B5)", "x":0, "y":3, "w":1.25},
- {"label":"K31 (B3,B6)", "x":1.25, "y":3},
- {"label":"K32 (B3,B7)", "x":2.25, "y":3},
- {"label":"K33 (B3,C0)", "x":3.25, "y":3},
- {"label":"K34 (B3,C1)", "x":4.25, "y":3},
- {"label":"K35 (B3,C2)", "x":5.25, "y":3},
- {"label":"K36 (B3,C3)", "x":6.25, "y":3},
- {"label":"K37 (B3,C4)", "x":7.25, "y":3},
- {"label":"K38 (B3,C5)", "x":8.25, "y":3},
- {"label":"K39 (B3,C6)", "x":9.25, "y":3},
- {"label":"K3A (B3,C7)", "x":10.25, "y":3},
- {"label":"K3B (B3,D0)", "x":11.25, "y":3},
- {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75},
- {"label":"K3D (B3,D2)", "x":14, "y":3},
- {"label":"K3E (B3,D3)", "x":15, "y":3},
- {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
- {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
- {"label":"K44 (B4,C1)", "x":3.75, "y":4, "w":2.75},
- {"label":"K46 (B4,C3)", "x":6.5, "y":4, "w":1.25},
- {"label":"K48 (B4,C5)", "x":7.75, "y":4, "w":2.25},
- {"label":"K4A (B4,C7)", "x":10, "y":4, "w":1.25},
- {"label":"K4B (B4,D0)", "x":11.25, "y":4, "w":1.25},
- {"label":"K4C (B4,D1)", "x":13, "y":4},
- {"label":"K4D (B4,D2)", "x":14, "y":4},
- {"label":"K4E (B4,D3)", "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": [4, 9], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 15, "y": 0},
+ {"matrix": [1, 1], "x": 16, "y": 0},
+ {"matrix": [1, 2], "x": 17, "y": 0},
+ {"matrix": [1, 3], "x": 18, "y": 0},
+ {"matrix": [1, 4], "x": 19, "y": 0},
+ {"matrix": [1, 5], "x": 20, "y": 0},
+ {"matrix": [1, 6], "x": 21, "y": 0},
+ {"matrix": [1, 7], "x": 22, "y": 0},
+ {"matrix": [1, 8], "x": 23, "y": 0},
+ {"matrix": [1, 9], "x": 24, "y": 0},
+ {"matrix": [1, 10], "x": 25, "y": 0},
+ {"matrix": [1, 11], "x": 26, "y": 0},
+ {"matrix": [1, 12], "x": 27, "y": 0},
+ {"matrix": [1, 14], "x": 28, "y": 0},
+
+ {"matrix": [2, 0], "x": 29, "y": 0},
+ {"matrix": [2, 1], "x": 30, "y": 0},
+ {"matrix": [2, 2], "x": 31, "y": 0},
+ {"matrix": [2, 3], "x": 32, "y": 0},
+ {"matrix": [2, 4], "x": 33, "y": 0},
+ {"matrix": [2, 5], "x": 34, "y": 0},
+ {"matrix": [2, 6], "x": 35, "y": 0},
+ {"matrix": [2, 7], "x": 36, "y": 0},
+ {"matrix": [2, 8], "x": 37, "y": 0},
+ {"matrix": [2, 9], "x": 38, "y": 0},
+ {"matrix": [2, 10], "x": 39, "y": 0},
+ {"matrix": [2, 11], "x": 40, "y": 0},
+ {"matrix": [2, 12], "x": 41, "y": 0},
+ {"matrix": [2, 13], "x": 42, "y": 0},
+ {"matrix": [2, 14], "x": 43, "y": 0},
+
+ {"matrix": [3, 0], "x": 44, "y": 0},
+ {"matrix": [3, 1], "x": 45, "y": 0},
+ {"matrix": [3, 2], "x": 46, "y": 0},
+ {"matrix": [3, 3], "x": 47, "y": 0},
+ {"matrix": [3, 4], "x": 48, "y": 0},
+ {"matrix": [3, 5], "x": 49, "y": 0},
+ {"matrix": [3, 6], "x": 50, "y": 0},
+ {"matrix": [3, 7], "x": 51, "y": 0},
+ {"matrix": [3, 8], "x": 52, "y": 0},
+ {"matrix": [3, 9], "x": 53, "y": 0},
+ {"matrix": [3, 10], "x": 54, "y": 0},
+ {"matrix": [3, 11], "x": 55, "y": 0},
+ {"matrix": [3, 12], "x": 56, "y": 0},
+ {"matrix": [3, 13], "x": 57, "y": 0},
+ {"matrix": [3, 14], "x": 58, "y": 0},
+
+ {"matrix": [4, 0], "x": 59, "y": 0},
+ {"matrix": [4, 1], "x": 60, "y": 0},
+ {"matrix": [4, 2], "x": 61, "y": 0},
+ {"matrix": [4, 6], "x": 62, "y": 0},
+ {"matrix": [4, 10], "x": 63, "y": 0},
+ {"matrix": [4, 11], "x": 64, "y": 0},
+ {"matrix": [4, 12], "x": 65, "y": 0},
+ {"matrix": [4, 13], "x": 66, "y": 0},
+ {"matrix": [4, 14], "x": 67, "y": 0}
]
- },
+ },
"LAYOUT_65_iso_blocker_split_bs": {
"layout": [
- {"label":"K00 (B0,B5)", "x":0, "y":0},
- {"label":"K01 (B0,B6)", "x":1, "y":0},
- {"label":"K02 (B0,B7)", "x":2, "y":0},
- {"label":"K03 (B0,C0)", "x":3, "y":0},
- {"label":"K04 (B0,C1)", "x":4, "y":0},
- {"label":"K05 (B0,C2)", "x":5, "y":0},
- {"label":"K06 (B0,C3)", "x":6, "y":0},
- {"label":"K07 (B0,C4)", "x":7, "y":0},
- {"label":"K08 (B0,C5)", "x":8, "y":0},
- {"label":"K09 (B0,C6)", "x":9, "y":0},
- {"label":"K0A (B0,C7)", "x":10, "y":0},
- {"label":"K0B (B0,D0)", "x":11, "y":0},
- {"label":"K0C (B0,D1)", "x":12, "y":0},
- {"label":"K0D (B0,D2)", "x":13, "y":0},
- {"label":"K0E (B0,D3)", "x":14, "y":0},
- {"label":"K49 (B4,C6)", "x":15, "y":0},
- {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
- {"label":"K11 (B1,B6)", "x":1.5, "y":1},
- {"label":"K12 (B1,B7)", "x":2.5, "y":1},
- {"label":"K13 (B1,C0)", "x":3.5, "y":1},
- {"label":"K14 (B1,C1)", "x":4.5, "y":1},
- {"label":"K15 (B1,C2)", "x":5.5, "y":1},
- {"label":"K16 (B1,C3)", "x":6.5, "y":1},
- {"label":"K17 (B1,C4)", "x":7.5, "y":1},
- {"label":"K18 (B1,C5)", "x":8.5, "y":1},
- {"label":"K19 (B1,C6)", "x":9.5, "y":1},
- {"label":"K1A (B1,C7)", "x":10.5, "y":1},
- {"label":"K1B (B1,D0)", "x":11.5, "y":1},
- {"label":"K1C (B1,D1)", "x":12.5, "y":1},
- {"label":"K1E (B1,D3)", "x":15, "y":1},
- {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75},
- {"label":"K21 (B2,B6)", "x":1.75, "y":2},
- {"label":"K22 (B2,B7)", "x":2.75, "y":2},
- {"label":"K23 (B2,C0)", "x":3.75, "y":2},
- {"label":"K24 (B2,C1)", "x":4.75, "y":2},
- {"label":"K25 (B2,C2)", "x":5.75, "y":2},
- {"label":"K26 (B2,C3)", "x":6.75, "y":2},
- {"label":"K27 (B2,C4)", "x":7.75, "y":2},
- {"label":"K28 (B2,C5)", "x":8.75, "y":2},
- {"label":"K29 (B2,C6)", "x":9.75, "y":2},
- {"label":"K2A (B2,C7)", "x":10.75, "y":2},
- {"label":"K2B (B2,D0)", "x":11.75, "y":2},
- {"label":"K2C (B2,D1)", "x":12.75, "y":2},
- {"label":"K2D (B2,D2)", "x":13.75, "y":1, "w":1.25, "h":2},
- {"label":"K2E (B2,D3)", "x":15, "y":2},
- {"label":"K30 (B3,B5)", "x":0, "y":3, "w":1.25},
- {"label":"K31 (B3,B6)", "x":1.25, "y":3},
- {"label":"K32 (B3,B7)", "x":2.25, "y":3},
- {"label":"K33 (B3,C0)", "x":3.25, "y":3},
- {"label":"K34 (B3,C1)", "x":4.25, "y":3},
- {"label":"K35 (B3,C2)", "x":5.25, "y":3},
- {"label":"K36 (B3,C3)", "x":6.25, "y":3},
- {"label":"K37 (B3,C4)", "x":7.25, "y":3},
- {"label":"K38 (B3,C5)", "x":8.25, "y":3},
- {"label":"K39 (B3,C6)", "x":9.25, "y":3},
- {"label":"K3A (B3,C7)", "x":10.25, "y":3},
- {"label":"K3B (B3,D0)", "x":11.25, "y":3},
- {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75},
- {"label":"K3D (B3,D2)", "x":14, "y":3},
- {"label":"K3E (B3,D3)", "x":15, "y":3},
- {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
- {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
- {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25},
- {"label":"K4A (B4,C7)", "x":10, "y":4, "w":1.25},
- {"label":"K4B (B4,D0)", "x":11.25, "y":4, "w":1.25},
- {"label":"K4C (B4,D1)", "x":13, "y":4},
- {"label":"K4D (B4,D2)", "x":14, "y":4},
- {"label":"K4E (B4,D3)", "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": [4, 9], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
},
- "LAYOUT_65_ansi_blocker": {
+ "LAYOUT_all": {
"layout": [
- {"label":"K00 (B0,B5)", "x":0, "y":0},
- {"label":"K01 (B0,B6)", "x":1, "y":0},
- {"label":"K02 (B0,B7)", "x":2, "y":0},
- {"label":"K03 (B0,C0)", "x":3, "y":0},
- {"label":"K04 (B0,C1)", "x":4, "y":0},
- {"label":"K05 (B0,C2)", "x":5, "y":0},
- {"label":"K06 (B0,C3)", "x":6, "y":0},
- {"label":"K07 (B0,C4)", "x":7, "y":0},
- {"label":"K08 (B0,C5)", "x":8, "y":0},
- {"label":"K09 (B0,C6)", "x":9, "y":0},
- {"label":"K0A (B0,C7)", "x":10, "y":0},
- {"label":"K0B (B0,D0)", "x":11, "y":0},
- {"label":"K0C (B0,D1)", "x":12, "y":0},
- {"label":"K0D (B0,D2)", "x":13, "y":0, "w":2},
- {"label":"K49 (B4,C6)", "x":15, "y":0},
- {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
- {"label":"K11 (B1,B6)", "x":1.5, "y":1},
- {"label":"K12 (B1,B7)", "x":2.5, "y":1},
- {"label":"K13 (B1,C0)", "x":3.5, "y":1},
- {"label":"K14 (B1,C1)", "x":4.5, "y":1},
- {"label":"K15 (B1,C2)", "x":5.5, "y":1},
- {"label":"K16 (B1,C3)", "x":6.5, "y":1},
- {"label":"K17 (B1,C4)", "x":7.5, "y":1},
- {"label":"K18 (B1,C5)", "x":8.5, "y":1},
- {"label":"K19 (B1,C6)", "x":9.5, "y":1},
- {"label":"K1A (B1,C7)", "x":10.5, "y":1},
- {"label":"K1B (B1,D0)", "x":11.5, "y":1},
- {"label":"K1C (B1,D1)", "x":12.5, "y":1},
- {"label":"K1D (B1,D2)", "x":13.5, "y":1, "w":1.5},
- {"label":"K1E (B1,D3)", "x":15, "y":1},
- {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75},
- {"label":"K21 (B2,B6)", "x":1.75, "y":2},
- {"label":"K22 (B2,B7)", "x":2.75, "y":2},
- {"label":"K23 (B2,C0)", "x":3.75, "y":2},
- {"label":"K24 (B2,C1)", "x":4.75, "y":2},
- {"label":"K25 (B2,C2)", "x":5.75, "y":2},
- {"label":"K26 (B2,C3)", "x":6.75, "y":2},
- {"label":"K27 (B2,C4)", "x":7.75, "y":2},
- {"label":"K28 (B2,C5)", "x":8.75, "y":2},
- {"label":"K29 (B2,C6)", "x":9.75, "y":2},
- {"label":"K2A (B2,C7)", "x":10.75, "y":2},
- {"label":"K2B (B2,D0)", "x":11.75, "y":2},
- {"label":"K2D (B2,D2)", "x":12.75, "y":2, "w":2.25},
- {"label":"K2E (B2,D3)", "x":15, "y":2},
- {"label":"K30 (B3,B5)", "x":0, "y":3, "w":2.25},
- {"label":"K32 (B3,B7)", "x":2.25, "y":3},
- {"label":"K33 (B3,C0)", "x":3.25, "y":3},
- {"label":"K34 (B3,C1)", "x":4.25, "y":3},
- {"label":"K35 (B3,C2)", "x":5.25, "y":3},
- {"label":"K36 (B3,C3)", "x":6.25, "y":3},
- {"label":"K37 (B3,C4)", "x":7.25, "y":3},
- {"label":"K38 (B3,C5)", "x":8.25, "y":3},
- {"label":"K39 (B3,C6)", "x":9.25, "y":3},
- {"label":"K3A (B3,C7)", "x":10.25, "y":3},
- {"label":"K3B (B3,D0)", "x":11.25, "y":3},
- {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75},
- {"label":"K3D (B3,D2)", "x":14, "y":3},
- {"label":"K3E (B3,D3)", "x":15, "y":3},
- {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
- {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
- {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25},
- {"label":"K4A (B4,C7)", "x":10, "y":4, "w":1.25},
- {"label":"K4B (B4,D0)", "x":11.25, "y":4, "w":1.25},
- {"label":"K4C (B4,D1)", "x":13, "y":4},
- {"label":"K4D (B4,D2)", "x":14, "y":4},
- {"label":"K4E (B4,D3)", "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": [4, 9], "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, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 7.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
}
}
diff --git a/keyboards/mechlovin/kanu/kanu.c b/keyboards/mechlovin/kanu/kanu.c
index ceb874e124..67bf8f88fb 100644
--- a/keyboards/mechlovin/kanu/kanu.c
+++ b/keyboards/mechlovin/kanu/kanu.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "kanu.h"
+#include "quantum.h"
void led_init_ports(void) {
setPinOutput(B2);
diff --git a/keyboards/mechlovin/kanu/kanu.h b/keyboards/mechlovin/kanu/kanu.h
deleted file mode 100644
index 54163529d6..0000000000
--- a/keyboards/mechlovin/kanu/kanu.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-
-#define LAYOUT_all( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k67, \
- k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k45, \
- k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60, \
- k61, k62, k63, k64, k65, k66, k68, k69, k70, k71, k72 \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14 }, \
- { k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k45 }, \
- { k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60 }, \
- { k61, k62, k63, KC_NO, k64, KC_NO, k65, KC_NO, k66, k67, k68, k69, k70, k71, k72 }, \
-}
-#define LAYOUT_65_iso_blocker_split_bs( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k66, \
- k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k29, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k45, \
- k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60, \
- k61, k62, k63, k65, k67, k68, k69, k70, k71 \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14 }, \
- { k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, KC_NO, k29 }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k45 }, \
- { k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60 }, \
- { k61, k62, k63, KC_NO, KC_NO, KC_NO, k65, KC_NO, KC_NO, k66, k67, k68, k69, k70, k71 }, \
-}
-
-#define LAYOUT_65_iso_blocker( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k66, \
- k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k29, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k45, \
- k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60, \
- k61, k62, k63, k65, k67, k68, k69, k70, k71 \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, KC_NO }, \
- { k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, KC_NO, k29 }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k45 }, \
- { k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60 }, \
- { k61, k62, k63, KC_NO, KC_NO, KC_NO, k65, KC_NO, KC_NO, k66, k67, k68, k69, k70, k71 }, \
-}
-
-#define LAYOUT_65_ansi_blocker( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k66, \
- k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k43, k45, \
- k46, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60, \
- k61, k62, k63, k65, k67, k68, k69, k70, k71 \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, KC_NO }, \
- { k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, KC_NO, k43, k45 }, \
- { k46, KC_NO, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60 }, \
- { k61, k62, k63, KC_NO, KC_NO, KC_NO, k65, KC_NO, KC_NO, k66, k67, k68, k69, k70, k71 }, \
-}
-
diff --git a/keyboards/mechlovin/kay60/config.h b/keyboards/mechlovin/kay60/config.h
index b05cc594e4..68e6d62c48 100644
--- a/keyboards/mechlovin/kay60/config.h
+++ b/keyboards/mechlovin/kay60/config.h
@@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D5, D3, D2, B1, B5}
-#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B2, B3, B7, B4, D7, D6, D4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 22
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
/*
* Feature disable options
diff --git a/keyboards/mechlovin/kay60/info.json b/keyboards/mechlovin/kay60/info.json
index a12cb83719..48ca04815b 100644
--- a/keyboards/mechlovin/kay60/info.json
+++ b/keyboards/mechlovin/kay60/info.json
@@ -8,9 +8,17 @@
"pid": "0x0601",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B2", "B3", "B7", "B4", "D7", "D6", "D4"],
+ "rows": ["D5", "D3", "D2", "B1", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "B0"
},
+ "ws2812": {
+ "pin": "E2"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/mechlovin/kay60/kay60.c b/keyboards/mechlovin/kay60/kay60.c
deleted file mode 100644
index 61d968e48c..0000000000
--- a/keyboards/mechlovin/kay60/kay60.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "kay60.h"
diff --git a/keyboards/mechlovin/kay65/config.h b/keyboards/mechlovin/kay65/config.h
index d3cacf757a..af8fb5765c 100644
--- a/keyboards/mechlovin/kay65/config.h
+++ b/keyboards/mechlovin/kay65/config.h
@@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B7, D3, D5, D4, C6 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, C7, E6, B0, D2, D1, D0, B3, B2, B1 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 24
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
/*
* Feature disable options
diff --git a/keyboards/mechlovin/kay65/info.json b/keyboards/mechlovin/kay65/info.json
index 3bfc5c66e5..fbd556217c 100644
--- a/keyboards/mechlovin/kay65/info.json
+++ b/keyboards/mechlovin/kay65/info.json
@@ -8,229 +8,249 @@
"pid": "0x6502",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "C7", "E6", "B0", "D2", "D1", "D0", "B3", "B2", "B1"],
+ "rows": ["B7", "D3", "D5", "D4", "C6"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "D6",
"on_state": 0
},
+ "ws2812": {
+ "pin": "E2"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["65_ansi_blocker", "65_iso_blocker"],
"layouts": {
"LAYOUT_all": {
"layout": [
- {"label":"K00 (B0,B5)", "x":0, "y":0},
- {"label":"K01 (B0,B6)", "x":1, "y":0},
- {"label":"K02 (B0,B7)", "x":2, "y":0},
- {"label":"K03 (B0,C0)", "x":3, "y":0},
- {"label":"K04 (B0,C1)", "x":4, "y":0},
- {"label":"K05 (B0,C2)", "x":5, "y":0},
- {"label":"K06 (B0,C3)", "x":6, "y":0},
- {"label":"K07 (B0,C4)", "x":7, "y":0},
- {"label":"K08 (B0,C5)", "x":8, "y":0},
- {"label":"K09 (B0,C6)", "x":9, "y":0},
- {"label":"K0A (B0,C7)", "x":10, "y":0},
- {"label":"K0B (B0,D0)", "x":11, "y":0},
- {"label":"K0C (B0,D1)", "x":12, "y":0},
- {"label":"K0D (B0,D2)", "x":13, "y":0},
- {"label":"K1D (B1,D2)", "x":14, "y":0},
- {"label":"K0E (B0,D3)", "x":15, "y":0},
- {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
- {"label":"K11 (B1,B6)", "x":1.5, "y":1},
- {"label":"K12 (B1,B7)", "x":2.5, "y":1},
- {"label":"K13 (B1,C0)", "x":3.5, "y":1},
- {"label":"K14 (B1,C1)", "x":4.5, "y":1},
- {"label":"K15 (B1,C2)", "x":5.5, "y":1},
- {"label":"K16 (B1,C3)", "x":6.5, "y":1},
- {"label":"K17 (B1,C4)", "x":7.5, "y":1},
- {"label":"K18 (B1,C5)", "x":8.5, "y":1},
- {"label":"K19 (B1,C6)", "x":9.5, "y":1},
- {"label":"K1A (B1,C7)", "x":10.5, "y":1},
- {"label":"K1B (B1,D0)", "x":11.5, "y":1},
- {"label":"K1C (B1,D1)", "x":12.5, "y":1},
- {"label":"K2C (B2,D1)", "x":13.5, "y":1, "w":1.5},
- {"label":"K1E (B1,D3)", "x":15, "y":1},
- {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75},
- {"label":"K21 (B2,B6)", "x":1.75, "y":2},
- {"label":"K22 (B2,B7)", "x":2.75, "y":2},
- {"label":"K23 (B2,C0)", "x":3.75, "y":2},
- {"label":"K24 (B2,C1)", "x":4.75, "y":2},
- {"label":"K25 (B2,C2)", "x":5.75, "y":2},
- {"label":"K26 (B2,C3)", "x":6.75, "y":2},
- {"label":"K27 (B2,C4)", "x":7.75, "y":2},
- {"label":"K28 (B2,C5)", "x":8.75, "y":2},
- {"label":"K29 (B2,C6)", "x":9.75, "y":2},
- {"label":"K2A (B2,C7)", "x":10.75, "y":2},
- {"label":"K2B (B2,D0)", "x":11.75, "y":2},
- {"label":"K2D (B2,D2)", "x":12.75, "y":2, "w":2.25},
- {"label":"K2E (B2,D3)", "x":15, "y":2},
- {"label":"K30 (B3,B5)", "x":0, "y":3, "w":1.25},
- {"label":"K31 (B3,B6)", "x":1.25, "y":3},
- {"label":"K32 (B3,B7)", "x":2.25, "y":3},
- {"label":"K33 (B3,C0)", "x":3.25, "y":3},
- {"label":"K34 (B3,C1)", "x":4.25, "y":3},
- {"label":"K35 (B3,C2)", "x":5.25, "y":3},
- {"label":"K36 (B3,C3)", "x":6.25, "y":3},
- {"label":"K37 (B3,C4)", "x":7.25, "y":3},
- {"label":"K38 (B3,C5)", "x":8.25, "y":3},
- {"label":"K39 (B3,C6)", "x":9.25, "y":3},
- {"label":"K3A (B3,C7)", "x":10.25, "y":3},
- {"label":"K3B (B3,D0)", "x":11.25, "y":3},
- {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75},
- {"label":"K3D (B3,D2)", "x":14, "y":3},
- {"label":"K3E (B3,D3)", "x":15, "y":3},
- {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
- {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
- {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25},
- {"label":"K49 (B4,C7)", "x":10, "y":4},
- {"label":"K4A (B4,C7)", "x":11, "y":4},
- {"label":"K4B (B4,D0)", "x":12, "y":4},
- {"label":"K4C (B4,D1)", "x":13, "y":4},
- {"label":"K4D (B4,D2)", "x":14, "y":4},
- {"label":"K4E (B4,D3)", "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": [1, 13], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [2, 12], "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": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4},
+ {"matrix": [4, 10], "x": 11, "y": 4},
+ {"matrix": [4, 11], "x": 12, "y": 4},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
},
"LAYOUT_65_ansi_blocker": {
"layout": [
- {"label":"K00 (B0,B5)", "x":0, "y":0},
- {"label":"K01 (B0,B6)", "x":1, "y":0},
- {"label":"K02 (B0,B7)", "x":2, "y":0},
- {"label":"K03 (B0,C0)", "x":3, "y":0},
- {"label":"K04 (B0,C1)", "x":4, "y":0},
- {"label":"K05 (B0,C2)", "x":5, "y":0},
- {"label":"K06 (B0,C3)", "x":6, "y":0},
- {"label":"K07 (B0,C4)", "x":7, "y":0},
- {"label":"K08 (B0,C5)", "x":8, "y":0},
- {"label":"K09 (B0,C6)", "x":9, "y":0},
- {"label":"K0A (B0,C7)", "x":10, "y":0},
- {"label":"K0B (B0,D0)", "x":11, "y":0},
- {"label":"K0C (B0,D1)", "x":12, "y":0},
- {"label":"K0D (B0,D2)", "x":13, "y":0, "w":2},
- {"label":"K0E (B0,D3)", "x":15, "y":0},
- {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
- {"label":"K11 (B1,B6)", "x":1.5, "y":1},
- {"label":"K12 (B1,B7)", "x":2.5, "y":1},
- {"label":"K13 (B1,C0)", "x":3.5, "y":1},
- {"label":"K14 (B1,C1)", "x":4.5, "y":1},
- {"label":"K15 (B1,C2)", "x":5.5, "y":1},
- {"label":"K16 (B1,C3)", "x":6.5, "y":1},
- {"label":"K17 (B1,C4)", "x":7.5, "y":1},
- {"label":"K18 (B1,C5)", "x":8.5, "y":1},
- {"label":"K19 (B1,C6)", "x":9.5, "y":1},
- {"label":"K1A (B1,C7)", "x":10.5, "y":1},
- {"label":"K1B (B1,D0)", "x":11.5, "y":1},
- {"label":"K1C (B1,D1)", "x":12.5, "y":1},
- {"label":"K2C (B2,D1)", "x":13.5, "y":1, "w":1.5},
- {"label":"K1E (B1,D3)", "x":15, "y":1},
- {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75},
- {"label":"K21 (B2,B6)", "x":1.75, "y":2},
- {"label":"K22 (B2,B7)", "x":2.75, "y":2},
- {"label":"K23 (B2,C0)", "x":3.75, "y":2},
- {"label":"K24 (B2,C1)", "x":4.75, "y":2},
- {"label":"K25 (B2,C2)", "x":5.75, "y":2},
- {"label":"K26 (B2,C3)", "x":6.75, "y":2},
- {"label":"K27 (B2,C4)", "x":7.75, "y":2},
- {"label":"K28 (B2,C5)", "x":8.75, "y":2},
- {"label":"K29 (B2,C6)", "x":9.75, "y":2},
- {"label":"K2A (B2,C7)", "x":10.75, "y":2},
- {"label":"K2B (B2,D0)", "x":11.75, "y":2},
- {"label":"K2D (B2,D2)", "x":12.75, "y":2, "w":2.25},
- {"label":"K2E (B2,D3)", "x":15, "y":2},
- {"label":"K30 (B3,B5)", "x":0, "y":3, "w":2.25},
- {"label":"K32 (B3,B7)", "x":2.25, "y":3},
- {"label":"K33 (B3,C0)", "x":3.25, "y":3},
- {"label":"K34 (B3,C1)", "x":4.25, "y":3},
- {"label":"K35 (B3,C2)", "x":5.25, "y":3},
- {"label":"K36 (B3,C3)", "x":6.25, "y":3},
- {"label":"K37 (B3,C4)", "x":7.25, "y":3},
- {"label":"K38 (B3,C5)", "x":8.25, "y":3},
- {"label":"K39 (B3,C6)", "x":9.25, "y":3},
- {"label":"K3A (B3,C7)", "x":10.25, "y":3},
- {"label":"K3B (B3,D0)", "x":11.25, "y":3},
- {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75},
- {"label":"K3D (B3,D2)", "x":14, "y":3},
- {"label":"K3E (B3,D3)", "x":15, "y":3},
- {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
- {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
- {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25},
- {"label":"K49 (B4,C7)", "x":10, "y":4, "w":1.25},
- {"label":"K4A (B4,D0)", "x":11.25, "y":4, "w":1.25},
- {"label":"K4C (B4,D1)", "x":13, "y":4},
- {"label":"K4D (B4,D2)", "x":14, "y":4},
- {"label":"K4E (B4,D3)", "x":15, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
},
"LAYOUT_65_iso_blocker": {
"layout": [
- {"label":"K00 (B0,B5)", "x":0, "y":0},
- {"label":"K01 (B0,B6)", "x":1, "y":0},
- {"label":"K02 (B0,B7)", "x":2, "y":0},
- {"label":"K03 (B0,C0)", "x":3, "y":0},
- {"label":"K04 (B0,C1)", "x":4, "y":0},
- {"label":"K05 (B0,C2)", "x":5, "y":0},
- {"label":"K06 (B0,C3)", "x":6, "y":0},
- {"label":"K07 (B0,C4)", "x":7, "y":0},
- {"label":"K08 (B0,C5)", "x":8, "y":0},
- {"label":"K09 (B0,C6)", "x":9, "y":0},
- {"label":"K0A (B0,C7)", "x":10, "y":0},
- {"label":"K0B (B0,D0)", "x":11, "y":0},
- {"label":"K0C (B0,D1)", "x":12, "y":0},
- {"label":"K0D (B0,D2)", "x":13, "y":0, "w":2},
- {"label":"K0E (B0,D3)", "x":15, "y":0},
- {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
- {"label":"K11 (B1,B6)", "x":1.5, "y":1},
- {"label":"K12 (B1,B7)", "x":2.5, "y":1},
- {"label":"K13 (B1,C0)", "x":3.5, "y":1},
- {"label":"K14 (B1,C1)", "x":4.5, "y":1},
- {"label":"K15 (B1,C2)", "x":5.5, "y":1},
- {"label":"K16 (B1,C3)", "x":6.5, "y":1},
- {"label":"K17 (B1,C4)", "x":7.5, "y":1},
- {"label":"K18 (B1,C5)", "x":8.5, "y":1},
- {"label":"K19 (B1,C6)", "x":9.5, "y":1},
- {"label":"K1A (B1,C7)", "x":10.5, "y":1},
- {"label":"K1B (B1,D0)", "x":11.5, "y":1},
- {"label":"K1C (B1,D1)", "x":12.5, "y":1},
- {"label":"K1E (B1,D3)", "x":15, "y":1},
- {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75},
- {"label":"K21 (B2,B6)", "x":1.75, "y":2},
- {"label":"K22 (B2,B7)", "x":2.75, "y":2},
- {"label":"K23 (B2,C0)", "x":3.75, "y":2},
- {"label":"K24 (B2,C1)", "x":4.75, "y":2},
- {"label":"K25 (B2,C2)", "x":5.75, "y":2},
- {"label":"K26 (B2,C3)", "x":6.75, "y":2},
- {"label":"K27 (B2,C4)", "x":7.75, "y":2},
- {"label":"K28 (B2,C5)", "x":8.75, "y":2},
- {"label":"K29 (B2,C6)", "x":9.75, "y":2},
- {"label":"K2A (B2,C7)", "x":10.75, "y":2},
- {"label":"K2B (B2,D0)", "x":11.75, "y":2},
- {"label":"K2C (B2,D1)", "x":12.75, "y":2},
- {"label":"K2D (B2,D2)", "x":13.75, "y":1, "w":1.25, "h":2},
- {"label":"K2E (B2,D3)", "x":15, "y":2},
- {"label":"K30 (B3,B5)", "x":0, "y":3, "w":1.25},
- {"label":"K31 (B3,B6)", "x":1.25, "y":3},
- {"label":"K32 (B3,B7)", "x":2.25, "y":3},
- {"label":"K33 (B3,C0)", "x":3.25, "y":3},
- {"label":"K34 (B3,C1)", "x":4.25, "y":3},
- {"label":"K35 (B3,C2)", "x":5.25, "y":3},
- {"label":"K36 (B3,C3)", "x":6.25, "y":3},
- {"label":"K37 (B3,C4)", "x":7.25, "y":3},
- {"label":"K38 (B3,C5)", "x":8.25, "y":3},
- {"label":"K39 (B3,C6)", "x":9.25, "y":3},
- {"label":"K3A (B3,C7)", "x":10.25, "y":3},
- {"label":"K3B (B3,D0)", "x":11.25, "y":3},
- {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75},
- {"label":"K3D (B3,D2)", "x":14, "y":3},
- {"label":"K3E (B3,D3)", "x":15, "y":3},
- {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
- {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
- {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25},
- {"label":"K49 (B4,C7)", "x":10, "y":4, "w":1.25},
- {"label":"K4A (B4,D0)", "x":11.25, "y":4, "w":1.25},
- {"label":"K4C (B4,D1)", "x":13, "y":4},
- {"label":"K4D (B4,D2)", "x":14, "y":4},
- {"label":"K4E (B4,D3)", "x":15, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
}
}
diff --git a/keyboards/mechlovin/kay65/kay65.c b/keyboards/mechlovin/kay65/kay65.c
index abc6a7f8d4..591c618c6c 100644
--- a/keyboards/mechlovin/kay65/kay65.c
+++ b/keyboards/mechlovin/kay65/kay65.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "kay65.h"
+#include "quantum.h"
void keyboard_pre_init_user(void) {
// Call the keyboard pre init code.
diff --git a/keyboards/mechlovin/kay65/kay65.h b/keyboards/mechlovin/kay65/kay65.h
deleted file mode 100644
index 1af2673dc1..0000000000
--- a/keyboards/mechlovin/kay65/kay65.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-Copyright 2021 Mechlovin'
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, K1E, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
- K40, K41, K42, K46, K49, K4A, K4B, K4C, K4D, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, K49, K4A, K4B, K4C, K4D, K4E }, \
-}
-
-#define LAYOUT_65_ansi_blocker( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, K1E, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
- K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E }, \
-}
-
-#define LAYOUT_65_iso_blocker( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
- K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E }, \
-}
diff --git a/keyboards/mechlovin/mechlovin9/config.h b/keyboards/mechlovin/mechlovin9/config.h
deleted file mode 100644
index 94a281c2f8..0000000000
--- a/keyboards/mechlovin/mechlovin9/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
-Copyright 2021 Mechlovin' Studio
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechlovin/mechlovin9/mechlovin9.c b/keyboards/mechlovin/mechlovin9/mechlovin9.c
deleted file mode 100644
index a5a8b6c0fe..0000000000
--- a/keyboards/mechlovin/mechlovin9/mechlovin9.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Mechlovin' Studio
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mechlovin9.h"
diff --git a/keyboards/mechlovin/mechlovin9/rev1/config.h b/keyboards/mechlovin/mechlovin9/rev1/config.h
index c5e997d425..3686536dfb 100644
--- a/keyboards/mechlovin/mechlovin9/rev1/config.h
+++ b/keyboards/mechlovin/mechlovin9/rev1/config.h
@@ -17,18 +17,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { A4, A5, A3, A2, A1 }
-#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A0, C15, B4, B5, B3, C13, C14, A13 }
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 3
diff --git a/keyboards/mechlovin/mechlovin9/rev1/info.json b/keyboards/mechlovin/mechlovin9/rev1/info.json
index aa8e9e94e3..1ece8fc52d 100644
--- a/keyboards/mechlovin/mechlovin9/rev1/info.json
+++ b/keyboards/mechlovin/mechlovin9/rev1/info.json
@@ -4,6 +4,11 @@
"pid": "0x6509",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14", "A13"],
+ "rows": ["A4", "A5", "A3", "A2", "A1"]
+ },
+ "diode_direction": "COL2ROW",
"features": {
"backlight": true
},
diff --git a/keyboards/mechlovin/mechlovin9/rev2/config.h b/keyboards/mechlovin/mechlovin9/rev2/config.h
deleted file mode 100644
index f550a2e39a..0000000000
--- a/keyboards/mechlovin/mechlovin9/rev2/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-Copyright 2020 Team Mechlovin'
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 }
-#define MATRIX_COL_PINS { B2, B1, B0, B3, B4, B5, D0, D1, D5, D6, D7, C0, C3, C2, C1 }
diff --git a/keyboards/mechlovin/mechlovin9/rev2/info.json b/keyboards/mechlovin/mechlovin9/rev2/info.json
index 85a20210b2..01e8d59579 100644
--- a/keyboards/mechlovin/mechlovin9/rev2/info.json
+++ b/keyboards/mechlovin/mechlovin9/rev2/info.json
@@ -4,6 +4,11 @@
"pid": "0x6509",
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["B2", "B1", "B0", "B3", "B4", "B5", "D0", "D1", "D5", "D6", "D7", "C0", "C3", "C2", "C1"],
+ "rows": ["A0", "A1", "A2", "A3", "A4"]
+ },
+ "diode_direction": "COL2ROW",
"features": {
"backlight": true
},
diff --git a/keyboards/mechlovin/mechlovin9/rev3/info.json b/keyboards/mechlovin/mechlovin9/rev3/info.json
index d5da28d3ed..f5efcc1f6a 100644
--- a/keyboards/mechlovin/mechlovin9/rev3/info.json
+++ b/keyboards/mechlovin/mechlovin9/rev3/info.json
@@ -16,6 +16,7 @@
"rows": ["B12", "B13", "B14", "B15", "A1"],
"cols": ["B11", "B10", "B2", "B1", "B0", "A6", "A5", "A4", "A3", "C13", "B7", "B6", "B5", "B4", "B3"]
},
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "B9"
}
diff --git a/keyboards/mechlovin/olly/bb/config.h b/keyboards/mechlovin/olly/bb/config.h
index 0f9a61426e..3aa97fd207 100644
--- a/keyboards/mechlovin/olly/bb/config.h
+++ b/keyboards/mechlovin/olly/bb/config.h
@@ -35,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROW_PINS {D6, A5, A4, A3, A6}
#ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN B3
#define RGBLED_NUM 24
#define RGBLIGHT_LIMIT_VAL 255
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
diff --git a/keyboards/mechlovin/olly/bb/info.json b/keyboards/mechlovin/olly/bb/info.json
index 887e32d9a5..4bb73904d0 100644
--- a/keyboards/mechlovin/olly/bb/info.json
+++ b/keyboards/mechlovin/olly/bb/info.json
@@ -12,6 +12,9 @@
"pin": "D4",
"breathing": true
},
+ "ws2812": {
+ "pin": "B3"
+ },
"indicators": {
"caps_lock": "B0",
"num_lock": "B1",
diff --git a/keyboards/mechlovin/olly/jf/config.h b/keyboards/mechlovin/olly/jf/config.h
index 2b42e66edc..5e1321bc8b 100644
--- a/keyboards/mechlovin/olly/jf/config.h
+++ b/keyboards/mechlovin/olly/jf/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION ROW2COL
-#define RGB_DI_PIN B3
#define RGBLED_NUM 27
#define RGBLIGHT_LIMIT_VAL 255
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
diff --git a/keyboards/mechlovin/olly/jf/info.json b/keyboards/mechlovin/olly/jf/info.json
index 86de2f1bfe..ba324e6f3e 100644
--- a/keyboards/mechlovin/olly/jf/info.json
+++ b/keyboards/mechlovin/olly/jf/info.json
@@ -17,6 +17,9 @@
"num_lock": "B1",
"scroll_lock": "B2"
},
+ "ws2812": {
+ "pin": "B3"
+ },
"bootmagic": {
"matrix": [1, 14]
},
diff --git a/keyboards/mechlovin/olly/octagon/config.h b/keyboards/mechlovin/olly/octagon/config.h
index 89e8a32d4f..a1127f6aad 100644
--- a/keyboards/mechlovin/olly/octagon/config.h
+++ b/keyboards/mechlovin/olly/octagon/config.h
@@ -17,16 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define MATRIX_ROW_PINS { B0, B12, A6, A5, A4, A3 }
-#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B2, B1, A15, B3, B9, B8, B7, B6, B5, B4 }
-
#ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN A7
#define RGBLED_NUM 26
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/mechlovin/olly/octagon/info.json b/keyboards/mechlovin/olly/octagon/info.json
index 9adec5281c..0e1054a1fb 100644
--- a/keyboards/mechlovin/olly/octagon/info.json
+++ b/keyboards/mechlovin/olly/octagon/info.json
@@ -8,6 +8,14 @@
"pid": "0xD750",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "A7"
+ },
+ "matrix_pins": {
+ "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B2", "B1", "A15", "B3", "B9", "B8", "B7", "B6", "B5", "B4"],
+ "rows": ["B0", "B12", "A6", "A5", "A4", "A3"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F103",
"bootloader": "stm32duino",
"layout_aliases": {
diff --git a/keyboards/mechlovin/olly/orion/config.h b/keyboards/mechlovin/olly/orion/config.h
index 225795d3c0..efb5f91189 100644
--- a/keyboards/mechlovin/olly/orion/config.h
+++ b/keyboards/mechlovin/olly/orion/config.h
@@ -17,25 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { A8, A9, A10, B11, C13, C14 }
-#define MATRIX_COL_PINS { B14, B13, B12, B2, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0, A15, B3, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
#ifdef RGBLIGHT_ENABLE
-# define RGB_DI_PIN B15
# define RGBLED_NUM 24
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/mechlovin/olly/orion/info.json b/keyboards/mechlovin/olly/orion/info.json
index 89433dfd1b..ad792e81af 100644
--- a/keyboards/mechlovin/olly/orion/info.json
+++ b/keyboards/mechlovin/olly/orion/info.json
@@ -8,22 +8,341 @@
"pid": "0xD870",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B14", "B13", "B12", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "A15", "B3", "B4"],
+ "rows": ["A8", "A9", "A10", "B11", "C13", "C14"]
+ },
+ "diode_direction": "ROW2COL",
"indicators": {
"caps_lock": "B10",
"num_lock": "A13",
"scroll_lock": "A14"
},
+ "ws2812": {
+ "pin": "B15"
+ },
"processor": "STM32F103",
"bootloader": "stm32duino",
"layouts": {
"LAYOUT_tkl_ansi_split_bs_rshift": {
- "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":2, "y":0}, {"label":"0,2", "x":3, "y":0}, {"label":"0,3", "x":4, "y":0}, {"label":"0,4", "x":5, "y":0}, {"label":"0,5", "x":6.5, "y":0}, {"label":"0,6", "x":7.5, "y":0}, {"label":"0,7", "x":8.5, "y":0}, {"label":"0,8", "x":9.5, "y":0}, {"label":"0,9", "x":11, "y":0}, {"label":"0,10", "x":12, "y":0}, {"label":"0,11", "x":13, "y":0}, {"label":"0,12", "x":14, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.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":"2,13", "x":14, "y":1.25}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.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":"3,12", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.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,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25}, {"label":"4,13", "x":13.25, "y":4.25, "w":1.75}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,6", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,10", "x":10, "y":5.25, "w":1.25}, {"label":"5,11", "x":11.25, "y":5.25, "w":1.25}, {"label":"5,12", "x":12.5, "y":5.25, "w":1.25}, {"label":"5,13", "x":13.75, "y":5.25, "w":1.25}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 10], "x": 11, "y": 0},
+ {"matrix": [0, 11], "x": 12, "y": 0},
+ {"matrix": [0, 12], "x": 13, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [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": [2, 13], "x": 14, "y": 1.25},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"matrix": [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": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+ {"matrix": [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, 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},
+ {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+
+ {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+ ]
},
"LAYOUT_tkl_iso_split_bs_rshift": {
- "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":2, "y":0}, {"label":"0,2", "x":3, "y":0}, {"label":"0,3", "x":4, "y":0}, {"label":"0,4", "x":5, "y":0}, {"label":"0,5", "x":6.5, "y":0}, {"label":"0,6", "x":7.5, "y":0}, {"label":"0,7", "x":8.5, "y":0}, {"label":"0,8", "x":9.5, "y":0}, {"label":"0,9", "x":11, "y":0}, {"label":"0,10", "x":12, "y":0}, {"label":"0,11", "x":13, "y":0}, {"label":"0,12", "x":14, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.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":"2,13", "x":14, "y":1.25}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.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":"3,13", "x":13.75, "y":2.25, "w":1.25, "h":2}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.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,12", "x":12.75, "y":3.25}, {"label":"4,0", "x":0, "y":4.25, "w":1.25}, {"label":"4,1", "x":1.25, "y":4.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25}, {"label":"4,13", "x":13.25, "y":4.25, "w":1.75}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,6", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,10", "x":10, "y":5.25, "w":1.25}, {"label":"5,11", "x":11.25, "y":5.25, "w":1.25}, {"label":"5,12", "x":12.5, "y":5.25, "w":1.25}, {"label":"5,13", "x":13.75, "y":5.25, "w":1.25}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 10], "x": 11, "y": 0},
+ {"matrix": [0, 11], "x": 12, "y": 0},
+ {"matrix": [0, 12], "x": 13, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [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": [2, 13], "x": 14, "y": 1.25},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+ {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+ {"matrix": [3, 0], "x": 17.25, "y": 2.25},
+
+ {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+
+ {"matrix": [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},
+ {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+
+ {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+ ]
},
"LAYOUT_all": {
- "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,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.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":"2,13", "x":14, "y":1.25}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.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":"3,12", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.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":1.25}, {"label":"4,1", "x":1.25, "y":4.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25}, {"label":"4,13", "x":13.25, "y":4.25, "w":1.75}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,6", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,10", "x":10, "y":5.25, "w":1.25}, {"label":"5,11", "x":11.25, "y":5.25, "w":1.25}, {"label":"5,12", "x":12.5, "y":5.25, "w":1.25}, {"label":"5,13", "x":13.75, "y":5.25, "w":1.25}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 2], "x": 1.25, "y": 0},
+ {"matrix": [0, 3], "x": 2.25, "y": 0},
+ {"matrix": [0, 4], "x": 3.25, "y": 0},
+ {"matrix": [0, 5], "x": 4.25, "y": 0},
+
+ {"matrix": [0, 6], "x": 5.5, "y": 0},
+ {"matrix": [0, 7], "x": 6.5, "y": 0},
+ {"matrix": [0, 8], "x": 7.5, "y": 0},
+ {"matrix": [0, 9], "x": 8.5, "y": 0},
+
+ {"matrix": [0, 10], "x": 9.75, "y": 0},
+ {"matrix": [0, 11], "x": 10.75, "y": 0},
+ {"matrix": [0, 12], "x": 11.75, "y": 0},
+ {"matrix": [0, 13], "x": 12.75, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.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": [2, 13], "x": 14, "y": 1.25},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"matrix": [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": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+ {"matrix": [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": 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},
+ {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+
+ {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+ ]
}
},
"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
diff --git a/keyboards/mechlovin/olly/orion/orion.c b/keyboards/mechlovin/olly/orion/orion.c
index 270683fa4c..9fc89a6d02 100644
--- a/keyboards/mechlovin/olly/orion/orion.c
+++ b/keyboards/mechlovin/olly/orion/orion.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "orion.h"
+#include "quantum.h"
void board_init(void) {
//JTAG-DP Disabled and SW-DP Enabled
diff --git a/keyboards/mechlovin/olly/orion/orion.h b/keyboards/mechlovin/olly/orion/orion.h
deleted file mode 100644
index fb62e0948e..0000000000
--- a/keyboards/mechlovin/olly/orion/orion.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright 2022 Mechlovin' Studio
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
- K00, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D, K1E, K1F, K1G, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K3C, K2E, K2F, K2G, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
- K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4F, \
- K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E, K5F, K5G \
-) { \
- { K00, KC_NO, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO, KC_NO, KC_NO }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, KC_NO, K4F, KC_NO }, \
- { K50, K51, K52, KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO, KC_NO, K5A, K5B, K5C, K5D, K5E, K5F, K5G }, \
-}
-
-#define LAYOUT_tkl_ansi_split_bs_rshift( \
- K00, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D, K1E, K1F, K1G, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K3C, K2E, K2F, K2G, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
- K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4F, \
- K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E, K5F, K5G \
-) { \
- { K00, KC_NO, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO, KC_NO, KC_NO }, \
- { K40, KC_NO, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, KC_NO, K4F, KC_NO }, \
- { K50, K51, K52, KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO, KC_NO, K5A, K5B, K5C, K5D, K5E, K5F, K5G }, \
-}
-
-#define LAYOUT_tkl_iso_split_bs_rshift( \
- K00, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D, K1E, K1F, K1G, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, K2F, K2G, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
- K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4F, \
- K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E, K5F, K5G \
-) { \
- { K00, KC_NO, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO, KC_NO, KC_NO }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, KC_NO, K4F, KC_NO }, \
- { K50, K51, K52, KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO, KC_NO, K5A, K5B, K5C, K5D, K5E, K5F, K5G }, \
-}
diff --git a/keyboards/mechlovin/pisces/config.h b/keyboards/mechlovin/pisces/config.h
index 1540505bad..06dc10ad91 100644
--- a/keyboards/mechlovin/pisces/config.h
+++ b/keyboards/mechlovin/pisces/config.h
@@ -17,24 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, F0, F5, F6, F7 }
-#define MATRIX_COL_PINS { E6, B1, B3, D0, D1, D2, D3, D5, F4, F1, D4, D6, D7, B4, B5 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -51,4 +33,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/mechlovin/pisces/info.json b/keyboards/mechlovin/pisces/info.json
index 19246528e7..3159cc500b 100644
--- a/keyboards/mechlovin/pisces/info.json
+++ b/keyboards/mechlovin/pisces/info.json
@@ -8,12 +8,20 @@
"pid": "0x6501",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["E6", "B1", "B3", "D0", "D1", "D2", "D3", "D5", "F4", "F1", "D4", "D6", "D7", "B4", "B5"],
+ "rows": ["B0", "F0", "F5", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B7"
},
"indicators": {
"caps_lock": "B2"
},
+ "ws2812": {
+ "pin": "E2"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/mechlovin/pisces/pisces.c b/keyboards/mechlovin/pisces/pisces.c
deleted file mode 100644
index b43bf2aaa4..0000000000
--- a/keyboards/mechlovin/pisces/pisces.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "pisces.h"
diff --git a/keyboards/mechlovin/serratus/config.h b/keyboards/mechlovin/serratus/config.h
index abfafffd0d..4b064e3676 100644
--- a/keyboards/mechlovin/serratus/config.h
+++ b/keyboards/mechlovin/serratus/config.h
@@ -39,7 +39,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DIODE_DIRECTION ROW2COL
#ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN E2
#define RGBLED_NUM 24
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/mechlovin/serratus/info.json b/keyboards/mechlovin/serratus/info.json
index e5125314cb..ca23ddecf3 100644
--- a/keyboards/mechlovin/serratus/info.json
+++ b/keyboards/mechlovin/serratus/info.json
@@ -17,6 +17,9 @@
"num_lock": "D7",
"scroll_lock": "B4"
},
+ "ws2812": {
+ "pin": "E2"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/mechlovin/serratus/serratus.c b/keyboards/mechlovin/serratus/serratus.c
deleted file mode 100644
index b396e57bf5..0000000000
--- a/keyboards/mechlovin/serratus/serratus.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "serratus.h"
diff --git a/keyboards/mechlovin/th1800/config.h b/keyboards/mechlovin/th1800/config.h
deleted file mode 100644
index 0dca95dfee..0000000000
--- a/keyboards/mechlovin/th1800/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2020 Team Mechlovin
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B6, B7, D0, D1, D5, D6 }
-#define MATRIX_COL_PINS { A3, D7, C0, C1, C2, C3, C4, C5, C6, C7, A7, A6, A5, A4, B3, B2, B0, B1 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechlovin/th1800/info.json b/keyboards/mechlovin/th1800/info.json
index 02efb8dc03..d42f6dbef6 100644
--- a/keyboards/mechlovin/th1800/info.json
+++ b/keyboards/mechlovin/th1800/info.json
@@ -8,6 +8,11 @@
"pid": "0x1800",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["A3", "D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4", "B3", "B2", "B0", "B1"],
+ "rows": ["B6", "B7", "D0", "D1", "D5", "D6"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "A0",
"num_lock": "A2",
diff --git a/keyboards/mechlovin/th1800/th1800.c b/keyboards/mechlovin/th1800/th1800.c
deleted file mode 100644
index f27b244c41..0000000000
--- a/keyboards/mechlovin/th1800/th1800.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "th1800.h"
diff --git a/keyboards/mechlovin/tmkl/config.h b/keyboards/mechlovin/tmkl/config.h
index 54cd52de76..e604c6bcfa 100644
--- a/keyboards/mechlovin/tmkl/config.h
+++ b/keyboards/mechlovin/tmkl/config.h
@@ -17,22 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { A8, A4, A5, A3, A2, A1 }
-#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A0, C15, B4, B5, B3, C13, C14 }
-
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 3
diff --git a/keyboards/mechlovin/tmkl/info.json b/keyboards/mechlovin/tmkl/info.json
index 5cdd06aa12..d6be668d13 100644
--- a/keyboards/mechlovin/tmkl/info.json
+++ b/keyboards/mechlovin/tmkl/info.json
@@ -7,6 +7,11 @@
"pid": "0xC601",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14"],
+ "rows": ["A8", "A4", "A5", "A3", "A2", "A1"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B8",
"breathing": true
diff --git a/keyboards/mechlovin/tmkl/tmkl.c b/keyboards/mechlovin/tmkl/tmkl.c
deleted file mode 100644
index 22c4d3f0b8..0000000000
--- a/keyboards/mechlovin/tmkl/tmkl.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "tmkl.h" \ No newline at end of file
diff --git a/keyboards/mechlovin/tmkl/tmkl.h b/keyboards/mechlovin/tmkl/tmkl.h
index d31f61012a..3d30e61d89 100644
--- a/keyboards/mechlovin/tmkl/tmkl.h
+++ b/keyboards/mechlovin/tmkl/tmkl.h
@@ -30,6 +30,6 @@
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
- { K40, KC_NO, K42, K43, K44, K45, K46, K47, K48, K49, KC_NO, K4B, K4C, K4D }, \
+ { K40, KC_NO, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D }, \
{ K50, K51, K52, KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO, KC_NO, KC_NO, K5B, K5C, K5D }, \
}
diff --git a/keyboards/mechlovin/zed60/config.h b/keyboards/mechlovin/zed60/config.h
index 17467fd9fe..b3a4876ba0 100644
--- a/keyboards/mechlovin/zed60/config.h
+++ b/keyboards/mechlovin/zed60/config.h
@@ -17,33 +17,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B10, B2, B1, B0, A2 }
-#define MATRIX_COL_PINS { A10, A3, A9, A8, B15, B14, B13, B12, B5, B4, B3, A15, B7, B6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN A7
#define RGBLED_NUM 22
#define RGBLIGHT_LIMIT_VAL 255
#define WS2812_SPI SPID1 // default: SPID1
#define WS2812_SPI_MOSI_PAL_MODE 5 // MOSI pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 5
-//#define RGB_DI_PIN E2
-//#ifdef RGB_DI_PIN
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mechlovin/zed60/info.json b/keyboards/mechlovin/zed60/info.json
index 3c0c450c69..6ee5954db4 100644
--- a/keyboards/mechlovin/zed60/info.json
+++ b/keyboards/mechlovin/zed60/info.json
@@ -8,9 +8,18 @@
"pid": "0x0602",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["A10", "A3", "A9", "A8", "B15", "B14", "B13", "B12", "B5", "B4", "B3", "A15", "B7", "B6"],
+ "rows": ["B10", "B2", "B1", "B0", "A2"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "A4"
},
+ "ws2812": {
+ "pin": "A7",
+ "driver": "spi"
+ },
"processor": "STM32F103",
"bootloader": "stm32duino",
"layout_aliases": {
diff --git a/keyboards/mechlovin/zed60/rules.mk b/keyboards/mechlovin/zed60/rules.mk
index a0a5d79843..622edc3408 100644
--- a/keyboards/mechlovin/zed60/rules.mk
+++ b/keyboards/mechlovin/zed60/rules.mk
@@ -10,4 +10,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
-WS2812_DRIVER = spi
diff --git a/keyboards/mechlovin/zed60/zed60.c b/keyboards/mechlovin/zed60/zed60.c
deleted file mode 100644
index fb0c44ec3d..0000000000
--- a/keyboards/mechlovin/zed60/zed60.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Mechlovin' Studio
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "zed60.h"
diff --git a/keyboards/mechlovin/zed65/config.h b/keyboards/mechlovin/zed65/config.h
deleted file mode 100644
index 40392b609a..0000000000
--- a/keyboards/mechlovin/zed65/config.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-Copyright 2022 Mechlovin'
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/mechlovin/zed65/mono_led/config.h b/keyboards/mechlovin/zed65/mono_led/config.h
index 233d2b8fd0..3bbf0bb2e6 100644
--- a/keyboards/mechlovin/zed65/mono_led/config.h
+++ b/keyboards/mechlovin/zed65/mono_led/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-#define MATRIX_ROW_PINS { B12, A6, A5, A4, A3 }
-#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B2, B1, A15, B3, B9, B8, B7, B6, B5, B4 }
-
-
#ifdef LED_MATRIX_ENABLE
// This is a 7-bit address, that gets left-shifted and bit 0
// set to 0 for write, 1 for read (as per I2C protocol)
@@ -66,8 +61,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define VIA_QMK_LED_MATRIX_ENABLE
#endif
-#define RGB_DI_PIN A7
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 24
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -84,4 +77,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/mechlovin/zed65/mono_led/info.json b/keyboards/mechlovin/zed65/mono_led/info.json
index 75fcb44ae3..e0debf3cc5 100644
--- a/keyboards/mechlovin/zed65/mono_led/info.json
+++ b/keyboards/mechlovin/zed65/mono_led/info.json
@@ -8,15 +8,243 @@
"pid": "0x6503",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "A7"
+ },
+ "matrix_pins": {
+ "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B2", "B1", "A15", "B3", "B9", "B8", "B7", "B6", "B5", "B4"],
+ "rows": ["B12", "A6", "A5", "A4", "A3"]
+ },
+ "diode_direction": "COL2ROW",
"layouts": {
"LAYOUT_all": {
- "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,10", "x":10, "y":0}, {"label":"0,11", "x":11, "y":0}, {"label":"0,12", "x":12, "y":0}, {"label":"0,13", "x":13, "y":0}, {"label":"0,14", "x":14, "y":0}, {"label":"0,15", "x":15, "y":0}, {"label":"1,0", "x":0, "y":1, "w":1.5}, {"label":"1,1", "x":1.5, "y":1}, {"label":"1,2", "x":2.5, "y":1}, {"label":"1,3", "x":3.5, "y":1}, {"label":"1,4", "x":4.5, "y":1}, {"label":"1,5", "x":5.5, "y":1}, {"label":"1,6", "x":6.5, "y":1}, {"label":"1,7", "x":7.5, "y":1}, {"label":"1,8", "x":8.5, "y":1}, {"label":"1,9", "x":9.5, "y":1}, {"label":"1,10", "x":10.5, "y":1}, {"label":"1,11", "x":11.5, "y":1}, {"label":"1,12", "x":12.5, "y":1}, {"label":"1,14", "x":13.5, "y":1, "w":1.5}, {"label":"1,15", "x":15, "y":1}, {"label":"2,0", "x":0, "y":2, "w":1.75}, {"label":"2,1", "x":1.75, "y":2}, {"label":"2,2", "x":2.75, "y":2}, {"label":"2,3", "x":3.75, "y":2}, {"label":"2,4", "x":4.75, "y":2}, {"label":"2,5", "x":5.75, "y":2}, {"label":"2,6", "x":6.75, "y":2}, {"label":"2,7", "x":7.75, "y":2}, {"label":"2,8", "x":8.75, "y":2}, {"label":"2,9", "x":9.75, "y":2}, {"label":"2,10", "x":10.75, "y":2}, {"label":"2,11", "x":11.75, "y":2}, {"label":"2,12", "x":12.75, "y":2}, {"label":"2,13", "x":13.75, "y":2, "w":1.25}, {"label":"2,15", "x":15, "y":2}, {"label":"3,0", "x":0, "y":3, "w":1.25}, {"label":"3,1", "x":1.25, "y":3}, {"label":"3,2", "x":2.25, "y":3}, {"label":"3,3", "x":3.25, "y":3}, {"label":"3,4", "x":4.25, "y":3}, {"label":"3,5", "x":5.25, "y":3}, {"label":"3,6", "x":6.25, "y":3}, {"label":"3,7", "x":7.25, "y":3}, {"label":"3,8", "x":8.25, "y":3}, {"label":"3,9", "x":9.25, "y":3}, {"label":"3,10", "x":10.25, "y":3}, {"label":"3,11", "x":11.25, "y":3}, {"label":"3,12", "x":12.25, "y":3, "w":1.75}, {"label":"3,14", "x":14, "y":3}, {"label":"3,15", "x":15, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.25}, {"label":"4,1", "x":1.25, "y":4, "w":1.25}, {"label":"4,2", "x":2.5, "y":4, "w":1.25}, {"label":"4,6", "x":3.75, "y":4, "w":6.25}, {"label":"4,10", "x":10, "y":4, "w":1.25}, {"label":"4,11", "x":11.25, "y":4, "w":1.25}, {"label":"4,13", "x":13, "y":4}, {"label":"4,14", "x":14, "y":4}, {"label":"4,15", "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, 14], "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, 14], "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, 13], "x": 13, "y": 4},
+ {"matrix": [4, 14], "x": 14, "y": 4},
+ {"matrix": [4, 15], "x": 15, "y": 4}
+ ]
},
"LAYOUT_65_ansi_blocker": {
- "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,10", "x":10, "y":0}, {"label":"0,11", "x":11, "y":0}, {"label":"0,12", "x":12, "y":0}, {"label":"0,13", "x":13, "y":0, "w":2}, {"label":"0,15", "x":15, "y":0}, {"label":"1,0", "x":0, "y":1, "w":1.5}, {"label":"1,1", "x":1.5, "y":1}, {"label":"1,2", "x":2.5, "y":1}, {"label":"1,3", "x":3.5, "y":1}, {"label":"1,4", "x":4.5, "y":1}, {"label":"1,5", "x":5.5, "y":1}, {"label":"1,6", "x":6.5, "y":1}, {"label":"1,7", "x":7.5, "y":1}, {"label":"1,8", "x":8.5, "y":1}, {"label":"1,9", "x":9.5, "y":1}, {"label":"1,10", "x":10.5, "y":1}, {"label":"1,11", "x":11.5, "y":1}, {"label":"1,12", "x":12.5, "y":1}, {"label":"1,14", "x":13.5, "y":1, "w":1.5}, {"label":"1,15", "x":15, "y":1}, {"label":"2,0", "x":0, "y":2, "w":1.75}, {"label":"2,1", "x":1.75, "y":2}, {"label":"2,2", "x":2.75, "y":2}, {"label":"2,3", "x":3.75, "y":2}, {"label":"2,4", "x":4.75, "y":2}, {"label":"2,5", "x":5.75, "y":2}, {"label":"2,6", "x":6.75, "y":2}, {"label":"2,7", "x":7.75, "y":2}, {"label":"2,8", "x":8.75, "y":2}, {"label":"2,9", "x":9.75, "y":2}, {"label":"2,10", "x":10.75, "y":2}, {"label":"2,11", "x":11.75, "y":2}, {"label":"2,13", "x":12.75, "y":2, "w":2.25}, {"label":"2,15", "x":15, "y":2}, {"label":"3,0", "x":0, "y":3, "w":2.25}, {"label":"3,2", "x":2.25, "y":3}, {"label":"3,3", "x":3.25, "y":3}, {"label":"3,4", "x":4.25, "y":3}, {"label":"3,5", "x":5.25, "y":3}, {"label":"3,6", "x":6.25, "y":3}, {"label":"3,7", "x":7.25, "y":3}, {"label":"3,8", "x":8.25, "y":3}, {"label":"3,9", "x":9.25, "y":3}, {"label":"3,10", "x":10.25, "y":3}, {"label":"3,11", "x":11.25, "y":3}, {"label":"3,12", "x":12.25, "y":3, "w":1.75}, {"label":"3,14", "x":14, "y":3}, {"label":"3,15", "x":15, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.25}, {"label":"4,1", "x":1.25, "y":4, "w":1.25}, {"label":"4,2", "x":2.5, "y":4, "w":1.25}, {"label":"4,6", "x":3.75, "y":4, "w":6.25}, {"label":"4,10", "x":10, "y":4, "w":1.25}, {"label":"4,11", "x":11.25, "y":4, "w":1.25}, {"label":"4,13", "x":13, "y":4}, {"label":"4,14", "x":14, "y":4}, {"label":"4,15", "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, 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, 14], "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, 14], "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, 13], "x": 13, "y": 4},
+ {"matrix": [4, 14], "x": 14, "y": 4},
+ {"matrix": [4, 15], "x": 15, "y": 4}
+ ]
},
"LAYOUT_65_iso_blocker": {
- "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,10", "x":10, "y":0}, {"label":"0,11", "x":11, "y":0}, {"label":"0,12", "x":12, "y":0}, {"label":"0,13", "x":13, "y":0, "w":2}, {"label":"0,15", "x":15, "y":0}, {"label":"1,0", "x":0, "y":1, "w":1.5}, {"label":"1,1", "x":1.5, "y":1}, {"label":"1,2", "x":2.5, "y":1}, {"label":"1,3", "x":3.5, "y":1}, {"label":"1,4", "x":4.5, "y":1}, {"label":"1,5", "x":5.5, "y":1}, {"label":"1,6", "x":6.5, "y":1}, {"label":"1,7", "x":7.5, "y":1}, {"label":"1,8", "x":8.5, "y":1}, {"label":"1,9", "x":9.5, "y":1}, {"label":"1,10", "x":10.5, "y":1}, {"label":"1,11", "x":11.5, "y":1}, {"label":"1,12", "x":12.5, "y":1}, {"label":"1,14", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"1,15", "x":15, "y":1}, {"label":"2,0", "x":0, "y":2, "w":1.75}, {"label":"2,1", "x":1.75, "y":2}, {"label":"2,2", "x":2.75, "y":2}, {"label":"2,3", "x":3.75, "y":2}, {"label":"2,4", "x":4.75, "y":2}, {"label":"2,5", "x":5.75, "y":2}, {"label":"2,6", "x":6.75, "y":2}, {"label":"2,7", "x":7.75, "y":2}, {"label":"2,8", "x":8.75, "y":2}, {"label":"2,9", "x":9.75, "y":2}, {"label":"2,10", "x":10.75, "y":2}, {"label":"2,11", "x":11.75, "y":2}, {"label":"2,12", "x":12.75, "y":2}, {"label":"2,15", "x":15, "y":2}, {"label":"3,0", "x":0, "y":3, "w":1.25}, {"label":"3,1", "x":1.25, "y":3}, {"label":"3,2", "x":2.25, "y":3}, {"label":"3,3", "x":3.25, "y":3}, {"label":"3,4", "x":4.25, "y":3}, {"label":"3,5", "x":5.25, "y":3}, {"label":"3,6", "x":6.25, "y":3}, {"label":"3,7", "x":7.25, "y":3}, {"label":"3,8", "x":8.25, "y":3}, {"label":"3,9", "x":9.25, "y":3}, {"label":"3,10", "x":10.25, "y":3}, {"label":"3,11", "x":11.25, "y":3}, {"label":"3,12", "x":12.25, "y":3, "w":1.75}, {"label":"3,14", "x":14, "y":3}, {"label":"3,15", "x":15, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.25}, {"label":"4,1", "x":1.25, "y":4, "w":1.25}, {"label":"4,2", "x":2.5, "y":4, "w":1.25}, {"label":"4,6", "x":3.75, "y":4, "w":6.25}, {"label":"4,10", "x":10, "y":4, "w":1.25}, {"label":"4,11", "x":11.25, "y":4, "w":1.25}, {"label":"4,13", "x":13, "y":4}, {"label":"4,14", "x":14, "y":4}, {"label":"4,15", "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, 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, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"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, 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, 14], "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, 13], "x": 13, "y": 4},
+ {"matrix": [4, 14], "x": 14, "y": 4},
+ {"matrix": [4, 15], "x": 15, "y": 4}
+ ]
}
}
} \ No newline at end of file
diff --git a/keyboards/mechlovin/zed65/mono_led/mono_led.c b/keyboards/mechlovin/zed65/mono_led/mono_led.c
index b6bf37f98f..e618d41489 100644
--- a/keyboards/mechlovin/zed65/mono_led/mono_led.c
+++ b/keyboards/mechlovin/zed65/mono_led/mono_led.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "mono_led.h"
+#include "quantum.h"
diff --git a/keyboards/mechlovin/zed65/mono_led/mono_led.h b/keyboards/mechlovin/zed65/mono_led/mono_led.h
deleted file mode 100644
index e2f66a9144..0000000000
--- a/keyboards/mechlovin/zed65/mono_led/mono_led.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-Copyright 2022 Mechlovin'
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define 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, K1E, K1F, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, K3F, \
- K40, K41, K42, K46, K4A, K4B, K4D, K4E, K4F \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, K1E, K1F }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO, K2F }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO, K3E, K3F }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_ansi_blocker( \
- 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, K1E, 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, K3E, K3F, \
- K40, K41, K42, K46, K4A, K4B, K4D, K4E, K4F \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO, K0F }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, K1E, K1F }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO, K2F }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO, K3E, K3F }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_iso_blocker( \
- 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, 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, K46, K4A, K4B, K4D, K4E, K4F \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO, K0F }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, K1E, K1F }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, KC_NO, KC_NO, K2F }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO, K3E, K3F }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D, K4E, K4F }, \
-}
diff --git a/keyboards/mechlovin/zed65/no_backlight/cor65/config.h b/keyboards/mechlovin/zed65/no_backlight/cor65/config.h
deleted file mode 100644
index 890026c2fc..0000000000
--- a/keyboards/mechlovin/zed65/no_backlight/cor65/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2022 Mechlovin'
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-#define MATRIX_ROW_PINS { B12, B13, B14, B15, A1 }
-#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A6, A5, A4, A3, A2, C13, B7, B6, B5, B4, B3 }
diff --git a/keyboards/mechlovin/zed65/no_backlight/cor65/cor65.c b/keyboards/mechlovin/zed65/no_backlight/cor65/cor65.c
deleted file mode 100644
index 632a595ece..0000000000
--- a/keyboards/mechlovin/zed65/no_backlight/cor65/cor65.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2022 Mechlovin'
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "cor65.h"
-
diff --git a/keyboards/mechlovin/zed65/no_backlight/cor65/cor65.h b/keyboards/mechlovin/zed65/no_backlight/cor65/cor65.h
deleted file mode 100644
index 5096a10cc3..0000000000
--- a/keyboards/mechlovin/zed65/no_backlight/cor65/cor65.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-Copyright 2022 Mechlovin'
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K2D, 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, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \
- K40, K41, K42, K43, K47, K4A, K4B, K4D, K4E, K4F \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
- { K30, K31, KC_NO, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
- { K40, K41, K42, K43, KC_NO, KC_NO, KC_NO, K47, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_ansi( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, K2F, \
- K30, K31, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \
- K40, K41, K42, K43, K47, K4A, K4B, K4D, K4E, K4F \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, KC_NO, K2E, K2F }, \
- { K30, K31, KC_NO, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
- { K40, K41, K42, K43, KC_NO, KC_NO, KC_NO, K47, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_winkeyless( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, K2F, \
- K30, K31, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \
- K40, K41, K43, K47, K4B, K4D, K4E, K4F \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, KC_NO, K2E, K2F }, \
- { K30, K31, KC_NO, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
- { K40, K41, KC_NO, K43, KC_NO, KC_NO, KC_NO, K47, KC_NO, KC_NO, KC_NO, K4B, KC_NO, K4D, K4E, K4F }, \
-}
diff --git a/keyboards/mechlovin/zed65/no_backlight/cor65/info.json b/keyboards/mechlovin/zed65/no_backlight/cor65/info.json
index 2f0ea4817f..11fb617ac4 100644
--- a/keyboards/mechlovin/zed65/no_backlight/cor65/info.json
+++ b/keyboards/mechlovin/zed65/no_backlight/cor65/info.json
@@ -8,19 +8,260 @@
"pid": "0x6504",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B11", "B10", "B2", "B1", "B0", "A6", "A5", "A4", "A3", "A2", "C13", "B7", "B6", "B5", "B4", "B3"],
+ "rows": ["B12", "B13", "B14", "B15", "A1"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "B9",
"on_state": 0
},
"layouts": {
"LAYOUT_all": {
- "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.25, "y":0}, {"label":"0,6", "x":6.25, "y":0}, {"label":"0,7", "x":7.25, "y":0}, {"label":"0,8", "x":8.25, "y":0}, {"label":"0,9", "x":9.25, "y":0}, {"label":"0,10", "x":10.25, "y":0}, {"label":"0,11", "x":11.25, "y":0}, {"label":"0,12", "x":12.25, "y":0}, {"label":"0,13", "x":13.25, "y":0}, {"label":"0,14", "x":14.25, "y":0}, {"label":"2,13", "x":15.25, "y":0}, {"label":"0,15", "x":16.75, "y":0}, {"label":"1,0", "x":0, "y":1}, {"label":"1,1", "x":1.25, "y":1, "w":1.5}, {"label":"1,2", "x":2.75, "y":1}, {"label":"1,3", "x":3.75, "y":1}, {"label":"1,4", "x":4.75, "y":1}, {"label":"1,5", "x":5.75, "y":1}, {"label":"1,6", "x":6.75, "y":1}, {"label":"1,7", "x":7.75, "y":1}, {"label":"1,8", "x":8.75, "y":1}, {"label":"1,9", "x":9.75, "y":1}, {"label":"1,10", "x":10.75, "y":1}, {"label":"1,11", "x":11.75, "y":1}, {"label":"1,12", "x":12.75, "y":1}, {"label":"1,13", "x":13.75, "y":1}, {"label":"1,14", "x":14.75, "y":1, "w":1.5}, {"label":"1,15", "x":16.75, "y":1}, {"label":"2,0", "x":0, "y":2}, {"label":"2,1", "x":1.25, "y":2, "w":1.75}, {"label":"2,2", "x":3, "y":2}, {"label":"2,3", "x":4, "y":2}, {"label":"2,4", "x":5, "y":2}, {"label":"2,5", "x":6, "y":2}, {"label":"2,6", "x":7, "y":2}, {"label":"2,7", "x":8, "y":2}, {"label":"2,8", "x":9, "y":2}, {"label":"2,9", "x":10, "y":2}, {"label":"2,10", "x":11, "y":2}, {"label":"2,11", "x":12, "y":2}, {"label":"2,12", "x":13, "y":2}, {"label":"2,14", "x":14, "y":2, "w":2.25}, {"label":"2,15", "x":16.75, "y":2}, {"label":"3,0", "x":0, "y":3}, {"label":"3,1", "x":1.25, "y":3, "w":2.25}, {"label":"3,3", "x":3.5, "y":3}, {"label":"3,4", "x":4.5, "y":3}, {"label":"3,5", "x":5.5, "y":3}, {"label":"3,6", "x":6.5, "y":3}, {"label":"3,7", "x":7.5, "y":3}, {"label":"3,8", "x":8.5, "y":3}, {"label":"3,9", "x":9.5, "y":3}, {"label":"3,10", "x":10.5, "y":3}, {"label":"3,11", "x":11.5, "y":3}, {"label":"3,12", "x":12.5, "y":3}, {"label":"3,13", "x":13.5, "y":3, "w":1.75}, {"label":"3,15", "x":16.75, "y":3}, {"label":"3,14", "x":15.5, "y":3.25}, {"label":"4,0", "x":0, "y":4}, {"label":"4,1", "x":1.25, "y":4, "w":1.25}, {"label":"4,2", "x":2.5, "y":4, "w":1.25}, {"label":"4,3", "x":3.75, "y":4, "w":1.25}, {"label":"4,7", "x":5, "y":4, "w":6.25}, {"label":"4,10", "x":11.25, "y":4, "w":1.25}, {"label":"4,11", "x":12.5, "y":4, "w":1.25}, {"label":"4,13", "x":14.5, "y":4.25}, {"label":"4,14", "x":15.5, "y":4.25}, {"label":"4,15", "x":16.5, "y":4.25}]
+ "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": [2, 13], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.75, "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, 15], "x": 16.75, "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, 14], "x": 14, "y": 2, "w": 2.25},
+ {"matrix": [2, 15], "x": 16.75, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.5, "y": 3},
+ {"matrix": [3, 7], "x": 7.5, "y": 3},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [3, 9], "x": 9.5, "y": 3},
+ {"matrix": [3, 10], "x": 10.5, "y": 3},
+ {"matrix": [3, 11], "x": 11.5, "y": 3},
+ {"matrix": [3, 12], "x": 12.5, "y": 3},
+ {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16.75, "y": 3},
+
+ {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+ {"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, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 13], "x": 14.5, "y": 4.25},
+ {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+ {"matrix": [4, 15], "x": 16.5, "y": 4.25}
+ ]
},
"LAYOUT_65_ansi": {
- "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.25, "y":0}, {"label":"0,6", "x":6.25, "y":0}, {"label":"0,7", "x":7.25, "y":0}, {"label":"0,8", "x":8.25, "y":0}, {"label":"0,9", "x":9.25, "y":0}, {"label":"0,10", "x":10.25, "y":0}, {"label":"0,11", "x":11.25, "y":0}, {"label":"0,12", "x":12.25, "y":0}, {"label":"0,13", "x":13.25, "y":0}, {"label":"0,14", "x":14.25, "y":0, "w":2}, {"label":"0,15", "x":16.75, "y":0}, {"label":"1,0", "x":0, "y":1}, {"label":"1,1", "x":1.25, "y":1, "w":1.5}, {"label":"1,2", "x":2.75, "y":1}, {"label":"1,3", "x":3.75, "y":1}, {"label":"1,4", "x":4.75, "y":1}, {"label":"1,5", "x":5.75, "y":1}, {"label":"1,6", "x":6.75, "y":1}, {"label":"1,7", "x":7.75, "y":1}, {"label":"1,8", "x":8.75, "y":1}, {"label":"1,9", "x":9.75, "y":1}, {"label":"1,10", "x":10.75, "y":1}, {"label":"1,11", "x":11.75, "y":1}, {"label":"1,12", "x":12.75, "y":1}, {"label":"1,13", "x":13.75, "y":1}, {"label":"1,14", "x":14.75, "y":1, "w":1.5}, {"label":"1,15", "x":16.75, "y":1}, {"label":"2,0", "x":0, "y":2}, {"label":"2,1", "x":1.25, "y":2, "w":1.75}, {"label":"2,2", "x":3, "y":2}, {"label":"2,3", "x":4, "y":2}, {"label":"2,4", "x":5, "y":2}, {"label":"2,5", "x":6, "y":2}, {"label":"2,6", "x":7, "y":2}, {"label":"2,7", "x":8, "y":2}, {"label":"2,8", "x":9, "y":2}, {"label":"2,9", "x":10, "y":2}, {"label":"2,10", "x":11, "y":2}, {"label":"2,11", "x":12, "y":2}, {"label":"2,12", "x":13, "y":2}, {"label":"2,14", "x":14, "y":2, "w":2.25}, {"label":"2,15", "x":16.75, "y":2}, {"label":"3,0", "x":0, "y":3}, {"label":"3,1", "x":1.25, "y":3, "w":2.25}, {"label":"3,3", "x":3.5, "y":3}, {"label":"3,4", "x":4.5, "y":3}, {"label":"3,5", "x":5.5, "y":3}, {"label":"3,6", "x":6.5, "y":3}, {"label":"3,7", "x":7.5, "y":3}, {"label":"3,8", "x":8.5, "y":3}, {"label":"3,9", "x":9.5, "y":3}, {"label":"3,10", "x":10.5, "y":3}, {"label":"3,11", "x":11.5, "y":3}, {"label":"3,12", "x":12.5, "y":3}, {"label":"3,13", "x":13.5, "y":3, "w":1.75}, {"label":"3,15", "x":16.75, "y":3}, {"label":"3,14", "x":15.5, "y":3.25}, {"label":"4,0", "x":0, "y":4}, {"label":"4,1", "x":1.25, "y":4, "w":1.25}, {"label":"4,2", "x":2.5, "y":4, "w":1.25}, {"label":"4,3", "x":3.75, "y":4, "w":1.25}, {"label":"4,7", "x":5, "y":4, "w":6.25}, {"label":"4,10", "x":11.25, "y":4, "w":1.25}, {"label":"4,11", "x":12.5, "y":4, "w":1.25}, {"label":"4,13", "x":14.5, "y":4.25}, {"label":"4,14", "x":15.5, "y":4.25}, {"label":"4,15", "x":16.5, "y":4.25}]
+ "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, "w": 2},
+ {"matrix": [0, 15], "x": 16.75, "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, 15], "x": 16.75, "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, 14], "x": 14, "y": 2, "w": 2.25},
+ {"matrix": [2, 15], "x": 16.75, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.5, "y": 3},
+ {"matrix": [3, 7], "x": 7.5, "y": 3},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [3, 9], "x": 9.5, "y": 3},
+ {"matrix": [3, 10], "x": 10.5, "y": 3},
+ {"matrix": [3, 11], "x": 11.5, "y": 3},
+ {"matrix": [3, 12], "x": 12.5, "y": 3},
+ {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16.75, "y": 3},
+
+ {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+ {"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, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 13], "x": 14.5, "y": 4.25},
+ {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+ {"matrix": [4, 15], "x": 16.5, "y": 4.25}
+ ]
},
"LAYOUT_winkeyless": {
- "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.25, "y":0}, {"label":"0,6", "x":6.25, "y":0}, {"label":"0,7", "x":7.25, "y":0}, {"label":"0,8", "x":8.25, "y":0}, {"label":"0,9", "x":9.25, "y":0}, {"label":"0,10", "x":10.25, "y":0}, {"label":"0,11", "x":11.25, "y":0}, {"label":"0,12", "x":12.25, "y":0}, {"label":"0,13", "x":13.25, "y":0}, {"label":"0,14", "x":14.25, "y":0, "w":2}, {"label":"0,15", "x":16.75, "y":0}, {"label":"1,0", "x":0, "y":1}, {"label":"1,1", "x":1.25, "y":1, "w":1.5}, {"label":"1,2", "x":2.75, "y":1}, {"label":"1,3", "x":3.75, "y":1}, {"label":"1,4", "x":4.75, "y":1}, {"label":"1,5", "x":5.75, "y":1}, {"label":"1,6", "x":6.75, "y":1}, {"label":"1,7", "x":7.75, "y":1}, {"label":"1,8", "x":8.75, "y":1}, {"label":"1,9", "x":9.75, "y":1}, {"label":"1,10", "x":10.75, "y":1}, {"label":"1,11", "x":11.75, "y":1}, {"label":"1,12", "x":12.75, "y":1}, {"label":"1,13", "x":13.75, "y":1}, {"label":"1,14", "x":14.75, "y":1, "w":1.5}, {"label":"1,15", "x":16.75, "y":1}, {"label":"2,0", "x":0, "y":2}, {"label":"2,1", "x":1.25, "y":2, "w":1.75}, {"label":"2,2", "x":3, "y":2}, {"label":"2,3", "x":4, "y":2}, {"label":"2,4", "x":5, "y":2}, {"label":"2,5", "x":6, "y":2}, {"label":"2,6", "x":7, "y":2}, {"label":"2,7", "x":8, "y":2}, {"label":"2,8", "x":9, "y":2}, {"label":"2,9", "x":10, "y":2}, {"label":"2,10", "x":11, "y":2}, {"label":"2,11", "x":12, "y":2}, {"label":"2,12", "x":13, "y":2}, {"label":"2,14", "x":14, "y":2, "w":2.25}, {"label":"2,15", "x":16.75, "y":2}, {"label":"3,0", "x":0, "y":3}, {"label":"3,1", "x":1.25, "y":3, "w":2.25}, {"label":"3,3", "x":3.5, "y":3}, {"label":"3,4", "x":4.5, "y":3}, {"label":"3,5", "x":5.5, "y":3}, {"label":"3,6", "x":6.5, "y":3}, {"label":"3,7", "x":7.5, "y":3}, {"label":"3,8", "x":8.5, "y":3}, {"label":"3,9", "x":9.5, "y":3}, {"label":"3,10", "x":10.5, "y":3}, {"label":"3,11", "x":11.5, "y":3}, {"label":"3,12", "x":12.5, "y":3}, {"label":"3,13", "x":13.5, "y":3, "w":1.75}, {"label":"3,15", "x":16.75, "y":3}, {"label":"3,14", "x":15.5, "y":3.25}, {"label":"4,0", "x":0, "y":4}, {"label":"4,1", "x":1.25, "y":4, "w":1.5}, {"label":"4,3", "x":3.75, "y":4, "w":1.5}, {"label":"4,7", "x":5.25, "y":4, "w":7}, {"label":"4,11", "x":12.25, "y":4, "w":1.5}, {"label":"4,13", "x":14.5, "y":4.25}, {"label":"4,14", "x":15.5, "y":4.25}, {"label":"4,15", "x":16.5, "y":4.25}]
+ "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, "w": 2},
+ {"matrix": [0, 15], "x": 16.75, "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, 15], "x": 16.75, "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, 14], "x": 14, "y": 2, "w": 2.25},
+ {"matrix": [2, 15], "x": 16.75, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.5, "y": 3},
+ {"matrix": [3, 7], "x": 7.5, "y": 3},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [3, 9], "x": 9.5, "y": 3},
+ {"matrix": [3, 10], "x": 10.5, "y": 3},
+ {"matrix": [3, 11], "x": 11.5, "y": 3},
+ {"matrix": [3, 12], "x": 12.5, "y": 3},
+ {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 16.75, "y": 3},
+
+ {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 5.25, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 13], "x": 14.5, "y": 4.25},
+ {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+ {"matrix": [4, 15], "x": 16.5, "y": 4.25}
+ ]
}
}
} \ No newline at end of file
diff --git a/keyboards/mechlovin/zed65/no_backlight/retro66/config.h b/keyboards/mechlovin/zed65/no_backlight/retro66/config.h
index 4739a7c2b1..6786e3b953 100644
--- a/keyboards/mechlovin/zed65/no_backlight/retro66/config.h
+++ b/keyboards/mechlovin/zed65/no_backlight/retro66/config.h
@@ -17,8 +17,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-#define MATRIX_ROW_PINS { B13, B14, A8, A1, A0 }
-#define MATRIX_COL_PINS { B11, B12, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2, B3, A15, B5 }
-
#define TAP_CODE_DELAY 10 \ No newline at end of file
diff --git a/keyboards/mechlovin/zed65/no_backlight/retro66/info.json b/keyboards/mechlovin/zed65/no_backlight/retro66/info.json
index f14d88910b..a014cfb554 100644
--- a/keyboards/mechlovin/zed65/no_backlight/retro66/info.json
+++ b/keyboards/mechlovin/zed65/no_backlight/retro66/info.json
@@ -8,6 +8,11 @@
"pid": "0x6601",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B11", "B12", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "B3", "A15", "B5"],
+ "rows": ["B13", "B14", "A8", "A1", "A0"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B4", "pin_b": "B8"},
diff --git a/keyboards/mechlovin/zed65/no_backlight/retro66/retro66.c b/keyboards/mechlovin/zed65/no_backlight/retro66/retro66.c
deleted file mode 100644
index ffdf09db28..0000000000
--- a/keyboards/mechlovin/zed65/no_backlight/retro66/retro66.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2022 Mechlovin'
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "retro66.h"
-
diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h
index 67c1ffb2d6..6a0f857d25 100644
--- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h
+++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h
@@ -17,21 +17,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-#define MATRIX_ROW_PINS { B13, B14, A8, A1, A0 }
-#define MATRIX_COL_PINS { B11, B12, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2, B3, A15, B5 }
-
-
#ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN B15
#define RGBLED_NUM 24
#define RGBLIGHT_LIMIT_VAL 255
#define WS2812_SPI SPID2 // default: SPID1
#define WS2812_SPI_MOSI_PAL_MODE 0 // MOSI pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 5
-//#define RGB_DI_PIN E2
-//#ifdef RGB_DI_PIN
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
@@ -47,4 +39,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
-#endif \ No newline at end of file
+#endif
diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json
index e023f83396..fb00050ed8 100644
--- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json
+++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json
@@ -8,9 +8,18 @@
"pid": "0x6602",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B11", "B12", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "B3", "A15", "B5"],
+ "rows": ["B13", "B14", "A8", "A1", "A0"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "C14"
},
+ "ws2812": {
+ "pin": "B15",
+ "driver": "spi"
+ },
"layout_aliases": {
"LAYOUT_65_ansi_blocker": "LAYOUT_ansi_blocker",
"LAYOUT_65_iso_blocker": "LAYOUT_iso_blocker"
diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/rules.mk b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/rules.mk
index 48d473fbdb..84ef473c02 100644
--- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/rules.mk
+++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/rules.mk
@@ -1,2 +1 @@
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-WS2812_DRIVER = spi \ No newline at end of file
diff --git a/keyboards/mechlovin/zed65/zed65.c b/keyboards/mechlovin/zed65/zed65.c
deleted file mode 100644
index 289c98d068..0000000000
--- a/keyboards/mechlovin/zed65/zed65.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2022 Mechlovin'
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "zed65.h"
diff --git a/keyboards/mechlovin/zed65/zed65.h b/keyboards/mechlovin/zed65/zed65.h
deleted file mode 100644
index 85bd4eb3d2..0000000000
--- a/keyboards/mechlovin/zed65/zed65.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2022 Mechlovin'
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_mechlovin_zed65_no_backlight_retro66
- #include "retro66.h"
-#elif KEYBOARD_mechlovin_zed65_no_backlight_wearhaus66
- #include "wearhaus66.h"
-#elif KEYBOARD_mechlovin_zed65_no_backlight_cor65
- #include "cor65.h"
-#elif KEYBOARD_mechlovin_zed65_mono_led
- #include "mono_led.h"
-#endif