Merge remote-tracking branch 'origin/develop' into xap

2024-12-03 08:25:11 +00:00 · 2023-06-18 04:39:41 +00:00 · 2023-06-18 04:39:41 +00:00 · 3bce99af37
commit 3bce99af37
parent 85a367dfe8 b1783db4ea
2160 changed files with 2194 additions and 2058 deletions
--- a/keyboards/0_sixty/underglow/config.h
+++ b/keyboards/0_sixty/underglow/config.h
@ -18,7 +18,6 @@


 /* underglow */
-#define RGBLED_NUM 24
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
--- a/keyboards/0_sixty/underglow/info.json
+++ b/keyboards/0_sixty/underglow/info.json
@ -10,6 +10,7 @@
        "pin": "B6"
    },
    "rgblight": {
+        "led_count": 24,
        "max_brightness": 185
    }
 }
--- a/keyboards/0xcb/1337/config.h
+++ b/keyboards/0xcb/1337/config.h
@ -20,7 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #define TAP_CODE_DELAY 10

-  #define RGBLED_NUM 4
  #define RGBLIGHT_HUE_STEP 8
  #define RGBLIGHT_SAT_STEP 8
  #define RGBLIGHT_VAL_STEP 8
--- a/keyboards/0xcb/1337/info.json
+++ b/keyboards/0xcb/1337/info.json
@ -22,6 +22,7 @@
    "led": "B0"
  },
  "rgblight": {
+    "led_count": 4,
    "sleep": true
  },
  "ws2812": {
--- a/keyboards/0xcb/tutelpad/config.h
+++ b/keyboards/0xcb/tutelpad/config.h
@ -16,8 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-#define RGBLED_NUM 4                    // Number of LEDs connected
-
 #define RGBLIGHT_HUE_STEP 10            // The number of steps to cycle through the hue by
 #define RGBLIGHT_SAT_STEP 17            // The number of steps to increment the saturation by
 #define RGBLIGHT_VAL_STEP 17            // The number of steps to increment the brightness by
--- a/keyboards/0xcb/tutelpad/info.json
+++ b/keyboards/0xcb/tutelpad/info.json
@ -12,6 +12,7 @@
        "matrix": [1, 0]
    },
    "rgblight": {
+        "led_count": 4,
        "sleep": true
    },
    "ws2812": {
--- a/keyboards/10bleoledhub/config.h
+++ b/keyboards/10bleoledhub/config.h
@ -18,8 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/

 #define SSD1306OLED

-#define RGBLED_NUM 4
-
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
--- a/keyboards/10bleoledhub/info.json
+++ b/keyboards/10bleoledhub/info.json
@ -8,6 +8,9 @@
        "pid": "0x7C99",
        "device_version": "0.0.1"
    },
+    "rgblight": {
+        "led_count": 4
+    },
    "ws2812": {
        "pin": "B7"
    },
--- a/keyboards/1k/config.h
+++ b/keyboards/1k/config.h
@ -15,8 +15,6 @@
 */
 #pragma once

-#define RGBLED_NUM 1
-
 // Save as much space as we can...
 #define LAYER_STATE_8BIT
 #define NO_ACTION_LAYER
--- a/keyboards/1k/info.json
+++ b/keyboards/1k/info.json
@ -8,6 +8,9 @@
    "pid": "0x0001",
    "device_version": "0.0.1"
  },
+  "rgblight": {
+    "led_count": 1
+  },
  "ws2812": {
    "pin": "B2"
  },
--- a/keyboards/1upkeyboards/1up60hse/config.h
+++ b/keyboards/1upkeyboards/1up60hse/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 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
--- a/keyboards/1upkeyboards/1up60hse/info.json
+++ b/keyboards/1upkeyboards/1up60hse/info.json
@ -19,6 +19,7 @@
        "breathing": true
    },
    "rgblight": {
+        "led_count": 14,
        "sleep": true
    },
    "ws2812": {
--- a/keyboards/1upkeyboards/1up60hte/config.h
+++ b/keyboards/1upkeyboards/1up60hte/config.h
@ -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
--- a/keyboards/1upkeyboards/1up60hte/info.json
+++ b/keyboards/1upkeyboards/1up60hte/info.json
@ -20,6 +20,9 @@
        "caps_lock": "B6",
        "on_state": 0
    },
+    "rgblight": {
+        "led_count": 14
+    },
    "ws2812": {
        "pin": "F0"
    },
--- a/keyboards/1upkeyboards/1up60rgb/config.h
+++ b/keyboards/1upkeyboards/1up60rgb/config.h
@ -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
--- a/keyboards/1upkeyboards/1up60rgb/info.json
+++ b/keyboards/1upkeyboards/1up60rgb/info.json
@ -17,6 +17,9 @@
    "pin": "B6",
    "levels": 5
  },
+  "rgblight": {
+    "led_count": 16
+  },
  "ws2812": {
    "pin": "E2"
  },
--- a/keyboards/1upkeyboards/pi60_hse/config.h
+++ b/keyboards/1upkeyboards/pi60_hse/config.h
@ -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
--- a/keyboards/1upkeyboards/super16/config.h
+++ b/keyboards/1upkeyboards/super16/config.h
@ -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
--- a/keyboards/1upkeyboards/super16/info.json
+++ b/keyboards/1upkeyboards/super16/info.json
@ -12,6 +12,7 @@
    "pin": "D3"
  },
  "rgblight": {
+    "led_count": 16,
    "sleep": true
  },
  "rgb_matrix": {
--- a/keyboards/1upkeyboards/sweet16/v1/config.h
+++ b/keyboards/1upkeyboards/sweet16/v1/config.h
@ -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
--- a/keyboards/1upkeyboards/sweet16/v1/info.json
+++ b/keyboards/1upkeyboards/sweet16/v1/info.json
@ -3,6 +3,9 @@
        "pid": "0x0161",
        "device_version": "0.0.1"
    },
+    "rgblight": {
+        "led_count": 1
+    },
    "ws2812": {
        "pin": "B1"
    },
--- a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h
+++ b/keyboards/1upkeyboards/sweet16v2/kb2040/config.h
@ -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
--- a/keyboards/25keys/aleth42/rev0/config.h
+++ b/keyboards/25keys/aleth42/rev0/config.h
@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-   #define RGBLED_NUM 6
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
--- a/keyboards/25keys/aleth42/rev0/info.json
+++ b/keyboards/25keys/aleth42/rev0/info.json
@ -14,6 +14,7 @@
        ]
    },
    "rgblight": {
+        "led_count": 6,
        "sleep": true
    },
    "ws2812": {
--- a/keyboards/25keys/aleth42/rev1/config.h
+++ b/keyboards/25keys/aleth42/rev1/config.h
@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-   #define RGBLED_NUM 8
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
--- a/keyboards/25keys/aleth42/rev1/info.json
+++ b/keyboards/25keys/aleth42/rev1/info.json
@ -14,6 +14,7 @@
        ]
    },
    "rgblight": {
+        "led_count": 8,
        "sleep": true
    },
    "ws2812": {
--- a/keyboards/25keys/cassette42/config.h
+++ b/keyboards/25keys/cassette42/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/25keys/cassette42/info.json
+++ b/keyboards/25keys/cassette42/info.json
@ -15,6 +15,7 @@
        ]
    },
    "rgblight": {
+        "led_count": 5,
        "sleep": true
    },
    "ws2812": {
--- a/keyboards/2key2crawl/config.h
+++ b/keyboards/2key2crawl/config.h
@ -18,5 +18,4 @@
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 3
 #endif
--- a/keyboards/2key2crawl/info.json
+++ b/keyboards/2key2crawl/info.json
@ -18,6 +18,9 @@
            {"pin_a": "D0", "pin_b": "D1", "resolution": 1}
        ]
    },
+    "rgblight": {
+        "led_count": 3
+    },
    "ws2812": {
        "pin": "C6"
    },
--- a/keyboards/40percentclub/luddite/config.h
+++ b/keyboards/40percentclub/luddite/config.h
@ -17,7 +17,6 @@
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 8    // Number of LEDs
 // #define RGBLIGHT_HUE_STEP 10
 // #define RGBLIGHT_SAT_STEP 17
 // #define RGBLIGHT_VAL_STEP 17
--- a/keyboards/40percentclub/luddite/info.json
+++ b/keyboards/40percentclub/luddite/info.json
@ -17,6 +17,9 @@
    "pin": "B5",
    "levels": 4
  },
+  "rgblight": {
+    "led_count": 8
+  },
  "ws2812": {
    "pin": "B4"
  },
--- a/keyboards/40percentclub/nano/config.h
+++ b/keyboards/40percentclub/nano/config.h
@ -28,4 +28,3 @@ 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 6    // Number of LEDs
--- a/keyboards/40percentclub/nano/info.json
+++ b/keyboards/40percentclub/nano/info.json
@ -8,6 +8,9 @@
    "pid": "0x0007",
    "device_version": "0.0.1"
  },
+  "rgblight": {
+    "led_count": 6
+  },
  "ws2812": {
    "pin": "D3"
  },
--- a/keyboards/40percentclub/nori/config.h
+++ b/keyboards/40percentclub/nori/config.h
@ -27,7 +27,6 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 10
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
--- a/keyboards/40percentclub/nori/info.json
+++ b/keyboards/40percentclub/nori/info.json
@ -16,6 +16,9 @@
    "backlight": {
      "pin": "B5"
    },
+    "rgblight": {
+      "led_count": 10
+    },
    "ws2812": {
      "pin": "B4"
    },
--- a/keyboards/40percentclub/tomato/config.h
+++ b/keyboards/40percentclub/tomato/config.h
@ -17,7 +17,6 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 30
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
--- a/keyboards/40percentclub/tomato/info.json
+++ b/keyboards/40percentclub/tomato/info.json
@ -8,6 +8,9 @@
    "pid": "0x546F",
    "device_version": "0.0.1"
  },
+  "rgblight": {
+    "led_count": 30
+  },
  "ws2812": {
    "pin": "B5"
  },
--- a/keyboards/4pplet/aekiso60/rev_a/config.h
+++ b/keyboards/4pplet/aekiso60/rev_a/config.h
@ -1,7 +1,5 @@
 #pragma once

-#define RGBLED_NUM 12
-
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
--- a/keyboards/4pplet/aekiso60/rev_a/info.json
+++ b/keyboards/4pplet/aekiso60/rev_a/info.json
@ -4,6 +4,9 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "rgblight": {
+        "led_count": 12
+    },
    "ws2812": {
        "pin": "D3"
    },
--- a/keyboards/4pplet/aekiso60/rev_b/config.h
+++ b/keyboards/4pplet/aekiso60/rev_b/config.h
@ -16,7 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once

-#define RGBLED_NUM 12
 #define WS2812_EXTERNAL_PULLUP
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
--- a/keyboards/4pplet/aekiso60/rev_b/info.json
+++ b/keyboards/4pplet/aekiso60/rev_b/info.json
@ -4,6 +4,9 @@
        "pid": "0x0011",
        "device_version": "0.0.2"
    },
+    "rgblight": {
+        "led_count": 12
+    },
    "ws2812": {
        "pin": "A8"
    },
--- a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h
@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_SPI_MOSI_PAL_MODE 0
 #define WS2812_SPI_SCK_PIN A5
 #define WS2812_SPI_SCK_PAL_MODE 0
-#define RGBLED_NUM  16
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
--- a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json
@ -18,6 +18,9 @@
        "levels": 10,
        "breathing": true
    },
+    "rgblight": {
+        "led_count": 16
+    },
    "ws2812": {
        "pin": "A7",
        "driver": "spi"
--- a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h
+++ b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h
@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PAL_MODE      1

 /* Underglow */
-#define RGBLED_NUM 16
 #define WS2812_EXTERNAL_PULLUP

 #define RGBLIGHT_HUE_STEP 8
--- a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json
+++ b/keyboards/4pplet/eagle_viper_rep/rev_b/info.json
@ -23,6 +23,9 @@
        "num_lock": "B12",
        "scroll_lock": "B13"
    },
+    "rgblight": {
+        "led_count": 16
+    },
    "ws2812": {
        "pin": "A8"
    },
--- a/keyboards/4pplet/waffling60/rev_b/config.h
+++ b/keyboards/4pplet/waffling60/rev_b/config.h
@ -16,8 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once

-#define RGBLED_NUM 1
-
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
--- a/keyboards/4pplet/waffling60/rev_b/info.json
+++ b/keyboards/4pplet/waffling60/rev_b/info.json
@ -8,6 +8,9 @@
        "pid": "0x0005",
        "device_version": "0.0.2"
    },
+    "rgblight": {
+        "led_count": 1
+    },
    "ws2812": {
        "pin": "D3"
    },
--- a/keyboards/4pplet/waffling60/rev_c/config.h
+++ b/keyboards/4pplet/waffling60/rev_c/config.h
@ -16,8 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once

-#define RGBLED_NUM 1
-
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
--- a/keyboards/4pplet/waffling60/rev_c/info.json
+++ b/keyboards/4pplet/waffling60/rev_c/info.json
@ -12,6 +12,9 @@
        "cols": ["C4", "C5", "D2", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D1", "D4"],
        "rows": ["C2", "D0", "B0", "D6", "D5"]
    },
+    "rgblight": {
+        "led_count": 1
+    },
    "ws2812": {
        "pin": "D3"
    },
--- a/keyboards/4pplet/waffling60/rev_d/config.h
+++ b/keyboards/4pplet/waffling60/rev_d/config.h
@ -16,7 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once

-#define RGBLED_NUM 1
 #define WS2812_EXTERNAL_PULLUP

 #define RGBLIGHT_HUE_STEP 8
--- a/keyboards/4pplet/waffling60/rev_d/info.json
+++ b/keyboards/4pplet/waffling60/rev_d/info.json
@ -8,6 +8,9 @@
        "pid": "0x000E",
        "device_version": "0.0.4"
    },
+    "rgblight": {
+        "led_count": 1
+    },
    "ws2812": {
        "pin": "A8"
    },
--- a/keyboards/4pplet/waffling80/rev_a/config.h
+++ b/keyboards/4pplet/waffling80/rev_a/config.h
@ -16,8 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once

-#define RGBLED_NUM 2
-
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
--- a/keyboards/4pplet/waffling80/rev_a/info.json
+++ b/keyboards/4pplet/waffling80/rev_a/info.json
@ -4,6 +4,9 @@
        "pid": "0x0006",
        "device_version": "0.0.1"
    },
+    "rgblight": {
+        "led_count": 2
+    },
    "ws2812": {
        "pin": "D7"
    },
--- a/keyboards/4pplet/waffling80/rev_b/config.h
+++ b/keyboards/4pplet/waffling80/rev_b/config.h
@ -16,7 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once

-#define RGBLED_NUM 2
 #define WS2812_EXTERNAL_PULLUP

 #define RGBLIGHT_HUE_STEP 8
--- a/keyboards/4pplet/waffling80/rev_b/info.json
+++ b/keyboards/4pplet/waffling80/rev_b/info.json
@ -4,6 +4,9 @@
        "pid": "0x000F",
        "device_version": "0.0.2"
    },
+    "rgblight": {
+        "led_count": 2
+    },
    "ws2812": {
        "pin": "A8"
    },
--- a/keyboards/8pack/config.h
+++ b/keyboards/8pack/config.h
@ -7,7 +7,6 @@
 #define LOCKING_RESYNC_ENABLE

 // ws2812 options
-#define RGBLED_NUM 8 // number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
--- a/keyboards/8pack/info.json
+++ b/keyboards/8pack/info.json
@ -11,6 +11,9 @@
    "pins": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
    "levels": 8
  },
+  "rgblight": {
+    "led_count": 8
+  },
  "ws2812": {
    "pin": "D2"
  },
--- a/keyboards/9key/config.h
+++ b/keyboards/9key/config.h
@ -17,6 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-#define RGBLED_NUM 1    // Number of LEDs
-
 #define TAPPING_TERM 200
--- a/keyboards/9key/info.json
+++ b/keyboards/9key/info.json
@ -8,6 +8,9 @@
    "pid": "0x0007",
    "device_version": "0.0.1"
  },
+  "rgblight": {
+    "led_count": 1
+  },
  "ws2812": {
    "pin": "F7"
  },
--- a/keyboards/abacus/config.h
+++ b/keyboards/abacus/config.h
@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #define DIP_SWITCH_PINS { D0 }

-#    define RGBLED_NUM 17
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
--- a/keyboards/abacus/info.json
+++ b/keyboards/abacus/info.json
@ -19,6 +19,7 @@
        ]
    },
    "rgblight": {
+        "led_count": 17,
        "sleep": true
    },
    "ws2812": {
--- a/keyboards/abatskeyboardclub/nayeon/config.h
+++ b/keyboards/abatskeyboardclub/nayeon/config.h
@ -20,5 +20,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* RGB Matrix setup */
 #define RGB_MATRIX_LED_COUNT 2
-#define RGBLED_NUM 2
 #define WS2812_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the WS2812 implementation uses the PIO0 peripheral
--- a/keyboards/abstract/ellipse/rev1/config.h
+++ b/keyboards/abstract/ellipse/rev1/config.h
@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-   #define RGBLED_NUM 3
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
--- a/keyboards/abstract/ellipse/rev1/info.json
+++ b/keyboards/abstract/ellipse/rev1/info.json
@ -25,6 +25,7 @@
        "levels": 15
    },
    "rgblight": {
+        "led_count": 3,
        "sleep": true
    },
    "ws2812": {
--- a/keyboards/acekeyboard/titan60/config.h
+++ b/keyboards/acekeyboard/titan60/config.h
@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-#    define RGBLED_NUM 6
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
--- a/keyboards/acekeyboard/titan60/info.json
+++ b/keyboards/acekeyboard/titan60/info.json
@ -18,6 +18,7 @@
      "breathing": true
    },
    "rgblight": {
+      "led_count": 6,
      "sleep": true
    },
    "ws2812": {
--- a/keyboards/acheron/athena/alpha/config.h
+++ b/keyboards/acheron/athena/alpha/config.h
@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      2

-#define RGBLED_NUM 34
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
--- a/keyboards/acheron/athena/alpha/info.json
+++ b/keyboards/acheron/athena/alpha/info.json
@ -15,6 +15,9 @@
        "on_state": 0,
        "breathing": true
    },
+    "rgblight": {
+        "led_count": 34
+    },
    "ws2812": {
        "pin": "B15"
    },
--- a/keyboards/acheron/athena/beta/config.h
+++ b/keyboards/acheron/athena/beta/config.h
@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PWM_CHANNEL   3
 #define BACKLIGHT_PAL_MODE      2

-#define RGBLED_NUM 34
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
--- a/keyboards/acheron/athena/beta/info.json
+++ b/keyboards/acheron/athena/beta/info.json
@ -14,6 +14,9 @@
        "levels": 20,
        "breathing": true
    },
+    "rgblight": {
+        "led_count": 34
+    },
    "ws2812": {
        "pin": "B15"
    },
--- a/keyboards/acheron/elongate/beta/config.h
+++ b/keyboards/acheron/elongate/beta/config.h
@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-  #define RGBLED_NUM 16
  #define RGBLIGHT_HUE_STEP 8
  #define RGBLIGHT_SAT_STEP 8
  #define RGBLIGHT_VAL_STEP 8
--- a/keyboards/acheron/elongate/beta/info.json
+++ b/keyboards/acheron/elongate/beta/info.json
@ -9,6 +9,7 @@
        "device_version": "0.0.1"
    },
    "rgblight": {
+        "led_count": 16,
        "sleep": true
    },
    "ws2812": {
--- a/keyboards/acheron/elongate/delta/config.h
+++ b/keyboards/acheron/elongate/delta/config.h
@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PWM_CHANNEL 1
 #define BACKLIGHT_PAL_MODE 1

-#define RGBLED_NUM 16
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
--- a/keyboards/acheron/elongate/delta/info.json
+++ b/keyboards/acheron/elongate/delta/info.json
@ -20,6 +20,7 @@
        "breathing_period": 3
    },
    "rgblight": {
+        "led_count": 16,
        "max_brightness": 200,
        "sleep": true
    },
--- a/keyboards/acheron/shark/beta/config.h
+++ b/keyboards/acheron/shark/beta/config.h
@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      2

-#define RGBLED_NUM 24
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
--- a/keyboards/acheron/shark/beta/info.json
+++ b/keyboards/acheron/shark/beta/info.json
@ -14,6 +14,9 @@
            {"pin_a": "C15", "pin_b": "C14"}
        ]
    },
+    "rgblight": {
+        "led_count": 24
+    },
    "ws2812": {
        "pin": "B15"
    },
--- a/keyboards/ada/ada1800mini/config.h
+++ b/keyboards/ada/ada1800mini/config.h
@ -17,7 +17,6 @@
 #pragma once

 //TODO: implement RGB matrix when I get the hardware
-    #define RGBLED_NUM 100
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
    #define RGBLIGHT_VAL_STEP 8
--- a/keyboards/ada/ada1800mini/info.json
+++ b/keyboards/ada/ada1800mini/info.json
@ -12,6 +12,7 @@
        "pin": "F0"
    },
    "rgblight": {
+        "led_count": 100,
        "max_brightness": 200,
        "sleep": true
    },
--- a/keyboards/ada/infinity81/config.h
+++ b/keyboards/ada/infinity81/config.h
@ -3,7 +3,6 @@

 #pragma once

-#    define RGBLED_NUM 107
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
--- a/keyboards/ada/infinity81/info.json
+++ b/keyboards/ada/infinity81/info.json
@ -9,6 +9,7 @@
        "device_version": "0.0.1"
    },
    "rgblight": {
+        "led_count": 107,
        "sleep": true
    },
    "ws2812": {
--- a/keyboards/adafruit/macropad/config.h
+++ b/keyboards/adafruit/macropad/config.h
@ -55,7 +55,6 @@

     /* RGB Defines */
 #    define RGB_MATRIX_LED_COUNT 12
-#    define RGBLED_NUM 12

     /* Enable Framebuffer and keypress effects */
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
--- a/keyboards/adpenrose/kintsugi/config.h
+++ b/keyboards/adpenrose/kintsugi/config.h
@ -20,7 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAP_CODE_DELAY 10

 /* Underglow options: */
-#    define RGBLED_NUM 16
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
--- a/keyboards/adpenrose/kintsugi/info.json
+++ b/keyboards/adpenrose/kintsugi/info.json
@ -9,6 +9,7 @@
        "device_version": "1.0.0"
    },
    "rgblight": {
+        "led_count": 16,
        "sleep": true
    },
    "ws2812": {
--- a/keyboards/adpenrose/obi/config.h
+++ b/keyboards/adpenrose/obi/config.h
@ -6,7 +6,6 @@
 #define TAP_CODE_DELAY 10

 /* Underglow options: */
-#    define RGBLED_NUM 16
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
--- a/keyboards/adpenrose/obi/info.json
+++ b/keyboards/adpenrose/obi/info.json
@ -8,6 +8,7 @@
        "vid": "0x4450"
    },
    "rgblight": {
+        "led_count": 16,
        "sleep": true
    },
    "ws2812": {
--- a/keyboards/aeboards/ext65/rev2/config.h
+++ b/keyboards/aeboards/ext65/rev2/config.h
@ -27,7 +27,6 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 24

 //SPI
 #define WS2812_SPI SPID2
--- a/keyboards/aeboards/ext65/rev2/info.json
+++ b/keyboards/aeboards/ext65/rev2/info.json
@ -12,6 +12,9 @@
        "levels": 6,
        "breathing": true
    },
+    "rgblight": {
+        "led_count": 24
+    },
    "ws2812": {
        "pin": "B15",
        "driver": "spi"
--- a/keyboards/ai03/polaris/config.h
+++ b/keyboards/ai03/polaris/config.h
@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-  #define RGBLED_NUM 14
  #define RGBLIGHT_HUE_STEP 8
  #define RGBLIGHT_SAT_STEP 8
  #define RGBLIGHT_VAL_STEP 8
--- a/keyboards/ai03/polaris/info.json
+++ b/keyboards/ai03/polaris/info.json
@ -19,6 +19,7 @@
        "breathing": true
    },
    "rgblight": {
+        "led_count": 14,
        "max_brightness": 200,
        "sleep": true
    },
--- a/keyboards/ai03/voyager60_alps/config.h
+++ b/keyboards/ai03/voyager60_alps/config.h
@ -14,7 +14,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-  #define RGBLED_NUM 14
  #define RGBLIGHT_HUE_STEP 8
  #define RGBLIGHT_SAT_STEP 8
  #define RGBLIGHT_VAL_STEP 8
--- a/keyboards/ai03/voyager60_alps/info.json
+++ b/keyboards/ai03/voyager60_alps/info.json
@ -9,6 +9,7 @@
        "device_version": "0.0.1"
    },
    "rgblight": {
+        "led_count": 14,
        "sleep": true
    },
    "ws2812": {
--- a/keyboards/aleblazer/zodiark/config.h
+++ b/keyboards/aleblazer/zodiark/config.h
@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define SELECT_SOFT_SERIAL_SPEED 1

 #ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 68
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
--- a/keyboards/aleblazer/zodiark/info.json
+++ b/keyboards/aleblazer/zodiark/info.json
@ -12,6 +12,7 @@
        "pin": "B5"
    },
    "rgblight": {
+        "led_count": 68,
        "max_brightness": 170,
        "split_count": [34, 34]
    },
--- a/keyboards/alf/dc60/config.h
+++ b/keyboards/alf/dc60/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 20
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
--- a/keyboards/alf/dc60/info.json
+++ b/keyboards/alf/dc60/info.json
@ -17,6 +17,9 @@
        "levels": 5,
        "breathing": true
    },
+    "rgblight": {
+        "led_count": 20
+    },
    "ws2812": {
        "pin": "E6"
    },
--- a/keyboards/alf/x11/config.h
+++ b/keyboards/alf/x11/config.h
@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-  #define RGBLED_NUM 28
  #define RGBLIGHT_HUE_STEP 8
  #define RGBLIGHT_SAT_STEP 8
  #define RGBLIGHT_VAL_STEP 8
--- a/keyboards/alf/x11/info.json
+++ b/keyboards/alf/x11/info.json
@ -18,6 +18,7 @@
    "breathing": true
  },
  "rgblight": {
+    "led_count": 28,
    "sleep": true
  },
  "ws2812": {
--- a/keyboards/alf/x2/config.h
+++ b/keyboards/alf/x2/config.h
@ -32,7 +32,6 @@
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#    define RGBLED_NUM 4
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
--- a/keyboards/alf/x2/info.json
+++ b/keyboards/alf/x2/info.json
@ -17,6 +17,9 @@
        "caps_lock": "B2",
        "on_state": 0
    },
+    "rgblight": {
+        "led_count": 4
+    },
    "ws2812": {
        "pin": "E2"
    },
--- a/Show More
+++ b/Show More