From ace372d90de13dafc815df5d8049497cb351b69b Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 00:34:34 +1100 Subject: Move matrix config to info.json, part 3 (#19991) Co-authored-by: Nick Brassel --- keyboards/rgbkb/sol3/config.h | 10 ---------- keyboards/rgbkb/sol3/rev1/info.json | 11 +++++++++++ 2 files changed, 11 insertions(+), 10 deletions(-) (limited to 'keyboards/rgbkb/sol3') diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/config.h index 727947ef0b..88d4a84c73 100644 --- a/keyboards/rgbkb/sol3/config.h +++ b/keyboards/rgbkb/sol3/config.h @@ -9,13 +9,6 @@ #pragma once - -// Last pins reserved for encoder / touch encoder support -#define MATRIX_ROW_PINS { B15, A8, A15, B12, A3, NO_PIN } -#define MATRIX_ROW_PINS_RIGHT { B15, B14, A8, A13, A7, NO_PIN } -// Empty matrix entries used for encoder / touch encoder support -#define MATRIX_COL_PINS { A6, A7, B0, B2, B1, B9, B3, B4 } -#define MATRIX_COL_PINS_RIGHT { B9, B8, B4, A6, A3, B10, B12, B11 } #define MATRIX_IO_DELAY 5 #define BUSY_WAIT @@ -28,9 +21,6 @@ #define TOUCH_RESOLUTION 25 // sensitivity of swipes, lower=faster #define TOUCH_SEGMENTS 3 -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* CRC Configuration */ #define CRC8_OPTIMIZE_SPEED #define CRC8_USE_TABLE diff --git a/keyboards/rgbkb/sol3/rev1/info.json b/keyboards/rgbkb/sol3/rev1/info.json index 046a56f390..767a26b222 100644 --- a/keyboards/rgbkb/sol3/rev1/info.json +++ b/keyboards/rgbkb/sol3/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x3510", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A6", "A7", "B0", "B2", "B1", "B9", "B3", "B4"], + "rows": ["B15", "A8", "A15", "B12", "A3", null] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A1", "pin_b": "A2"}, @@ -25,6 +30,12 @@ {"pin_a": "B3", "pin_b": "B13"} ] } + }, + "matrix_pins": { + "right": { + "cols": ["B9", "B8", "B4", "A6", "A3", "B10", "B12", "B11"], + "rows": ["B15", "B14", "A8", "A13", "A7", null] + } } }, "processor": "STM32F303", -- cgit v1.2.3