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/ymdk/bface/config.h | 2 -- keyboards/ymdk/bface/info.json | 3 +++ keyboards/ymdk/melody96/config.h | 5 ----- keyboards/ymdk/melody96/info.json | 6 ++++++ keyboards/ymdk/np21/config.h | 2 -- keyboards/ymdk/np21/info.json | 3 +++ keyboards/ymdk/np24/u4rgb6/config.h | 4 ---- keyboards/ymdk/np24/u4rgb6/info.json | 4 ++++ keyboards/ymdk/sp64/config.h | 5 ----- keyboards/ymdk/sp64/info.json | 5 +++++ keyboards/ymdk/wings/config.h | 3 --- keyboards/ymdk/wings/info.json | 4 ++++ keyboards/ymdk/wingshs/config.h | 3 --- keyboards/ymdk/wingshs/info.json | 4 ++++ keyboards/ymdk/ymd75/config.h | 2 -- keyboards/ymdk/ymd75/rev1/info.json | 3 +++ keyboards/ymdk/ymd75/rev2/info.json | 3 +++ keyboards/ymdk/ymd75/rev3/config.h | 2 -- keyboards/ymdk/ymd75/rev3/info.json | 3 +++ keyboards/ymdk/ymd96/config.h | 4 ---- keyboards/ymdk/ymd96/info.json | 5 +++++ 21 files changed, 43 insertions(+), 32 deletions(-) (limited to 'keyboards/ymdk') diff --git a/keyboards/ymdk/bface/config.h b/keyboards/ymdk/bface/config.h index f93e8bce31..aad880f51c 100644 --- a/keyboards/ymdk/bface/config.h +++ b/keyboards/ymdk/bface/config.h @@ -27,8 +27,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define LED_CAPS_LOCK_PIN D1 - #define BACKLIGHT_PIN D4 #define BACKLIGHT_LEVELS 6 diff --git a/keyboards/ymdk/bface/info.json b/keyboards/ymdk/bface/info.json index fe3f8c2cea..0547091c2a 100644 --- a/keyboards/ymdk/bface/info.json +++ b/keyboards/ymdk/bface/info.json @@ -8,6 +8,9 @@ "pid": "0x4266", "device_version": "2.0.0" }, + "indicators": { + "caps_lock": "D1" + }, "processor": "atmega32a", "bootloader": "bootloadhid", "layouts": { diff --git a/keyboards/ymdk/melody96/config.h b/keyboards/ymdk/melody96/config.h index 21e724b43f..0aa29f642b 100644 --- a/keyboards/ymdk/melody96/config.h +++ b/keyboards/ymdk/melody96/config.h @@ -12,11 +12,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION ROW2COL -#define LED_NUM_LOCK_PIN C6 -#define LED_CAPS_LOCK_PIN C7 -#define LED_SCROLL_LOCK_PIN B5 -#define LED_PIN_ON_STATE 0 - #define BACKLIGHT_PIN B6 #ifdef BACKLIGHT_PIN #define BACKLIGHT_LEVELS 5 diff --git a/keyboards/ymdk/melody96/info.json b/keyboards/ymdk/melody96/info.json index 1c21c0fdeb..93c64be2cd 100644 --- a/keyboards/ymdk/melody96/info.json +++ b/keyboards/ymdk/melody96/info.json @@ -8,6 +8,12 @@ "pid": "0x4D96", "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "C7", + "num_lock": "C6", + "scroll_lock": "B5", + "on_state": 0 + }, "bootmagic": { "matrix": [5, 0] }, diff --git a/keyboards/ymdk/np21/config.h b/keyboards/ymdk/np21/config.h index 6911f4f103..682396ca1e 100644 --- a/keyboards/ymdk/np21/config.h +++ b/keyboards/ymdk/np21/config.h @@ -38,8 +38,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define LED_NUM_LOCK_PIN D0 - #define BACKLIGHT_PIN D4 #define BACKLIGHT_LEVELS 12 #define BACKLIGHT_BREATHING diff --git a/keyboards/ymdk/np21/info.json b/keyboards/ymdk/np21/info.json index 9a7053358b..31dc02f0cd 100644 --- a/keyboards/ymdk/np21/info.json +++ b/keyboards/ymdk/np21/info.json @@ -7,6 +7,9 @@ "pid": "0x5021", "device_version": "2.0.0" }, + "indicators": { + "num_lock": "D0" + }, "processor": "atmega32a", "bootloader": "bootloadhid", "community_layouts": ["ortho_6x4", "numpad_6x4"], diff --git a/keyboards/ymdk/np24/u4rgb6/config.h b/keyboards/ymdk/np24/u4rgb6/config.h index 196258a5e7..737a4c3b31 100644 --- a/keyboards/ymdk/np24/u4rgb6/config.h +++ b/keyboards/ymdk/np24/u4rgb6/config.h @@ -27,10 +27,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION ROW2COL -/* LED indicator pins */ -#define LED_NUM_LOCK_PIN C6 -#define LED_PIN_ON_STATE 0 - #define BACKLIGHT_PIN B7 #ifdef BACKLIGHT_PIN # define BACKLIGHT_LEVELS 31 diff --git a/keyboards/ymdk/np24/u4rgb6/info.json b/keyboards/ymdk/np24/u4rgb6/info.json index 3353a16269..1d5ff5dbd7 100644 --- a/keyboards/ymdk/np24/u4rgb6/info.json +++ b/keyboards/ymdk/np24/u4rgb6/info.json @@ -7,6 +7,10 @@ "pid": "0x5024", "device_version": "4.0.6" }, + "indicators": { + "num_lock": "C6", + "on_state": 0 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_6x4", "numpad_6x4"], diff --git a/keyboards/ymdk/sp64/config.h b/keyboards/ymdk/sp64/config.h index 8fd53baafd..da23123292 100644 --- a/keyboards/ymdk/sp64/config.h +++ b/keyboards/ymdk/sp64/config.h @@ -23,11 +23,6 @@ along with this program. If not, see . #define RIGHT_HALF -/* LED indicator lights */ -#define LED_CAPS_LOCK_PIN D1 -#define LED_NUM_LOCK_PIN D0 -#define LED_SCROLL_LOCK_PIN D6 - /* RGB underglow */ #define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/ymdk/sp64/info.json b/keyboards/ymdk/sp64/info.json index 2b2ed16285..66cbbe56e5 100644 --- a/keyboards/ymdk/sp64/info.json +++ b/keyboards/ymdk/sp64/info.json @@ -8,6 +8,11 @@ "pid": "0x5364", "device_version": "2.0.0" }, + "indicators": { + "caps_lock": "D1", + "num_lock": "D0", + "scroll_lock": "D6" + }, "processor": "atmega32a", "bootloader": "bootloadhid", "layouts": { diff --git a/keyboards/ymdk/wings/config.h b/keyboards/ymdk/wings/config.h index b99fcdfda1..8b0ec334e5 100644 --- a/keyboards/ymdk/wings/config.h +++ b/keyboards/ymdk/wings/config.h @@ -39,9 +39,6 @@ along with this program. If not, see . #define BACKLIGHT_PIN B6 #define BACKLIGHT_LEVELS 5 -#define LED_CAPS_LOCK_PIN C7 -#define LED_PIN_ON_STATE 0 - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 14 diff --git a/keyboards/ymdk/wings/info.json b/keyboards/ymdk/wings/info.json index 44fcc47c63..80e0c580a3 100644 --- a/keyboards/ymdk/wings/info.json +++ b/keyboards/ymdk/wings/info.json @@ -8,6 +8,10 @@ "pid": "0x2975", "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "C7", + "on_state": 0 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/ymdk/wingshs/config.h b/keyboards/ymdk/wingshs/config.h index 9ebb46827a..11ba82cabc 100644 --- a/keyboards/ymdk/wingshs/config.h +++ b/keyboards/ymdk/wingshs/config.h @@ -37,9 +37,6 @@ along with this program. If not, see . #define BACKLIGHT_PIN B6 #define BACKLIGHT_LEVELS 5 -#define LED_CAPS_LOCK_PIN C7 -#define LED_PIN_ON_STATE 0 - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 80 diff --git a/keyboards/ymdk/wingshs/info.json b/keyboards/ymdk/wingshs/info.json index ab474f0a19..e451d10d4d 100644 --- a/keyboards/ymdk/wingshs/info.json +++ b/keyboards/ymdk/wingshs/info.json @@ -8,6 +8,10 @@ "pid": "0x4975", "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "C7", + "on_state": 0 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/ymdk/ymd75/config.h b/keyboards/ymdk/ymd75/config.h index c9c88a026b..d384ae2479 100644 --- a/keyboards/ymdk/ymd75/config.h +++ b/keyboards/ymdk/ymd75/config.h @@ -22,8 +22,6 @@ along with this program. If not, see . #define BACKLIGHT_LEVELS 12 -#define LED_CAPS_LOCK_PIN D1 - #define RGB_DI_PIN E2 #define RGBLED_NUM 16 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/ymdk/ymd75/rev1/info.json b/keyboards/ymdk/ymd75/rev1/info.json index d7be6a3c86..6dee7f2d94 100644 --- a/keyboards/ymdk/ymd75/rev1/info.json +++ b/keyboards/ymdk/ymd75/rev1/info.json @@ -2,6 +2,9 @@ "usb": { "device_version": "1.0.0" }, + "indicators": { + "caps_lock": "D1" + }, "processor": "atmega32a", "bootloader": "bootloadhid" } diff --git a/keyboards/ymdk/ymd75/rev2/info.json b/keyboards/ymdk/ymd75/rev2/info.json index 759d2c1e0c..be7df2e5a7 100644 --- a/keyboards/ymdk/ymd75/rev2/info.json +++ b/keyboards/ymdk/ymd75/rev2/info.json @@ -2,6 +2,9 @@ "usb": { "device_version": "2.0.0" }, + "indicators": { + "caps_lock": "D1" + }, "processor": "atmega32a", "bootloader": "bootloadhid" } diff --git a/keyboards/ymdk/ymd75/rev3/config.h b/keyboards/ymdk/ymd75/rev3/config.h index 9e54c7acdd..41af337f4c 100644 --- a/keyboards/ymdk/ymd75/rev3/config.h +++ b/keyboards/ymdk/ymd75/rev3/config.h @@ -7,5 +7,3 @@ #define BACKLIGHT_PIN B6 // change the backlight pin that has since changed in Rev 3 #define DIODE_DIRECTION ROW2COL #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 4 -#undef LED_CAPS_LOCK_PIN // CapsLock pin changed in Rev 3 -#define LED_CAPS_LOCK_PIN C7 diff --git a/keyboards/ymdk/ymd75/rev3/info.json b/keyboards/ymdk/ymd75/rev3/info.json index c72db1ba6f..850cf51f56 100644 --- a/keyboards/ymdk/ymd75/rev3/info.json +++ b/keyboards/ymdk/ymd75/rev3/info.json @@ -2,6 +2,9 @@ "usb": { "device_version": "3.0.0" }, + "indicators": { + "caps_lock": "C7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/ymdk/ymd96/config.h b/keyboards/ymdk/ymd96/config.h index 52b9ec5ed9..cb783702c6 100644 --- a/keyboards/ymdk/ymd96/config.h +++ b/keyboards/ymdk/ymd96/config.h @@ -28,10 +28,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define LED_NUM_LOCK_PIN D0 -#define LED_CAPS_LOCK_PIN D1 -#define LED_PIN_ON_STATE 0 - #define BACKLIGHT_PIN D4 #define BACKLIGHT_LEVELS 12 #define BACKLIGHT_BREATHING diff --git a/keyboards/ymdk/ymd96/info.json b/keyboards/ymdk/ymd96/info.json index 1628aeb271..ebf56d2ee5 100644 --- a/keyboards/ymdk/ymd96/info.json +++ b/keyboards/ymdk/ymd96/info.json @@ -8,6 +8,11 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "indicators": { + "caps_lock": "D1", + "num_lock": "D0", + "on_state": 0 + }, "processor": "atmega32a", "bootloader": "bootloadhid", "layouts": { -- cgit v1.2.3