From 1022afa6c24a64c78d1c9be99a695ff5335876f7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 04:59:07 +1100 Subject: Move matrix config to info.json, part 8 (#20030) --- keyboards/kikoslab/ellora65/config.h | 9 --------- keyboards/kikoslab/ellora65/info.json | 5 +++++ keyboards/kikoslab/kl90/config.h | 9 --------- keyboards/kikoslab/kl90/info.json | 5 +++++ 4 files changed, 10 insertions(+), 18 deletions(-) (limited to 'keyboards/kikoslab') diff --git a/keyboards/kikoslab/ellora65/config.h b/keyboards/kikoslab/ellora65/config.h index 1243e775d3..1369ec04d7 100644 --- a/keyboards/kikoslab/ellora65/config.h +++ b/keyboards/kikoslab/ellora65/config.h @@ -17,15 +17,6 @@ along with this program. If not, see . #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { B7, B2, F1, F4, D6, D7, D5, D4, D3, D2 } -#define MATRIX_COL_PINS { F5, F6, F7, C6, B6, B5, B4, B3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /*RGB TINGS*/ #define RGB_DI_PIN E6 #define RGBLED_NUM 12 diff --git a/keyboards/kikoslab/ellora65/info.json b/keyboards/kikoslab/ellora65/info.json index 2fae750985..0b78709509 100644 --- a/keyboards/kikoslab/ellora65/info.json +++ b/keyboards/kikoslab/ellora65/info.json @@ -8,6 +8,11 @@ "pid": "0xE88F", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "C6", "B6", "B5", "B4", "B3"], + "rows": ["B7", "B2", "F1", "F4", "D6", "D7", "D5", "D4", "D3", "D2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B0", "pin_b": "B1"} diff --git a/keyboards/kikoslab/kl90/config.h b/keyboards/kikoslab/kl90/config.h index f5f54eee2c..9987ae161e 100644 --- a/keyboards/kikoslab/kl90/config.h +++ b/keyboards/kikoslab/kl90/config.h @@ -17,15 +17,6 @@ along with this program. If not, see . #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { F1, F3, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { F2, F0, A2, A1, A0, D2, D3, D4, D5, D6, D7, E0, E1, C0, C1, C2 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define EMCODER_DIRECTION_FLIP /*EEPROM for via*/ diff --git a/keyboards/kikoslab/kl90/info.json b/keyboards/kikoslab/kl90/info.json index f063fd2323..47141fbdd8 100644 --- a/keyboards/kikoslab/kl90/info.json +++ b/keyboards/kikoslab/kl90/info.json @@ -8,6 +8,11 @@ "pid": "0xEA53", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F2", "F0", "A2", "A1", "A0", "D2", "D3", "D4", "D5", "D6", "D7", "E0", "E1", "C0", "C1", "C2"], + "rows": ["F1", "F3", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A3", "pin_b": "A4"}, -- cgit v1.2.3