summaryrefslogtreecommitdiff
path: root/keyboards/nopunin10did/jabberwocky
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-03-11 00:34:34 +1100
committerGitHub <noreply@github.com>2023-03-11 00:34:34 +1100
commitace372d90de13dafc815df5d8049497cb351b69b (patch)
tree0eb4793443956fbc60a1cfca5c1f1e556422ce66 /keyboards/nopunin10did/jabberwocky
parent76cc7fe109d66c1e0ac16b27b2f691e7d55792d3 (diff)
Move matrix config to info.json, part 3 (#19991)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'keyboards/nopunin10did/jabberwocky')
-rw-r--r--keyboards/nopunin10did/jabberwocky/v1/config.h8
-rw-r--r--keyboards/nopunin10did/jabberwocky/v1/info.json5
-rw-r--r--keyboards/nopunin10did/jabberwocky/v2/config.h8
-rw-r--r--keyboards/nopunin10did/jabberwocky/v2/info.json5
4 files changed, 10 insertions, 16 deletions
diff --git a/keyboards/nopunin10did/jabberwocky/v1/config.h b/keyboards/nopunin10did/jabberwocky/v1/config.h
index bec3df0189..1eb25da282 100644
--- a/keyboards/nopunin10did/jabberwocky/v1/config.h
+++ b/keyboards/nopunin10did/jabberwocky/v1/config.h
@@ -16,14 +16,6 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { E6, B4, B5, B7, D5, C7, F1, F0, B1, B3, B2, B6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, D7, C6, D4, D0, D2, D3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/nopunin10did/jabberwocky/v1/info.json b/keyboards/nopunin10did/jabberwocky/v1/info.json
index bbf52486b9..01b4804a66 100644
--- a/keyboards/nopunin10did/jabberwocky/v1/info.json
+++ b/keyboards/nopunin10did/jabberwocky/v1/info.json
@@ -8,6 +8,11 @@
"pid": "0x4A57",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "D7", "C6", "D4", "D0", "D2", "D3"],
+ "rows": ["E6", "B4", "B5", "B7", "D5", "C7", "F1", "F0", "B1", "B3", "B2", "B6"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "B0",
"num_lock": "D1"
diff --git a/keyboards/nopunin10did/jabberwocky/v2/config.h b/keyboards/nopunin10did/jabberwocky/v2/config.h
index 0a91a41444..7be9070afe 100644
--- a/keyboards/nopunin10did/jabberwocky/v2/config.h
+++ b/keyboards/nopunin10did/jabberwocky/v2/config.h
@@ -16,14 +16,6 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B2, B3, B1, D4, B4, D1, E6, B0, F0, F1, F4, F5 }
-#define MATRIX_COL_PINS { D0, D2, D3, D5, B5, D7, F6, F7, C7, B6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/nopunin10did/jabberwocky/v2/info.json b/keyboards/nopunin10did/jabberwocky/v2/info.json
index a2b9d5a02c..0cbca54f00 100644
--- a/keyboards/nopunin10did/jabberwocky/v2/info.json
+++ b/keyboards/nopunin10did/jabberwocky/v2/info.json
@@ -8,6 +8,11 @@
"pid": "0x4A58",
"device_version": "0.2.0"
},
+ "matrix_pins": {
+ "cols": ["D0", "D2", "D3", "D5", "B5", "D7", "F6", "F7", "C7", "B6"],
+ "rows": ["B2", "B3", "B1", "D4", "B4", "D1", "E6", "B0", "F0", "F1", "F4", "F5"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"driver": "software",
"pins": ["D6"],