Move RGBLED_NUM to data driven (#21278)

2025-12-22 22:21:58 +00:00 · 2023-06-18 14:39:07 +10:00
parent 7178645be7
commit b1783db4ea
2160 changed files with 2194 additions and 2058 deletions
--- a/keyboards/ymdk/bface/config.h
+++ b/keyboards/ymdk/bface/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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
--- 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"
  },
--- 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
--- 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"
    },
--- a/keyboards/ymdk/np21/config.h
+++ b/keyboards/ymdk/np21/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-#define RGBLED_NUM 5
 //#define RGBLIGHT_HUE_STEP 8
 //#define RGBLIGHT_SAT_STEP 8
 //#define RGBLIGHT_VAL_STEP 8
--- 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"
    },
--- 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
--- 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"
    },
--- a/keyboards/ymdk/sp64/config.h
+++ b/keyboards/ymdk/sp64/config.h
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RIGHT_HALF

 /* RGB underglow */
-#define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
--- 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
    },
--- a/keyboards/ymdk/wings/config.h
+++ b/keyboards/ymdk/wings/config.h
@@ -15,7 +15,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-#define RGBLED_NUM 14
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
--- 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": {
--- a/keyboards/ymdk/wingshs/config.h
+++ b/keyboards/ymdk/wingshs/config.h
@@ -13,7 +13,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-#define RGBLED_NUM 80
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
--- 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
    },
--- a/keyboards/ymdk/yd60mq/12led/config.h
+++ b/keyboards/ymdk/yd60mq/12led/config.h
@@ -1,3 +0,0 @@
-#pragma once
-
-#define RGBLED_NUM 12
--- 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
    }
 }
--- a/keyboards/ymdk/yd60mq/16led/config.h
+++ b/keyboards/ymdk/yd60mq/16led/config.h
@@ -1,3 +0,0 @@
-#pragma once
-
-#define RGBLED_NUM 16
--- 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
    }
 }
--- 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
--- 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
--- 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": {
--- 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
--- 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
    },
--- 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
--- 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
    },
--- 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
--- 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"
    },
--- a/keyboards/ymdk/ymd75/config.h
+++ b/keyboards/ymdk/ymd75/config.h
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-#define RGBLED_NUM 16
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
--- 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"
    },
--- a/keyboards/ymdk/ymd96/config.h
+++ b/keyboards/ymdk/ymd96/config.h
@@ -22,7 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TOGGLE 3

 /* RGB underglow */
-#define RGBLED_NUM 18
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
--- 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"
    },