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/the_royal/liminal/config.h | 7 ------- keyboards/the_royal/liminal/info.json | 5 +++++ keyboards/the_royal/schwann/config.h | 7 ------- keyboards/the_royal/schwann/info.json | 5 +++++ 4 files changed, 10 insertions(+), 14 deletions(-) (limited to 'keyboards/the_royal') diff --git a/keyboards/the_royal/liminal/config.h b/keyboards/the_royal/liminal/config.h index 351589a086..f752e60fcd 100644 --- a/keyboards/the_royal/liminal/config.h +++ b/keyboards/the_royal/liminal/config.h @@ -1,12 +1,5 @@ #pragma once - -#define MATRIX_ROW_PINS { C6, B6, B7, C7 } -#define MATRIX_COL_PINS { D6, C4, D3, D2, D1, D0, C2, B0, B1, B2, B3, B4, D5, C5 } - -/* COL2ROW or ROW2COL */ -#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/the_royal/liminal/info.json b/keyboards/the_royal/liminal/info.json index d4865fa3e8..45d26bf4e7 100644 --- a/keyboards/the_royal/liminal/info.json +++ b/keyboards/the_royal/liminal/info.json @@ -8,6 +8,11 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D6", "C4", "D3", "D2", "D1", "D0", "C2", "B0", "B1", "B2", "B3", "B4", "D5", "C5"], + "rows": ["C6", "B6", "B7", "C7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/the_royal/schwann/config.h b/keyboards/the_royal/schwann/config.h index 0c6341af0f..600797d1ee 100644 --- a/keyboards/the_royal/schwann/config.h +++ b/keyboards/the_royal/schwann/config.h @@ -1,12 +1,5 @@ #pragma once - -#define MATRIX_ROW_PINS { F0, F1, F6, C7 } -#define MATRIX_COL_PINS { F4, F5, D5, D3, D2, C6, B6, B5, B4, D7, D6, D1 } - -/* COL2ROW or ROW2COL */ -#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/the_royal/schwann/info.json b/keyboards/the_royal/schwann/info.json index 97d10f6edc..db132721eb 100644 --- a/keyboards/the_royal/schwann/info.json +++ b/keyboards/the_royal/schwann/info.json @@ -8,6 +8,11 @@ "pid": "0x3521", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "D5", "D3", "D2", "C6", "B6", "B5", "B4", "D7", "D6", "D1"], + "rows": ["F0", "F1", "F6", "C7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { -- cgit v1.2.3