From dd086a51d82a574a55eb3b89e8943301d72296f3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 10 Mar 2023 22:16:56 +1100 Subject: Move matrix config to info.json, part 2 (#19987) --- keyboards/hineybush/h08_ocelot/config.h | 17 ----------------- keyboards/hineybush/h08_ocelot/info.json | 5 +++++ keyboards/hineybush/h10/config.h | 17 ----------------- keyboards/hineybush/h10/info.json | 5 +++++ keyboards/hineybush/h60/config.h | 7 ------- keyboards/hineybush/h60/info.json | 5 +++++ keyboards/hineybush/h65/config.h | 17 ----------------- keyboards/hineybush/h65/info.json | 5 +++++ keyboards/hineybush/h65_hotswap/config.h | 17 ----------------- keyboards/hineybush/h65_hotswap/info.json | 5 +++++ keyboards/hineybush/h660s/config.h | 17 ----------------- keyboards/hineybush/h660s/info.json | 5 +++++ keyboards/hineybush/h75_singa/config.h | 17 ----------------- keyboards/hineybush/h75_singa/info.json | 5 +++++ keyboards/hineybush/h87a/config.h | 16 ---------------- keyboards/hineybush/h87a/info.json | 5 +++++ keyboards/hineybush/h88/config.h | 17 ----------------- keyboards/hineybush/h88/info.json | 5 +++++ keyboards/hineybush/hineyg80/config.h | 8 -------- keyboards/hineybush/hineyg80/info.json | 5 +++++ keyboards/hineybush/physix/config.h | 17 ----------------- keyboards/hineybush/physix/info.json | 5 +++++ keyboards/hineybush/sm68/config.h | 18 ------------------ keyboards/hineybush/sm68/info.json | 5 +++++ 24 files changed, 60 insertions(+), 185 deletions(-) (limited to 'keyboards/hineybush') diff --git a/keyboards/hineybush/h08_ocelot/config.h b/keyboards/hineybush/h08_ocelot/config.h index 7037db7735..27c2811e68 100644 --- a/keyboards/hineybush/h08_ocelot/config.h +++ b/keyboards/hineybush/h08_ocelot/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 { B4, B6 } -#define MATRIX_COL_PINS { F4, C7, D0, D1 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F1 #ifdef RGB_DI_PIN # define RGBLED_NUM 7 diff --git a/keyboards/hineybush/h08_ocelot/info.json b/keyboards/hineybush/h08_ocelot/info.json index d7e395285b..439b37e379 100644 --- a/keyboards/hineybush/h08_ocelot/info.json +++ b/keyboards/hineybush/h08_ocelot/info.json @@ -8,6 +8,11 @@ "pid": "0xE8E9", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "C7", "D0", "D1"], + "rows": ["B4", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/hineybush/h10/config.h b/keyboards/hineybush/h10/config.h index 2fc1c25eb6..994b108d8e 100644 --- a/keyboards/hineybush/h10/config.h +++ b/keyboards/hineybush/h10/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 { B0, C6, B6, B5, B4, D7 } -#define MATRIX_COL_PINS { F0, C7, B1, B2 } - -/* 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/hineybush/h10/info.json b/keyboards/hineybush/h10/info.json index e59ba7f3e4..d63c6da200 100644 --- a/keyboards/hineybush/h10/info.json +++ b/keyboards/hineybush/h10/info.json @@ -8,6 +8,11 @@ "pid": "0xEBD8", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "C7", "B1", "B2"], + "rows": ["B0", "C6", "B6", "B5", "B4", "D7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/hineybush/h60/config.h b/keyboards/hineybush/h60/config.h index ca8f344793..c0365b76e7 100644 --- a/keyboards/hineybush/h60/config.h +++ b/keyboards/hineybush/h60/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { B6, B5, B4, D7, E6 } -#define MATRIX_COL_PINS { B3, D0, D1, D2, D3, D5, D6, C7, F0, F1, F4, F5, F6, F7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B0 #ifdef RGB_DI_PIN #define RGBLED_NUM 16 diff --git a/keyboards/hineybush/h60/info.json b/keyboards/hineybush/h60/info.json index eece82f5f2..7defbee93c 100644 --- a/keyboards/hineybush/h60/info.json +++ b/keyboards/hineybush/h60/info.json @@ -8,6 +8,11 @@ "pid": "0xEBBE", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B3", "D0", "D1", "D2", "D3", "D5", "D6", "C7", "F0", "F1", "F4", "F5", "F6", "F7"], + "rows": ["B6", "B5", "B4", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 12 diff --git a/keyboards/hineybush/h65/config.h b/keyboards/hineybush/h65/config.h index 925f0498ca..49d4991b06 100644 --- a/keyboards/hineybush/h65/config.h +++ b/keyboards/hineybush/h65/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 { D7, D6, D4, D1, D0 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, B0, B1, B2, B3 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D2 #ifdef RGB_DI_PIN # define RGBLED_NUM 17 diff --git a/keyboards/hineybush/h65/info.json b/keyboards/hineybush/h65/info.json index e1bebb560c..70ccfc19d3 100644 --- a/keyboards/hineybush/h65/info.json +++ b/keyboards/hineybush/h65/info.json @@ -8,6 +8,11 @@ "pid": "0xE9E4", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "B0", "B1", "B2", "B3"], + "rows": ["D7", "D6", "D4", "D1", "D0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/hineybush/h65_hotswap/config.h b/keyboards/hineybush/h65_hotswap/config.h index 925f0498ca..49d4991b06 100644 --- a/keyboards/hineybush/h65_hotswap/config.h +++ b/keyboards/hineybush/h65_hotswap/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 { D7, D6, D4, D1, D0 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, B0, B1, B2, B3 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D2 #ifdef RGB_DI_PIN # define RGBLED_NUM 17 diff --git a/keyboards/hineybush/h65_hotswap/info.json b/keyboards/hineybush/h65_hotswap/info.json index 9eebb77345..457f09921a 100644 --- a/keyboards/hineybush/h65_hotswap/info.json +++ b/keyboards/hineybush/h65_hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0xE8B7", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "B0", "B1", "B2", "B3"], + "rows": ["D7", "D6", "D4", "D1", "D0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/hineybush/h660s/config.h b/keyboards/hineybush/h660s/config.h index e8e84f1117..707d202266 100644 --- a/keyboards/hineybush/h660s/config.h +++ b/keyboards/hineybush/h660s/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, E6, B3, D3, D2 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B0 #ifdef RGB_DI_PIN # define RGBLED_NUM 16 diff --git a/keyboards/hineybush/h660s/info.json b/keyboards/hineybush/h660s/info.json index d773651ee6..8faaa2f505 100644 --- a/keyboards/hineybush/h660s/info.json +++ b/keyboards/hineybush/h660s/info.json @@ -8,6 +8,11 @@ "pid": "0xEB1B", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5"], + "rows": ["B1", "E6", "B3", "D3", "D2"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/hineybush/h75_singa/config.h b/keyboards/hineybush/h75_singa/config.h index 55b920a2b9..45e93b7ebd 100644 --- a/keyboards/hineybush/h75_singa/config.h +++ b/keyboards/hineybush/h75_singa/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 { B0, B1, D0, D1, D2, D6 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, B2, D4, D5, D3 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B3 #ifdef RGB_DI_PIN #define RGBLED_NUM 22 diff --git a/keyboards/hineybush/h75_singa/info.json b/keyboards/hineybush/h75_singa/info.json index 94e8d256fd..3114f46d35 100644 --- a/keyboards/hineybush/h75_singa/info.json +++ b/keyboards/hineybush/h75_singa/info.json @@ -8,6 +8,11 @@ "pid": "0xEC9A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "B2", "D4", "D5", "D3"], + "rows": ["B0", "B1", "D0", "D1", "D2", "D6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/hineybush/h87a/config.h b/keyboards/hineybush/h87a/config.h index f267f09020..652b910feb 100644 --- a/keyboards/hineybush/h87a/config.h +++ b/keyboards/hineybush/h87a/config.h @@ -17,22 +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 { B0, B1, B2, B3, D0, D1, B5, B6, D7, B4, D6, D4 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, D2 } - -/* 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/hineybush/h87a/info.json b/keyboards/hineybush/h87a/info.json index db1fd91d13..2baf4c7e5e 100644 --- a/keyboards/hineybush/h87a/info.json +++ b/keyboards/hineybush/h87a/info.json @@ -8,6 +8,11 @@ "pid": "0xECE9", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "D2"], + "rows": ["B0", "B1", "B2", "B3", "D0", "D1", "B5", "B6", "D7", "B4", "D6", "D4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/hineybush/h88/config.h b/keyboards/hineybush/h88/config.h index 9a75238cb3..3f57906377 100644 --- a/keyboards/hineybush/h88/config.h +++ b/keyboards/hineybush/h88/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 { B0, B1, B2, B3, D0, D1, B5, B6, D7, B4, D6, D4 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, D2 } - -/* 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/hineybush/h88/info.json b/keyboards/hineybush/h88/info.json index bd362c74b5..acab34777a 100644 --- a/keyboards/hineybush/h88/info.json +++ b/keyboards/hineybush/h88/info.json @@ -8,6 +8,11 @@ "pid": "0xECA2", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "D2"], + "rows": ["B0", "B1", "B2", "B3", "D0", "D1", "B5", "B6", "D7", "B4", "D6", "D4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/hineybush/hineyg80/config.h b/keyboards/hineybush/hineyg80/config.h index acf19753f5..b44dfaac52 100644 --- a/keyboards/hineybush/hineyg80/config.h +++ b/keyboards/hineybush/hineyg80/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B2, B3, D0, B1, D2, D1, D5, D3, D6, D4, B4, D7 } -#define MATRIX_COL_PINS { C7, F7, F6, F5, F4, F1, F0, B7, B0 } - -/* 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 diff --git a/keyboards/hineybush/hineyg80/info.json b/keyboards/hineybush/hineyg80/info.json index dcc3aa5f29..2df90c7957 100644 --- a/keyboards/hineybush/hineyg80/info.json +++ b/keyboards/hineybush/hineyg80/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "F0", "B7", "B0"], + "rows": ["B2", "B3", "D0", "B1", "D2", "D1", "D5", "D3", "D6", "D4", "B4", "D7"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B6", "num_lock": "C6", diff --git a/keyboards/hineybush/physix/config.h b/keyboards/hineybush/physix/config.h index ee7b90de23..77d8169cfe 100644 --- a/keyboards/hineybush/physix/config.h +++ b/keyboards/hineybush/physix/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, C7, C6 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B3, B2, B1, B0, B5, B4, D7, D6, D4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E6 #ifdef RGB_DI_PIN #define RGBLED_NUM 26 diff --git a/keyboards/hineybush/physix/info.json b/keyboards/hineybush/physix/info.json index b611de62e4..597beceb54 100644 --- a/keyboards/hineybush/physix/info.json +++ b/keyboards/hineybush/physix/info.json @@ -8,6 +8,11 @@ "pid": "0xEC81", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B3", "B2", "B1", "B0", "B5", "B4", "D7", "D6", "D4"], + "rows": ["D0", "D1", "D2", "C7", "C6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/hineybush/sm68/config.h b/keyboards/hineybush/sm68/config.h index c11c6431ce..95d44f631d 100644 --- a/keyboards/hineybush/sm68/config.h +++ b/keyboards/hineybush/sm68/config.h @@ -17,24 +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 { B2, B1, B0, D4, D1 } -#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D3, D2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - - #define RGB_DI_PIN D0 #ifdef RGB_DI_PIN #define RGBLED_NUM 16 diff --git a/keyboards/hineybush/sm68/info.json b/keyboards/hineybush/sm68/info.json index 642e7b5e07..94765a6a14 100644 --- a/keyboards/hineybush/sm68/info.json +++ b/keyboards/hineybush/sm68/info.json @@ -8,6 +8,11 @@ "pid": "0xEC9F", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D3", "D2"], + "rows": ["B2", "B1", "B0", "D4", "D1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { -- cgit v1.2.3