From 9e64300e67720a5468c2585391250ca5579b311b Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 00:00:24 +1100 Subject: Move matrix config to info.json, part 4 (#20001) --- keyboards/doppelganger/config.h | 20 -------------------- keyboards/doppelganger/info.json | 13 ++++++++++++- 2 files changed, 12 insertions(+), 21 deletions(-) (limited to 'keyboards/doppelganger') diff --git a/keyboards/doppelganger/config.h b/keyboards/doppelganger/config.h index 7fb78172d4..21b4c6f146 100644 --- a/keyboards/doppelganger/config.h +++ b/keyboards/doppelganger/config.h @@ -17,28 +17,8 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ #define SPLIT_HAND_PIN D4 -#define MATRIX_ROW_PINS { E6, F1, C7, F7, F6 } -#define MATRIX_COL_PINS { F4, F0, B7, B3, B2, B1, D5, D3, D2 } - -#define MATRIX_ROW_PINS_RIGHT { D7, D6, D4, E6, B5 } -#define MATRIX_COL_PINS_RIGHT { F1, F0, F4, F5, F6, F7, C7, C6, B6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - // #define USE_I2C #define RGB_DI_PIN B4 diff --git a/keyboards/doppelganger/info.json b/keyboards/doppelganger/info.json index d576f73d69..5c489fe44e 100644 --- a/keyboards/doppelganger/info.json +++ b/keyboards/doppelganger/info.json @@ -8,8 +8,19 @@ "pid": "0x4447", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F0", "B7", "B3", "B2", "B1", "D5", "D3", "D2"], + "rows": ["E6", "F1", "C7", "F7", "F6"] + }, + "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D1" + "soft_serial_pin": "D1", + "matrix_pins": { + "right": { + "cols": ["F1", "F0", "F4", "F5", "F6", "F7", "C7", "C6", "B6"], + "rows": ["D7", "D6", "D4", "E6", "B5"] + } + } }, "bootmagic": { "matrix": [0, 2] -- cgit v1.2.3