summaryrefslogtreecommitdiffstats
path: root/keyboards/doio
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-03-11 00:00:24 +1100
committerGitHub <noreply@github.com>2023-03-11 00:00:24 +1100
commit9e64300e67720a5468c2585391250ca5579b311b (patch)
treed8c471bb33cd5d0e38e90d925d69b3c6b3cb2d59 /keyboards/doio
parentdd086a51d82a574a55eb3b89e8943301d72296f3 (diff)
Move matrix config to info.json, part 4 (#20001)
Diffstat (limited to 'keyboards/doio')
-rw-r--r--keyboards/doio/kb16/rev1/config.h8
-rw-r--r--keyboards/doio/kb16/rev1/info.json5
-rw-r--r--keyboards/doio/kb16/rev2/config.h8
-rw-r--r--keyboards/doio/kb16/rev2/info.json5
-rw-r--r--keyboards/doio/kb30/config.h5
-rw-r--r--keyboards/doio/kb30/info.json5
6 files changed, 15 insertions, 21 deletions
diff --git a/keyboards/doio/kb16/rev1/config.h b/keyboards/doio/kb16/rev1/config.h
index aa066fe393..c01191e869 100644
--- a/keyboards/doio/kb16/rev1/config.h
+++ b/keyboards/doio/kb16/rev1/config.h
@@ -17,14 +17,6 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D5, D4, D3, D2 }
-#define MATRIX_COL_PINS { F5, F4, F1, F0, B7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Forcing to use NKRO instead 6KRO */
#define FORCE_NKRO
diff --git a/keyboards/doio/kb16/rev1/info.json b/keyboards/doio/kb16/rev1/info.json
index d0acdedfb9..03deae0cbc 100644
--- a/keyboards/doio/kb16/rev1/info.json
+++ b/keyboards/doio/kb16/rev1/info.json
@@ -8,6 +8,11 @@
"pid": "0x1601",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F5", "F4", "F1", "F0", "B7"],
+ "rows": ["D5", "D4", "D3", "D2"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F7", "pin_b": "E6"},
diff --git a/keyboards/doio/kb16/rev2/config.h b/keyboards/doio/kb16/rev2/config.h
index e7e2791ac8..a11f7c8d3a 100644
--- a/keyboards/doio/kb16/rev2/config.h
+++ b/keyboards/doio/kb16/rev2/config.h
@@ -17,14 +17,6 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B3, B4, B9, B8 }
-#define MATRIX_COL_PINS { B14, B13, B12, B0, A7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Forcing to use NKRO instead 6KRO */
#define FORCE_NKRO
diff --git a/keyboards/doio/kb16/rev2/info.json b/keyboards/doio/kb16/rev2/info.json
index 8b5eeb45c2..c208bec1bf 100644
--- a/keyboards/doio/kb16/rev2/info.json
+++ b/keyboards/doio/kb16/rev2/info.json
@@ -8,6 +8,11 @@
"pid": "0x1601",
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["B14", "B13", "B12", "B0", "A7"],
+ "rows": ["B3", "B4", "B9", "B8"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B5", "pin_b": "B6"},
diff --git a/keyboards/doio/kb30/config.h b/keyboards/doio/kb30/config.h
index 866bd3e1d9..c2fe07026c 100644
--- a/keyboards/doio/kb30/config.h
+++ b/keyboards/doio/kb30/config.h
@@ -17,11 +17,6 @@
#pragma once
-
-#define MATRIX_ROW_PINS { B3, B4, B9, B8, A5, A6 }
-#define MATRIX_COL_PINS { B14, B13, B12, B0, A7, A9, A8 }
-#define DIODE_DIRECTION COL2ROW // COL2ROW or ROW2COL
-
/* 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/doio/kb30/info.json b/keyboards/doio/kb30/info.json
index 9fe8e83185..f4e43522d5 100644
--- a/keyboards/doio/kb30/info.json
+++ b/keyboards/doio/kb30/info.json
@@ -8,6 +8,11 @@
"pid": "0x3001",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B14", "B13", "B12", "B0", "A7", "A9", "A8"],
+ "rows": ["B3", "B4", "B9", "B8", "A5", "A6"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B5", "pin_b": "B6"},