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
@@ -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 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
@@ -19,6 +19,7 @@
        "breathing": true
    },
    "rgblight": {
+        "led_count": 14,
        "sleep": true
    },
    "ws2812": {
@@ -34,7 +34,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 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
@@ -20,6 +20,9 @@
        "caps_lock": "B6",
        "on_state": 0
    },
+    "rgblight": {
+        "led_count": 14
+    },
    "ws2812": {
        "pin": "F0"
    },
@@ -16,7 +16,6 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 16
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
@@ -17,6 +17,9 @@
    "pin": "B6",
    "levels": 5
  },
+  "rgblight": {
+    "led_count": 16
+  },
  "ws2812": {
    "pin": "E2"
  },
@@ -6,7 +6,6 @@

 #define DYNAMIC_KEYMAP_LAYER_COUNT 10
 #define RGB_MATRIX_LED_COUNT 16
-#define RGBLED_NUM 16
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
@@ -17,8 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-#    define RGBLED_NUM 16  // Add 12 if attaching the RGB LED ring
-#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#    define RGB_MATRIX_LED_COUNT 16
 #    ifdef RGBLIGHT_ENABLE
 #        define RGBLIGHT_HUE_STEP 8
 #        define RGBLIGHT_SAT_STEP 8
@@ -12,6 +12,7 @@
    "pin": "D3"
  },
  "rgblight": {
+    "led_count": 16,
    "sleep": true
  },
  "rgb_matrix": {
@@ -17,7 +17,6 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 1
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
@@ -3,6 +3,9 @@
        "pid": "0x0161",
        "device_version": "0.0.1"
    },
+    "rgblight": {
+        "led_count": 1
+    },
    "ws2812": {
        "pin": "B1"
    },
@@ -19,7 +19,6 @@

 #define DYNAMIC_KEYMAP_LAYER_COUNT 10
 #define RGB_MATRIX_LED_COUNT 20
-#define RGBLED_NUM 20
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_DISABLE_WHEN_USB_SUSPENDED