summaryrefslogtreecommitdiffstats
path: root/keyboards/tokyokeyboard/tokyo60
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/tokyokeyboard/tokyo60
parent76cc7fe109d66c1e0ac16b27b2f691e7d55792d3 (diff)
Move matrix config to info.json, part 3 (#19991)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'keyboards/tokyokeyboard/tokyo60')
-rw-r--r--keyboards/tokyokeyboard/tokyo60/config.h7
-rw-r--r--keyboards/tokyokeyboard/tokyo60/info.json5
2 files changed, 5 insertions, 7 deletions
diff --git a/keyboards/tokyokeyboard/tokyo60/config.h b/keyboards/tokyokeyboard/tokyo60/config.h
index 8ba921eaeb..bf86645ce5 100644
--- a/keyboards/tokyokeyboard/tokyo60/config.h
+++ b/keyboards/tokyokeyboard/tokyo60/config.h
@@ -1,15 +1,8 @@
#pragma once
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
/* Set power consumption to work with mobile devices */
#define USB_MAX_POWER_CONSUMPTION 100
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B2, B5, B4, D7, D6, B3 }
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/tokyokeyboard/tokyo60/info.json b/keyboards/tokyokeyboard/tokyo60/info.json
index dd16c3f4c2..f7bba46b46 100644
--- a/keyboards/tokyokeyboard/tokyo60/info.json
+++ b/keyboards/tokyokeyboard/tokyo60/info.json
@@ -8,6 +8,11 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B2", "B5", "B4", "D7", "D6", "B3"],
+ "rows": ["D0", "D1", "D2", "D3", "D5"]
+ },
+ "diode_direction": "ROW2COL",
"backlight": {
"pin": "B7",
"levels": 6