From f4ba17c4a0ee59603c167b04f2d6f6eee8b2cf1b Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 13:14:29 +1100 Subject: Move LED indicator config to data driven (#19800) --- keyboards/handwired/aim65/config.h | 3 --- keyboards/handwired/aim65/info.json | 4 ++++ keyboards/handwired/bolek/config.h | 6 ------ keyboards/handwired/bstk100/config.h | 9 --------- keyboards/handwired/bstk100/info.json | 6 ++++++ keyboards/handwired/dqz11n1g/config.h | 4 ---- keyboards/handwired/dqz11n1g/info.json | 5 +++++ keyboards/handwired/evk/v1_3/config.h | 3 --- keyboards/handwired/evk/v1_3/info.json | 3 +++ keyboards/handwired/frankie_macropad/config.h | 6 ------ keyboards/handwired/hwpm87/config.h | 3 --- keyboards/handwired/hwpm87/info.json | 4 ++++ keyboards/handwired/kbod/config.h | 2 -- keyboards/handwired/kbod/info.json | 3 +++ keyboards/handwired/lagrange/config.h | 3 --- keyboards/handwired/lagrange/info.json | 4 ++++ keyboards/handwired/meck_tkl/blackpill_f401/config.h | 3 --- keyboards/handwired/meck_tkl/blackpill_f401/info.json | 4 ++++ keyboards/handwired/oem_ansi_fullsize/config.h | 6 ------ keyboards/handwired/oem_iso_fullsize/config.h | 3 --- keyboards/handwired/snatchpad/config.h | 6 ------ keyboards/handwired/sono1/stm32f103/config.h | 6 ------ keyboards/handwired/sono1/stm32f103/info.json | 6 ++++++ keyboards/handwired/sono1/t2pp/config.h | 6 ------ keyboards/handwired/sono1/t2pp/info.json | 6 ++++++ keyboards/handwired/split89/config.h | 6 ------ keyboards/handwired/tritium_numpad/config.h | 3 --- keyboards/handwired/tritium_numpad/info.json | 4 ++++ keyboards/handwired/unicomp_mini_m/config.h | 5 ----- keyboards/handwired/unicomp_mini_m/info.json | 6 ++++++ 30 files changed, 55 insertions(+), 83 deletions(-) (limited to 'keyboards/handwired') diff --git a/keyboards/handwired/aim65/config.h b/keyboards/handwired/aim65/config.h index 3ef2064ade..5ff4263ecd 100644 --- a/keyboards/handwired/aim65/config.h +++ b/keyboards/handwired/aim65/config.h @@ -35,6 +35,3 @@ #define MATRIX_COL_PINS { D1, C6, B6, B2, F7, F6, F5, F4 } #define DIODE_DIRECTION COL2ROW - -#define LED_CAPS_LOCK_PIN B0 -#define LED_PIN_ON_STATE 0 diff --git a/keyboards/handwired/aim65/info.json b/keyboards/handwired/aim65/info.json index f7671ea318..de4263d1cd 100644 --- a/keyboards/handwired/aim65/info.json +++ b/keyboards/handwired/aim65/info.json @@ -8,6 +8,10 @@ "pid": "0x0F34", "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "B0", + "on_state": 0 + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/bolek/config.h b/keyboards/handwired/bolek/config.h index 645e05039e..de1a49da1c 100644 --- a/keyboards/handwired/bolek/config.h +++ b/keyboards/handwired/bolek/config.h @@ -38,12 +38,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -//#define LED_NUM_LOCK_PIN B0 -//#define LED_CAPS_LOCK_PIN B1 -//#define LED_SCROLL_LOCK_PIN B2 -//#define LED_COMPOSE_PIN B3 -//#define LED_KANA_PIN B4 - /* 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/handwired/bstk100/config.h b/keyboards/handwired/bstk100/config.h index 31a2d42769..373f0b461b 100644 --- a/keyboards/handwired/bstk100/config.h +++ b/keyboards/handwired/bstk100/config.h @@ -39,15 +39,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -// The state of the indicator pins when the LED is "on" - 1 for high -#define LED_PIN_ON_STATE 0 - -#define LED_NUM_LOCK_PIN D4 -#define LED_CAPS_LOCK_PIN D5 -#define LED_SCROLL_LOCK_PIN B0 -//#define LED_COMPOSE_PIN B3 -//#define LED_KANA_PIN B4 - /* 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/handwired/bstk100/info.json b/keyboards/handwired/bstk100/info.json index 093fde872c..03580c3332 100644 --- a/keyboards/handwired/bstk100/info.json +++ b/keyboards/handwired/bstk100/info.json @@ -8,6 +8,12 @@ "pid": "0xB100", "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "D5", + "num_lock": "D4", + "scroll_lock": "B0", + "on_state": 0 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/dqz11n1g/config.h b/keyboards/handwired/dqz11n1g/config.h index cd12f0d250..bd609c9082 100644 --- a/keyboards/handwired/dqz11n1g/config.h +++ b/keyboards/handwired/dqz11n1g/config.h @@ -31,10 +31,6 @@ along with this program. If not, see . /* Column read via SPI (shift register) */ /* #define MATRIX_COL_PINS { } */ -#define LED_CAPS_LOCK_PIN F7 /* A0 */ -#define LED_NUM_LOCK_PIN F5 /*A2 */ -#define LED_SCROLL_LOCK_PIN F4 /*A3 */ - #define LED_FUN_LOCK_PIN F6 /* A1 (handled in layer_state_set_user()) */ /* audio config */ diff --git a/keyboards/handwired/dqz11n1g/info.json b/keyboards/handwired/dqz11n1g/info.json index 039362f5b8..c72310a1e8 100644 --- a/keyboards/handwired/dqz11n1g/info.json +++ b/keyboards/handwired/dqz11n1g/info.json @@ -8,6 +8,11 @@ "pid": "0x4451", "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "F7", + "num_lock": "F5", + "scroll_lock": "F4" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/evk/v1_3/config.h b/keyboards/handwired/evk/v1_3/config.h index 817473a125..ccd23ad45a 100644 --- a/keyboards/handwired/evk/v1_3/config.h +++ b/keyboards/handwired/evk/v1_3/config.h @@ -38,9 +38,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION ROW2COL // the positive current flows into the rows and then out of the columns negative. -/* define whiche Pins to use for the status LEDs*/ -#define LED_CAPS_LOCK_PIN D4 - /* 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/handwired/evk/v1_3/info.json b/keyboards/handwired/evk/v1_3/info.json index 8ac987e2db..bc6a522003 100644 --- a/keyboards/handwired/evk/v1_3/info.json +++ b/keyboards/handwired/evk/v1_3/info.json @@ -8,6 +8,9 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "D4" + }, "processor": "atmega32u4", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/handwired/frankie_macropad/config.h b/keyboards/handwired/frankie_macropad/config.h index 6d0aa48c7c..03fe3ecdb7 100644 --- a/keyboards/handwired/frankie_macropad/config.h +++ b/keyboards/handwired/frankie_macropad/config.h @@ -38,12 +38,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -//#define LED_NUM_LOCK_PIN B0 -//#define LED_CAPS_LOCK_PIN B1 -//#define LED_SCROLL_LOCK_PIN B2 -//#define LED_COMPOSE_PIN B3 -//#define LED_KANA_PIN B4 - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/handwired/hwpm87/config.h b/keyboards/handwired/hwpm87/config.h index be662d4bf6..c8275d9dc6 100644 --- a/keyboards/handwired/hwpm87/config.h +++ b/keyboards/handwired/hwpm87/config.h @@ -23,6 +23,3 @@ #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5 } #define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B7, F0, F1, D6, C7, B6, F7, F6, F5, F4 } - -#define LED_CAPS_LOCK_PIN D5 -#define LED_PIN_ON_STATE 0 diff --git a/keyboards/handwired/hwpm87/info.json b/keyboards/handwired/hwpm87/info.json index 3560bac95f..8654ea7561 100644 --- a/keyboards/handwired/hwpm87/info.json +++ b/keyboards/handwired/hwpm87/info.json @@ -8,6 +8,10 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "D5", + "on_state": 0 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/kbod/config.h b/keyboards/handwired/kbod/config.h index 4bc9154f38..5e01f4093e 100644 --- a/keyboards/handwired/kbod/config.h +++ b/keyboards/handwired/kbod/config.h @@ -27,8 +27,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define LED_CAPS_LOCK_PIN B0 - /* 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/handwired/kbod/info.json b/keyboards/handwired/kbod/info.json index 398dbcd5ed..6ce0f46f2c 100644 --- a/keyboards/handwired/kbod/info.json +++ b/keyboards/handwired/kbod/info.json @@ -8,6 +8,9 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "B0" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/lagrange/config.h b/keyboards/handwired/lagrange/config.h index 7a54cd0460..59a366cdb6 100644 --- a/keyboards/handwired/lagrange/config.h +++ b/keyboards/handwired/lagrange/config.h @@ -32,6 +32,3 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION ROW2COL - -#define LED_CAPS_LOCK_PIN D1 -#define LED_SCROLL_LOCK_PIN D2 diff --git a/keyboards/handwired/lagrange/info.json b/keyboards/handwired/lagrange/info.json index 9eb68abdf3..7d1179e1f4 100644 --- a/keyboards/handwired/lagrange/info.json +++ b/keyboards/handwired/lagrange/info.json @@ -8,6 +8,10 @@ "pid": "0x2718", "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "D1", + "scroll_lock": "D2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/config.h b/keyboards/handwired/meck_tkl/blackpill_f401/config.h index eff5d5d81f..dcf0a27d21 100644 --- a/keyboards/handwired/meck_tkl/blackpill_f401/config.h +++ b/keyboards/handwired/meck_tkl/blackpill_f401/config.h @@ -7,6 +7,3 @@ { B15, A8, A9, B14, A15, B3 } #define MATRIX_COL_PINS \ { B4, B5, B6, B7, B8, B9, A1, A2, A3, A4, A5, A6, A7, B0, B1, A0, B10 } - -#define LED_CAPS_LOCK_PIN C13 -#define LED_PIN_ON_STATE 0 diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/info.json b/keyboards/handwired/meck_tkl/blackpill_f401/info.json index acd7e83f77..68df328ac7 100644 --- a/keyboards/handwired/meck_tkl/blackpill_f401/info.json +++ b/keyboards/handwired/meck_tkl/blackpill_f401/info.json @@ -1,4 +1,8 @@ { + "indicators": { + "caps_lock": "C13", + "on_state": 0 + }, "processor": "STM32F401", "bootloader": "stm32-dfu", "board": "BLACKPILL_STM32_F401" diff --git a/keyboards/handwired/oem_ansi_fullsize/config.h b/keyboards/handwired/oem_ansi_fullsize/config.h index 3687ae6994..bce35ad928 100644 --- a/keyboards/handwired/oem_ansi_fullsize/config.h +++ b/keyboards/handwired/oem_ansi_fullsize/config.h @@ -45,12 +45,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -//#define LED_NUM_LOCK_PIN B0 -//#define LED_CAPS_LOCK_PIN B1 -//#define LED_SCROLL_LOCK_PIN B2 -//#define LED_COMPOSE_PIN B3 -//#define LED_KANA_PIN B4 - /* 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/handwired/oem_iso_fullsize/config.h b/keyboards/handwired/oem_iso_fullsize/config.h index 88925e58d3..00421d2705 100644 --- a/keyboards/handwired/oem_iso_fullsize/config.h +++ b/keyboards/handwired/oem_iso_fullsize/config.h @@ -40,9 +40,6 @@ *Row 3, R129, Pin A2 *Row 4, R128, Pin E5 *Row 5, R127, Pin A7 -#define LED_CAPS_LOCK_PIN C7 -#define LED_SCROLL_LOCK_PIN A3 -#define LED_NUM_LOCK_PIN C6 #define BACKLIGHT_PINS { B5, E5, E4, A7, A1, A2 } #define BACKLIGHT_LEVELS 1*/ diff --git a/keyboards/handwired/snatchpad/config.h b/keyboards/handwired/snatchpad/config.h index 6bb7b1c82a..f38f90a651 100644 --- a/keyboards/handwired/snatchpad/config.h +++ b/keyboards/handwired/snatchpad/config.h @@ -29,12 +29,6 @@ #define ENCODERS_PAD_A { D3, D0 } #define ENCODERS_PAD_B { D2, D1 } -//#define LED_NUM_LOCK_PIN B0 -//#define LED_CAPS_LOCK_PIN B1 -//#define LED_SCROLL_LOCK_PIN B2 -//#define LED_COMPOSE_PIN B3 -//#define LED_KANA_PIN B4 - /* 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/handwired/sono1/stm32f103/config.h b/keyboards/handwired/sono1/stm32f103/config.h index ec0ddfbe05..b961eaffd6 100644 --- a/keyboards/handwired/sono1/stm32f103/config.h +++ b/keyboards/handwired/sono1/stm32f103/config.h @@ -21,11 +21,5 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { A5, B3, A9, A10, B13, B14, B15, A8, B7, B8, B9, C13, A15, A0, A1 } #define MATRIX_COL_PINS { A4, A3, B11, B10, B1, B0, A7, A6 } - -#define LED_KANA_PIN A2 -#define LED_CAPS_LOCK_PIN B5 #define LED_CTRL_XFER_PIN B6 -#define LED_NUM_LOCK_PIN B4 #define LED_KB_LOCK_PIN B12 -#define LED_PIN_ON_STATE 0 - diff --git a/keyboards/handwired/sono1/stm32f103/info.json b/keyboards/handwired/sono1/stm32f103/info.json index 241cf5e9a2..b25392382a 100644 --- a/keyboards/handwired/sono1/stm32f103/info.json +++ b/keyboards/handwired/sono1/stm32f103/info.json @@ -2,6 +2,12 @@ "usb": { "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "B5", + "num_lock": "B4", + "kana": "A2", + "on_state": 0 + }, "processor": "STM32F103", "bootloader": "stm32duino" } diff --git a/keyboards/handwired/sono1/t2pp/config.h b/keyboards/handwired/sono1/t2pp/config.h index 4097132e86..15bea036a2 100644 --- a/keyboards/handwired/sono1/t2pp/config.h +++ b/keyboards/handwired/sono1/t2pp/config.h @@ -21,11 +21,5 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { F7, F6, F5, F4, F3, F2, F1, F0, D7, B7, D0, D1, D2, D3, D4 } #define MATRIX_COL_PINS { C6, C5, C4, C3, C2, C1, C0, E1 } - -#define LED_KANA_PIN D5 -#define LED_CAPS_LOCK_PIN B3 #define LED_CTRL_XFER_PIN B4 -#define LED_NUM_LOCK_PIN B2 #define LED_KB_LOCK_PIN B1 -#define LED_PIN_ON_STATE 0 - diff --git a/keyboards/handwired/sono1/t2pp/info.json b/keyboards/handwired/sono1/t2pp/info.json index 69ccef72ae..3e637c3e94 100644 --- a/keyboards/handwired/sono1/t2pp/info.json +++ b/keyboards/handwired/sono1/t2pp/info.json @@ -2,6 +2,12 @@ "usb": { "device_version": "0.0.2" }, + "indicators": { + "caps_lock": "B3", + "num_lock": "B2", + "kana": "D5", + "on_state": 0 + }, "processor": "at90usb1286", "bootloader": "halfkay" } diff --git a/keyboards/handwired/split89/config.h b/keyboards/handwired/split89/config.h index 3f4934dd8b..c720ab30a4 100644 --- a/keyboards/handwired/split89/config.h +++ b/keyboards/handwired/split89/config.h @@ -54,12 +54,6 @@ COLS = number of cols per side which curently needs to be equal so there are bla */ #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 -//#define LED_NUM_LOCK_PIN B0 -//#define LED_CAPS_LOCK_PIN B1 -//#define LED_SCROLL_LOCK_PIN B2 -//#define LED_COMPOSE_PIN B3 -//#define LED_KANA_PIN B4 - /* 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/handwired/tritium_numpad/config.h b/keyboards/handwired/tritium_numpad/config.h index d7b9998964..f1f52a56f0 100644 --- a/keyboards/handwired/tritium_numpad/config.h +++ b/keyboards/handwired/tritium_numpad/config.h @@ -27,9 +27,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { D1, D0, D4, C6, D7, E6 } #define MATRIX_COL_PINS { F4, F6, B1, B2 } -#define LED_NUM_LOCK_PIN D5 -#define LED_PIN_ON_STATE 0 - #define BACKLIGHT_PIN B6 /* COL2ROW or ROW2COL */ diff --git a/keyboards/handwired/tritium_numpad/info.json b/keyboards/handwired/tritium_numpad/info.json index 97362a0665..8dc967df96 100644 --- a/keyboards/handwired/tritium_numpad/info.json +++ b/keyboards/handwired/tritium_numpad/info.json @@ -8,6 +8,10 @@ "pid": "0x6060", "device_version": "0.0.3" }, + "indicators": { + "num_lock": "D5", + "on_state": 0 + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["numpad_6x4", "ortho_6x4"], diff --git a/keyboards/handwired/unicomp_mini_m/config.h b/keyboards/handwired/unicomp_mini_m/config.h index df916c9b86..ef38f37c70 100644 --- a/keyboards/handwired/unicomp_mini_m/config.h +++ b/keyboards/handwired/unicomp_mini_m/config.h @@ -35,11 +35,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { F7, F6, F5, F4, F3, F2, F1, F0, E6, E7, B0, B1 } #define MATRIX_COL_PINS { C7, C6, C5, C4, C3, C2, C1, C0, E1, E0, D7, B7, D5, D4, D3, D2 } -#define LED_PIN_ON_STATE 0 -#define LED_NUM_LOCK_PIN B6 -#define LED_CAPS_LOCK_PIN B5 -#define LED_SCROLL_LOCK_PIN B4 - /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION ROW2COL diff --git a/keyboards/handwired/unicomp_mini_m/info.json b/keyboards/handwired/unicomp_mini_m/info.json index af9b90cc24..7216203ba8 100644 --- a/keyboards/handwired/unicomp_mini_m/info.json +++ b/keyboards/handwired/unicomp_mini_m/info.json @@ -8,6 +8,12 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "B5", + "num_lock": "B6", + "scroll_lock": "B4", + "on_state": 0 + }, "processor": "at90usb1286", "bootloader": "halfkay", "layouts": { -- cgit v1.2.3