summaryrefslogtreecommitdiff
path: root/keyboards/horrortroll
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-03-10 22:16:56 +1100
committerGitHub <noreply@github.com>2023-03-10 22:16:56 +1100
commitdd086a51d82a574a55eb3b89e8943301d72296f3 (patch)
treedb49e94d90e9f3a8a6cf72a9da0d5549dd2a9bcb /keyboards/horrortroll
parent80661e5f1981af4d50a32d41e136e9586d5f5a43 (diff)
Move matrix config to info.json, part 2 (#19987)
Diffstat (limited to 'keyboards/horrortroll')
-rw-r--r--keyboards/horrortroll/caticorn/config.h27
-rw-r--r--keyboards/horrortroll/caticorn/rev1/hotswap/info.json5
-rw-r--r--keyboards/horrortroll/caticorn/rev1/solder/info.json5
-rw-r--r--keyboards/horrortroll/chinese_pcb/black_e65/config.h8
-rw-r--r--keyboards/horrortroll/chinese_pcb/black_e65/info.json5
-rw-r--r--keyboards/horrortroll/chinese_pcb/devil68_pro/config.h8
-rw-r--r--keyboards/horrortroll/chinese_pcb/devil68_pro/info.json5
-rw-r--r--keyboards/horrortroll/handwired_k552/config.h8
-rw-r--r--keyboards/horrortroll/handwired_k552/info.json5
-rw-r--r--keyboards/horrortroll/lemon40/config.h8
-rw-r--r--keyboards/horrortroll/lemon40/info.json5
-rw-r--r--keyboards/horrortroll/paws60/config.h8
-rw-r--r--keyboards/horrortroll/paws60/info.json5
13 files changed, 35 insertions, 67 deletions
diff --git a/keyboards/horrortroll/caticorn/config.h b/keyboards/horrortroll/caticorn/config.h
deleted file mode 100644
index ad43bb2b3d..0000000000
--- a/keyboards/horrortroll/caticorn/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
- *
- * 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
-
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS \
- { GP7, GP0, GP8, GP25, GP11, GP12 }
-#define MATRIX_COL_PINS \
- { GP6, GP5, GP4, GP3, GP2, GP1, GP20, GP21, GP16, GP17, GP18, GP19, GP15, GP14, GP13, GP10, GP9 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/horrortroll/caticorn/rev1/hotswap/info.json b/keyboards/horrortroll/caticorn/rev1/hotswap/info.json
index f336f57a52..5b44ceb954 100644
--- a/keyboards/horrortroll/caticorn/rev1/hotswap/info.json
+++ b/keyboards/horrortroll/caticorn/rev1/hotswap/info.json
@@ -8,6 +8,11 @@
"pid": "0x6002",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["GP6", "GP5", "GP4", "GP3", "GP2", "GP1", "GP20", "GP21", "GP16", "GP17", "GP18", "GP19", "GP15", "GP14", "GP13", "GP10", "GP9"],
+ "rows": ["GP7", "GP0", "GP8", "GP25", "GP11", "GP12"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "RP2040",
"bootloader": "rp2040",
"community_layouts": ["tkl_f13_ansi"],
diff --git a/keyboards/horrortroll/caticorn/rev1/solder/info.json b/keyboards/horrortroll/caticorn/rev1/solder/info.json
index 4eb4941102..72e71bef6d 100644
--- a/keyboards/horrortroll/caticorn/rev1/solder/info.json
+++ b/keyboards/horrortroll/caticorn/rev1/solder/info.json
@@ -8,6 +8,11 @@
"pid": "0x6001",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["GP6", "GP5", "GP4", "GP3", "GP2", "GP1", "GP20", "GP21", "GP16", "GP17", "GP18", "GP19", "GP15", "GP14", "GP13", "GP10", "GP9"],
+ "rows": ["GP7", "GP0", "GP8", "GP25", "GP11", "GP12"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "RP2040",
"bootloader": "rp2040",
"community_layouts": ["tkl_ansi", "tkl_ansi_split_bs_rshift", "tkl_ansi_tsangan", "tkl_ansi_tsangan_split_bs_rshift", "tkl_f13_ansi", "tkl_f13_ansi_split_bs_rshift", "tkl_f13_ansi_tsangan", "tkl_f13_ansi_tsangan_split_bs_rshift", "tkl_iso", "tkl_iso_split_bs_rshift", "tkl_iso_tsangan", "tkl_iso_tsangan_split_bs_rshift", "tkl_f13_iso", "tkl_f13_iso_split_bs_rshift", "tkl_f13_iso_tsangan", "tkl_f13_iso_tsangan_split_bs_rshift"],
diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/config.h b/keyboards/horrortroll/chinese_pcb/black_e65/config.h
index 9e040808d2..64aebdefe2 100644
--- a/keyboards/horrortroll/chinese_pcb/black_e65/config.h
+++ b/keyboards/horrortroll/chinese_pcb/black_e65/config.h
@@ -16,14 +16,6 @@
#pragma once
-
-/* Key matrix pins */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
/* Forcing to use NKRO instead 6KRO */
#define FORCE_NKRO
diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/info.json b/keyboards/horrortroll/chinese_pcb/black_e65/info.json
index 24fae0c08a..cf9df8be98 100644
--- a/keyboards/horrortroll/chinese_pcb/black_e65/info.json
+++ b/keyboards/horrortroll/chinese_pcb/black_e65/info.json
@@ -8,6 +8,11 @@
"pid": "0x7000",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"],
+ "rows": ["B0", "B1", "B2", "B3", "B7"]
+ },
+ "diode_direction": "ROW2COL",
"backlight": {
"pin": "B6",
"levels": 6
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h b/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
index fde006a091..d62ef3c41e 100644
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
@@ -16,14 +16,6 @@
#pragma once
-
-/* Key matrix pins */
-#define MATRIX_ROW_PINS { B7, B3, B2, F6, F7 }
-#define MATRIX_COL_PINS { B1, B0, B5, B6, C6, C7, E2, D0, D1, D2, D3, D5, D4, D6, D7, B4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Forcing to use NKRO instead 6KRO */
#define FORCE_NKRO
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json b/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json
index 96168dd67e..ee24a6261f 100644
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json
@@ -8,6 +8,11 @@
"pid": "0x7001",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B1", "B0", "B5", "B6", "C6", "C7", "E2", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+ "rows": ["B7", "B3", "B2", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/horrortroll/handwired_k552/config.h b/keyboards/horrortroll/handwired_k552/config.h
index 07e9591b24..563ce20ad6 100644
--- a/keyboards/horrortroll/handwired_k552/config.h
+++ b/keyboards/horrortroll/handwired_k552/config.h
@@ -16,14 +16,6 @@
#pragma once
-
-/* Key matrix pins */
-#define MATRIX_ROW_PINS { C12, C10, A10, A8, C8, C9 }
-#define MATRIX_COL_PINS { B15, C6, C7, A3, A1, C3, C1, B14, B13, A9, B3, B4, A0, C11, C4, C0, C2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
/* Forcing to use NKRO instead 6KRO */
#define FORCE_NKRO
diff --git a/keyboards/horrortroll/handwired_k552/info.json b/keyboards/horrortroll/handwired_k552/info.json
index 150973eaf0..edbcaf98de 100644
--- a/keyboards/horrortroll/handwired_k552/info.json
+++ b/keyboards/horrortroll/handwired_k552/info.json
@@ -8,6 +8,11 @@
"pid": "0x5104",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B15", "C6", "C7", "A3", "A1", "C3", "C1", "B14", "B13", "A9", "B3", "B4", "A0", "C11", "C4", "C0", "C2"],
+ "rows": ["C12", "C10", "A10", "A8", "C8", "C9"]
+ },
+ "diode_direction": "ROW2COL",
"community_layouts": ["tkl_ansi"],
"layouts": {
"LAYOUT_tkl_ansi": {
diff --git a/keyboards/horrortroll/lemon40/config.h b/keyboards/horrortroll/lemon40/config.h
index e40642946b..93d89532e6 100644
--- a/keyboards/horrortroll/lemon40/config.h
+++ b/keyboards/horrortroll/lemon40/config.h
@@ -16,14 +16,6 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D7, E6, B4, B5, D4, C6, D2, D3 }
-#define MATRIX_COL_PINS { F5, F6, B1, B3, B2, B6, F7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Forcing to use NKRO instead 6KRO */
#define FORCE_NKRO
diff --git a/keyboards/horrortroll/lemon40/info.json b/keyboards/horrortroll/lemon40/info.json
index 40e6f70ccd..327131ab8b 100644
--- a/keyboards/horrortroll/lemon40/info.json
+++ b/keyboards/horrortroll/lemon40/info.json
@@ -8,6 +8,11 @@
"pid": "0x2434",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F5", "F6", "B1", "B3", "B2", "B6", "F7"],
+ "rows": ["D7", "E6", "B4", "B5", "D4", "C6", "D2", "D3"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/horrortroll/paws60/config.h b/keyboards/horrortroll/paws60/config.h
index c969810df0..5d9f1d9dc6 100644
--- a/keyboards/horrortroll/paws60/config.h
+++ b/keyboards/horrortroll/paws60/config.h
@@ -16,13 +16,5 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
-#define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Forcing to use NKRO instead 6KRO */
#define FORCE_NKRO
diff --git a/keyboards/horrortroll/paws60/info.json b/keyboards/horrortroll/paws60/info.json
index f9b81dfc96..7391972d8b 100644
--- a/keyboards/horrortroll/paws60/info.json
+++ b/keyboards/horrortroll/paws60/info.json
@@ -8,6 +8,11 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"],
+ "rows": ["E6", "B7", "F7", "F4", "F5"]
+ },
+ "diode_direction": "COL2ROW",
"bootmagic": {
"matrix": [3, 6]
},