From 9e64300e67720a5468c2585391250ca5579b311b Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 00:00:24 +1100 Subject: Move matrix config to info.json, part 4 (#20001) --- keyboards/deng/djam/config.h | 5 ----- keyboards/deng/djam/info.json | 5 +++++ keyboards/deng/thirty/config.h | 6 ------ keyboards/deng/thirty/info.json | 5 +++++ 4 files changed, 10 insertions(+), 11 deletions(-) (limited to 'keyboards/deng') diff --git a/keyboards/deng/djam/config.h b/keyboards/deng/djam/config.h index 8193eae02f..5896f3cd70 100644 --- a/keyboards/deng/djam/config.h +++ b/keyboards/deng/djam/config.h @@ -15,11 +15,6 @@ */ #pragma once - -#define MATRIX_ROW_PINS { F0, F1, F4 } -#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4 } -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE #define RGB_DI_PIN D5 #define RGB_MATRIX_LED_COUNT 31 diff --git a/keyboards/deng/djam/info.json b/keyboards/deng/djam/info.json index abf18685b2..cdba6219d4 100644 --- a/keyboards/deng/djam/info.json +++ b/keyboards/deng/djam/info.json @@ -8,6 +8,11 @@ "pid": "0x7325", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["F0", "F1", "F4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5 diff --git a/keyboards/deng/thirty/config.h b/keyboards/deng/thirty/config.h index e80b0d97a4..e96dee185b 100644 --- a/keyboards/deng/thirty/config.h +++ b/keyboards/deng/thirty/config.h @@ -15,12 +15,6 @@ */ #pragma once - -/* Matrix */ -#define MATRIX_ROW_PINS { B15, A5, A3, A15, B7, B8 } -#define MATRIX_COL_PINS { B13, B14, B3, A4, A6 } -#define DIODE_DIRECTION COL2ROW - /* RGB Matrix */ #ifdef RGB_MATRIX_ENABLE #define RGB_DI_PIN B12 diff --git a/keyboards/deng/thirty/info.json b/keyboards/deng/thirty/info.json index 0fda78c76d..454577c1eb 100644 --- a/keyboards/deng/thirty/info.json +++ b/keyboards/deng/thirty/info.json @@ -8,6 +8,11 @@ "pid": "0x7342", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B13", "B14", "B3", "A4", "A6"], + "rows": ["B15", "A5", "A3", "A15", "B7", "B8"] + }, + "diode_direction": "COL2ROW", "backlight": { "driver": "software", "pin": "B11", -- cgit v1.2.3