summaryrefslogtreecommitdiff
path: root/keyboards/cutie_club
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/cutie_club')
-rw-r--r--keyboards/cutie_club/borsdorf/borsdorf.c17
-rw-r--r--keyboards/cutie_club/borsdorf/config.h10
-rw-r--r--keyboards/cutie_club/borsdorf/info.json5
-rwxr-xr-xkeyboards/cutie_club/giant_macro_pad/config.h10
-rwxr-xr-xkeyboards/cutie_club/giant_macro_pad/giant_macro_pad.c17
-rwxr-xr-xkeyboards/cutie_club/giant_macro_pad/giant_macro_pad.h72
-rw-r--r--keyboards/cutie_club/giant_macro_pad/info.json805
-rw-r--r--keyboards/cutie_club/keebcats/denis/config.h10
-rw-r--r--keyboards/cutie_club/keebcats/denis/denis.c17
-rw-r--r--keyboards/cutie_club/keebcats/denis/info.json5
-rw-r--r--keyboards/cutie_club/keebcats/dougal/config.h10
-rw-r--r--keyboards/cutie_club/keebcats/dougal/dougal.c17
-rw-r--r--keyboards/cutie_club/keebcats/dougal/info.json5
-rw-r--r--keyboards/cutie_club/novus/config.h17
-rw-r--r--keyboards/cutie_club/novus/info.json5
-rw-r--r--keyboards/cutie_club/novus/novus.c17
-rw-r--r--keyboards/cutie_club/wraith/config.h17
-rw-r--r--keyboards/cutie_club/wraith/info.json5
18 files changed, 430 insertions, 631 deletions
diff --git a/keyboards/cutie_club/borsdorf/borsdorf.c b/keyboards/cutie_club/borsdorf/borsdorf.c
deleted file mode 100644
index 94ca279864..0000000000
--- a/keyboards/cutie_club/borsdorf/borsdorf.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Cutie Club
- *
- * 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 "borsdorf.h"
diff --git a/keyboards/cutie_club/borsdorf/config.h b/keyboards/cutie_club/borsdorf/config.h
index 655ac6ece1..c25df59397 100644
--- a/keyboards/cutie_club/borsdorf/config.h
+++ b/keyboards/cutie_club/borsdorf/config.h
@@ -17,16 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- */
-#define MATRIX_ROW_PINS { A15, A14, B12, B5, B4 }
-#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0, F1, F0 }
-
-/* 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/cutie_club/borsdorf/info.json b/keyboards/cutie_club/borsdorf/info.json
index c53dc5f9dd..3bd5ba0b09 100644
--- a/keyboards/cutie_club/borsdorf/info.json
+++ b/keyboards/cutie_club/borsdorf/info.json
@@ -8,6 +8,11 @@
"pid": "0x6D8A",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "F1", "F0"],
+ "rows": ["A15", "A14", "B12", "B5", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "B13"
},
diff --git a/keyboards/cutie_club/giant_macro_pad/config.h b/keyboards/cutie_club/giant_macro_pad/config.h
index c78221d4c8..c5eb6384a3 100755
--- a/keyboards/cutie_club/giant_macro_pad/config.h
+++ b/keyboards/cutie_club/giant_macro_pad/config.h
@@ -16,16 +16,6 @@
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- */
-#define MATRIX_ROW_PINS { C10, C11, C12, D2, B3, B4, B5, B6, B7, B8, A3, B2, B1, B0, C5, C4, A7, A6, A5, A4 }
-#define MATRIX_COL_PINS { C9, C8, C7, C6, B15, B14, B13, B12, A8, A15, B9, A2, A1, A0, C3, C2, C1, C0, F1, F0 }
-
-/* 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/cutie_club/giant_macro_pad/giant_macro_pad.c b/keyboards/cutie_club/giant_macro_pad/giant_macro_pad.c
deleted file mode 100755
index 934817aca2..0000000000
--- a/keyboards/cutie_club/giant_macro_pad/giant_macro_pad.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Cutie Club
- *
- * 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 "giant_macro_pad.h"
diff --git a/keyboards/cutie_club/giant_macro_pad/giant_macro_pad.h b/keyboards/cutie_club/giant_macro_pad/giant_macro_pad.h
deleted file mode 100755
index 478846e3c2..0000000000
--- a/keyboards/cutie_club/giant_macro_pad/giant_macro_pad.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright 2021 Cutie Club
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_20x20( \
- k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_13, k00_14, k00_15, k00_16, k00_17, k00_18, k00_19, \
- k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, k01_13, k01_14, k01_15, k01_16, k01_17, k01_18, k01_19, \
- k02_00, k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, k02_12, k02_13, k02_14, k02_15, k02_16, k02_17, k02_18, k02_19, \
- k03_00, k03_01, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12, k03_13, k03_14, k03_15, k03_16, k03_17, k03_18, k03_19, \
- k04_00, k04_01, k04_02, k04_03, k04_04, k04_05, k04_06, k04_07, k04_08, k04_09, k04_10, k04_11, k04_12, k04_13, k04_14, k04_15, k04_16, k04_17, k04_18, k04_19, \
- k05_00, k05_01, k05_02, k05_03, k05_04, k05_05, k05_06, k05_07, k05_08, k05_09, k05_10, k05_11, k05_12, k05_13, k05_14, k05_15, k05_16, k05_17, k05_18, k05_19, \
- k06_00, k06_01, k06_02, k06_03, k06_04, k06_05, k06_06, k06_07, k06_08, k06_09, k06_10, k06_11, k06_12, k06_13, k06_14, k06_15, k06_16, k06_17, k06_18, k06_19, \
- k07_00, k07_01, k07_02, k07_03, k07_04, k07_05, k07_06, k07_07, k07_08, k07_09, k07_10, k07_11, k07_12, k07_13, k07_14, k07_15, k07_16, k07_17, k07_18, k07_19, \
- k08_00, k08_01, k08_02, k08_03, k08_04, k08_05, k08_06, k08_07, k08_08, k08_09, k08_10, k08_11, k08_12, k08_13, k08_14, k08_15, k08_16, k08_17, k08_18, k08_19, \
- k09_00, k09_01, k09_02, k09_03, k09_04, k09_05, k09_06, k09_07, k09_08, k09_09, k09_10, k09_11, k09_12, k09_13, k09_14, k09_15, k09_16, k09_17, k09_18, k09_19, \
- k10_00, k10_01, k10_02, k10_03, k10_04, k10_05, k10_06, k10_07, k10_08, k10_09, k10_10, k10_11, k10_12, k10_13, k10_14, k10_15, k10_16, k10_17, k10_18, k10_19, \
- k11_00, k11_01, k11_02, k11_03, k11_04, k11_05, k11_06, k11_07, k11_08, k11_09, k11_10, k11_11, k11_12, k11_13, k11_14, k11_15, k11_16, k11_17, k11_18, k11_19, \
- k12_00, k12_01, k12_02, k12_03, k12_04, k12_05, k12_06, k12_07, k12_08, k12_09, k12_10, k12_11, k12_12, k12_13, k12_14, k12_15, k12_16, k12_17, k12_18, k12_19, \
- k13_00, k13_01, k13_02, k13_03, k13_04, k13_05, k13_06, k13_07, k13_08, k13_09, k13_10, k13_11, k13_12, k13_13, k13_14, k13_15, k13_16, k13_17, k13_18, k13_19, \
- k14_00, k14_01, k14_02, k14_03, k14_04, k14_05, k14_06, k14_07, k14_08, k14_09, k14_10, k14_11, k14_12, k14_13, k14_14, k14_15, k14_16, k14_17, k14_18, k14_19, \
- k15_00, k15_01, k15_02, k15_03, k15_04, k15_05, k15_06, k15_07, k15_08, k15_09, k15_10, k15_11, k15_12, k15_13, k15_14, k15_15, k15_16, k15_17, k15_18, k15_19, \
- k16_00, k16_01, k16_02, k16_03, k16_04, k16_05, k16_06, k16_07, k16_08, k16_09, k16_10, k16_11, k16_12, k16_13, k16_14, k16_15, k16_16, k16_17, k16_18, k16_19, \
- k17_00, k17_01, k17_02, k17_03, k17_04, k17_05, k17_06, k17_07, k17_08, k17_09, k17_10, k17_11, k17_12, k17_13, k17_14, k17_15, k17_16, k17_17, k17_18, k17_19, \
- k18_00, k18_01, k18_02, k18_03, k18_04, k18_05, k18_06, k18_07, k18_08, k18_09, k18_10, k18_11, k18_12, k18_13, k18_14, k18_15, k18_16, k18_17, k18_18, k18_19, \
- k19_00, k19_01, k19_02, k19_03, k19_04, k19_05, k19_06, k19_07, k19_08, k19_09, k19_10, k19_11, k19_12, k19_13, k19_14, k19_15, k19_16, k19_17, k19_18, k19_19 \
-) \
-{ \
- { k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_13, k00_14, k00_15, k00_16, k00_17, k00_18, k00_19 }, \
- { k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, k01_13, k01_14, k01_15, k01_16, k01_17, k01_18, k01_19 }, \
- { k02_00, k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, k02_12, k02_13, k02_14, k02_15, k02_16, k02_17, k02_18, k02_19 }, \
- { k03_00, k03_01, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12, k03_13, k03_14, k03_15, k03_16, k03_17, k03_18, k03_19 }, \
- { k04_00, k04_01, k04_02, k04_03, k04_04, k04_05, k04_06, k04_07, k04_08, k04_09, k04_10, k04_11, k04_12, k04_13, k04_14, k04_15, k04_16, k04_17, k04_18, k04_19 }, \
- { k05_00, k05_01, k05_02, k05_03, k05_04, k05_05, k05_06, k05_07, k05_08, k05_09, k05_10, k05_11, k05_12, k05_13, k05_14, k05_15, k05_16, k05_17, k05_18, k05_19 }, \
- { k06_00, k06_01, k06_02, k06_03, k06_04, k06_05, k06_06, k06_07, k06_08, k06_09, k06_10, k06_11, k06_12, k06_13, k06_14, k06_15, k06_16, k06_17, k06_18, k06_19 }, \
- { k07_00, k07_01, k07_02, k07_03, k07_04, k07_05, k07_06, k07_07, k07_08, k07_09, k07_10, k07_11, k07_12, k07_13, k07_14, k07_15, k07_16, k07_17, k07_18, k07_19 }, \
- { k08_00, k08_01, k08_02, k08_03, k08_04, k08_05, k08_06, k08_07, k08_08, k08_09, k08_10, k08_11, k08_12, k08_13, k08_14, k08_15, k08_16, k08_17, k08_18, k08_19 }, \
- { k09_00, k09_01, k09_02, k09_03, k09_04, k09_05, k09_06, k09_07, k09_08, k09_09, k09_10, k09_11, k09_12, k09_13, k09_14, k09_15, k09_16, k09_17, k09_18, k09_19 }, \
- { k10_00, k10_01, k10_02, k10_03, k10_04, k10_05, k10_06, k10_07, k10_08, k10_09, k10_10, k10_11, k10_12, k10_13, k10_14, k10_15, k10_16, k10_17, k10_18, k10_19 }, \
- { k11_00, k11_01, k11_02, k11_03, k11_04, k11_05, k11_06, k11_07, k11_08, k11_09, k11_10, k11_11, k11_12, k11_13, k11_14, k11_15, k11_16, k11_17, k11_18, k11_19 }, \
- { k12_00, k12_01, k12_02, k12_03, k12_04, k12_05, k12_06, k12_07, k12_08, k12_09, k12_10, k12_11, k12_12, k12_13, k12_14, k12_15, k12_16, k12_17, k12_18, k12_19 }, \
- { k13_00, k13_01, k13_02, k13_03, k13_04, k13_05, k13_06, k13_07, k13_08, k13_09, k13_10, k13_11, k13_12, k13_13, k13_14, k13_15, k13_16, k13_17, k13_18, k13_19 }, \
- { k14_00, k14_01, k14_02, k14_03, k14_04, k14_05, k14_06, k14_07, k14_08, k14_09, k14_10, k14_11, k14_12, k14_13, k14_14, k14_15, k14_16, k14_17, k14_18, k14_19 }, \
- { k15_00, k15_01, k15_02, k15_03, k15_04, k15_05, k15_06, k15_07, k15_08, k15_09, k15_10, k15_11, k15_12, k15_13, k15_14, k15_15, k15_16, k15_17, k15_18, k15_19 }, \
- { k16_00, k16_01, k16_02, k16_03, k16_04, k16_05, k16_06, k16_07, k16_08, k16_09, k16_10, k16_11, k16_12, k16_13, k16_14, k16_15, k16_16, k16_17, k16_18, k16_19 }, \
- { k17_00, k17_01, k17_02, k17_03, k17_04, k17_05, k17_06, k17_07, k17_08, k17_09, k17_10, k17_11, k17_12, k17_13, k17_14, k17_15, k17_16, k17_17, k17_18, k17_19 }, \
- { k18_00, k18_01, k18_02, k18_03, k18_04, k18_05, k18_06, k18_07, k18_08, k18_09, k18_10, k18_11, k18_12, k18_13, k18_14, k18_15, k18_16, k18_17, k18_18, k18_19 }, \
- { k19_00, k19_01, k19_02, k19_03, k19_04, k19_05, k19_06, k19_07, k19_08, k19_09, k19_10, k19_11, k19_12, k19_13, k19_14, k19_15, k19_16, k19_17, k19_18, k19_19 } \
-}
diff --git a/keyboards/cutie_club/giant_macro_pad/info.json b/keyboards/cutie_club/giant_macro_pad/info.json
index d68b8aa4d4..8132fa62a5 100644
--- a/keyboards/cutie_club/giant_macro_pad/info.json
+++ b/keyboards/cutie_club/giant_macro_pad/info.json
@@ -8,6 +8,11 @@
"pid": "0x74B6",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["C9", "C8", "C7", "C6", "B15", "B14", "B13", "B12", "A8", "A15", "B9", "A2", "A1", "A0", "C3", "C2", "C1", "C0", "F1", "F0"],
+ "rows": ["C10", "C11", "C12", "D2", "B3", "B4", "B5", "B6", "B7", "B8", "A3", "B2", "B1", "B0", "C5", "C4", "A7", "A6", "A5", "A4"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"layout_aliases": {
@@ -16,425 +21,425 @@
"layouts": {
"LAYOUT_ortho_20x20": {
"layout": [
- {"label":"k00_00", "x":0, "y":0},
- {"label":"k00_01", "x":1, "y":0},
- {"label":"k00_02", "x":2, "y":0},
- {"label":"k00_03", "x":3, "y":0},
- {"label":"k00_04", "x":4, "y":0},
- {"label":"k00_05", "x":5, "y":0},
- {"label":"k00_06", "x":6, "y":0},
- {"label":"k00_07", "x":7, "y":0},
- {"label":"k00_08", "x":8, "y":0},
- {"label":"k00_09", "x":9, "y":0},
- {"label":"k00_10", "x":10, "y":0},
- {"label":"k00_11", "x":11, "y":0},
- {"label":"k00_12", "x":12, "y":0},
- {"label":"k00_13", "x":13, "y":0},
- {"label":"k00_14", "x":14, "y":0},
- {"label":"k00_15", "x":15, "y":0},
- {"label":"k00_16", "x":16, "y":0},
- {"label":"k00_17", "x":17, "y":0},
- {"label":"k00_18", "x":18, "y":0},
- {"label":"k00_19", "x":19, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 15], "x": 15, "y": 0},
+ {"matrix": [0, 16], "x": 16, "y": 0},
+ {"matrix": [0, 17], "x": 17, "y": 0},
+ {"matrix": [0, 18], "x": 18, "y": 0},
+ {"matrix": [0, 19], "x": 19, "y": 0},
- {"label":"k01_00", "x":0, "y":1},
- {"label":"k01_01", "x":1, "y":1},
- {"label":"k01_02", "x":2, "y":1},
- {"label":"k01_03", "x":3, "y":1},
- {"label":"k01_04", "x":4, "y":1},
- {"label":"k01_05", "x":5, "y":1},
- {"label":"k01_06", "x":6, "y":1},
- {"label":"k01_07", "x":7, "y":1},
- {"label":"k01_08", "x":8, "y":1},
- {"label":"k01_09", "x":9, "y":1},
- {"label":"k01_10", "x":10, "y":1},
- {"label":"k01_11", "x":11, "y":1},
- {"label":"k01_12", "x":12, "y":1},
- {"label":"k01_13", "x":13, "y":1},
- {"label":"k01_14", "x":14, "y":1},
- {"label":"k01_15", "x":15, "y":1},
- {"label":"k01_16", "x":16, "y":1},
- {"label":"k01_17", "x":17, "y":1},
- {"label":"k01_18", "x":18, "y":1},
- {"label":"k01_19", "x":19, "y":1},
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1},
+ {"matrix": [1, 14], "x": 14, "y": 1},
+ {"matrix": [1, 15], "x": 15, "y": 1},
+ {"matrix": [1, 16], "x": 16, "y": 1},
+ {"matrix": [1, 17], "x": 17, "y": 1},
+ {"matrix": [1, 18], "x": 18, "y": 1},
+ {"matrix": [1, 19], "x": 19, "y": 1},
- {"label":"k02_00", "x":0, "y":2},
- {"label":"k02_01", "x":1, "y":2},
- {"label":"k02_02", "x":2, "y":2},
- {"label":"k02_03", "x":3, "y":2},
- {"label":"k02_04", "x":4, "y":2},
- {"label":"k02_05", "x":5, "y":2},
- {"label":"k02_06", "x":6, "y":2},
- {"label":"k02_07", "x":7, "y":2},
- {"label":"k02_08", "x":8, "y":2},
- {"label":"k02_09", "x":9, "y":2},
- {"label":"k02_10", "x":10, "y":2},
- {"label":"k02_11", "x":11, "y":2},
- {"label":"k02_12", "x":12, "y":2},
- {"label":"k02_13", "x":13, "y":2},
- {"label":"k02_14", "x":14, "y":2},
- {"label":"k02_15", "x":15, "y":2},
- {"label":"k02_16", "x":16, "y":2},
- {"label":"k02_17", "x":17, "y":2},
- {"label":"k02_18", "x":18, "y":2},
- {"label":"k02_19", "x":19, "y":2},
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2},
+ {"matrix": [2, 12], "x": 12, "y": 2},
+ {"matrix": [2, 13], "x": 13, "y": 2},
+ {"matrix": [2, 14], "x": 14, "y": 2},
+ {"matrix": [2, 15], "x": 15, "y": 2},
+ {"matrix": [2, 16], "x": 16, "y": 2},
+ {"matrix": [2, 17], "x": 17, "y": 2},
+ {"matrix": [2, 18], "x": 18, "y": 2},
+ {"matrix": [2, 19], "x": 19, "y": 2},
- {"label":"k03_00", "x":0, "y":3},
- {"label":"k03_01", "x":1, "y":3},
- {"label":"k03_02", "x":2, "y":3},
- {"label":"k03_03", "x":3, "y":3},
- {"label":"k03_04", "x":4, "y":3},
- {"label":"k03_05", "x":5, "y":3},
- {"label":"k03_06", "x":6, "y":3},
- {"label":"k03_07", "x":7, "y":3},
- {"label":"k03_08", "x":8, "y":3},
- {"label":"k03_09", "x":9, "y":3},
- {"label":"k03_10", "x":10, "y":3},
- {"label":"k03_11", "x":11, "y":3},
- {"label":"k03_12", "x":12, "y":3},
- {"label":"k03_13", "x":13, "y":3},
- {"label":"k03_14", "x":14, "y":3},
- {"label":"k03_15", "x":15, "y":3},
- {"label":"k03_16", "x":16, "y":3},
- {"label":"k03_17", "x":17, "y":3},
- {"label":"k03_18", "x":18, "y":3},
- {"label":"k03_19", "x":19, "y":3},
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3},
+ {"matrix": [3, 12], "x": 12, "y": 3},
+ {"matrix": [3, 13], "x": 13, "y": 3},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+ {"matrix": [3, 15], "x": 15, "y": 3},
+ {"matrix": [3, 16], "x": 16, "y": 3},
+ {"matrix": [3, 17], "x": 17, "y": 3},
+ {"matrix": [3, 18], "x": 18, "y": 3},
+ {"matrix": [3, 19], "x": 19, "y": 3},
- {"label":"k04_00", "x":0, "y":4},
- {"label":"k04_01", "x":1, "y":4},
- {"label":"k04_02", "x":2, "y":4},
- {"label":"k04_03", "x":3, "y":4},
- {"label":"k04_04", "x":4, "y":4},
- {"label":"k04_05", "x":5, "y":4},
- {"label":"k04_06", "x":6, "y":4},
- {"label":"k04_07", "x":7, "y":4},
- {"label":"k04_08", "x":8, "y":4},
- {"label":"k04_09", "x":9, "y":4},
- {"label":"k04_10", "x":10, "y":4},
- {"label":"k04_11", "x":11, "y":4},
- {"label":"k04_12", "x":12, "y":4},
- {"label":"k04_13", "x":13, "y":4},
- {"label":"k04_14", "x":14, "y":4},
- {"label":"k04_15", "x":15, "y":4},
- {"label":"k04_16", "x":16, "y":4},
- {"label":"k04_17", "x":17, "y":4},
- {"label":"k04_18", "x":18, "y":4},
- {"label":"k04_19", "x":19, "y":4},
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+ {"matrix": [4, 6], "x": 6, "y": 4},
+ {"matrix": [4, 7], "x": 7, "y": 4},
+ {"matrix": [4, 8], "x": 8, "y": 4},
+ {"matrix": [4, 9], "x": 9, "y": 4},
+ {"matrix": [4, 10], "x": 10, "y": 4},
+ {"matrix": [4, 11], "x": 11, "y": 4},
+ {"matrix": [4, 12], "x": 12, "y": 4},
+ {"matrix": [4, 13], "x": 13, "y": 4},
+ {"matrix": [4, 14], "x": 14, "y": 4},
+ {"matrix": [4, 15], "x": 15, "y": 4},
+ {"matrix": [4, 16], "x": 16, "y": 4},
+ {"matrix": [4, 17], "x": 17, "y": 4},
+ {"matrix": [4, 18], "x": 18, "y": 4},
+ {"matrix": [4, 19], "x": 19, "y": 4},
- {"label":"k05_00", "x":0, "y":5},
- {"label":"k05_01", "x":1, "y":5},
- {"label":"k05_02", "x":2, "y":5},
- {"label":"k05_03", "x":3, "y":5},
- {"label":"k05_04", "x":4, "y":5},
- {"label":"k05_05", "x":5, "y":5},
- {"label":"k05_06", "x":6, "y":5},
- {"label":"k05_07", "x":7, "y":5},
- {"label":"k05_08", "x":8, "y":5},
- {"label":"k05_09", "x":9, "y":5},
- {"label":"k05_10", "x":10, "y":5},
- {"label":"k05_11", "x":11, "y":5},
- {"label":"k05_12", "x":12, "y":5},
- {"label":"k05_13", "x":13, "y":5},
- {"label":"k05_14", "x":14, "y":5},
- {"label":"k05_15", "x":15, "y":5},
- {"label":"k05_16", "x":16, "y":5},
- {"label":"k05_17", "x":17, "y":5},
- {"label":"k05_18", "x":18, "y":5},
- {"label":"k05_19", "x":19, "y":5},
+ {"matrix": [5, 0], "x": 0, "y": 5},
+ {"matrix": [5, 1], "x": 1, "y": 5},
+ {"matrix": [5, 2], "x": 2, "y": 5},
+ {"matrix": [5, 3], "x": 3, "y": 5},
+ {"matrix": [5, 4], "x": 4, "y": 5},
+ {"matrix": [5, 5], "x": 5, "y": 5},
+ {"matrix": [5, 6], "x": 6, "y": 5},
+ {"matrix": [5, 7], "x": 7, "y": 5},
+ {"matrix": [5, 8], "x": 8, "y": 5},
+ {"matrix": [5, 9], "x": 9, "y": 5},
+ {"matrix": [5, 10], "x": 10, "y": 5},
+ {"matrix": [5, 11], "x": 11, "y": 5},
+ {"matrix": [5, 12], "x": 12, "y": 5},
+ {"matrix": [5, 13], "x": 13, "y": 5},
+ {"matrix": [5, 14], "x": 14, "y": 5},
+ {"matrix": [5, 15], "x": 15, "y": 5},
+ {"matrix": [5, 16], "x": 16, "y": 5},
+ {"matrix": [5, 17], "x": 17, "y": 5},
+ {"matrix": [5, 18], "x": 18, "y": 5},
+ {"matrix": [5, 19], "x": 19, "y": 5},
- {"label":"k06_00", "x":0, "y":6},
- {"label":"k06_01", "x":1, "y":6},
- {"label":"k06_02", "x":2, "y":6},
- {"label":"k06_03", "x":3, "y":6},
- {"label":"k06_04", "x":4, "y":6},
- {"label":"k06_05", "x":5, "y":6},
- {"label":"k06_06", "x":6, "y":6},
- {"label":"k06_07", "x":7, "y":6},
- {"label":"k06_08", "x":8, "y":6},
- {"label":"k06_09", "x":9, "y":6},
- {"label":"k06_10", "x":10, "y":6},
- {"label":"k06_11", "x":11, "y":6},
- {"label":"k06_12", "x":12, "y":6},
- {"label":"k06_13", "x":13, "y":6},
- {"label":"k06_14", "x":14, "y":6},
- {"label":"k06_15", "x":15, "y":6},
- {"label":"k06_16", "x":16, "y":6},
- {"label":"k06_17", "x":17, "y":6},
- {"label":"k06_18", "x":18, "y":6},
- {"label":"k06_19", "x":19, "y":6},
+ {"matrix": [6, 0], "x": 0, "y": 6},
+ {"matrix": [6, 1], "x": 1, "y": 6},
+ {"matrix": [6, 2], "x": 2, "y": 6},
+ {"matrix": [6, 3], "x": 3, "y": 6},
+ {"matrix": [6, 4], "x": 4, "y": 6},
+ {"matrix": [6, 5], "x": 5, "y": 6},
+ {"matrix": [6, 6], "x": 6, "y": 6},
+ {"matrix": [6, 7], "x": 7, "y": 6},
+ {"matrix": [6, 8], "x": 8, "y": 6},
+ {"matrix": [6, 9], "x": 9, "y": 6},
+ {"matrix": [6, 10], "x": 10, "y": 6},
+ {"matrix": [6, 11], "x": 11, "y": 6},
+ {"matrix": [6, 12], "x": 12, "y": 6},
+ {"matrix": [6, 13], "x": 13, "y": 6},
+ {"matrix": [6, 14], "x": 14, "y": 6},
+ {"matrix": [6, 15], "x": 15, "y": 6},
+ {"matrix": [6, 16], "x": 16, "y": 6},
+ {"matrix": [6, 17], "x": 17, "y": 6},
+ {"matrix": [6, 18], "x": 18, "y": 6},
+ {"matrix": [6, 19], "x": 19, "y": 6},
- {"label":"k07_00", "x":0, "y":7},
- {"label":"k07_01", "x":1, "y":7},
- {"label":"k07_02", "x":2, "y":7},
- {"label":"k07_03", "x":3, "y":7},
- {"label":"k07_04", "x":4, "y":7},
- {"label":"k07_05", "x":5, "y":7},
- {"label":"k07_06", "x":6, "y":7},
- {"label":"k07_07", "x":7, "y":7},
- {"label":"k07_08", "x":8, "y":7},
- {"label":"k07_09", "x":9, "y":7},
- {"label":"k07_10", "x":10, "y":7},
- {"label":"k07_11", "x":11, "y":7},
- {"label":"k07_12", "x":12, "y":7},
- {"label":"k07_13", "x":13, "y":7},
- {"label":"k07_14", "x":14, "y":7},
- {"label":"k07_15", "x":15, "y":7},
- {"label":"k07_16", "x":16, "y":7},
- {"label":"k07_17", "x":17, "y":7},
- {"label":"k07_18", "x":18, "y":7},
- {"label":"k07_19", "x":19, "y":7},
+ {"matrix": [7, 0], "x": 0, "y": 7},
+ {"matrix": [7, 1], "x": 1, "y": 7},
+ {"matrix": [7, 2], "x": 2, "y": 7},
+ {"matrix": [7, 3], "x": 3, "y": 7},
+ {"matrix": [7, 4], "x": 4, "y": 7},
+ {"matrix": [7, 5], "x": 5, "y": 7},
+ {"matrix": [7, 6], "x": 6, "y": 7},
+ {"matrix": [7, 7], "x": 7, "y": 7},
+ {"matrix": [7, 8], "x": 8, "y": 7},
+ {"matrix": [7, 9], "x": 9, "y": 7},
+ {"matrix": [7, 10], "x": 10, "y": 7},
+ {"matrix": [7, 11], "x": 11, "y": 7},
+ {"matrix": [7, 12], "x": 12, "y": 7},
+ {"matrix": [7, 13], "x": 13, "y": 7},
+ {"matrix": [7, 14], "x": 14, "y": 7},
+ {"matrix": [7, 15], "x": 15, "y": 7},
+ {"matrix": [7, 16], "x": 16, "y": 7},
+ {"matrix": [7, 17], "x": 17, "y": 7},
+ {"matrix": [7, 18], "x": 18, "y": 7},
+ {"matrix": [7, 19], "x": 19, "y": 7},
- {"label":"k08_00", "x":0, "y":8},
- {"label":"k08_01", "x":1, "y":8},
- {"label":"k08_02", "x":2, "y":8},
- {"label":"k08_03", "x":3, "y":8},
- {"label":"k08_04", "x":4, "y":8},
- {"label":"k08_05", "x":5, "y":8},
- {"label":"k08_06", "x":6, "y":8},
- {"label":"k08_07", "x":7, "y":8},
- {"label":"k08_08", "x":8, "y":8},
- {"label":"k08_09", "x":9, "y":8},
- {"label":"k08_10", "x":10, "y":8},
- {"label":"k08_11", "x":11, "y":8},
- {"label":"k08_12", "x":12, "y":8},
- {"label":"k08_13", "x":13, "y":8},
- {"label":"k08_14", "x":14, "y":8},
- {"label":"k08_15", "x":15, "y":8},
- {"label":"k08_16", "x":16, "y":8},
- {"label":"k08_17", "x":17, "y":8},
- {"label":"k08_18", "x":18, "y":8},
- {"label":"k08_19", "x":19, "y":8},
+ {"matrix": [8, 0], "x": 0, "y": 8},
+ {"matrix": [8, 1], "x": 1, "y": 8},
+ {"matrix": [8, 2], "x": 2, "y": 8},
+ {"matrix": [8, 3], "x": 3, "y": 8},
+ {"matrix": [8, 4], "x": 4, "y": 8},
+ {"matrix": [8, 5], "x": 5, "y": 8},
+ {"matrix": [8, 6], "x": 6, "y": 8},
+ {"matrix": [8, 7], "x": 7, "y": 8},
+ {"matrix": [8, 8], "x": 8, "y": 8},
+ {"matrix": [8, 9], "x": 9, "y": 8},
+ {"matrix": [8, 10], "x": 10, "y": 8},
+ {"matrix": [8, 11], "x": 11, "y": 8},
+ {"matrix": [8, 12], "x": 12, "y": 8},
+ {"matrix": [8, 13], "x": 13, "y": 8},
+ {"matrix": [8, 14], "x": 14, "y": 8},
+ {"matrix": [8, 15], "x": 15, "y": 8},
+ {"matrix": [8, 16], "x": 16, "y": 8},
+ {"matrix": [8, 17], "x": 17, "y": 8},
+ {"matrix": [8, 18], "x": 18, "y": 8},
+ {"matrix": [8, 19], "x": 19, "y": 8},
- {"label":"k09_00", "x":0, "y":9},
- {"label":"k09_01", "x":1, "y":9},
- {"label":"k09_02", "x":2, "y":9},
- {"label":"k09_03", "x":3, "y":9},
- {"label":"k09_04", "x":4, "y":9},
- {"label":"k09_05", "x":5, "y":9},
- {"label":"k09_06", "x":6, "y":9},
- {"label":"k09_07", "x":7, "y":9},
- {"label":"k09_08", "x":8, "y":9},
- {"label":"k09_09", "x":9, "y":9},
- {"label":"k09_10", "x":10, "y":9},
- {"label":"k09_11", "x":11, "y":9},
- {"label":"k09_12", "x":12, "y":9},
- {"label":"k09_13", "x":13, "y":9},
- {"label":"k09_14", "x":14, "y":9},
- {"label":"k09_15", "x":15, "y":9},
- {"label":"k09_16", "x":16, "y":9},
- {"label":"k09_17", "x":17, "y":9},
- {"label":"k09_18", "x":18, "y":9},
- {"label":"k09_19", "x":19, "y":9},
+ {"matrix": [9, 0], "x": 0, "y": 9},
+ {"matrix": [9, 1], "x": 1, "y": 9},
+ {"matrix": [9, 2], "x": 2, "y": 9},
+ {"matrix": [9, 3], "x": 3, "y": 9},
+ {"matrix": [9, 4], "x": 4, "y": 9},
+ {"matrix": [9, 5], "x": 5, "y": 9},
+ {"matrix": [9, 6], "x": 6, "y": 9},
+ {"matrix": [9, 7], "x": 7, "y": 9},
+ {"matrix": [9, 8], "x": 8, "y": 9},
+ {"matrix": [9, 9], "x": 9, "y": 9},
+ {"matrix": [9, 10], "x": 10, "y": 9},
+ {"matrix": [9, 11], "x": 11, "y": 9},
+ {"matrix": [9, 12], "x": 12, "y": 9},
+ {"matrix": [9, 13], "x": 13, "y": 9},
+ {"matrix": [9, 14], "x": 14, "y": 9},
+ {"matrix": [9, 15], "x": 15, "y": 9},
+ {"matrix": [9, 16], "x": 16, "y": 9},
+ {"matrix": [9, 17], "x": 17, "y": 9},
+ {"matrix": [9, 18], "x": 18, "y": 9},
+ {"matrix": [9, 19], "x": 19, "y": 9},
- {"label":"k10_00", "x":0, "y":10},
- {"label":"k10_01", "x":1, "y":10},
- {"label":"k10_02", "x":2, "y":10},
- {"label":"k10_03", "x":3, "y":10},
- {"label":"k10_04", "x":4, "y":10},
- {"label":"k10_05", "x":5, "y":10},
- {"label":"k10_06", "x":6, "y":10},
- {"label":"k10_07", "x":7, "y":10},
- {"label":"k10_08", "x":8, "y":10},
- {"label":"k10_09", "x":9, "y":10},
- {"label":"k10_10", "x":10, "y":10},
- {"label":"k10_11", "x":11, "y":10},
- {"label":"k10_12", "x":12, "y":10},
- {"label":"k10_13", "x":13, "y":10},
- {"label":"k10_14", "x":14, "y":10},
- {"label":"k10_15", "x":15, "y":10},
- {"label":"k10_16", "x":16, "y":10},
- {"label":"k10_17", "x":17, "y":10},
- {"label":"k10_18", "x":18, "y":10},
- {"label":"k10_19", "x":19, "y":10},
+ {"matrix": [10, 0], "x": 0, "y": 10},
+ {"matrix": [10, 1], "x": 1, "y": 10},
+ {"matrix": [10, 2], "x": 2, "y": 10},
+ {"matrix": [10, 3], "x": 3, "y": 10},
+ {"matrix": [10, 4], "x": 4, "y": 10},
+ {"matrix": [10, 5], "x": 5, "y": 10},
+ {"matrix": [10, 6], "x": 6, "y": 10},
+ {"matrix": [10, 7], "x": 7, "y": 10},
+ {"matrix": [10, 8], "x": 8, "y": 10},
+ {"matrix": [10, 9], "x": 9, "y": 10},
+ {"matrix": [10, 10], "x": 10, "y": 10},
+ {"matrix": [10, 11], "x": 11, "y": 10},
+ {"matrix": [10, 12], "x": 12, "y": 10},
+ {"matrix": [10, 13], "x": 13, "y": 10},
+ {"matrix": [10, 14], "x": 14, "y": 10},
+ {"matrix": [10, 15], "x": 15, "y": 10},
+ {"matrix": [10, 16], "x": 16, "y": 10},
+ {"matrix": [10, 17], "x": 17, "y": 10},
+ {"matrix": [10, 18], "x": 18, "y": 10},
+ {"matrix": [10, 19], "x": 19, "y": 10},
- {"label":"k11_00", "x":0, "y":11},
- {"label":"k11_01", "x":1, "y":11},
- {"label":"k11_02", "x":2, "y":11},
- {"label":"k11_03", "x":3, "y":11},
- {"label":"k11_04", "x":4, "y":11},
- {"label":"k11_05", "x":5, "y":11},
- {"label":"k11_06", "x":6, "y":11},
- {"label":"k11_07", "x":7, "y":11},
- {"label":"k11_08", "x":8, "y":11},
- {"label":"k11_09", "x":9, "y":11},
- {"label":"k11_10", "x":10, "y":11},
- {"label":"k11_11", "x":11, "y":11},
- {"label":"k11_12", "x":12, "y":11},
- {"label":"k11_13", "x":13, "y":11},
- {"label":"k11_14", "x":14, "y":11},
- {"label":"k11_15", "x":15, "y":11},
- {"label":"k11_16", "x":16, "y":11},
- {"label":"k11_17", "x":17, "y":11},
- {"label":"k11_18", "x":18, "y":11},
- {"label":"k11_19", "x":19, "y":11},
+ {"matrix": [11, 0], "x": 0, "y": 11},
+ {"matrix": [11, 1], "x": 1, "y": 11},
+ {"matrix": [11, 2], "x": 2, "y": 11},
+ {"matrix": [11, 3], "x": 3, "y": 11},
+ {"matrix": [11, 4], "x": 4, "y": 11},
+ {"matrix": [11, 5], "x": 5, "y": 11},
+ {"matrix": [11, 6], "x": 6, "y": 11},
+ {"matrix": [11, 7], "x": 7, "y": 11},
+ {"matrix": [11, 8], "x": 8, "y": 11},
+ {"matrix": [11, 9], "x": 9, "y": 11},
+ {"matrix": [11, 10], "x": 10, "y": 11},
+ {"matrix": [11, 11], "x": 11, "y": 11},
+ {"matrix": [11, 12], "x": 12, "y": 11},
+ {"matrix": [11, 13], "x": 13, "y": 11},
+ {"matrix": [11, 14], "x": 14, "y": 11},
+ {"matrix": [11, 15], "x": 15, "y": 11},
+ {"matrix": [11, 16], "x": 16, "y": 11},
+ {"matrix": [11, 17], "x": 17, "y": 11},
+ {"matrix": [11, 18], "x": 18, "y": 11},
+ {"matrix": [11, 19], "x": 19, "y": 11},
- {"label":"k12_00", "x":0, "y":12},
- {"label":"k12_01", "x":1, "y":12},
- {"label":"k12_02", "x":2, "y":12},
- {"label":"k12_03", "x":3, "y":12},
- {"label":"k12_04", "x":4, "y":12},
- {"label":"k12_05", "x":5, "y":12},
- {"label":"k12_06", "x":6, "y":12},
- {"label":"k12_07", "x":7, "y":12},
- {"label":"k12_08", "x":8, "y":12},
- {"label":"k12_09", "x":9, "y":12},
- {"label":"k12_10", "x":10, "y":12},
- {"label":"k12_11", "x":11, "y":12},
- {"label":"k12_12", "x":12, "y":12},
- {"label":"k12_13", "x":13, "y":12},
- {"label":"k12_14", "x":14, "y":12},
- {"label":"k12_15", "x":15, "y":12},
- {"label":"k12_16", "x":16, "y":12},
- {"label":"k12_17", "x":17, "y":12},
- {"label":"k12_18", "x":18, "y":12},
- {"label":"k12_19", "x":19, "y":12},
+ {"matrix": [12, 0], "x": 0, "y": 12},
+ {"matrix": [12, 1], "x": 1, "y": 12},
+ {"matrix": [12, 2], "x": 2, "y": 12},
+ {"matrix": [12, 3], "x": 3, "y": 12},
+ {"matrix": [12, 4], "x": 4, "y": 12},
+ {"matrix": [12, 5], "x": 5, "y": 12},
+ {"matrix": [12, 6], "x": 6, "y": 12},
+ {"matrix": [12, 7], "x": 7, "y": 12},
+ {"matrix": [12, 8], "x": 8, "y": 12},
+ {"matrix": [12, 9], "x": 9, "y": 12},
+ {"matrix": [12, 10], "x": 10, "y": 12},
+ {"matrix": [12, 11], "x": 11, "y": 12},
+ {"matrix": [12, 12], "x": 12, "y": 12},
+ {"matrix": [12, 13], "x": 13, "y": 12},
+ {"matrix": [12, 14], "x": 14, "y": 12},
+ {"matrix": [12, 15], "x": 15, "y": 12},
+ {"matrix": [12, 16], "x": 16, "y": 12},
+ {"matrix": [12, 17], "x": 17, "y": 12},
+ {"matrix": [12, 18], "x": 18, "y": 12},
+ {"matrix": [12, 19], "x": 19, "y": 12},
- {"label":"k13_00", "x":0, "y":13},
- {"label":"k13_01", "x":1, "y":13},
- {"label":"k13_02", "x":2, "y":13},
- {"label":"k13_03", "x":3, "y":13},
- {"label":"k13_04", "x":4, "y":13},
- {"label":"k13_05", "x":5, "y":13},
- {"label":"k13_06", "x":6, "y":13},
- {"label":"k13_07", "x":7, "y":13},
- {"label":"k13_08", "x":8, "y":13},
- {"label":"k13_09", "x":9, "y":13},
- {"label":"k13_10", "x":10, "y":13},
- {"label":"k13_11", "x":11, "y":13},
- {"label":"k13_12", "x":12, "y":13},
- {"label":"k13_13", "x":13, "y":13},
- {"label":"k13_14", "x":14, "y":13},
- {"label":"k13_15", "x":15, "y":13},
- {"label":"k13_16", "x":16, "y":13},
- {"label":"k13_17", "x":17, "y":13},
- {"label":"k13_18", "x":18, "y":13},
- {"label":"k13_19", "x":19, "y":13},
+ {"matrix": [13, 0], "x": 0, "y": 13},
+ {"matrix": [13, 1], "x": 1, "y": 13},
+ {"matrix": [13, 2], "x": 2, "y": 13},
+ {"matrix": [13, 3], "x": 3, "y": 13},
+ {"matrix": [13, 4], "x": 4, "y": 13},
+ {"matrix": [13, 5], "x": 5, "y": 13},
+ {"matrix": [13, 6], "x": 6, "y": 13},
+ {"matrix": [13, 7], "x": 7, "y": 13},
+ {"matrix": [13, 8], "x": 8, "y": 13},
+ {"matrix": [13, 9], "x": 9, "y": 13},
+ {"matrix": [13, 10], "x": 10, "y": 13},
+ {"matrix": [13, 11], "x": 11, "y": 13},
+ {"matrix": [13, 12], "x": 12, "y": 13},
+ {"matrix": [13, 13], "x": 13, "y": 13},
+ {"matrix": [13, 14], "x": 14, "y": 13},
+ {"matrix": [13, 15], "x": 15, "y": 13},
+ {"matrix": [13, 16], "x": 16, "y": 13},
+ {"matrix": [13, 17], "x": 17, "y": 13},
+ {"matrix": [13, 18], "x": 18, "y": 13},
+ {"matrix": [13, 19], "x": 19, "y": 13},
- {"label":"k14_00", "x":0, "y":14},
- {"label":"k14_01", "x":1, "y":14},
- {"label":"k14_02", "x":2, "y":14},
- {"label":"k14_03", "x":3, "y":14},
- {"label":"k14_04", "x":4, "y":14},
- {"label":"k14_05", "x":5, "y":14},
- {"label":"k14_06", "x":6, "y":14},
- {"label":"k14_07", "x":7, "y":14},
- {"label":"k14_08", "x":8, "y":14},
- {"label":"k14_09", "x":9, "y":14},
- {"label":"k14_10", "x":10, "y":14},
- {"label":"k14_11", "x":11, "y":14},
- {"label":"k14_12", "x":12, "y":14},
- {"label":"k14_13", "x":13, "y":14},
- {"label":"k14_14", "x":14, "y":14},
- {"label":"k14_15", "x":15, "y":14},
- {"label":"k14_16", "x":16, "y":14},
- {"label":"k14_17", "x":17, "y":14},
- {"label":"k14_18", "x":18, "y":14},
- {"label":"k14_19", "x":19, "y":14},
+ {"matrix": [14, 0], "x": 0, "y": 14},
+ {"matrix": [14, 1], "x": 1, "y": 14},
+ {"matrix": [14, 2], "x": 2, "y": 14},
+ {"matrix": [14, 3], "x": 3, "y": 14},
+ {"matrix": [14, 4], "x": 4, "y": 14},
+ {"matrix": [14, 5], "x": 5, "y": 14},
+ {"matrix": [14, 6], "x": 6, "y": 14},
+ {"matrix": [14, 7], "x": 7, "y": 14},
+ {"matrix": [14, 8], "x": 8, "y": 14},
+ {"matrix": [14, 9], "x": 9, "y": 14},
+ {"matrix": [14, 10], "x": 10, "y": 14},
+ {"matrix": [14, 11], "x": 11, "y": 14},
+ {"matrix": [14, 12], "x": 12, "y": 14},
+ {"matrix": [14, 13], "x": 13, "y": 14},
+ {"matrix": [14, 14], "x": 14, "y": 14},
+ {"matrix": [14, 15], "x": 15, "y": 14},
+ {"matrix": [14, 16], "x": 16, "y": 14},
+ {"matrix": [14, 17], "x": 17, "y": 14},
+ {"matrix": [14, 18], "x": 18, "y": 14},
+ {"matrix": [14, 19], "x": 19, "y": 14},
- {"label":"k15_00", "x":0, "y":15},
- {"label":"k15_01", "x":1, "y":15},
- {"label":"k15_02", "x":2, "y":15},
- {"label":"k15_03", "x":3, "y":15},
- {"label":"k15_04", "x":4, "y":15},
- {"label":"k15_05", "x":5, "y":15},
- {"label":"k15_06", "x":6, "y":15},
- {"label":"k15_07", "x":7, "y":15},
- {"label":"k15_08", "x":8, "y":15},
- {"label":"k15_09", "x":9, "y":15},
- {"label":"k15_10", "x":10, "y":15},
- {"label":"k15_11", "x":11, "y":15},
- {"label":"k15_12", "x":12, "y":15},
- {"label":"k15_13", "x":13, "y":15},
- {"label":"k15_14", "x":14, "y":15},
- {"label":"k15_15", "x":15, "y":15},
- {"label":"k15_16", "x":16, "y":15},
- {"label":"k15_17", "x":17, "y":15},
- {"label":"k15_18", "x":18, "y":15},
- {"label":"k15_19", "x":19, "y":15},
+ {"matrix": [15, 0], "x": 0, "y": 15},
+ {"matrix": [15, 1], "x": 1, "y": 15},
+ {"matrix": [15, 2], "x": 2, "y": 15},
+ {"matrix": [15, 3], "x": 3, "y": 15},
+ {"matrix": [15, 4], "x": 4, "y": 15},
+ {"matrix": [15, 5], "x": 5, "y": 15},
+ {"matrix": [15, 6], "x": 6, "y": 15},
+ {"matrix": [15, 7], "x": 7, "y": 15},
+ {"matrix": [15, 8], "x": 8, "y": 15},
+ {"matrix": [15, 9], "x": 9, "y": 15},
+ {"matrix": [15, 10], "x": 10, "y": 15},
+ {"matrix": [15, 11], "x": 11, "y": 15},
+ {"matrix": [15, 12], "x": 12, "y": 15},
+ {"matrix": [15, 13], "x": 13, "y": 15},
+ {"matrix": [15, 14], "x": 14, "y": 15},
+ {"matrix": [15, 15], "x": 15, "y": 15},
+ {"matrix": [15, 16], "x": 16, "y": 15},
+ {"matrix": [15, 17], "x": 17, "y": 15},
+ {"matrix": [15, 18], "x": 18, "y": 15},
+ {"matrix": [15, 19], "x": 19, "y": 15},
- {"label":"k16_00", "x":0, "y":16},
- {"label":"k16_01", "x":1, "y":16},
- {"label":"k16_02", "x":2, "y":16},
- {"label":"k16_03", "x":3, "y":16},
- {"label":"k16_04", "x":4, "y":16},
- {"label":"k16_05", "x":5, "y":16},
- {"label":"k16_06", "x":6, "y":16},
- {"label":"k16_07", "x":7, "y":16},
- {"label":"k16_08", "x":8, "y":16},
- {"label":"k16_09", "x":9, "y":16},
- {"label":"k16_10", "x":10, "y":16},
- {"label":"k16_11", "x":11, "y":16},
- {"label":"k16_12", "x":12, "y":16},
- {"label":"k16_13", "x":13, "y":16},
- {"label":"k16_14", "x":14, "y":16},
- {"label":"k16_15", "x":15, "y":16},
- {"label":"k16_16", "x":16, "y":16},
- {"label":"k16_17", "x":17, "y":16},
- {"label":"k16_18", "x":18, "y":16},
- {"label":"k16_19", "x":19, "y":16},
+ {"matrix": [16, 0], "x": 0, "y": 16},
+ {"matrix": [16, 1], "x": 1, "y": 16},
+ {"matrix": [16, 2], "x": 2, "y": 16},
+ {"matrix": [16, 3], "x": 3, "y": 16},
+ {"matrix": [16, 4], "x": 4, "y": 16},
+ {"matrix": [16, 5], "x": 5, "y": 16},
+ {"matrix": [16, 6], "x": 6, "y": 16},
+ {"matrix": [16, 7], "x": 7, "y": 16},
+ {"matrix": [16, 8], "x": 8, "y": 16},
+ {"matrix": [16, 9], "x": 9, "y": 16},
+ {"matrix": [16, 10], "x": 10, "y": 16},
+ {"matrix": [16, 11], "x": 11, "y": 16},
+ {"matrix": [16, 12], "x": 12, "y": 16},
+ {"matrix": [16, 13], "x": 13, "y": 16},
+ {"matrix": [16, 14], "x": 14, "y": 16},
+ {"matrix": [16, 15], "x": 15, "y": 16},
+ {"matrix": [16, 16], "x": 16, "y": 16},
+ {"matrix": [16, 17], "x": 17, "y": 16},
+ {"matrix": [16, 18], "x": 18, "y": 16},
+ {"matrix": [16, 19], "x": 19, "y": 16},
- {"label":"k17_00", "x":0, "y":17},
- {"label":"k17_01", "x":1, "y":17},
- {"label":"k17_02", "x":2, "y":17},
- {"label":"k17_03", "x":3, "y":17},
- {"label":"k17_04", "x":4, "y":17},
- {"label":"k17_05", "x":5, "y":17},
- {"label":"k17_06", "x":6, "y":17},
- {"label":"k17_07", "x":7, "y":17},
- {"label":"k17_08", "x":8, "y":17},
- {"label":"k17_09", "x":9, "y":17},
- {"label":"k17_10", "x":10, "y":17},
- {"label":"k17_11", "x":11, "y":17},
- {"label":"k17_12", "x":12, "y":17},
- {"label":"k17_13", "x":13, "y":17},
- {"label":"k17_14", "x":14, "y":17},
- {"label":"k17_15", "x":15, "y":17},
- {"label":"k17_16", "x":16, "y":17},
- {"label":"k17_17", "x":17, "y":17},
- {"label":"k17_18", "x":18, "y":17},
- {"label":"k17_19", "x":19, "y":17},
+ {"matrix": [17, 0], "x": 0, "y": 17},
+ {"matrix": [17, 1], "x": 1, "y": 17},
+ {"matrix": [17, 2], "x": 2, "y": 17},
+ {"matrix": [17, 3], "x": 3, "y": 17},
+ {"matrix": [17, 4], "x": 4, "y": 17},
+ {"matrix": [17, 5], "x": 5, "y": 17},
+ {"matrix": [17, 6], "x": 6, "y": 17},
+ {"matrix": [17, 7], "x": 7, "y": 17},
+ {"matrix": [17, 8], "x": 8, "y": 17},
+ {"matrix": [17, 9], "x": 9, "y": 17},
+ {"matrix": [17, 10], "x": 10, "y": 17},
+ {"matrix": [17, 11], "x": 11, "y": 17},
+ {"matrix": [17, 12], "x": 12, "y": 17},
+ {"matrix": [17, 13], "x": 13, "y": 17},
+ {"matrix": [17, 14], "x": 14, "y": 17},
+ {"matrix": [17, 15], "x": 15, "y": 17},
+ {"matrix": [17, 16], "x": 16, "y": 17},
+ {"matrix": [17, 17], "x": 17, "y": 17},
+ {"matrix": [17, 18], "x": 18, "y": 17},
+ {"matrix": [17, 19], "x": 19, "y": 17},
- {"label":"k18_00", "x":0, "y":18},
- {"label":"k18_01", "x":1, "y":18},
- {"label":"k18_02", "x":2, "y":18},
- {"label":"k18_03", "x":3, "y":18},
- {"label":"k18_04", "x":4, "y":18},
- {"label":"k18_05", "x":5, "y":18},
- {"label":"k18_06", "x":6, "y":18},
- {"label":"k18_07", "x":7, "y":18},
- {"label":"k18_08", "x":8, "y":18},
- {"label":"k18_09", "x":9, "y":18},
- {"label":"k18_10", "x":10, "y":18},
- {"label":"k18_11", "x":11, "y":18},
- {"label":"k18_12", "x":12, "y":18},
- {"label":"k18_13", "x":13, "y":18},
- {"label":"k18_14", "x":14, "y":18},
- {"label":"k18_15", "x":15, "y":18},
- {"label":"k18_16", "x":16, "y":18},
- {"label":"k18_17", "x":17, "y":18},
- {"label":"k18_18", "x":18, "y":18},
- {"label":"k18_19", "x":19, "y":18},
+ {"matrix": [18, 0], "x": 0, "y": 18},
+ {"matrix": [18, 1], "x": 1, "y": 18},
+ {"matrix": [18, 2], "x": 2, "y": 18},
+ {"matrix": [18, 3], "x": 3, "y": 18},
+ {"matrix": [18, 4], "x": 4, "y": 18},
+ {"matrix": [18, 5], "x": 5, "y": 18},
+ {"matrix": [18, 6], "x": 6, "y": 18},
+ {"matrix": [18, 7], "x": 7, "y": 18},
+ {"matrix": [18, 8], "x": 8, "y": 18},
+ {"matrix": [18, 9], "x": 9, "y": 18},
+ {"matrix": [18, 10], "x": 10, "y": 18},
+ {"matrix": [18, 11], "x": 11, "y": 18},
+ {"matrix": [18, 12], "x": 12, "y": 18},
+ {"matrix": [18, 13], "x": 13, "y": 18},
+ {"matrix": [18, 14], "x": 14, "y": 18},
+ {"matrix": [18, 15], "x": 15, "y": 18},
+ {"matrix": [18, 16], "x": 16, "y": 18},
+ {"matrix": [18, 17], "x": 17, "y": 18},
+ {"matrix": [18, 18], "x": 18, "y": 18},
+ {"matrix": [18, 19], "x": 19, "y": 18},
- {"label":"k19_00", "x":0, "y":19},
- {"label":"k19_01", "x":1, "y":19},
- {"label":"k19_02", "x":2, "y":19},
- {"label":"k19_03", "x":3, "y":19},
- {"label":"k19_04", "x":4, "y":19},
- {"label":"k19_05", "x":5, "y":19},
- {"label":"k19_06", "x":6, "y":19},
- {"label":"k19_07", "x":7, "y":19},
- {"label":"k19_08", "x":8, "y":19},
- {"label":"k19_09", "x":9, "y":19},
- {"label":"k19_10", "x":10, "y":19},
- {"label":"k19_11", "x":11, "y":19},
- {"label":"k19_12", "x":12, "y":19},
- {"label":"k19_13", "x":13, "y":19},
- {"label":"k19_14", "x":14, "y":19},
- {"label":"k19_15", "x":15, "y":19},
- {"label":"k19_16", "x":16, "y":19},
- {"label":"k19_17", "x":17, "y":19},
- {"label":"k19_18", "x":18, "y":19},
- {"label":"k19_19", "x":19, "y":19}
+ {"matrix": [19, 0], "x": 0, "y": 19},
+ {"matrix": [19, 1], "x": 1, "y": 19},
+ {"matrix": [19, 2], "x": 2, "y": 19},
+ {"matrix": [19, 3], "x": 3, "y": 19},
+ {"matrix": [19, 4], "x": 4, "y": 19},
+ {"matrix": [19, 5], "x": 5, "y": 19},
+ {"matrix": [19, 6], "x": 6, "y": 19},
+ {"matrix": [19, 7], "x": 7, "y": 19},
+ {"matrix": [19, 8], "x": 8, "y": 19},
+ {"matrix": [19, 9], "x": 9, "y": 19},
+ {"matrix": [19, 10], "x": 10, "y": 19},
+ {"matrix": [19, 11], "x": 11, "y": 19},
+ {"matrix": [19, 12], "x": 12, "y": 19},
+ {"matrix": [19, 13], "x": 13, "y": 19},
+ {"matrix": [19, 14], "x": 14, "y": 19},
+ {"matrix": [19, 15], "x": 15, "y": 19},
+ {"matrix": [19, 16], "x": 16, "y": 19},
+ {"matrix": [19, 17], "x": 17, "y": 19},
+ {"matrix": [19, 18], "x": 18, "y": 19},
+ {"matrix": [19, 19], "x": 19, "y": 19}
]
}
}
diff --git a/keyboards/cutie_club/keebcats/denis/config.h b/keyboards/cutie_club/keebcats/denis/config.h
index 7e46d166b7..c5eb6384a3 100644
--- a/keyboards/cutie_club/keebcats/denis/config.h
+++ b/keyboards/cutie_club/keebcats/denis/config.h
@@ -16,16 +16,6 @@
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- */
-#define MATRIX_ROW_PINS { B2, D0, F5, F4, F1 }
-#define MATRIX_COL_PINS { E6, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1 }
-
-/* 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/cutie_club/keebcats/denis/denis.c b/keyboards/cutie_club/keebcats/denis/denis.c
deleted file mode 100644
index c661e8cbb5..0000000000
--- a/keyboards/cutie_club/keebcats/denis/denis.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Cutie Club
- *
- * 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 "denis.h"
diff --git a/keyboards/cutie_club/keebcats/denis/info.json b/keyboards/cutie_club/keebcats/denis/info.json
index 0fe5fcf534..c4171df94d 100644
--- a/keyboards/cutie_club/keebcats/denis/info.json
+++ b/keyboards/cutie_club/keebcats/denis/info.json
@@ -8,6 +8,11 @@
"pid": "0xB260",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["E6", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"],
+ "rows": ["B2", "D0", "F5", "F4", "F1"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "F0"
},
diff --git a/keyboards/cutie_club/keebcats/dougal/config.h b/keyboards/cutie_club/keebcats/dougal/config.h
index d2f4b19e87..c5eb6384a3 100644
--- a/keyboards/cutie_club/keebcats/dougal/config.h
+++ b/keyboards/cutie_club/keebcats/dougal/config.h
@@ -16,16 +16,6 @@
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- */
-#define MATRIX_ROW_PINS { B2, D0, F5, F4, F1 }
-#define MATRIX_COL_PINS { E6, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, B7 }
-
-/* 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/cutie_club/keebcats/dougal/dougal.c b/keyboards/cutie_club/keebcats/dougal/dougal.c
deleted file mode 100644
index 8f247bd287..0000000000
--- a/keyboards/cutie_club/keebcats/dougal/dougal.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Cutie Club
- *
- * 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 "dougal.h"
diff --git a/keyboards/cutie_club/keebcats/dougal/info.json b/keyboards/cutie_club/keebcats/dougal/info.json
index 7555611d89..5060e14677 100644
--- a/keyboards/cutie_club/keebcats/dougal/info.json
+++ b/keyboards/cutie_club/keebcats/dougal/info.json
@@ -8,6 +8,11 @@
"pid": "0xB265",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["E6", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "B7"],
+ "rows": ["B2", "D0", "F5", "F4", "F1"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "F0"
},
diff --git a/keyboards/cutie_club/novus/config.h b/keyboards/cutie_club/novus/config.h
index 001aeb5375..4c65b71f76 100644
--- a/keyboards/cutie_club/novus/config.h
+++ b/keyboards/cutie_club/novus/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 { F0, F1, F4, F5, F6 }
-#define MATRIX_COL_PINS { B6, C6, C7, B2, B3, D0, D1, D2, D3, D7, B4, B5, D5, D4, D6 }
-
-/* 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/cutie_club/novus/info.json b/keyboards/cutie_club/novus/info.json
index 834021416a..e51a007def 100644
--- a/keyboards/cutie_club/novus/info.json
+++ b/keyboards/cutie_club/novus/info.json
@@ -8,6 +8,11 @@
"pid": "0x3F42",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B6", "C6", "C7", "B2", "B3", "D0", "D1", "D2", "D3", "D7", "B4", "B5", "D5", "D4", "D6"],
+ "rows": ["F0", "F1", "F4", "F5", "F6"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layout_aliases": {
diff --git a/keyboards/cutie_club/novus/novus.c b/keyboards/cutie_club/novus/novus.c
deleted file mode 100644
index 2fe5fbfc8f..0000000000
--- a/keyboards/cutie_club/novus/novus.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Cutie Club
- *
- * 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 "novus.h"
diff --git a/keyboards/cutie_club/wraith/config.h b/keyboards/cutie_club/wraith/config.h
index e7a7104856..46a265902c 100644
--- a/keyboards/cutie_club/wraith/config.h
+++ b/keyboards/cutie_club/wraith/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 { B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B7 }
-#define MATRIX_COL_PINS { C6, C7, F7, F6, F5, F4, F1, F0 }
-
-/* 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/cutie_club/wraith/info.json b/keyboards/cutie_club/wraith/info.json
index 4c27785468..f18b39837e 100644
--- a/keyboards/cutie_club/wraith/info.json
+++ b/keyboards/cutie_club/wraith/info.json
@@ -8,6 +8,11 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
+ "rows": ["B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "B3",
"on_state": 0
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 04:13:53 +0000