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
@@ -49,7 +49,6 @@
 #define SPLIT_TRANSACTION_IDS_KB TOUCH_ENCODER_SYNC, RGB_MENU_SYNC

 /* RGB LED Configuration */
-#define RGBLED_NUM 98
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -9,6 +9,7 @@
        "device_version": "0.0.1"
    },
    "rgblight": {
+        "led_count": 98,
        "split_count": [49, 49]
    },
    "ws2812": {
@@ -16,7 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-#define RGBLED_NUM 64
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -27,7 +26,7 @@ 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 RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 64

 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
@@ -12,6 +12,7 @@
        "driver": "custom"
    },
    "rgblight": {
+        "led_count": 64,
        "max_brightness": 120
    },
    "layouts": {
@@ -52,9 +52,6 @@
 #define DIP_SWITCH_PINS { A14, B13 }
 #define DIP_SWITCH_PINS_RIGHT { A14, B0 }

-/* RGB LED Configuration */
-#define RGBLED_NUM 156
-
 // RGB Lighting Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgblight?id=effect-and-animation-toggles
@@ -9,6 +9,7 @@
        "device_version": "0.0.1"
    },
    "rgblight": {
+        "led_count": 156,
        "split_count": [78, 78]
    },
    "ws2812": {
@@ -22,8 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE

-#define RGBLED_NUM 16    // Number of LEDs
-
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
@@ -16,6 +16,9 @@
  "split": {
    "soft_serial_pin": "D0"
  },
+  "rgblight": {
+    "led_count": 16
+  },
  "ws2812": {
    "pin": "D1"
  },
@@ -22,8 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE

-/* ws2812 RGB LED */
-#define RGBLED_NUM 34    // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -21,6 +21,9 @@
    "split": {
      "soft_serial_pin": "D3"
    },
+    "rgblight": {
+      "led_count": 34
+    },
    "ws2812": {
      "pin": "B6"
    },