From e933e0411f442fa411d3d5ec488180fee241e2ef Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 05:41:58 +1100 Subject: Move matrix config to info.json, part 5 (#20003) Co-authored-by: Nick Brassel --- keyboards/ai03/andromeda/config.h | 4 ---- keyboards/ai03/andromeda/info.json | 5 +++++ keyboards/ai03/equinox/config.h | 17 ----------------- keyboards/ai03/equinox/rev0/config.h | 22 ---------------------- keyboards/ai03/equinox/rev0/info.json | 5 +++++ keyboards/ai03/equinox/rev1/info.json | 5 +++++ keyboards/ai03/jp60/config.h | 17 ----------------- keyboards/ai03/jp60/info.json | 5 +++++ keyboards/ai03/lunar/config.h | 17 ----------------- keyboards/ai03/lunar/info.json | 5 +++++ keyboards/ai03/orbit/config.h | 19 ------------------- keyboards/ai03/orbit/info.json | 13 ++++++++++++- keyboards/ai03/orbit_x/config.h | 19 ------------------- keyboards/ai03/orbit_x/info.json | 13 ++++++++++++- keyboards/ai03/polaris/config.h | 17 ----------------- keyboards/ai03/polaris/info.json | 5 +++++ keyboards/ai03/quasar/config.h | 17 ----------------- keyboards/ai03/quasar/info.json | 5 +++++ keyboards/ai03/soyuz/config.h | 17 ----------------- keyboards/ai03/soyuz/info.json | 5 +++++ keyboards/ai03/vega/config.h | 4 ---- keyboards/ai03/vega/info.json | 5 +++++ keyboards/ai03/voyager60_alps/config.h | 6 ------ keyboards/ai03/voyager60_alps/info.json | 5 +++++ 24 files changed, 74 insertions(+), 178 deletions(-) delete mode 100644 keyboards/ai03/equinox/rev0/config.h (limited to 'keyboards/ai03') diff --git a/keyboards/ai03/andromeda/config.h b/keyboards/ai03/andromeda/config.h index 1fb163a652..056f54d521 100644 --- a/keyboards/ai03/andromeda/config.h +++ b/keyboards/ai03/andromeda/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, B5, B8, B9 } -#define MATRIX_ROW_PINS { B4, B3, A15, A3, A4, A5 } -#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/ai03/andromeda/info.json b/keyboards/ai03/andromeda/info.json index ade4938b82..e29bb3e121 100644 --- a/keyboards/ai03/andromeda/info.json +++ b/keyboards/ai03/andromeda/info.json @@ -8,6 +8,11 @@ "pid": "0x000A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "B5", "B8", "B9"], + "rows": ["B4", "B3", "A15", "A3", "A4", "A5"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "A2", "scroll_lock": "A1", diff --git a/keyboards/ai03/equinox/config.h b/keyboards/ai03/equinox/config.h index 32065a4740..50001e978c 100644 --- a/keyboards/ai03/equinox/config.h +++ b/keyboards/ai03/equinox/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, C5, D4, D5 } -#define MATRIX_COL_PINS { D1, D2, C6, C7, B6, B5, B4, B3, B2, B1, B0, D6 } - -/* 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/ai03/equinox/rev0/config.h b/keyboards/ai03/equinox/rev0/config.h deleted file mode 100644 index 78c6fb8fcd..0000000000 --- a/keyboards/ai03/equinox/rev0/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2019 Ryota Goto - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -// Fix for prototype missing COL0, COL1, using backlight and RGB underglow I/O pins -#undef MATRIX_COL_PINS -#define MATRIX_COL_PINS { C4, B7, C6, C7, B6, B5, B4, B3, B2, B1, B0, D6 } diff --git a/keyboards/ai03/equinox/rev0/info.json b/keyboards/ai03/equinox/rev0/info.json index d76623777e..f5dd365564 100644 --- a/keyboards/ai03/equinox/rev0/info.json +++ b/keyboards/ai03/equinox/rev0/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["C4", "B7", "C6", "C7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "D6"], + "rows": ["D3", "C5", "D4", "D5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D1", "levels": 5, diff --git a/keyboards/ai03/equinox/rev1/info.json b/keyboards/ai03/equinox/rev1/info.json index 19cd40d140..9c0727f7ba 100644 --- a/keyboards/ai03/equinox/rev1/info.json +++ b/keyboards/ai03/equinox/rev1/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["D1", "D2", "C6", "C7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "D6"], + "rows": ["D3", "C5", "D4", "D5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5, diff --git a/keyboards/ai03/jp60/config.h b/keyboards/ai03/jp60/config.h index 76e81dc2aa..9fe6627ecc 100644 --- a/keyboards/ai03/jp60/config.h +++ b/keyboards/ai03/jp60/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 { B6, B5, B4, D7, E6 } -#define MATRIX_COL_PINS { D2, D1, D3, D5, D4, D6, C6, F0, F1, F4, F5, F6, F7, C7 } - -/* 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/ai03/jp60/info.json b/keyboards/ai03/jp60/info.json index 3a07c7224c..c7b55c53be 100644 --- a/keyboards/ai03/jp60/info.json +++ b/keyboards/ai03/jp60/info.json @@ -8,6 +8,11 @@ "pid": "0x0024", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "D1", "D3", "D5", "D4", "D6", "C6", "F0", "F1", "F4", "F5", "F6", "F7", "C7"], + "rows": ["B6", "B5", "B4", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/ai03/lunar/config.h b/keyboards/ai03/lunar/config.h index 10c8ab70ab..50001e978c 100644 --- a/keyboards/ai03/lunar/config.h +++ b/keyboards/ai03/lunar/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 { B3, D0, D1, D2, D3 } -#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 } - -/* 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/ai03/lunar/info.json b/keyboards/ai03/lunar/info.json index 6c069207e1..2b97d0042c 100644 --- a/keyboards/ai03/lunar/info.json +++ b/keyboards/ai03/lunar/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B3", "D0", "D1", "D2", "D3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/ai03/orbit/config.h b/keyboards/ai03/orbit/config.h index 85d4ae5bfe..f4157a1729 100644 --- a/keyboards/ai03/orbit/config.h +++ b/keyboards/ai03/orbit/config.h @@ -17,25 +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 { F7, F6, F5, F4, D3 } -#define MATRIX_COL_PINS { C7, B4, D7, D6, D4, F1, F0 } -#define MATRIX_ROW_PINS_RIGHT { B6, B5, B4, D7, E6 } -#define MATRIX_COL_PINS_RIGHT { D4, D6, F1, F0, F4, F5, C6 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define SELECT_SOFT_SERIAL_SPEED 1 #define SPLIT_LED_STATE_ENABLE diff --git a/keyboards/ai03/orbit/info.json b/keyboards/ai03/orbit/info.json index 840fb1fc20..981f3cd685 100644 --- a/keyboards/ai03/orbit/info.json +++ b/keyboards/ai03/orbit/info.json @@ -8,11 +8,22 @@ "pid": "0x0003", "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["C7", "B4", "D7", "D6", "D4", "F1", "F0"], + "rows": ["F7", "F6", "F5", "F4", "D3"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, "split": { - "soft_serial_pin": "D0" + "soft_serial_pin": "D0", + "matrix_pins": { + "right": { + "cols": ["D4", "D6", "F1", "F0", "F4", "F5", "C6"], + "rows": ["B6", "B5", "B4", "D7", "E6"] + } + } }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/ai03/orbit_x/config.h b/keyboards/ai03/orbit_x/config.h index 27a383f7bb..05d319d030 100644 --- a/keyboards/ai03/orbit_x/config.h +++ b/keyboards/ai03/orbit_x/config.h @@ -17,25 +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 { D7, D6, D4, F0 } -#define MATRIX_COL_PINS { E6, F6, B1, B0, C7, C6 } -#define MATRIX_ROW_PINS_RIGHT { B5, D7, B4, D4 } -#define MATRIX_COL_PINS_RIGHT { D6, B6, B1, B0, B3, B2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define SPLIT_HAND_PIN D5 #define SPLIT_USB_DETECT #define SPLIT_USB_TIMEOUT 2500 diff --git a/keyboards/ai03/orbit_x/info.json b/keyboards/ai03/orbit_x/info.json index fdb26bddf4..ef52a070e2 100644 --- a/keyboards/ai03/orbit_x/info.json +++ b/keyboards/ai03/orbit_x/info.json @@ -8,8 +8,19 @@ "pid": "0x0014", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "F6", "B1", "B0", "C7", "C6"], + "rows": ["D7", "D6", "D4", "F0"] + }, + "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D0" + "soft_serial_pin": "D0", + "matrix_pins": { + "right": { + "cols": ["D6", "B6", "B1", "B0", "B3", "B2"], + "rows": ["B5", "D7", "B4", "D4"] + } + } }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/ai03/polaris/config.h b/keyboards/ai03/polaris/config.h index 871f4bc8db..3946e761c3 100644 --- a/keyboards/ai03/polaris/config.h +++ b/keyboards/ai03/polaris/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 { B1, B2, B3, F0, F1 } -#define MATRIX_COL_PINS { F4, F7, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D2 #ifdef RGB_DI_PIN #define RGBLED_NUM 14 diff --git a/keyboards/ai03/polaris/info.json b/keyboards/ai03/polaris/info.json index ae0fcb927d..ee2f32ffae 100644 --- a/keyboards/ai03/polaris/info.json +++ b/keyboards/ai03/polaris/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], + "rows": ["B1", "B2", "B3", "F0", "F1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5, diff --git a/keyboards/ai03/quasar/config.h b/keyboards/ai03/quasar/config.h index 04765c0788..50001e978c 100644 --- a/keyboards/ai03/quasar/config.h +++ b/keyboards/ai03/quasar/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 { D0, D1, D2, D3, D5, D4, D6, D7 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4 } - -/* 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/ai03/quasar/info.json b/keyboards/ai03/quasar/info.json index c29799484d..68dc3c4a6f 100644 --- a/keyboards/ai03/quasar/info.json +++ b/keyboards/ai03/quasar/info.json @@ -8,6 +8,11 @@ "pid": "0x0010", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "B7", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4"], + "rows": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/ai03/soyuz/config.h b/keyboards/ai03/soyuz/config.h index 027bc03faa..50001e978c 100644 --- a/keyboards/ai03/soyuz/config.h +++ b/keyboards/ai03/soyuz/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 { D4, C6, B6, E6, B4 } -#define MATRIX_COL_PINS { F4, B3, D7, B5 } - -/* 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/ai03/soyuz/info.json b/keyboards/ai03/soyuz/info.json index b008ef45b6..f10a5d4000 100644 --- a/keyboards/ai03/soyuz/info.json +++ b/keyboards/ai03/soyuz/info.json @@ -8,6 +8,11 @@ "pid": "0x0018", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "B3", "D7", "B5"], + "rows": ["D4", "C6", "B6", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x4", "numpad_5x4"], diff --git a/keyboards/ai03/vega/config.h b/keyboards/ai03/vega/config.h index b2798481d4..b575a49f38 100644 --- a/keyboards/ai03/vega/config.h +++ b/keyboards/ai03/vega/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B5, A3, A9, A8, B15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6 } -#define MATRIX_ROW_PINS { A1, A2, B3, A15, A10 } -#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/ai03/vega/info.json b/keyboards/ai03/vega/info.json index 7b3c16cb52..3da23cac09 100644 --- a/keyboards/ai03/vega/info.json +++ b/keyboards/ai03/vega/info.json @@ -8,6 +8,11 @@ "pid": "0x0015", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "A3", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6"], + "rows": ["A1", "A2", "B3", "A15", "A10"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/ai03/voyager60_alps/config.h b/keyboards/ai03/voyager60_alps/config.h index 30b7481688..704a6879f5 100644 --- a/keyboards/ai03/voyager60_alps/config.h +++ b/keyboards/ai03/voyager60_alps/config.h @@ -14,12 +14,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { B1, B2, B3, F0, F1 } -#define MATRIX_COL_PINS { F4, F7, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3} - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D2 #ifdef RGB_DI_PIN #define RGBLED_NUM 14 diff --git a/keyboards/ai03/voyager60_alps/info.json b/keyboards/ai03/voyager60_alps/info.json index a7a68e43b0..fed5542930 100644 --- a/keyboards/ai03/voyager60_alps/info.json +++ b/keyboards/ai03/voyager60_alps/info.json @@ -8,6 +8,11 @@ "pid": "0x060A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], + "rows": ["B1", "B2", "B3", "F0", "F1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { -- cgit v1.2.3