From b1783db4eacacaf8181cfbce13146db1941486ba Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 18 Jun 2023 14:39:07 +1000 Subject: Move `RGBLED_NUM` to data driven (#21278) --- keyboards/ymdk/bface/config.h | 1 - keyboards/ymdk/bface/info.json | 3 +++ keyboards/ymdk/melody96/config.h | 1 - keyboards/ymdk/melody96/info.json | 3 +++ keyboards/ymdk/np21/config.h | 1 - keyboards/ymdk/np21/info.json | 3 +++ keyboards/ymdk/np24/u4rgb6/config.h | 1 - keyboards/ymdk/np24/u4rgb6/info.json | 3 +++ keyboards/ymdk/sp64/config.h | 1 - keyboards/ymdk/sp64/info.json | 1 + keyboards/ymdk/wings/config.h | 1 - keyboards/ymdk/wings/info.json | 1 + keyboards/ymdk/wingshs/config.h | 1 - keyboards/ymdk/wingshs/info.json | 1 + keyboards/ymdk/yd60mq/12led/config.h | 3 --- keyboards/ymdk/yd60mq/12led/info.json | 3 +++ keyboards/ymdk/yd60mq/16led/config.h | 3 --- keyboards/ymdk/yd60mq/16led/info.json | 3 +++ keyboards/ymdk/yd60mq/config.h | 1 - keyboards/ymdk/ym68/config.h | 1 - keyboards/ymdk/ym68/info.json | 1 + keyboards/ymdk/ymd21/v2/config.h | 1 - keyboards/ymdk/ymd21/v2/info.json | 1 + keyboards/ymdk/ymd40/v2/config.h | 1 - keyboards/ymdk/ymd40/v2/info.json | 1 + keyboards/ymdk/ymd67/config.h | 1 - keyboards/ymdk/ymd67/info.json | 3 +++ keyboards/ymdk/ymd75/config.h | 1 - keyboards/ymdk/ymd75/info.json | 3 +++ keyboards/ymdk/ymd96/config.h | 1 - keyboards/ymdk/ymd96/info.json | 3 +++ 31 files changed, 33 insertions(+), 20 deletions(-) delete mode 100644 keyboards/ymdk/yd60mq/12led/config.h delete mode 100644 keyboards/ymdk/yd60mq/16led/config.h (limited to 'keyboards/ymdk') diff --git a/keyboards/ymdk/bface/config.h b/keyboards/ymdk/bface/config.h index 08303c4b13..816875f94a 100644 --- a/keyboards/ymdk/bface/config.h +++ b/keyboards/ymdk/bface/config.h @@ -27,7 +27,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/ymdk/bface/info.json b/keyboards/ymdk/bface/info.json index 09441c5dbd..8e413c1702 100644 --- a/keyboards/ymdk/bface/info.json +++ b/keyboards/ymdk/bface/info.json @@ -17,6 +17,9 @@ "pin": "D4", "levels": 6 }, + "rgblight": { + "led_count": 12 + }, "ws2812": { "driver": "i2c" }, diff --git a/keyboards/ymdk/melody96/config.h b/keyboards/ymdk/melody96/config.h index a62c64fb37..401de718c1 100644 --- a/keyboards/ymdk/melody96/config.h +++ b/keyboards/ymdk/melody96/config.h @@ -16,7 +16,6 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/ymdk/melody96/info.json b/keyboards/ymdk/melody96/info.json index 83c45eaa6b..5903c2af6f 100644 --- a/keyboards/ymdk/melody96/info.json +++ b/keyboards/ymdk/melody96/info.json @@ -17,6 +17,9 @@ "pin": "B6", "levels": 5 }, + "rgblight": { + "led_count": 18 + }, "ws2812": { "pin": "E2" }, diff --git a/keyboards/ymdk/np21/config.h b/keyboards/ymdk/np21/config.h index 1d20ad110d..994e71507c 100644 --- a/keyboards/ymdk/np21/config.h +++ b/keyboards/ymdk/np21/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGBLED_NUM 5 //#define RGBLIGHT_HUE_STEP 8 //#define RGBLIGHT_SAT_STEP 8 //#define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/ymdk/np21/info.json b/keyboards/ymdk/np21/info.json index 62fdf7e20c..0e9f8a7a54 100644 --- a/keyboards/ymdk/np21/info.json +++ b/keyboards/ymdk/np21/info.json @@ -18,6 +18,9 @@ "levels": 12, "breathing": true }, + "rgblight": { + "led_count": 5 + }, "ws2812": { "driver": "i2c" }, diff --git a/keyboards/ymdk/np24/u4rgb6/config.h b/keyboards/ymdk/np24/u4rgb6/config.h index 0f6e31d199..d644169039 100644 --- a/keyboards/ymdk/np24/u4rgb6/config.h +++ b/keyboards/ymdk/np24/u4rgb6/config.h @@ -15,7 +15,6 @@ */ #pragma once -# define RGBLED_NUM 6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/ymdk/np24/u4rgb6/info.json b/keyboards/ymdk/np24/u4rgb6/info.json index 285baacdac..fcd7bf516d 100644 --- a/keyboards/ymdk/np24/u4rgb6/info.json +++ b/keyboards/ymdk/np24/u4rgb6/info.json @@ -16,6 +16,9 @@ "pin": "B7", "levels": 31 }, + "rgblight": { + "led_count": 6 + }, "ws2812": { "pin": "E2" }, diff --git a/keyboards/ymdk/sp64/config.h b/keyboards/ymdk/sp64/config.h index 8e3de2387d..18732f8ed6 100644 --- a/keyboards/ymdk/sp64/config.h +++ b/keyboards/ymdk/sp64/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define RIGHT_HALF /* RGB underglow */ -#define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/ymdk/sp64/info.json b/keyboards/ymdk/sp64/info.json index b972d634f7..d0ca560e84 100644 --- a/keyboards/ymdk/sp64/info.json +++ b/keyboards/ymdk/sp64/info.json @@ -17,6 +17,7 @@ "driver": "i2c" }, "rgblight": { + "led_count": 12, "max_brightness": 250, "sleep": true }, diff --git a/keyboards/ymdk/wings/config.h b/keyboards/ymdk/wings/config.h index 30144bcdac..0d72c8464c 100644 --- a/keyboards/ymdk/wings/config.h +++ b/keyboards/ymdk/wings/config.h @@ -15,7 +15,6 @@ along with this program. If not, see . #pragma once -#define RGBLED_NUM 14 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/ymdk/wings/info.json b/keyboards/ymdk/wings/info.json index 19b7102dc0..971b8e743a 100644 --- a/keyboards/ymdk/wings/info.json +++ b/keyboards/ymdk/wings/info.json @@ -18,6 +18,7 @@ "levels": 5 }, "rgblight": { + "led_count": 14, "sleep": true }, "ws2812": { diff --git a/keyboards/ymdk/wingshs/config.h b/keyboards/ymdk/wingshs/config.h index 4c691f9ff9..ef09c08a2c 100644 --- a/keyboards/ymdk/wingshs/config.h +++ b/keyboards/ymdk/wingshs/config.h @@ -13,7 +13,6 @@ along with this program. If not, see . #pragma once -#define RGBLED_NUM 80 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/ymdk/wingshs/info.json b/keyboards/ymdk/wingshs/info.json index 000051e7b0..a13c1a6950 100644 --- a/keyboards/ymdk/wingshs/info.json +++ b/keyboards/ymdk/wingshs/info.json @@ -25,6 +25,7 @@ "pin": "E2" }, "rgblight": { + "led_count": 80, "max_brightness": 160, "sleep": true }, diff --git a/keyboards/ymdk/yd60mq/12led/config.h b/keyboards/ymdk/yd60mq/12led/config.h deleted file mode 100644 index edea795f78..0000000000 --- a/keyboards/ymdk/yd60mq/12led/config.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#define RGBLED_NUM 12 diff --git a/keyboards/ymdk/yd60mq/12led/info.json b/keyboards/ymdk/yd60mq/12led/info.json index 90ac25f360..2c9ef7320e 100644 --- a/keyboards/ymdk/yd60mq/12led/info.json +++ b/keyboards/ymdk/yd60mq/12led/info.json @@ -1,5 +1,8 @@ { "usb": { "device_version": "0.0.1" + }, + "rgblight": { + "led_count": 12 } } diff --git a/keyboards/ymdk/yd60mq/16led/config.h b/keyboards/ymdk/yd60mq/16led/config.h deleted file mode 100644 index 00d3fcfc8c..0000000000 --- a/keyboards/ymdk/yd60mq/16led/config.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#define RGBLED_NUM 16 diff --git a/keyboards/ymdk/yd60mq/16led/info.json b/keyboards/ymdk/yd60mq/16led/info.json index e557e4d307..48f9a19f9b 100644 --- a/keyboards/ymdk/yd60mq/16led/info.json +++ b/keyboards/ymdk/yd60mq/16led/info.json @@ -1,5 +1,8 @@ { "usb": { "device_version": "0.0.2" + }, + "rgblight": { + "led_count": 16 } } diff --git a/keyboards/ymdk/yd60mq/config.h b/keyboards/ymdk/yd60mq/config.h index 135548b4ff..a8a0bb420a 100644 --- a/keyboards/ymdk/yd60mq/config.h +++ b/keyboards/ymdk/yd60mq/config.h @@ -18,4 +18,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -// RGBLED_NUM is defined in revisions diff --git a/keyboards/ymdk/ym68/config.h b/keyboards/ymdk/ym68/config.h index 3d79d49cfa..0a5632e37b 100644 --- a/keyboards/ymdk/ym68/config.h +++ b/keyboards/ymdk/ym68/config.h @@ -17,7 +17,6 @@ #pragma once #if defined(RGBLIGHT_ENABLE) - #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/ymdk/ym68/info.json b/keyboards/ymdk/ym68/info.json index a66ddd4e7c..96314a2707 100644 --- a/keyboards/ymdk/ym68/info.json +++ b/keyboards/ymdk/ym68/info.json @@ -19,6 +19,7 @@ "breathing": true }, "rgblight": { + "led_count": 20, "sleep": true }, "ws2812": { diff --git a/keyboards/ymdk/ymd21/v2/config.h b/keyboards/ymdk/ymd21/v2/config.h index 8adc76dd6a..6936d591e2 100644 --- a/keyboards/ymdk/ymd21/v2/config.h +++ b/keyboards/ymdk/ymd21/v2/config.h @@ -17,7 +17,6 @@ #pragma once #if defined(RGBLIGHT_ENABLE) - #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/ymdk/ymd21/v2/info.json b/keyboards/ymdk/ymd21/v2/info.json index 764bd9f002..5bd3f23bf5 100644 --- a/keyboards/ymdk/ymd21/v2/info.json +++ b/keyboards/ymdk/ymd21/v2/info.json @@ -21,6 +21,7 @@ "pin": "E2" }, "rgblight": { + "led_count": 8, "max_brightness": 180, "sleep": true }, diff --git a/keyboards/ymdk/ymd40/v2/config.h b/keyboards/ymdk/ymd40/v2/config.h index cc789411e7..0a5632e37b 100644 --- a/keyboards/ymdk/ymd40/v2/config.h +++ b/keyboards/ymdk/ymd40/v2/config.h @@ -17,7 +17,6 @@ #pragma once #if defined(RGBLIGHT_ENABLE) - #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/ymdk/ymd40/v2/info.json b/keyboards/ymdk/ymd40/v2/info.json index 7fadfd2ab1..f5229eabc3 100644 --- a/keyboards/ymdk/ymd40/v2/info.json +++ b/keyboards/ymdk/ymd40/v2/info.json @@ -21,6 +21,7 @@ "pin": "E2" }, "rgblight": { + "led_count": 8, "max_brightness": 150, "sleep": true }, diff --git a/keyboards/ymdk/ymd67/config.h b/keyboards/ymdk/ymd67/config.h index 8a3612b8a5..a8a0bb420a 100644 --- a/keyboards/ymdk/ymd67/config.h +++ b/keyboards/ymdk/ymd67/config.h @@ -15,7 +15,6 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/ymdk/ymd67/info.json b/keyboards/ymdk/ymd67/info.json index 39801fe04e..9f93ba55ef 100644 --- a/keyboards/ymdk/ymd67/info.json +++ b/keyboards/ymdk/ymd67/info.json @@ -17,6 +17,9 @@ "pin": "B7", "levels": 5 }, + "rgblight": { + "led_count": 12 + }, "ws2812": { "pin": "E2" }, diff --git a/keyboards/ymdk/ymd75/config.h b/keyboards/ymdk/ymd75/config.h index 32bdab2478..99e7ce428b 100644 --- a/keyboards/ymdk/ymd75/config.h +++ b/keyboards/ymdk/ymd75/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #pragma once -#define RGBLED_NUM 16 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/ymdk/ymd75/info.json b/keyboards/ymdk/ymd75/info.json index 930139be90..9f6081ebae 100644 --- a/keyboards/ymdk/ymd75/info.json +++ b/keyboards/ymdk/ymd75/info.json @@ -7,6 +7,9 @@ "vid": "0x20A0", "pid": "0x422D" }, + "rgblight": { + "led_count": 16 + }, "ws2812": { "pin": "E2" }, diff --git a/keyboards/ymdk/ymd96/config.h b/keyboards/ymdk/ymd96/config.h index ecb03b5917..f69fb22fc7 100644 --- a/keyboards/ymdk/ymd96/config.h +++ b/keyboards/ymdk/ymd96/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . #define TAPPING_TOGGLE 3 /* RGB underglow */ -#define RGBLED_NUM 18 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/ymdk/ymd96/info.json b/keyboards/ymdk/ymd96/info.json index f603439d39..ca123a3c52 100644 --- a/keyboards/ymdk/ymd96/info.json +++ b/keyboards/ymdk/ymd96/info.json @@ -19,6 +19,9 @@ "levels": 12, "breathing": true }, + "rgblight": { + "led_count": 18 + }, "ws2812": { "driver": "i2c" }, -- cgit v1.2.3