Move RGBLED_NUM to data driven (#21278)

2023-06-18 14:39:07 +10:00
parent 7178645be7
commit b1783db4ea
2160 changed files with 2194 additions and 2058 deletions
--- a/keyboards/yandrstudio/buff67v3/config.h
+++ b/keyboards/yandrstudio/buff67v3/config.h
@@ -17,7 +17,6 @@

 #ifdef RGBLIGHT_ENABLE

-#    define RGBLED_NUM 1
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
--- a/keyboards/yandrstudio/buff67v3/info.json
+++ b/keyboards/yandrstudio/buff67v3/info.json
@@ -6,6 +6,9 @@
        "pid": "0xAA88",
        "device_version": "1.0.0"
    },
+    "rgblight": {
+        "led_count": 1
+    },
    "ws2812": {
        "pin": "B4",
        "driver": "pwm"
--- a/keyboards/yandrstudio/eau_r2/config.h
+++ b/keyboards/yandrstudio/eau_r2/config.h
@@ -17,7 +17,6 @@

 #ifdef RGBLIGHT_ENABLE

-#    define RGBLED_NUM 12
 #    define RGBLIGHT_VAL_STEP 5

 #    define RGBLIGHT_EFFECT_BREATHING
--- a/keyboards/yandrstudio/eau_r2/info.json
+++ b/keyboards/yandrstudio/eau_r2/info.json
@@ -15,6 +15,7 @@
        "pin": "A8"
    },
    "rgblight": {
+        "led_count": 12,
        "max_brightness": 200,
        "sleep": true
    },
--- a/keyboards/yandrstudio/nightstar75/config.h
+++ b/keyboards/yandrstudio/nightstar75/config.h
@@ -17,8 +17,6 @@

 #ifdef RGBLIGHT_ENABLE

-#    define RGBLED_NUM 4
-
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
--- a/keyboards/yandrstudio/nightstar75/info.json
+++ b/keyboards/yandrstudio/nightstar75/info.json
@@ -11,6 +11,7 @@
        "driver": "pwm"
    },
    "rgblight": {
+        "led_count": 4,
        "max_brightness": 180
    },
    "matrix_pins": {
--- a/keyboards/yandrstudio/nz64/config.h
+++ b/keyboards/yandrstudio/nz64/config.h
@@ -20,8 +20,7 @@

 /* RGB Matrix */
 #ifdef RGB_MATRIX_ENABLE
-#   define RGBLED_NUM 82
-#   define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#   define RGB_MATRIX_LED_COUNT 82

 #   define WS2812_PWM_DRIVER PWMD3  // default: PWMD2
 #   define WS2812_PWM_CHANNEL 2  // default: 2
@@ -87,9 +86,6 @@


 #ifdef RGBLIGHT_ENABLE
-#   define RGBLED_NUM 82
-#   define RGB_MATRIX_LED_COUNT RGBLED_NUM
-
 #   define WS2812_PWM_DRIVER PWMD3  // default: PWMD2
 #   define WS2812_PWM_CHANNEL 2  // default: 2
 #   define WS2812_PWM_PAL_MODE 2  // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
--- a/keyboards/yandrstudio/nz64/info.json
+++ b/keyboards/yandrstudio/nz64/info.json
@@ -4,6 +4,9 @@
        "pid": "0xAAAF",
        "device_version": "1.0.0"
    },
+    "rgblight": {
+        "led_count": 82
+    },
    "ws2812": {
        "pin": "A7",
        "driver": "pwm"
--- a/keyboards/yandrstudio/nz67v2/config.h
+++ b/keyboards/yandrstudio/nz67v2/config.h
@@ -21,8 +21,7 @@
 /* RGB Matrix */
 #ifdef RGB_MATRIX_ENABLE

-#    define RGBLED_NUM 86
-#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#    define RGB_MATRIX_LED_COUNT 86

 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
 #    define RGBLIGHT_VAL_STEP 5
--- a/keyboards/yandrstudio/tg67/config.h
+++ b/keyboards/yandrstudio/tg67/config.h
@@ -18,8 +18,7 @@
 /* RGB Matrix */
 #ifdef RGB_MATRIX_ENABLE

-#    define RGBLED_NUM 69
-#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#    define RGB_MATRIX_LED_COUNT 69

 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 250
 #    define RGBLIGHT_VAL_STEP 5
--- a/keyboards/yandrstudio/yr6095/config.h
+++ b/keyboards/yandrstudio/yr6095/config.h
@@ -17,8 +17,6 @@

 #ifdef RGBLIGHT_ENABLE

-#    define RGBLED_NUM 1
-
 #    define RGBLIGHT_LAYERS
 #    define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
 #    define RGBLIGHT_LAYERS_RETAIN_VAL
--- a/keyboards/yandrstudio/yr6095/info.json
+++ b/keyboards/yandrstudio/yr6095/info.json
@@ -6,6 +6,9 @@
        "pid": "0xAA0C",
        "device_version": "1.0.0"
    },
+    "rgblight": {
+        "led_count": 1
+    },
    "ws2812": {
        "pin": "B5",
        "driver": "pwm"
--- a/keyboards/yandrstudio/yr80/config.h
+++ b/keyboards/yandrstudio/yr80/config.h
@@ -18,9 +18,6 @@

 #ifdef RGBLIGHT_ENABLE

-#    define RGBLED_NUM 1
-#    define DRIVER_LED_TOTAL RGBLED_NUM
-
 #    define RGBLIGHT_LAYERS
 #    define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
 #    define RGBLIGHT_LAYERS_RETAIN_VAL
--- a/keyboards/yandrstudio/yr80/info.json
+++ b/keyboards/yandrstudio/yr80/info.json
@@ -6,6 +6,9 @@
        "pid": "0xAA0D",
        "device_version": "1.0.0"
    },
+    "rgblight": {
+        "led_count": 1
+    },
    "ws2812": {
        "pin": "A7",
        "driver": "pwm"