From e933e0411f442fa411d3d5ec488180fee241e2ef Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 05:41:58 +1100 Subject: Move matrix config to info.json, part 5 (#20003) Co-authored-by: Nick Brassel --- keyboards/soda/cherish/config.h | 4 ---- keyboards/soda/cherish/info.json | 5 +++++ keyboards/soda/pocket/config.h | 5 ----- keyboards/soda/pocket/info.json | 5 +++++ 4 files changed, 10 insertions(+), 9 deletions(-) (limited to 'keyboards/soda') diff --git a/keyboards/soda/cherish/config.h b/keyboards/soda/cherish/config.h index 95d332cf95..fdcd9d801b 100644 --- a/keyboards/soda/cherish/config.h +++ b/keyboards/soda/cherish/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A9, A10, A14, A15, B3, B4, B5, B6, B7, B8} -#define MATRIX_ROW_PINS { A7, B0, B1, B2, B10, B11 } -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/soda/cherish/info.json b/keyboards/soda/cherish/info.json index 713356f944..446fda090b 100644 --- a/keyboards/soda/cherish/info.json +++ b/keyboards/soda/cherish/info.json @@ -8,6 +8,11 @@ "pid": "0xEB52", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B12", "B13", "B14", "B15", "A8", "A9", "A10", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8"], + "rows": ["A7", "B0", "B1", "B2", "B10", "B11"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layout_aliases": { diff --git a/keyboards/soda/pocket/config.h b/keyboards/soda/pocket/config.h index 4b6ff7b4ab..89571c505f 100644 --- a/keyboards/soda/pocket/config.h +++ b/keyboards/soda/pocket/config.h @@ -15,11 +15,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_COL_PINS { A2, A1, B14, B4, B5, B6, B7} -#define MATRIX_ROW_PINS { A7, B0, B1, B2, B10, B11 } -#define DIODE_DIRECTION ROW2COL - #define LED_NUM_LOCK_PIN B15 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/soda/pocket/info.json b/keyboards/soda/pocket/info.json index b91f795b04..96b5276f80 100644 --- a/keyboards/soda/pocket/info.json +++ b/keyboards/soda/pocket/info.json @@ -8,6 +8,11 @@ "pid": "0x4F51", "device_version": "1.0.2" }, + "matrix_pins": { + "cols": ["A2", "A1", "B14", "B4", "B5", "B6", "B7"], + "rows": ["A7", "B0", "B1", "B2", "B10", "B11"] + }, + "diode_direction": "ROW2COL", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { -- cgit v1.2.3