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/sawnsprojects/krush/krush65/hotswap/config.h | 7 ------- keyboards/sawnsprojects/krush/krush65/hotswap/info.json | 5 +++++ keyboards/sawnsprojects/krush/krush65/solder/config.h | 7 ------- keyboards/sawnsprojects/krush/krush65/solder/info.json | 5 +++++ 4 files changed, 10 insertions(+), 14 deletions(-) (limited to 'keyboards/sawnsprojects/krush/krush65') diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/config.h b/keyboards/sawnsprojects/krush/krush65/hotswap/config.h index 8a947093dc..ef7cb26289 100644 --- a/keyboards/sawnsprojects/krush/krush65/hotswap/config.h +++ b/keyboards/sawnsprojects/krush/krush65/hotswap/config.h @@ -16,13 +16,6 @@ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { B1, B2, D4, F1, F0 } -#define MATRIX_COL_PINS { B7, B3, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D0, D5, D6, D3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Encoders */ #define ENCODERS_CW_KEY { { 12, 3 } } diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/info.json b/keyboards/sawnsprojects/krush/krush65/hotswap/info.json index 3872047ef8..94a091b0f8 100644 --- a/keyboards/sawnsprojects/krush/krush65/hotswap/info.json +++ b/keyboards/sawnsprojects/krush/krush65/hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0x5B31", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B7", "B3", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D0", "D5", "D6", "D3"], + "rows": ["B1", "B2", "D4", "F1", "F0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D1", "pin_b": "D2"} diff --git a/keyboards/sawnsprojects/krush/krush65/solder/config.h b/keyboards/sawnsprojects/krush/krush65/solder/config.h index 76f4acfbf6..6a5ac54353 100644 --- a/keyboards/sawnsprojects/krush/krush65/solder/config.h +++ b/keyboards/sawnsprojects/krush/krush65/solder/config.h @@ -16,13 +16,6 @@ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { B1, B2, D1, D2, D4, D6, F6, F7, F5, F4 } -#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D5, D3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F1 #ifdef RGB_DI_PIN #define RGBLED_NUM 20 diff --git a/keyboards/sawnsprojects/krush/krush65/solder/info.json b/keyboards/sawnsprojects/krush/krush65/solder/info.json index 9666127299..cf337c55f5 100644 --- a/keyboards/sawnsprojects/krush/krush65/solder/info.json +++ b/keyboards/sawnsprojects/krush/krush65/solder/info.json @@ -8,6 +8,11 @@ "pid": "0x6B31", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D5", "D3"], + "rows": ["B1", "B2", "D1", "D2", "D4", "D6", "F6", "F7", "F5", "F4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D0", "pin_b": "B3"} -- cgit v1.2.3