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/nightly_boards/conde60/config.h | 17 ----------------- keyboards/nightly_boards/conde60/info.json | 5 +++++ 2 files changed, 5 insertions(+), 17 deletions(-) (limited to 'keyboards/nightly_boards/conde60') diff --git a/keyboards/nightly_boards/conde60/config.h b/keyboards/nightly_boards/conde60/config.h index 9cad75e7b6..4fdd3f76a1 100644 --- a/keyboards/nightly_boards/conde60/config.h +++ b/keyboards/nightly_boards/conde60/config.h @@ -17,20 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B1, B2, F0, F1, F4 } -#define MATRIX_COL_PINS { B0, B3, B7, B6, C6, C7, F7, F6, F5, D4, D6, D7, B4, B5 } - #define RGB_DI_PIN D5 #ifdef RGB_DI_PIN #define RGBLED_NUM 12 @@ -47,9 +33,6 @@ along with this program. If not, see . #endif -/* COL2ROW, 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/nightly_boards/conde60/info.json b/keyboards/nightly_boards/conde60/info.json index 67c415381c..0883b994e3 100644 --- a/keyboards/nightly_boards/conde60/info.json +++ b/keyboards/nightly_boards/conde60/info.json @@ -8,6 +8,11 @@ "pid": "0x0015", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B3", "B7", "B6", "C6", "C7", "F7", "F6", "F5", "D4", "D6", "D7", "B4", "B5"], + "rows": ["B1", "B2", "F0", "F1", "F4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { -- cgit v1.2.3