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
@@ -28,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_EFFECT_STATIC_GRADIENT
    #define RGBLIGHT_EFFECT_TWINKLE

-    #define RGBLED_NUM 16
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
    #define RGBLIGHT_VAL_STEP 8
@@ -12,6 +12,9 @@
    "cols": ["F6", "F5", "F4", "F1", "E6", "D5", "D3", "D2", "D1", "D0", "D4", "D6", "D7", "B4", "B5"],
    "rows": ["B0", "B3", "C7", "B6", "C6"]
  },
+  "rgblight": {
+    "led_count": 16
+  },
  "ws2812": {
    "pin": "F0"
  },
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-    #define RGBLED_NUM 20       /* 16 underglow LEDs, 4 top LEDs */
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
    #define RGBLIGHT_VAL_STEP 8
@@ -19,6 +19,7 @@
        "pin": "E2"
    },
    "rgblight": {
+        "led_count": 20,
        "max_brightness": 180,
        "sleep": true
    },
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_EFFECT_STATIC_GRADIENT
    #define RGBLIGHT_EFFECT_TWINKLE

-    #define RGBLED_NUM 22 /* 16 Bottom 6 top*/
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
    #define RGBLIGHT_VAL_STEP 8
@@ -19,6 +19,9 @@
    "indicators": {
        "caps_lock": "C7"
    },
+    "rgblight": {
+        "led_count": 22
+    },
    "ws2812": {
        "pin": "E2"
    },
@@ -34,7 +34,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
@@ -18,6 +18,9 @@
        "levels": 7,
        "breathing": true
    },
+    "rgblight": {
+        "led_count": 18
+    },
    "ws2812": {
        "pin": "E2"
    },
@@ -33,7 +33,6 @@
    #define RGBLIGHT_EFFECT_STATIC_GRADIENT
    #define RGBLIGHT_EFFECT_TWINKLE

-    #define RGBLED_NUM 4
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
    #define RGBLIGHT_VAL_STEP 8
@@ -16,6 +16,9 @@
    "backlight": {
        "pin": "B6"
    },
+    "rgblight": {
+        "led_count": 4
+    },
    "ws2812": {
        "pin": "B1"
    },