From 23c365b023e409885e6f201f12df56e5145dde47 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 6 Mar 2023 09:53:52 +1100 Subject: Move matrix config to info.json, part 1 (#19985) --- keyboards/gon/nerd60/config.h | 7 ------- keyboards/gon/nerd60/info.json | 5 +++++ keyboards/gon/nerdtkl/config.h | 7 ------- keyboards/gon/nerdtkl/info.json | 5 +++++ 4 files changed, 10 insertions(+), 14 deletions(-) (limited to 'keyboards/gon') diff --git a/keyboards/gon/nerd60/config.h b/keyboards/gon/nerd60/config.h index c3762c6388..fa9a83d08e 100644 --- a/keyboards/gon/nerd60/config.h +++ b/keyboards/gon/nerd60/config.h @@ -1,12 +1,5 @@ #pragma once -/* matrix pins */ -#define MATRIX_ROW_PINS { B4, E2, F4, F7, F1, F6, C6, F5, D7, C7 } -#define MATRIX_COL_PINS { E6, B0, B1, B2, B3, F0, D0, D5 } - -/* 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/gon/nerd60/info.json b/keyboards/gon/nerd60/info.json index 097d4d45c0..4b1f158717 100644 --- a/keyboards/gon/nerd60/info.json +++ b/keyboards/gon/nerd60/info.json @@ -8,6 +8,11 @@ "pid": "0x3630", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B0", "B1", "B2", "B3", "F0", "D0", "D5"], + "rows": ["B4", "E2", "F4", "F7", "F1", "F6", "C6", "F5", "D7", "C7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/gon/nerdtkl/config.h b/keyboards/gon/nerdtkl/config.h index 8db20474be..fa9a83d08e 100644 --- a/keyboards/gon/nerdtkl/config.h +++ b/keyboards/gon/nerdtkl/config.h @@ -1,12 +1,5 @@ #pragma once -/* matrix pins */ -#define MATRIX_ROW_PINS { B4, E2, F4, F7, F1, F6, C6, F5, D7, C7 } -#define MATRIX_COL_PINS { E6, B0, B1, B2, B3, F0, D0, D5, 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/gon/nerdtkl/info.json b/keyboards/gon/nerdtkl/info.json index f9e38f0c89..ac7d8a0ce7 100644 --- a/keyboards/gon/nerdtkl/info.json +++ b/keyboards/gon/nerdtkl/info.json @@ -8,6 +8,11 @@ "pid": "0x5244", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B0", "B1", "B2", "B3", "F0", "D0", "D5", "D1"], + "rows": ["B4", "E2", "F4", "F7", "F1", "F6", "C6", "F5", "D7", "C7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, -- cgit v1.2.3