From dd086a51d82a574a55eb3b89e8943301d72296f3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 10 Mar 2023 22:16:56 +1100 Subject: Move matrix config to info.json, part 2 (#19987) --- keyboards/lily58/config.h | 2 -- keyboards/lily58/glow_enc/config.h | 4 ---- keyboards/lily58/glow_enc/info.json | 5 +++++ keyboards/lily58/light/config.h | 4 ---- keyboards/lily58/light/info.json | 5 +++++ keyboards/lily58/rev1/config.h | 4 ---- keyboards/lily58/rev1/info.json | 5 +++++ 7 files changed, 15 insertions(+), 14 deletions(-) (limited to 'keyboards/lily58') diff --git a/keyboards/lily58/config.h b/keyboards/lily58/config.h index a67e22b876..553b738b48 100644 --- a/keyboards/lily58/config.h +++ b/keyboards/lily58/config.h @@ -18,7 +18,5 @@ along with this program. If not, see . #pragma once -#define DIODE_DIRECTION COL2ROW - // Use the lily version to get the Lily58 logo instead of the qmk logo #define OLED_FONT_H "lib/glcdfont_lily.c" diff --git a/keyboards/lily58/glow_enc/config.h b/keyboards/lily58/glow_enc/config.h index d89148dbbf..70ab0030c4 100644 --- a/keyboards/lily58/glow_enc/config.h +++ b/keyboards/lily58/glow_enc/config.h @@ -20,10 +20,6 @@ along with this program. If not, see . #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 } - #define RGB_DI_PIN F4 #define RGBLED_NUM 72 // Number of LEDs diff --git a/keyboards/lily58/glow_enc/info.json b/keyboards/lily58/glow_enc/info.json index bc2eae23da..01bd6835ff 100644 --- a/keyboards/lily58/glow_enc/info.json +++ b/keyboards/lily58/glow_enc/info.json @@ -8,6 +8,11 @@ "pid": "0x0059", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F5", "pin_b": "D4"} diff --git a/keyboards/lily58/light/config.h b/keyboards/lily58/light/config.h index 3a0780e0a6..08ee5dcd82 100644 --- a/keyboards/lily58/light/config.h +++ b/keyboards/lily58/light/config.h @@ -20,10 +20,6 @@ along with this program. If not, see . #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 } - #define RGB_DI_PIN D3 #define RGBLED_SPLIT { 35, 35 } #define RGBLED_NUM 70 diff --git a/keyboards/lily58/light/info.json b/keyboards/lily58/light/info.json index 82e9affbd0..0ab0bd68d2 100644 --- a/keyboards/lily58/light/info.json +++ b/keyboards/lily58/light/info.json @@ -8,6 +8,11 @@ "pid": "0x4C4C", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F4", "pin_b": "F5"} diff --git a/keyboards/lily58/rev1/config.h b/keyboards/lily58/rev1/config.h index 1e6d2d08fc..8417a2ee2a 100644 --- a/keyboards/lily58/rev1/config.h +++ b/keyboards/lily58/rev1/config.h @@ -19,10 +19,6 @@ along with this program. If not, see . #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 } - /* ws2812 RGB LED */ #define RGB_DI_PIN D3 #define RGBLED_NUM 12 // Number of LEDs diff --git a/keyboards/lily58/rev1/info.json b/keyboards/lily58/rev1/info.json index 793386b664..373fd0c5c8 100644 --- a/keyboards/lily58/rev1/info.json +++ b/keyboards/lily58/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0xEB2D", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, -- cgit v1.2.3