diff options
| author | Ryan <fauxpark@gmail.com> | 2023-03-11 00:34:34 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-11 00:34:34 +1100 |
| commit | ace372d90de13dafc815df5d8049497cb351b69b (patch) | |
| tree | 0eb4793443956fbc60a1cfca5c1f1e556422ce66 /keyboards/tokyokeyboard | |
| parent | 76cc7fe109d66c1e0ac16b27b2f691e7d55792d3 (diff) | |
Move matrix config to info.json, part 3 (#19991)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'keyboards/tokyokeyboard')
| -rw-r--r-- | keyboards/tokyokeyboard/alix40/config.h | 7 | ||||
| -rw-r--r-- | keyboards/tokyokeyboard/alix40/info.json | 5 | ||||
| -rw-r--r-- | keyboards/tokyokeyboard/tokyo60/config.h | 7 | ||||
| -rw-r--r-- | keyboards/tokyokeyboard/tokyo60/info.json | 5 |
4 files changed, 10 insertions, 14 deletions
diff --git a/keyboards/tokyokeyboard/alix40/config.h b/keyboards/tokyokeyboard/alix40/config.h index 26736637cb..d56a8a1a55 100644 --- a/keyboards/tokyokeyboard/alix40/config.h +++ b/keyboards/tokyokeyboard/alix40/config.h @@ -14,13 +14,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D7, C6, C7, B5 } -#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, D0, D1, D2, D3, D5, D6 } - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/tokyokeyboard/alix40/info.json b/keyboards/tokyokeyboard/alix40/info.json index 513a883d8e..b839c147dc 100644 --- a/keyboards/tokyokeyboard/alix40/info.json +++ b/keyboards/tokyokeyboard/alix40/info.json @@ -8,6 +8,11 @@ "pid": "0x4134", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D0", "D1", "D2", "D3", "D5", "D6"], + "rows": ["D7", "C6", "C7", "B5"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B7", "levels": 31, 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 |