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/nacly/sodium42/config.h | 7 ------- keyboards/nacly/sodium42/info.json | 5 +++++ keyboards/nacly/sodium50/config.h | 7 ------- keyboards/nacly/sodium50/info.json | 5 +++++ keyboards/nacly/sodium62/config.h | 7 ------- keyboards/nacly/sodium62/info.json | 5 +++++ keyboards/nacly/splitreus62/config.h | 7 ------- keyboards/nacly/splitreus62/info.json | 5 +++++ keyboards/nacly/ua62/config.h | 17 ----------------- keyboards/nacly/ua62/info.json | 5 +++++ 10 files changed, 25 insertions(+), 45 deletions(-) (limited to 'keyboards/nacly') diff --git a/keyboards/nacly/sodium42/config.h b/keyboards/nacly/sodium42/config.h index 690f7c96f9..1bbaec44c6 100644 --- a/keyboards/nacly/sodium42/config.h +++ b/keyboards/nacly/sodium42/config.h @@ -16,13 +16,6 @@ #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { F7, D4, D7, B4 } -#define MATRIX_COL_PINS { D2, C6, E6, B5, B2, B3 } - -#define DIODE_DIRECTION COL2ROW - #define SPLIT_HAND_PIN F4 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/nacly/sodium42/info.json b/keyboards/nacly/sodium42/info.json index 752f5c5372..255d4e85e2 100644 --- a/keyboards/nacly/sodium42/info.json +++ b/keyboards/nacly/sodium42/info.json @@ -8,6 +8,11 @@ "pid": "0xFED0", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "C6", "E6", "B5", "B2", "B3"], + "rows": ["F7", "D4", "D7", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D3" }, diff --git a/keyboards/nacly/sodium50/config.h b/keyboards/nacly/sodium50/config.h index 55abbac4d1..1bbaec44c6 100644 --- a/keyboards/nacly/sodium50/config.h +++ b/keyboards/nacly/sodium50/config.h @@ -16,13 +16,6 @@ #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { F7, D4, D7, B4} -#define MATRIX_COL_PINS { D2, C6, E6, B5, B2, B3, B1 } - -#define DIODE_DIRECTION COL2ROW - #define SPLIT_HAND_PIN F4 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/nacly/sodium50/info.json b/keyboards/nacly/sodium50/info.json index 6e2e6d5aef..182162e39f 100644 --- a/keyboards/nacly/sodium50/info.json +++ b/keyboards/nacly/sodium50/info.json @@ -8,6 +8,11 @@ "pid": "0xFED0", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "C6", "E6", "B5", "B2", "B3", "B1"], + "rows": ["F7", "D4", "D7", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D3" }, diff --git a/keyboards/nacly/sodium62/config.h b/keyboards/nacly/sodium62/config.h index 5e24b062cf..c526c9c9c5 100644 --- a/keyboards/nacly/sodium62/config.h +++ b/keyboards/nacly/sodium62/config.h @@ -16,13 +16,6 @@ #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { F7, D4, D7, B4, B6 } -#define MATRIX_COL_PINS { D2, C6, E6, B5, B2, B3, B1 } - -#define DIODE_DIRECTION COL2ROW - #define SPLIT_HAND_PIN F4 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/nacly/sodium62/info.json b/keyboards/nacly/sodium62/info.json index bf9a50ded2..07e380569b 100644 --- a/keyboards/nacly/sodium62/info.json +++ b/keyboards/nacly/sodium62/info.json @@ -8,6 +8,11 @@ "pid": "0xFED0", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "C6", "E6", "B5", "B2", "B3", "B1"], + "rows": ["F7", "D4", "D7", "B4", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D3" }, diff --git a/keyboards/nacly/splitreus62/config.h b/keyboards/nacly/splitreus62/config.h index b7b0ec0d30..64f60becf3 100644 --- a/keyboards/nacly/splitreus62/config.h +++ b/keyboards/nacly/splitreus62/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { D3, D2, D1, D4, C6, D7 } -#define MATRIX_COL_PINS { E6, B4, B5, B6, B2, B3 } - -#define DIODE_DIRECTION ROW2COL - #define SPLIT_HAND_PIN F4 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/nacly/splitreus62/info.json b/keyboards/nacly/splitreus62/info.json index a3a3c88e0b..07ccd770c1 100644 --- a/keyboards/nacly/splitreus62/info.json +++ b/keyboards/nacly/splitreus62/info.json @@ -8,6 +8,11 @@ "pid": "0xFED0", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B4", "B5", "B6", "B2", "B3"], + "rows": ["D3", "D2", "D1", "D4", "C6", "D7"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/nacly/ua62/config.h b/keyboards/nacly/ua62/config.h index 882bda8ccf..0391f174c9 100644 --- a/keyboards/nacly/ua62/config.h +++ b/keyboards/nacly/ua62/config.h @@ -17,23 +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 { D3, D2, D1, D0, D4 } -#define MATRIX_COL_PINS { C6, D7, E6, B4, B5, B6, B2, B3, B1, F7, F6, F5, F4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* 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/nacly/ua62/info.json b/keyboards/nacly/ua62/info.json index d7bbd11265..82e284ebe7 100644 --- a/keyboards/nacly/ua62/info.json +++ b/keyboards/nacly/ua62/info.json @@ -8,6 +8,11 @@ "pid": "0xFFFF", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["D3", "D2", "D1", "D0", "D4"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { -- cgit v1.2.3