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/rmi_kb/squishyfrl/config.h | 18 ------------------ keyboards/rmi_kb/squishyfrl/info.json | 5 +++++ 2 files changed, 5 insertions(+), 18 deletions(-) (limited to 'keyboards/rmi_kb/squishyfrl') diff --git a/keyboards/rmi_kb/squishyfrl/config.h b/keyboards/rmi_kb/squishyfrl/config.h index e84edd8c87..f7cae14b1b 100644 --- a/keyboards/rmi_kb/squishyfrl/config.h +++ b/keyboards/rmi_kb/squishyfrl/config.h @@ -17,24 +17,6 @@ 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 MATRIX_ROW_PINS { B9, B8, A0, A1, A9, A8, B11, A6, A5} -#define MATRIX_COL_PINS { A7, C4, C5, B0, B1, B2, B10, B12, B13, B14, B15, C6, C9, C7, C8, A10, A4, C14, A3, A2, C3 } - - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN C15 #ifdef RGB_DI_PIN # define RGBLED_NUM 16 diff --git a/keyboards/rmi_kb/squishyfrl/info.json b/keyboards/rmi_kb/squishyfrl/info.json index f2dc2ebd24..541ec06731 100644 --- a/keyboards/rmi_kb/squishyfrl/info.json +++ b/keyboards/rmi_kb/squishyfrl/info.json @@ -8,6 +8,11 @@ "pid": "0x4BE5", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A7", "C4", "C5", "B0", "B1", "B2", "B10", "B12", "B13", "B14", "B15", "C6", "C9", "C7", "C8", "A10", "A4", "C14", "A3", "A2", "C3"], + "rows": ["B9", "B8", "A0", "A1", "A9", "A8", "B11", "A6", "A5"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F103", "bootloader": "stm32duino", "layouts": { -- cgit v1.2.3